11963 files changed, 68235 insertions, 103849 deletions

diff --git a/tests/arm64/Tests.lst b/tests/arm64/Tests.lst
index 5b2792b0c0..ee641ef23f 100644
--- a/tests/arm64/Tests.lst
+++ b/tests/arm64/Tests.lst
@@ -1,11 +1,17 @@
-## commit: 20fcbd02607d1d768061f2be4702d55b45d9920c
+## This list file has been produced automatically. Any changes
+## are subject to being overwritten when reproducing this file.
+## 
+## Last Updated: 31-Mar-2017 09:36:29
+## Commit: 2401b6ed08252d48831bfd804c3533cd0142c76c
+## 
 [Dev10_535767.cmd_0]
 RelativePath=baseservices\compilerservices\dynamicobjectproperties\Dev10_535767\Dev10_535767.cmd
 WorkingDir=baseservices\compilerservices\dynamicobjectproperties\Dev10_535767
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS;UNWIND
+Categories=Pri1;RT;EXPECTED_PASS;UNWIND;10070;GCSTRESS_FAIL
 HostStyle=0
+
 [test448035.cmd_1]
 RelativePath=baseservices\compilerservices\dynamicobjectproperties\test448035\test448035.cmd
 WorkingDir=baseservices\compilerservices\dynamicobjectproperties\test448035
@@ -13,13 +19,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TestAPIs.cmd_2]
 RelativePath=baseservices\compilerservices\dynamicobjectproperties\TestAPIs\TestAPIs.cmd
 WorkingDir=baseservices\compilerservices\dynamicobjectproperties\TestAPIs
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_FAIL;ISSUE_6857
+Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TestGC.cmd_3]
 RelativePath=baseservices\compilerservices\dynamicobjectproperties\TestGC\TestGC.cmd
 WorkingDir=baseservices\compilerservices\dynamicobjectproperties\TestGC
@@ -27,6 +35,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TestOverrides.cmd_4]
 RelativePath=baseservices\compilerservices\dynamicobjectproperties\TestOverrides\TestOverrides.cmd
 WorkingDir=baseservices\compilerservices\dynamicobjectproperties\TestOverrides
@@ -34,34 +43,39 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AVException01.cmd_5]
 RelativePath=baseservices\exceptions\AccessViolationException\AVException01\AVException01.cmd
 WorkingDir=baseservices\exceptions\AccessViolationException\AVException01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AVException02.cmd_6]
 RelativePath=baseservices\exceptions\AccessViolationException\AVException02\AVException02.cmd
 WorkingDir=baseservices\exceptions\AccessViolationException\AVException02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AVException03.cmd_7]
 RelativePath=baseservices\exceptions\AccessViolationException\AVException03\AVException03.cmd
 WorkingDir=baseservices\exceptions\AccessViolationException\AVException03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GenericExceptions.cmd_8]
 RelativePath=baseservices\exceptions\generics\GenericExceptions\GenericExceptions.cmd
 WorkingDir=baseservices\exceptions\generics\GenericExceptions
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GenericExceptions01.cmd_9]
 RelativePath=baseservices\exceptions\generics\GenericExceptions01\GenericExceptions01.cmd
 WorkingDir=baseservices\exceptions\generics\GenericExceptions01
@@ -69,6 +83,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GenericExceptions02.cmd_10]
 RelativePath=baseservices\exceptions\generics\GenericExceptions02\GenericExceptions02.cmd
 WorkingDir=baseservices\exceptions\generics\GenericExceptions02
@@ -76,6 +91,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GenericExceptions03.cmd_11]
 RelativePath=baseservices\exceptions\generics\GenericExceptions03\GenericExceptions03.cmd
 WorkingDir=baseservices\exceptions\generics\GenericExceptions03
@@ -83,6 +99,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GenericExceptions04.cmd_12]
 RelativePath=baseservices\exceptions\generics\GenericExceptions04\GenericExceptions04.cmd
 WorkingDir=baseservices\exceptions\generics\GenericExceptions04
@@ -90,6 +107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GenericExceptions05.cmd_13]
 RelativePath=baseservices\exceptions\generics\GenericExceptions05\GenericExceptions05.cmd
 WorkingDir=baseservices\exceptions\generics\GenericExceptions05
@@ -97,6 +115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GenericExceptions06.cmd_14]
 RelativePath=baseservices\exceptions\generics\GenericExceptions06\GenericExceptions06.cmd
 WorkingDir=baseservices\exceptions\generics\GenericExceptions06
@@ -104,6 +123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GenericExceptions07.cmd_15]
 RelativePath=baseservices\exceptions\generics\GenericExceptions07\GenericExceptions07.cmd
 WorkingDir=baseservices\exceptions\generics\GenericExceptions07
@@ -111,6 +131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GenericExceptions08.cmd_16]
 RelativePath=baseservices\exceptions\generics\GenericExceptions08\GenericExceptions08.cmd
 WorkingDir=baseservices\exceptions\generics\GenericExceptions08
@@ -118,6 +139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [nested-try-catch01.cmd_17]
 RelativePath=baseservices\exceptions\generics\nested-try-catch01\nested-try-catch01.cmd
 WorkingDir=baseservices\exceptions\generics\nested-try-catch01
@@ -125,6 +147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [nested-try-catch02.cmd_18]
 RelativePath=baseservices\exceptions\generics\nested-try-catch02\nested-try-catch02.cmd
 WorkingDir=baseservices\exceptions\generics\nested-try-catch02
@@ -132,6 +155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [nested-try-catch03.cmd_19]
 RelativePath=baseservices\exceptions\generics\nested-try-catch03\nested-try-catch03.cmd
 WorkingDir=baseservices\exceptions\generics\nested-try-catch03
@@ -139,6 +163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [nested-try-catch04.cmd_20]
 RelativePath=baseservices\exceptions\generics\nested-try-catch04\nested-try-catch04.cmd
 WorkingDir=baseservices\exceptions\generics\nested-try-catch04
@@ -146,6 +171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [nested-try-catch05.cmd_21]
 RelativePath=baseservices\exceptions\generics\nested-try-catch05\nested-try-catch05.cmd
 WorkingDir=baseservices\exceptions\generics\nested-try-catch05
@@ -153,6 +179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [nested-try-catch06.cmd_22]
 RelativePath=baseservices\exceptions\generics\nested-try-catch06\nested-try-catch06.cmd
 WorkingDir=baseservices\exceptions\generics\nested-try-catch06
@@ -160,6 +187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [nested-try-catch07.cmd_23]
 RelativePath=baseservices\exceptions\generics\nested-try-catch07\nested-try-catch07.cmd
 WorkingDir=baseservices\exceptions\generics\nested-try-catch07
@@ -167,6 +195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [nested-try-catch08.cmd_24]
 RelativePath=baseservices\exceptions\generics\nested-try-catch08\nested-try-catch08.cmd
 WorkingDir=baseservices\exceptions\generics\nested-try-catch08
@@ -174,6 +203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [nested-try-catch09.cmd_25]
 RelativePath=baseservices\exceptions\generics\nested-try-catch09\nested-try-catch09.cmd
 WorkingDir=baseservices\exceptions\generics\nested-try-catch09
@@ -181,6 +211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [nested-try-catch10.cmd_26]
 RelativePath=baseservices\exceptions\generics\nested-try-catch10\nested-try-catch10.cmd
 WorkingDir=baseservices\exceptions\generics\nested-try-catch10
@@ -188,6 +219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-finally-struct01.cmd_27]
 RelativePath=baseservices\exceptions\generics\try-catch-finally-struct01\try-catch-finally-struct01.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-finally-struct01
@@ -195,6 +227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-finally-struct02.cmd_28]
 RelativePath=baseservices\exceptions\generics\try-catch-finally-struct02\try-catch-finally-struct02.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-finally-struct02
@@ -202,6 +235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-finally-struct03.cmd_29]
 RelativePath=baseservices\exceptions\generics\try-catch-finally-struct03\try-catch-finally-struct03.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-finally-struct03
@@ -209,6 +243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-finally01.cmd_30]
 RelativePath=baseservices\exceptions\generics\try-catch-finally01\try-catch-finally01.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-finally01
@@ -216,6 +251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-finally02.cmd_31]
 RelativePath=baseservices\exceptions\generics\try-catch-finally02\try-catch-finally02.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-finally02
@@ -223,6 +259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-finally03.cmd_32]
 RelativePath=baseservices\exceptions\generics\try-catch-finally03\try-catch-finally03.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-finally03
@@ -230,6 +267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-struct01.cmd_33]
 RelativePath=baseservices\exceptions\generics\try-catch-struct01\try-catch-struct01.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-struct01
@@ -237,6 +275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-struct02.cmd_34]
 RelativePath=baseservices\exceptions\generics\try-catch-struct02\try-catch-struct02.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-struct02
@@ -244,6 +283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-struct03.cmd_35]
 RelativePath=baseservices\exceptions\generics\try-catch-struct03\try-catch-struct03.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-struct03
@@ -251,6 +291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-struct04.cmd_36]
 RelativePath=baseservices\exceptions\generics\try-catch-struct04\try-catch-struct04.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-struct04
@@ -258,6 +299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-struct05.cmd_37]
 RelativePath=baseservices\exceptions\generics\try-catch-struct05\try-catch-struct05.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-struct05
@@ -265,6 +307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-struct06.cmd_38]
 RelativePath=baseservices\exceptions\generics\try-catch-struct06\try-catch-struct06.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-struct06
@@ -272,6 +315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-struct07.cmd_39]
 RelativePath=baseservices\exceptions\generics\try-catch-struct07\try-catch-struct07.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-struct07
@@ -279,6 +323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-struct08.cmd_40]
 RelativePath=baseservices\exceptions\generics\try-catch-struct08\try-catch-struct08.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-struct08
@@ -286,6 +331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch-struct09.cmd_41]
 RelativePath=baseservices\exceptions\generics\try-catch-struct09\try-catch-struct09.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch-struct09
@@ -293,6 +339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch01.cmd_42]
 RelativePath=baseservices\exceptions\generics\try-catch01\try-catch01.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch01
@@ -300,6 +347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch02.cmd_43]
 RelativePath=baseservices\exceptions\generics\try-catch02\try-catch02.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch02
@@ -307,6 +355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch03.cmd_44]
 RelativePath=baseservices\exceptions\generics\try-catch03\try-catch03.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch03
@@ -314,6 +363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch04.cmd_45]
 RelativePath=baseservices\exceptions\generics\try-catch04\try-catch04.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch04
@@ -321,6 +371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch05.cmd_46]
 RelativePath=baseservices\exceptions\generics\try-catch05\try-catch05.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch05
@@ -328,6 +379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch06.cmd_47]
 RelativePath=baseservices\exceptions\generics\try-catch06\try-catch06.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch06
@@ -335,6 +387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch07.cmd_48]
 RelativePath=baseservices\exceptions\generics\try-catch07\try-catch07.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch07
@@ -342,6 +395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch08.cmd_49]
 RelativePath=baseservices\exceptions\generics\try-catch08\try-catch08.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch08
@@ -349,6 +403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-catch09.cmd_50]
 RelativePath=baseservices\exceptions\generics\try-catch09\try-catch09.cmd
 WorkingDir=baseservices\exceptions\generics\try-catch09
@@ -356,76 +411,87 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-fault-struct01.cmd_51]
 RelativePath=baseservices\exceptions\generics\try-fault-struct01\try-fault-struct01.cmd
 WorkingDir=baseservices\exceptions\generics\try-fault-struct01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [try-fault-struct02.cmd_52]
 RelativePath=baseservices\exceptions\generics\try-fault-struct02\try-fault-struct02.cmd
 WorkingDir=baseservices\exceptions\generics\try-fault-struct02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [try-fault-struct03.cmd_53]
 RelativePath=baseservices\exceptions\generics\try-fault-struct03\try-fault-struct03.cmd
 WorkingDir=baseservices\exceptions\generics\try-fault-struct03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [try-fault01.cmd_54]
 RelativePath=baseservices\exceptions\generics\try-fault01\try-fault01.cmd
 WorkingDir=baseservices\exceptions\generics\try-fault01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [try-fault02.cmd_55]
 RelativePath=baseservices\exceptions\generics\try-fault02\try-fault02.cmd
 WorkingDir=baseservices\exceptions\generics\try-fault02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [try-fault03.cmd_56]
 RelativePath=baseservices\exceptions\generics\try-fault03\try-fault03.cmd
 WorkingDir=baseservices\exceptions\generics\try-fault03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [try-filter-finally01.cmd_57]
 RelativePath=baseservices\exceptions\generics\try-filter-finally01\try-filter-finally01.cmd
 WorkingDir=baseservices\exceptions\generics\try-filter-finally01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [try-filter-finally02.cmd_58]
 RelativePath=baseservices\exceptions\generics\try-filter-finally02\try-filter-finally02.cmd
 WorkingDir=baseservices\exceptions\generics\try-filter-finally02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [try-filter-struct02.cmd_59]
 RelativePath=baseservices\exceptions\generics\try-filter-struct02\try-filter-struct02.cmd
 WorkingDir=baseservices\exceptions\generics\try-filter-struct02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [try-filter02.cmd_60]
 RelativePath=baseservices\exceptions\generics\try-filter02\try-filter02.cmd
 WorkingDir=baseservices\exceptions\generics\try-filter02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [try-finally-struct01.cmd_61]
 RelativePath=baseservices\exceptions\generics\try-finally-struct01\try-finally-struct01.cmd
 WorkingDir=baseservices\exceptions\generics\try-finally-struct01
@@ -433,6 +499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-finally-struct02.cmd_62]
 RelativePath=baseservices\exceptions\generics\try-finally-struct02\try-finally-struct02.cmd
 WorkingDir=baseservices\exceptions\generics\try-finally-struct02
@@ -440,6 +507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-finally-struct03.cmd_63]
 RelativePath=baseservices\exceptions\generics\try-finally-struct03\try-finally-struct03.cmd
 WorkingDir=baseservices\exceptions\generics\try-finally-struct03
@@ -447,6 +515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-finally01.cmd_64]
 RelativePath=baseservices\exceptions\generics\try-finally01\try-finally01.cmd
 WorkingDir=baseservices\exceptions\generics\try-finally01
@@ -454,6 +523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-finally02.cmd_65]
 RelativePath=baseservices\exceptions\generics\try-finally02\try-finally02.cmd
 WorkingDir=baseservices\exceptions\generics\try-finally02
@@ -461,6 +531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [try-finally03.cmd_66]
 RelativePath=baseservices\exceptions\generics\try-finally03\try-finally03.cmd
 WorkingDir=baseservices\exceptions\generics\try-finally03
@@ -468,6 +539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter001.cmd_67]
 RelativePath=baseservices\exceptions\generics\TypeParameter001\TypeParameter001.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter001
@@ -475,6 +547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter002.cmd_68]
 RelativePath=baseservices\exceptions\generics\TypeParameter002\TypeParameter002.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter002
@@ -482,6 +555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter003.cmd_69]
 RelativePath=baseservices\exceptions\generics\TypeParameter003\TypeParameter003.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter003
@@ -489,6 +563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter004.cmd_70]
 RelativePath=baseservices\exceptions\generics\TypeParameter004\TypeParameter004.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter004
@@ -496,6 +571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter005.cmd_71]
 RelativePath=baseservices\exceptions\generics\TypeParameter005\TypeParameter005.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter005
@@ -503,6 +579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter006.cmd_72]
 RelativePath=baseservices\exceptions\generics\TypeParameter006\TypeParameter006.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter006
@@ -510,6 +587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter007.cmd_73]
 RelativePath=baseservices\exceptions\generics\TypeParameter007\TypeParameter007.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter007
@@ -517,6 +595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter008.cmd_74]
 RelativePath=baseservices\exceptions\generics\TypeParameter008\TypeParameter008.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter008
@@ -524,6 +603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter009.cmd_75]
 RelativePath=baseservices\exceptions\generics\TypeParameter009\TypeParameter009.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter009
@@ -531,6 +611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter010.cmd_76]
 RelativePath=baseservices\exceptions\generics\TypeParameter010\TypeParameter010.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter010
@@ -538,6 +619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter011.cmd_77]
 RelativePath=baseservices\exceptions\generics\TypeParameter011\TypeParameter011.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter011
@@ -545,6 +627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter012.cmd_78]
 RelativePath=baseservices\exceptions\generics\TypeParameter012\TypeParameter012.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter012
@@ -552,6 +635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter013.cmd_79]
 RelativePath=baseservices\exceptions\generics\TypeParameter013\TypeParameter013.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter013
@@ -559,6 +643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter014.cmd_80]
 RelativePath=baseservices\exceptions\generics\TypeParameter014\TypeParameter014.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter014
@@ -566,6 +651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter015.cmd_81]
 RelativePath=baseservices\exceptions\generics\TypeParameter015\TypeParameter015.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter015
@@ -573,6 +659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter016.cmd_82]
 RelativePath=baseservices\exceptions\generics\TypeParameter016\TypeParameter016.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter016
@@ -580,6 +667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter017.cmd_83]
 RelativePath=baseservices\exceptions\generics\TypeParameter017\TypeParameter017.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter017
@@ -587,6 +675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeParameter018.cmd_84]
 RelativePath=baseservices\exceptions\generics\TypeParameter018\TypeParameter018.cmd
 WorkingDir=baseservices\exceptions\generics\TypeParameter018
@@ -594,202 +683,231 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [test147911.cmd_85]
 RelativePath=baseservices\exceptions\regressions\Dev11\147911\test147911\test147911.cmd
 WorkingDir=baseservices\exceptions\regressions\Dev11\147911\test147911
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXCLUDED
+Categories=EXPECTED_FAIL;EXCLUDED
 HostStyle=0
+
 [dynamicmethodliveness.cmd_86]
 RelativePath=baseservices\exceptions\regressions\Dev11\154243\dynamicmethodliveness\dynamicmethodliveness.cmd
 WorkingDir=baseservices\exceptions\regressions\Dev11\154243\dynamicmethodliveness
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Except.cmd_87]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\asm\Except\Except.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\asm\Except
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [FiltCatch.cmd_88]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\asm\FiltCatch\FiltCatch.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\asm\FiltCatch
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Filter.cmd_89]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\asm\Filter\Filter.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\asm\Filter
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [FiltFallThru.cmd_90]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\asm\FiltFallThru\FiltFallThru.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\asm\FiltFallThru
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Finally.cmd_91]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\asm\Finally\Finally.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\asm\Finally
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedExcept.cmd_92]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\asm\NestedExcept\NestedExcept.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\asm\NestedExcept
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedFilt.cmd_93]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\asm\NestedFilt\NestedFilt.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\asm\NestedFilt
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [finally.cmd_94]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\COOL\finally\finally.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\COOL\finally
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [rethrow.cmd_95]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\COOL\rethrow\rethrow.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\COOL\rethrow
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Exceptions.cmd_96]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\coverage\Exceptions\Exceptions.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\coverage\Exceptions
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ExternalException.cmd_97]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\ExternalException\ExternalException.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\ExternalException
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HandlerException.cmd_98]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\HandlerException\HandlerException.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\HandlerException
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleException.cmd_99]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\MultipleException\MultipleException.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\MultipleException
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedEx1.cmd_100]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\NestedEx1\NestedEx1.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\NestedEx1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedEx2.cmd_101]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\NestedEx2\NestedEx2.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\NestedEx2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedException.cmd_102]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\NestedException\NestedException.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\NestedException
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NormalException.cmd_103]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\NormalException\NormalException.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\NormalException
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RecursiveException.cmd_104]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\RecursiveException\RecursiveException.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\RecursiveException
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TryCatch.cmd_105]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\TryCatch\TryCatch.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\TryCatch
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TryCatchFinally.cmd_106]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\TryCatchFinally\TryCatchFinally.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\TryCatchFinally
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [UnmanagedToManaged.cmd_107]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\UnmanagedToManaged\UnmanagedToManaged.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\UnmanagedToManaged
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_FAIL
 HostStyle=0
+
 [UserException.cmd_108]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\UserException\UserException.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\UserException
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [UserExceptionThread.cmd_109]
 RelativePath=baseservices\exceptions\regressions\V1\SEH\VJ\UserExceptionThread\UserExceptionThread.cmd
 WorkingDir=baseservices\exceptions\regressions\V1\SEH\VJ\UserExceptionThread
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [15266.cmd_110]
 RelativePath=baseservices\exceptions\regressions\v1.0\15266\15266.cmd
 WorkingDir=baseservices\exceptions\regressions\v1.0\15266
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [19896.cmd_111]
 RelativePath=baseservices\exceptions\regressions\v1.0\19896\19896.cmd
 WorkingDir=baseservices\exceptions\regressions\v1.0\19896
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test640474.cmd_112]
 RelativePath=baseservices\exceptions\regressions\v4.0\640474\test640474\test640474.cmd
 WorkingDir=baseservices\exceptions\regressions\v4.0\640474\test640474
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [349379.cmd_113]
 RelativePath=baseservices\exceptions\regressions\whidbeybeta2\349379\349379\349379.cmd
 WorkingDir=baseservices\exceptions\regressions\whidbeybeta2\349379\349379
@@ -797,6 +915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [366085.cmd_114]
 RelativePath=baseservices\exceptions\regressions\whidbeybeta2\366085\366085\366085.cmd
 WorkingDir=baseservices\exceptions\regressions\whidbeybeta2\366085\366085
@@ -804,13 +923,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [151232.cmd_115]
 RelativePath=baseservices\exceptions\regressions\whidbeyM3.2\151232\151232.cmd
 WorkingDir=baseservices\exceptions\regressions\whidbeyM3.2\151232
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [106011.cmd_116]
 RelativePath=baseservices\exceptions\regressions\whidbeym3.3\106011\106011\106011.cmd
 WorkingDir=baseservices\exceptions\regressions\whidbeym3.3\106011\106011
@@ -818,6 +939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [302680.cmd_117]
 RelativePath=baseservices\exceptions\regressions\whidbeym3.3\302680\302680\302680.cmd
 WorkingDir=baseservices\exceptions\regressions\whidbeym3.3\302680\302680
@@ -825,6 +947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OOMException01.cmd_118]
 RelativePath=baseservices\exceptions\sharedexceptions\emptystacktrace\OOMException01\OOMException01.cmd
 WorkingDir=baseservices\exceptions\sharedexceptions\emptystacktrace\OOMException01
@@ -832,48 +955,55 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayInit.cmd_119]
 RelativePath=baseservices\exceptions\simple\ArrayInit\ArrayInit.cmd
 WorkingDir=baseservices\exceptions\simple\ArrayInit
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [fault.cmd_120]
 RelativePath=baseservices\exceptions\simple\fault\fault.cmd
 WorkingDir=baseservices\exceptions\simple\fault
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [finally.cmd_121]
 RelativePath=baseservices\exceptions\simple\finally\finally.cmd
 WorkingDir=baseservices\exceptions\simple\finally
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HardwareEh.cmd_122]
 RelativePath=baseservices\exceptions\simple\HardwareEh\HardwareEh.cmd
 WorkingDir=baseservices\exceptions\simple\HardwareEh
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [StackTracePreserveTests.cmd_123]
 RelativePath=baseservices\exceptions\StackTracePreserve\StackTracePreserveTests\StackTracePreserveTests.cmd
 WorkingDir=baseservices\exceptions\StackTracePreserve\StackTracePreserveTests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Baadbaad.cmd_124]
 RelativePath=baseservices\exceptions\unittests\Baadbaad\Baadbaad.cmd
 WorkingDir=baseservices\exceptions\unittests\Baadbaad
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [BaseClass.cmd_125]
 RelativePath=baseservices\exceptions\unittests\BaseClass\BaseClass.cmd
 WorkingDir=baseservices\exceptions\unittests\BaseClass
@@ -881,34 +1011,39 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CollidedUnwind.cmd_126]
 RelativePath=baseservices\exceptions\unittests\CollidedUnwind\CollidedUnwind.cmd
 WorkingDir=baseservices\exceptions\unittests\CollidedUnwind
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [EHPatternTests.cmd_127]
 RelativePath=baseservices\exceptions\unittests\EHPatternTests\EHPatternTests.cmd
 WorkingDir=baseservices\exceptions\unittests\EHPatternTests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GoryManagedPresent.cmd_128]
 RelativePath=baseservices\exceptions\unittests\GoryManagedPresent\GoryManagedPresent.cmd
 WorkingDir=baseservices\exceptions\unittests\GoryManagedPresent
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GoryNativePast.cmd_129]
 RelativePath=baseservices\exceptions\unittests\GoryNativePast\GoryNativePast.cmd
 WorkingDir=baseservices\exceptions\unittests\GoryNativePast
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [InnerFinally.cmd_130]
 RelativePath=baseservices\exceptions\unittests\InnerFinally\InnerFinally.cmd
 WorkingDir=baseservices\exceptions\unittests\InnerFinally
@@ -916,41 +1051,47 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InnerFinallyAndCatch.cmd_131]
 RelativePath=baseservices\exceptions\unittests\InnerFinallyAndCatch\InnerFinallyAndCatch.cmd
 WorkingDir=baseservices\exceptions\unittests\InnerFinallyAndCatch
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Pending.cmd_132]
 RelativePath=baseservices\exceptions\unittests\Pending\Pending.cmd
 WorkingDir=baseservices\exceptions\unittests\Pending
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Recurse.cmd_133]
 RelativePath=baseservices\exceptions\unittests\Recurse\Recurse.cmd
 WorkingDir=baseservices\exceptions\unittests\Recurse
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RecursiveRethrow.cmd_134]
 RelativePath=baseservices\exceptions\unittests\RecursiveRethrow\RecursiveRethrow.cmd
 WorkingDir=baseservices\exceptions\unittests\RecursiveRethrow
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RecursiveThrowNew.cmd_135]
 RelativePath=baseservices\exceptions\unittests\RecursiveThrowNew\RecursiveThrowNew.cmd
 WorkingDir=baseservices\exceptions\unittests\RecursiveThrowNew
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RethrowAndFinally.cmd_136]
 RelativePath=baseservices\exceptions\unittests\RethrowAndFinally\RethrowAndFinally.cmd
 WorkingDir=baseservices\exceptions\unittests\RethrowAndFinally
@@ -958,6 +1099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ReturnFromCatch.cmd_137]
 RelativePath=baseservices\exceptions\unittests\ReturnFromCatch\ReturnFromCatch.cmd
 WorkingDir=baseservices\exceptions\unittests\ReturnFromCatch
@@ -965,13 +1107,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StrSwitchFinally.cmd_138]
 RelativePath=baseservices\exceptions\unittests\StrSwitchFinally\StrSwitchFinally.cmd
 WorkingDir=baseservices\exceptions\unittests\StrSwitchFinally
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThrowInCatch.cmd_139]
 RelativePath=baseservices\exceptions\unittests\ThrowInCatch\ThrowInCatch.cmd
 WorkingDir=baseservices\exceptions\unittests\ThrowInCatch
@@ -979,6 +1123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ThrowInFinally.cmd_140]
 RelativePath=baseservices\exceptions\unittests\ThrowInFinally\ThrowInFinally.cmd
 WorkingDir=baseservices\exceptions\unittests\ThrowInFinally
@@ -986,13 +1131,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ThrowInFinallyNestedInTry.cmd_141]
 RelativePath=baseservices\exceptions\unittests\ThrowInFinallyNestedInTry\ThrowInFinallyNestedInTry.cmd
 WorkingDir=baseservices\exceptions\unittests\ThrowInFinallyNestedInTry
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TryCatchInFinally.cmd_142]
 RelativePath=baseservices\exceptions\unittests\TryCatchInFinally\TryCatchInFinally.cmd
 WorkingDir=baseservices\exceptions\unittests\TryCatchInFinally
@@ -1000,6 +1147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CS_ThreadPoolNullChecks.cmd_143]
 RelativePath=baseservices\regression\v1\threads\functional\threadpool\cs_threadpoolnullchecks\CS_ThreadPoolNullChecks\CS_ThreadPoolNullChecks.cmd
 WorkingDir=baseservices\regression\v1\threads\functional\threadpool\cs_threadpoolnullchecks\CS_ThreadPoolNullChecks
@@ -1007,6 +1155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DefaultStackCommit.cmd_144]
 RelativePath=baseservices\threading\commitstackonlyasneeded\DefaultStackCommit\DefaultStackCommit.cmd
 WorkingDir=baseservices\threading\commitstackonlyasneeded\DefaultStackCommit
@@ -1014,6 +1163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [CS_ARENullRefEx.cmd_145]
 RelativePath=baseservices\threading\coverage\Nullref\CS_ARENullRefEx\CS_ARENullRefEx.cmd
 WorkingDir=baseservices\threading\coverage\Nullref\CS_ARENullRefEx
@@ -1021,6 +1171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [CS_MRENullRefEx.cmd_146]
 RelativePath=baseservices\threading\coverage\Nullref\CS_MRENullRefEx\CS_MRENullRefEx.cmd
 WorkingDir=baseservices\threading\coverage\Nullref\CS_MRENullRefEx
@@ -1028,6 +1179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [CS_MutexNullRefEx.cmd_147]
 RelativePath=baseservices\threading\coverage\Nullref\CS_MutexNullRefEx\CS_MutexNullRefEx.cmd
 WorkingDir=baseservices\threading\coverage\Nullref\CS_MutexNullRefEx
@@ -1035,6 +1187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [CS_RWHNullRefEx.cmd_148]
 RelativePath=baseservices\threading\coverage\Nullref\CS_RWHNullRefEx\CS_RWHNullRefEx.cmd
 WorkingDir=baseservices\threading\coverage\Nullref\CS_RWHNullRefEx
@@ -1042,6 +1195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [CS_SLENullRefEx.cmd_149]
 RelativePath=baseservices\threading\coverage\Nullref\CS_SLENullRefEx\CS_SLENullRefEx.cmd
 WorkingDir=baseservices\threading\coverage\Nullref\CS_SLENullRefEx
@@ -1049,6 +1203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [CS_TimerNullRefEx.cmd_150]
 RelativePath=baseservices\threading\coverage\Nullref\CS_TimerNullRefEx\CS_TimerNullRefEx.cmd
 WorkingDir=baseservices\threading\coverage\Nullref\CS_TimerNullRefEx
@@ -1056,6 +1211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [CS_TSNullRefEx.cmd_151]
 RelativePath=baseservices\threading\coverage\Nullref\CS_TSNullRefEx\CS_TSNullRefEx.cmd
 WorkingDir=baseservices\threading\coverage\Nullref\CS_TSNullRefEx
@@ -1063,6 +1219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [CS_WHNullRefEx.cmd_152]
 RelativePath=baseservices\threading\coverage\Nullref\CS_WHNullRefEx\CS_WHNullRefEx.cmd
 WorkingDir=baseservices\threading\coverage\Nullref\CS_WHNullRefEx
@@ -1070,6 +1227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [CultureChangeSecurity.cmd_153]
 RelativePath=baseservices\threading\currentculture\CultureChangeSecurity\CultureChangeSecurity.cmd
 WorkingDir=baseservices\threading\currentculture\CultureChangeSecurity
@@ -1077,13 +1235,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BeginInvokeEndInvoke.cmd_154]
 RelativePath=baseservices\threading\delegate\BeginInvokeEndInvoke\BeginInvokeEndInvoke.cmd
 WorkingDir=baseservices\threading\delegate\BeginInvokeEndInvoke
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ConstructFalse.cmd_155]
 RelativePath=baseservices\threading\events\AutoResetEvent\ConstructFalse\ConstructFalse.cmd
 WorkingDir=baseservices\threading\events\AutoResetEvent\ConstructFalse
@@ -1091,6 +1251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [ConstructTrue.cmd_156]
 RelativePath=baseservices\threading\events\AutoResetEvent\ConstructTrue\ConstructTrue.cmd
 WorkingDir=baseservices\threading\events\AutoResetEvent\ConstructTrue
@@ -1098,6 +1259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [AutoResetCast1.cmd_157]
 RelativePath=baseservices\threading\events\EventWaitHandle\AutoReset\AutoResetCast1\AutoResetCast1.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\AutoReset\AutoResetCast1
@@ -1105,6 +1267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [AutoResetCast2.cmd_158]
 RelativePath=baseservices\threading\events\EventWaitHandle\AutoReset\AutoResetCast2\AutoResetCast2.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\AutoReset\AutoResetCast2
@@ -1112,6 +1275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [AutoResetCtor1.cmd_159]
 RelativePath=baseservices\threading\events\EventWaitHandle\AutoReset\AutoResetCtor1\AutoResetCtor1.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\AutoReset\AutoResetCtor1
@@ -1119,6 +1283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [AutoResetCtor2.cmd_160]
 RelativePath=baseservices\threading\events\EventWaitHandle\AutoReset\AutoResetCtor2\AutoResetCtor2.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\AutoReset\AutoResetCtor2
@@ -1126,6 +1291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [ManualResetCast1.cmd_161]
 RelativePath=baseservices\threading\events\EventWaitHandle\ManualReset\ManualResetCast1\ManualResetCast1.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\ManualReset\ManualResetCast1
@@ -1133,6 +1299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [ManualResetCast2.cmd_162]
 RelativePath=baseservices\threading\events\EventWaitHandle\ManualReset\ManualResetCast2\ManualResetCast2.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\ManualReset\ManualResetCast2
@@ -1140,6 +1307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [ManualResetCtor1.cmd_163]
 RelativePath=baseservices\threading\events\EventWaitHandle\ManualReset\ManualResetCtor1\ManualResetCtor1.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\ManualReset\ManualResetCtor1
@@ -1147,6 +1315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [ManualResetCtor2.cmd_164]
 RelativePath=baseservices\threading\events\EventWaitHandle\ManualReset\ManualResetCtor2\ManualResetCtor2.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\ManualReset\ManualResetCtor2
@@ -1154,6 +1323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [AutoConstructFalse.cmd_165]
 RelativePath=baseservices\threading\events\EventWaitHandle\unit\AutoConstructFalse\AutoConstructFalse.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\unit\AutoConstructFalse
@@ -1161,6 +1331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [AutoConstructTrue.cmd_166]
 RelativePath=baseservices\threading\events\EventWaitHandle\unit\AutoConstructTrue\AutoConstructTrue.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\unit\AutoConstructTrue
@@ -1168,6 +1339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [ManualConstructFalse.cmd_167]
 RelativePath=baseservices\threading\events\EventWaitHandle\unit\ManualConstructFalse\ManualConstructFalse.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\unit\ManualConstructFalse
@@ -1175,6 +1347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [ManualConstructTrue.cmd_168]
 RelativePath=baseservices\threading\events\EventWaitHandle\unit\ManualConstructTrue\ManualConstructTrue.cmd
 WorkingDir=baseservices\threading\events\EventWaitHandle\unit\ManualConstructTrue
@@ -1182,6 +1355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [ConstructFalse.cmd_169]
 RelativePath=baseservices\threading\events\ManualResetEvent\ConstructFalse\ConstructFalse.cmd
 WorkingDir=baseservices\threading\events\ManualResetEvent\ConstructFalse
@@ -1189,6 +1363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [ConstructTrue.cmd_170]
 RelativePath=baseservices\threading\events\ManualResetEvent\ConstructTrue\ConstructTrue.cmd
 WorkingDir=baseservices\threading\events\ManualResetEvent\ConstructTrue
@@ -1196,6 +1371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit01.cmd_171]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit01\EnterExit01.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit01
@@ -1203,6 +1379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit02.cmd_172]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit02\EnterExit02.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit02
@@ -1210,6 +1387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit03.cmd_173]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit03\EnterExit03.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit03
@@ -1217,6 +1395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit04.cmd_174]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit04\EnterExit04.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit04
@@ -1224,6 +1403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit05.cmd_175]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit05\EnterExit05.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit05
@@ -1231,6 +1411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit06.cmd_176]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit06\EnterExit06.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit06
@@ -1238,6 +1419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit07.cmd_177]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit07\EnterExit07.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit07
@@ -1245,13 +1427,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit08.cmd_178]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit08\EnterExit08.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit08
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri1;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit09.cmd_179]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit09\EnterExit09.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit09
@@ -1259,6 +1443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit10.cmd_180]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit10\EnterExit10.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit10
@@ -1266,6 +1451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit11.cmd_181]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit11\EnterExit11.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit11
@@ -1273,13 +1459,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit12.cmd_182]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit12\EnterExit12.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit12
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri1;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit13.cmd_183]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit13\EnterExit13.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit13
@@ -1287,13 +1475,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [EnterExit14.cmd_184]
 RelativePath=baseservices\threading\generics\Monitor\EnterExit14\EnterExit14.cmd
 WorkingDir=baseservices\threading\generics\Monitor\EnterExit14
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri1;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [TryEnter01.cmd_185]
 RelativePath=baseservices\threading\generics\Monitor\TryEnter01\TryEnter01.cmd
 WorkingDir=baseservices\threading\generics\Monitor\TryEnter01
@@ -1301,13 +1491,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [TryEnter03.cmd_186]
 RelativePath=baseservices\threading\generics\Monitor\TryEnter03\TryEnter03.cmd
 WorkingDir=baseservices\threading\generics\Monitor\TryEnter03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri1;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [TryEnter04.cmd_187]
 RelativePath=baseservices\threading\generics\Monitor\TryEnter04\TryEnter04.cmd
 WorkingDir=baseservices\threading\generics\Monitor\TryEnter04
@@ -1315,6 +1507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [TryEnter05.cmd_188]
 RelativePath=baseservices\threading\generics\Monitor\TryEnter05\TryEnter05.cmd
 WorkingDir=baseservices\threading\generics\Monitor\TryEnter05
@@ -1322,13 +1515,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [TryEnter06.cmd_189]
 RelativePath=baseservices\threading\generics\Monitor\TryEnter06\TryEnter06.cmd
 WorkingDir=baseservices\threading\generics\Monitor\TryEnter06
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri1;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [GThread01.cmd_190]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread01\GThread01.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread01
@@ -1336,6 +1531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread02.cmd_191]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread02\GThread02.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread02
@@ -1343,6 +1539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread03.cmd_192]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread03\GThread03.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread03
@@ -1350,6 +1547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread04.cmd_193]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread04\GThread04.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread04
@@ -1357,6 +1555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread05.cmd_194]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread05\GThread05.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread05
@@ -1364,6 +1563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread06.cmd_195]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread06\GThread06.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread06
@@ -1371,6 +1571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread07.cmd_196]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread07\GThread07.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread07
@@ -1378,6 +1579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread08.cmd_197]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread08\GThread08.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread08
@@ -1385,6 +1587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread09.cmd_198]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread09\GThread09.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread09
@@ -1392,6 +1595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread10.cmd_199]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread10\GThread10.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread10
@@ -1399,6 +1603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread11.cmd_200]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread11\GThread11.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread11
@@ -1406,6 +1611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread12.cmd_201]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread12\GThread12.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread12
@@ -1413,6 +1619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread13.cmd_202]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread13\GThread13.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread13
@@ -1420,6 +1627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread14.cmd_203]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread14\GThread14.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread14
@@ -1427,6 +1635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread15.cmd_204]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread15\GThread15.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread15
@@ -1434,6 +1643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread16.cmd_205]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread16\GThread16.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread16
@@ -1441,6 +1651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread17.cmd_206]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread17\GThread17.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread17
@@ -1448,6 +1659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread18.cmd_207]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread18\GThread18.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread18
@@ -1455,6 +1667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread19.cmd_208]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread19\GThread19.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread19
@@ -1462,6 +1675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread20.cmd_209]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread20\GThread20.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread20
@@ -1469,6 +1683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread21.cmd_210]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread21\GThread21.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread21
@@ -1476,6 +1691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread22.cmd_211]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread22\GThread22.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread22
@@ -1483,6 +1699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread23.cmd_212]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread23\GThread23.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread23
@@ -1490,6 +1707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread24.cmd_213]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread24\GThread24.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread24
@@ -1497,6 +1715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread25.cmd_214]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread25\GThread25.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread25
@@ -1504,6 +1723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread26.cmd_215]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread26\GThread26.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread26
@@ -1511,6 +1731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread27.cmd_216]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread27\GThread27.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread27
@@ -1518,6 +1739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread28.cmd_217]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread28\GThread28.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread28
@@ -1525,6 +1747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread29.cmd_218]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread29\GThread29.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread29
@@ -1532,6 +1755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread30.cmd_219]
 RelativePath=baseservices\threading\generics\syncdelegate\GThread30\GThread30.cmd
 WorkingDir=baseservices\threading\generics\syncdelegate\GThread30
@@ -1539,6 +1763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread01.cmd_220]
 RelativePath=baseservices\threading\generics\threadstart\GThread01\GThread01.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread01
@@ -1546,6 +1771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread02.cmd_221]
 RelativePath=baseservices\threading\generics\threadstart\GThread02\GThread02.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread02
@@ -1553,6 +1779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread03.cmd_222]
 RelativePath=baseservices\threading\generics\threadstart\GThread03\GThread03.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread03
@@ -1560,6 +1787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread04.cmd_223]
 RelativePath=baseservices\threading\generics\threadstart\GThread04\GThread04.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread04
@@ -1567,6 +1795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread05.cmd_224]
 RelativePath=baseservices\threading\generics\threadstart\GThread05\GThread05.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread05
@@ -1574,6 +1803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread06.cmd_225]
 RelativePath=baseservices\threading\generics\threadstart\GThread06\GThread06.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread06
@@ -1581,6 +1811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread07.cmd_226]
 RelativePath=baseservices\threading\generics\threadstart\GThread07\GThread07.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread07
@@ -1588,6 +1819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread08.cmd_227]
 RelativePath=baseservices\threading\generics\threadstart\GThread08\GThread08.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread08
@@ -1595,6 +1827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread09.cmd_228]
 RelativePath=baseservices\threading\generics\threadstart\GThread09\GThread09.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread09
@@ -1602,6 +1835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread10.cmd_229]
 RelativePath=baseservices\threading\generics\threadstart\GThread10\GThread10.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread10
@@ -1609,6 +1843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread11.cmd_230]
 RelativePath=baseservices\threading\generics\threadstart\GThread11\GThread11.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread11
@@ -1616,6 +1851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread12.cmd_231]
 RelativePath=baseservices\threading\generics\threadstart\GThread12\GThread12.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread12
@@ -1623,6 +1859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread13.cmd_232]
 RelativePath=baseservices\threading\generics\threadstart\GThread13\GThread13.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread13
@@ -1630,6 +1867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread14.cmd_233]
 RelativePath=baseservices\threading\generics\threadstart\GThread14\GThread14.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread14
@@ -1637,6 +1875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread15.cmd_234]
 RelativePath=baseservices\threading\generics\threadstart\GThread15\GThread15.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread15
@@ -1644,6 +1883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread16.cmd_235]
 RelativePath=baseservices\threading\generics\threadstart\GThread16\GThread16.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread16
@@ -1651,6 +1891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread17.cmd_236]
 RelativePath=baseservices\threading\generics\threadstart\GThread17\GThread17.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread17
@@ -1658,6 +1899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread18.cmd_237]
 RelativePath=baseservices\threading\generics\threadstart\GThread18\GThread18.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread18
@@ -1665,6 +1907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread19.cmd_238]
 RelativePath=baseservices\threading\generics\threadstart\GThread19\GThread19.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread19
@@ -1672,6 +1915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread20.cmd_239]
 RelativePath=baseservices\threading\generics\threadstart\GThread20\GThread20.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread20
@@ -1679,6 +1923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread21.cmd_240]
 RelativePath=baseservices\threading\generics\threadstart\GThread21\GThread21.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread21
@@ -1686,6 +1931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread22.cmd_241]
 RelativePath=baseservices\threading\generics\threadstart\GThread22\GThread22.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread22
@@ -1693,6 +1939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread23.cmd_242]
 RelativePath=baseservices\threading\generics\threadstart\GThread23\GThread23.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread23
@@ -1700,6 +1947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread24.cmd_243]
 RelativePath=baseservices\threading\generics\threadstart\GThread24\GThread24.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread24
@@ -1707,6 +1955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread25.cmd_244]
 RelativePath=baseservices\threading\generics\threadstart\GThread25\GThread25.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread25
@@ -1714,6 +1963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread26.cmd_245]
 RelativePath=baseservices\threading\generics\threadstart\GThread26\GThread26.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread26
@@ -1721,6 +1971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread27.cmd_246]
 RelativePath=baseservices\threading\generics\threadstart\GThread27\GThread27.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread27
@@ -1728,6 +1979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread28.cmd_247]
 RelativePath=baseservices\threading\generics\threadstart\GThread28\GThread28.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread28
@@ -1735,6 +1987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread29.cmd_248]
 RelativePath=baseservices\threading\generics\threadstart\GThread29\GThread29.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread29
@@ -1742,6 +1995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GThread30.cmd_249]
 RelativePath=baseservices\threading\generics\threadstart\GThread30\GThread30.cmd
 WorkingDir=baseservices\threading\generics\threadstart\GThread30
@@ -1749,6 +2003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [thread01.cmd_250]
 RelativePath=baseservices\threading\generics\TimerCallback\thread01\thread01.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread01
@@ -1756,6 +2011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread02.cmd_251]
 RelativePath=baseservices\threading\generics\TimerCallback\thread02\thread02.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread02
@@ -1763,6 +2019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread03.cmd_252]
 RelativePath=baseservices\threading\generics\TimerCallback\thread03\thread03.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread03
@@ -1770,6 +2027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread04.cmd_253]
 RelativePath=baseservices\threading\generics\TimerCallback\thread04\thread04.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread04
@@ -1777,6 +2035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread05.cmd_254]
 RelativePath=baseservices\threading\generics\TimerCallback\thread05\thread05.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread05
@@ -1784,6 +2043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread06.cmd_255]
 RelativePath=baseservices\threading\generics\TimerCallback\thread06\thread06.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread06
@@ -1791,6 +2051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread07.cmd_256]
 RelativePath=baseservices\threading\generics\TimerCallback\thread07\thread07.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread07
@@ -1798,6 +2059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread08.cmd_257]
 RelativePath=baseservices\threading\generics\TimerCallback\thread08\thread08.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread08
@@ -1805,6 +2067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread09.cmd_258]
 RelativePath=baseservices\threading\generics\TimerCallback\thread09\thread09.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread09
@@ -1812,6 +2075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread10.cmd_259]
 RelativePath=baseservices\threading\generics\TimerCallback\thread10\thread10.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread10
@@ -1819,6 +2083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread11.cmd_260]
 RelativePath=baseservices\threading\generics\TimerCallback\thread11\thread11.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread11
@@ -1826,6 +2091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread12.cmd_261]
 RelativePath=baseservices\threading\generics\TimerCallback\thread12\thread12.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread12
@@ -1833,6 +2099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread13.cmd_262]
 RelativePath=baseservices\threading\generics\TimerCallback\thread13\thread13.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread13
@@ -1840,6 +2107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread14.cmd_263]
 RelativePath=baseservices\threading\generics\TimerCallback\thread14\thread14.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread14
@@ -1847,6 +2115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread15.cmd_264]
 RelativePath=baseservices\threading\generics\TimerCallback\thread15\thread15.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread15
@@ -1854,6 +2123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread16.cmd_265]
 RelativePath=baseservices\threading\generics\TimerCallback\thread16\thread16.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread16
@@ -1861,6 +2131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread17.cmd_266]
 RelativePath=baseservices\threading\generics\TimerCallback\thread17\thread17.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread17
@@ -1868,6 +2139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread18.cmd_267]
 RelativePath=baseservices\threading\generics\TimerCallback\thread18\thread18.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread18
@@ -1875,6 +2147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread19.cmd_268]
 RelativePath=baseservices\threading\generics\TimerCallback\thread19\thread19.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread19
@@ -1882,6 +2155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread20.cmd_269]
 RelativePath=baseservices\threading\generics\TimerCallback\thread20\thread20.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread20
@@ -1889,6 +2163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread21.cmd_270]
 RelativePath=baseservices\threading\generics\TimerCallback\thread21\thread21.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread21
@@ -1896,6 +2171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread22.cmd_271]
 RelativePath=baseservices\threading\generics\TimerCallback\thread22\thread22.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread22
@@ -1903,6 +2179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread23.cmd_272]
 RelativePath=baseservices\threading\generics\TimerCallback\thread23\thread23.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread23
@@ -1910,6 +2187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread24.cmd_273]
 RelativePath=baseservices\threading\generics\TimerCallback\thread24\thread24.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread24
@@ -1917,6 +2195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread25.cmd_274]
 RelativePath=baseservices\threading\generics\TimerCallback\thread25\thread25.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread25
@@ -1924,6 +2203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread26.cmd_275]
 RelativePath=baseservices\threading\generics\TimerCallback\thread26\thread26.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread26
@@ -1931,6 +2211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread27.cmd_276]
 RelativePath=baseservices\threading\generics\TimerCallback\thread27\thread27.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread27
@@ -1938,6 +2219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread28.cmd_277]
 RelativePath=baseservices\threading\generics\TimerCallback\thread28\thread28.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread28
@@ -1945,6 +2227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread29.cmd_278]
 RelativePath=baseservices\threading\generics\TimerCallback\thread29\thread29.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread29
@@ -1952,6 +2235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread30.cmd_279]
 RelativePath=baseservices\threading\generics\TimerCallback\thread30\thread30.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\thread30
@@ -1959,13 +2243,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [tighttimercallback.cmd_280]
 RelativePath=baseservices\threading\generics\TimerCallback\tighttimercallback\tighttimercallback.cmd
 WorkingDir=baseservices\threading\generics\TimerCallback\tighttimercallback
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri1;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [thread01.cmd_281]
 RelativePath=baseservices\threading\generics\WaitCallback\thread01\thread01.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread01
@@ -1973,6 +2259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread02.cmd_282]
 RelativePath=baseservices\threading\generics\WaitCallback\thread02\thread02.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread02
@@ -1980,6 +2267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread03.cmd_283]
 RelativePath=baseservices\threading\generics\WaitCallback\thread03\thread03.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread03
@@ -1987,6 +2275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread04.cmd_284]
 RelativePath=baseservices\threading\generics\WaitCallback\thread04\thread04.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread04
@@ -1994,6 +2283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread05.cmd_285]
 RelativePath=baseservices\threading\generics\WaitCallback\thread05\thread05.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread05
@@ -2001,6 +2291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread06.cmd_286]
 RelativePath=baseservices\threading\generics\WaitCallback\thread06\thread06.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread06
@@ -2008,6 +2299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread07.cmd_287]
 RelativePath=baseservices\threading\generics\WaitCallback\thread07\thread07.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread07
@@ -2015,6 +2307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread08.cmd_288]
 RelativePath=baseservices\threading\generics\WaitCallback\thread08\thread08.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread08
@@ -2022,6 +2315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread09.cmd_289]
 RelativePath=baseservices\threading\generics\WaitCallback\thread09\thread09.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread09
@@ -2029,6 +2323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread10.cmd_290]
 RelativePath=baseservices\threading\generics\WaitCallback\thread10\thread10.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread10
@@ -2036,6 +2331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread11.cmd_291]
 RelativePath=baseservices\threading\generics\WaitCallback\thread11\thread11.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread11
@@ -2043,6 +2339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread12.cmd_292]
 RelativePath=baseservices\threading\generics\WaitCallback\thread12\thread12.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread12
@@ -2050,6 +2347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread13.cmd_293]
 RelativePath=baseservices\threading\generics\WaitCallback\thread13\thread13.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread13
@@ -2057,6 +2355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread14.cmd_294]
 RelativePath=baseservices\threading\generics\WaitCallback\thread14\thread14.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread14
@@ -2064,6 +2363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread15.cmd_295]
 RelativePath=baseservices\threading\generics\WaitCallback\thread15\thread15.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread15
@@ -2071,6 +2371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread16.cmd_296]
 RelativePath=baseservices\threading\generics\WaitCallback\thread16\thread16.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread16
@@ -2078,6 +2379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread17.cmd_297]
 RelativePath=baseservices\threading\generics\WaitCallback\thread17\thread17.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread17
@@ -2085,6 +2387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread18.cmd_298]
 RelativePath=baseservices\threading\generics\WaitCallback\thread18\thread18.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread18
@@ -2092,6 +2395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread19.cmd_299]
 RelativePath=baseservices\threading\generics\WaitCallback\thread19\thread19.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread19
@@ -2099,6 +2403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread20.cmd_300]
 RelativePath=baseservices\threading\generics\WaitCallback\thread20\thread20.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread20
@@ -2106,6 +2411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread21.cmd_301]
 RelativePath=baseservices\threading\generics\WaitCallback\thread21\thread21.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread21
@@ -2113,6 +2419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread22.cmd_302]
 RelativePath=baseservices\threading\generics\WaitCallback\thread22\thread22.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread22
@@ -2120,6 +2427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread23.cmd_303]
 RelativePath=baseservices\threading\generics\WaitCallback\thread23\thread23.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread23
@@ -2127,6 +2435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread24.cmd_304]
 RelativePath=baseservices\threading\generics\WaitCallback\thread24\thread24.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread24
@@ -2134,6 +2443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread25.cmd_305]
 RelativePath=baseservices\threading\generics\WaitCallback\thread25\thread25.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread25
@@ -2141,6 +2451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread26.cmd_306]
 RelativePath=baseservices\threading\generics\WaitCallback\thread26\thread26.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread26
@@ -2148,6 +2459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread27.cmd_307]
 RelativePath=baseservices\threading\generics\WaitCallback\thread27\thread27.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread27
@@ -2155,6 +2467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread28.cmd_308]
 RelativePath=baseservices\threading\generics\WaitCallback\thread28\thread28.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread28
@@ -2162,6 +2475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread29.cmd_309]
 RelativePath=baseservices\threading\generics\WaitCallback\thread29\thread29.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread29
@@ -2169,6 +2483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [thread30.cmd_310]
 RelativePath=baseservices\threading\generics\WaitCallback\thread30\thread30.cmd
 WorkingDir=baseservices\threading\generics\WaitCallback\thread30
@@ -2176,83 +2491,95 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [add.cmd_311]
 RelativePath=baseservices\threading\interlocked\add\add\add.cmd
 WorkingDir=baseservices\threading\interlocked\add\add
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CheckAddInt.cmd_312]
 RelativePath=baseservices\threading\interlocked\add\CheckAddInt\CheckAddInt.cmd
 WorkingDir=baseservices\threading\interlocked\add\CheckAddInt
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CheckAddInt_1.cmd_313]
 RelativePath=baseservices\threading\interlocked\add\CheckAddInt_1\CheckAddInt_1.cmd
 WorkingDir=baseservices\threading\interlocked\add\CheckAddInt_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CheckAddLong.cmd_314]
 RelativePath=baseservices\threading\interlocked\add\CheckAddLong\CheckAddLong.cmd
 WorkingDir=baseservices\threading\interlocked\add\CheckAddLong
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CheckAddLong_1.cmd_315]
 RelativePath=baseservices\threading\interlocked\add\CheckAddLong_1\CheckAddLong_1.cmd
 WorkingDir=baseservices\threading\interlocked\add\CheckAddLong_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [InterlockedAddInt.cmd_316]
 RelativePath=baseservices\threading\interlocked\add\InterlockedAddInt\InterlockedAddInt.cmd
 WorkingDir=baseservices\threading\interlocked\add\InterlockedAddInt
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [interlockedaddintwithsubtract.cmd_317]
 RelativePath=baseservices\threading\interlocked\add\interlockedaddintwithsubtract\interlockedaddintwithsubtract.cmd
 WorkingDir=baseservices\threading\interlocked\add\interlockedaddintwithsubtract
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [InterlockedAddInt_1.cmd_318]
 RelativePath=baseservices\threading\interlocked\add\InterlockedAddInt_1\InterlockedAddInt_1.cmd
 WorkingDir=baseservices\threading\interlocked\add\InterlockedAddInt_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [InterlockedAddInt_2.cmd_319]
 RelativePath=baseservices\threading\interlocked\add\InterlockedAddInt_2\InterlockedAddInt_2.cmd
 WorkingDir=baseservices\threading\interlocked\add\InterlockedAddInt_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [InterlockedAddInt_3.cmd_320]
 RelativePath=baseservices\threading\interlocked\add\InterlockedAddInt_3\InterlockedAddInt_3.cmd
 WorkingDir=baseservices\threading\interlocked\add\InterlockedAddInt_3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [InterlockedAddLong.cmd_321]
 RelativePath=baseservices\threading\interlocked\add\InterlockedAddLong\InterlockedAddLong.cmd
 WorkingDir=baseservices\threading\interlocked\add\InterlockedAddLong
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [InterlockedAddLongWithSubtract.cmd_322]
 RelativePath=baseservices\threading\interlocked\add\InterlockedAddLongWithSubtract\InterlockedAddLongWithSubtract.cmd
 WorkingDir=baseservices\threading\interlocked\add\InterlockedAddLongWithSubtract
@@ -2260,167 +2587,191 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedAddLong_1.cmd_323]
 RelativePath=baseservices\threading\interlocked\add\InterlockedAddLong_1\InterlockedAddLong_1.cmd
 WorkingDir=baseservices\threading\interlocked\add\InterlockedAddLong_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [InterlockedAddLong_2.cmd_324]
 RelativePath=baseservices\threading\interlocked\add\InterlockedAddLong_2\InterlockedAddLong_2.cmd
 WorkingDir=baseservices\threading\interlocked\add\InterlockedAddLong_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [intdeccheckreturn.cmd_325]
 RelativePath=baseservices\threading\interlocked\checkreturn\intdeccheckreturn\intdeccheckreturn.cmd
 WorkingDir=baseservices\threading\interlocked\checkreturn\intdeccheckreturn
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [intinccheckreturn.cmd_326]
 RelativePath=baseservices\threading\interlocked\checkreturn\intinccheckreturn\intinccheckreturn.cmd
 WorkingDir=baseservices\threading\interlocked\checkreturn\intinccheckreturn
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [longdeccheckreturn.cmd_327]
 RelativePath=baseservices\threading\interlocked\checkreturn\longdeccheckreturn\longdeccheckreturn.cmd
 WorkingDir=baseservices\threading\interlocked\checkreturn\longdeccheckreturn
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [longinccheckreturn.cmd_328]
 RelativePath=baseservices\threading\interlocked\checkreturn\longinccheckreturn\longinccheckreturn.cmd
 WorkingDir=baseservices\threading\interlocked\checkreturn\longinccheckreturn
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [compareexchange1_cti.cmd_329]
 RelativePath=baseservices\threading\interlocked\compareexchange\compareexchange1_cti\compareexchange1_cti.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\compareexchange1_cti
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [compareexchange2.cmd_330]
 RelativePath=baseservices\threading\interlocked\compareexchange\compareexchange2\compareexchange2.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\compareexchange2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [compareexchange3.cmd_331]
 RelativePath=baseservices\threading\interlocked\compareexchange\compareexchange3\compareexchange3.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\compareexchange3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [compareexchange4.cmd_332]
 RelativePath=baseservices\threading\interlocked\compareexchange\compareexchange4\compareexchange4.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\compareexchange4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [compareexchange5_cti.cmd_333]
 RelativePath=baseservices\threading\interlocked\compareexchange\compareexchange5_cti\compareexchange5_cti.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\compareexchange5_cti
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [compareexchangedouble.cmd_334]
 RelativePath=baseservices\threading\interlocked\compareexchange\compareexchangedouble\compareexchangedouble.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\compareexchangedouble
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [compareexchangefloat.cmd_335]
 RelativePath=baseservices\threading\interlocked\compareexchange\compareexchangefloat\compareexchangefloat.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\compareexchangefloat
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [compareexchangeint.cmd_336]
 RelativePath=baseservices\threading\interlocked\compareexchange\compareexchangeint\compareexchangeint.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\compareexchangeint
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [compareexchangeintptr.cmd_337]
 RelativePath=baseservices\threading\interlocked\compareexchange\compareexchangeintptr\compareexchangeintptr.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\compareexchangeintptr
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CompareExchangeLong.cmd_338]
 RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeLong\CompareExchangeLong.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\CompareExchangeLong
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CompareExchangeLong_1.cmd_339]
 RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeLong_1\CompareExchangeLong_1.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\CompareExchangeLong_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CompareExchangeLong_2.cmd_340]
 RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeLong_2\CompareExchangeLong_2.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\CompareExchangeLong_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CompareExchangeLong_3.cmd_341]
 RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeLong_3\CompareExchangeLong_3.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\CompareExchangeLong_3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [compareexchangeobject.cmd_342]
 RelativePath=baseservices\threading\interlocked\compareexchange\compareexchangeobject\compareexchangeobject.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\compareexchangeobject
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [compareexchanget.cmd_343]
 RelativePath=baseservices\threading\interlocked\compareexchange\compareexchanget\compareexchanget.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\compareexchanget
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CompareExchangeTClass.cmd_344]
 RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeTClass\CompareExchangeTClass.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\CompareExchangeTClass
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_FAIL;UNSTABLE
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CompareExchangeTClass_1.cmd_345]
 RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeTClass_1\CompareExchangeTClass_1.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\CompareExchangeTClass_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CompareExchangeTString.cmd_346]
 RelativePath=baseservices\threading\interlocked\compareexchange\CompareExchangeTString\CompareExchangeTString.cmd
 WorkingDir=baseservices\threading\interlocked\compareexchange\CompareExchangeTString
@@ -2428,83 +2779,95 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;EXPECTED_PASS
 HostStyle=0
+
 [ctorchk.cmd_347]
 RelativePath=baseservices\threading\interlocked\ctorchk\ctorchk\ctorchk.cmd
 WorkingDir=baseservices\threading\interlocked\ctorchk\ctorchk
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [intdec.cmd_348]
 RelativePath=baseservices\threading\interlocked\decrement\intdec\intdec.cmd
 WorkingDir=baseservices\threading\interlocked\decrement\intdec
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [longdec.cmd_349]
 RelativePath=baseservices\threading\interlocked\decrement\longdec\longdec.cmd
 WorkingDir=baseservices\threading\interlocked\decrement\longdec
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exchange1_cti.cmd_350]
 RelativePath=baseservices\threading\interlocked\exchange\exchange1_cti\exchange1_cti.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\exchange1_cti
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exchange2.cmd_351]
 RelativePath=baseservices\threading\interlocked\exchange\exchange2\exchange2.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\exchange2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exchange3.cmd_352]
 RelativePath=baseservices\threading\interlocked\exchange\exchange3\exchange3.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\exchange3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exchange4.cmd_353]
 RelativePath=baseservices\threading\interlocked\exchange\exchange4\exchange4.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\exchange4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exchange4_cti.cmd_354]
 RelativePath=baseservices\threading\interlocked\exchange\exchange4_cti\exchange4_cti.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\exchange4_cti
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exchange5_cti.cmd_355]
 RelativePath=baseservices\threading\interlocked\exchange\exchange5_cti\exchange5_cti.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\exchange5_cti
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exchangedouble.cmd_356]
 RelativePath=baseservices\threading\interlocked\exchange\exchangedouble\exchangedouble.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\exchangedouble
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exchangefloat.cmd_357]
 RelativePath=baseservices\threading\interlocked\exchange\exchangefloat\exchangefloat.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\exchangefloat
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ExchangeInt.cmd_358]
 RelativePath=baseservices\threading\interlocked\exchange\ExchangeInt\ExchangeInt.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\ExchangeInt
@@ -2512,6 +2875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ExchangeLong.cmd_359]
 RelativePath=baseservices\threading\interlocked\exchange\ExchangeLong\ExchangeLong.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\ExchangeLong
@@ -2519,20 +2883,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [exchangeobject.cmd_360]
 RelativePath=baseservices\threading\interlocked\exchange\exchangeobject\exchangeobject.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\exchangeobject
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exchanget.cmd_361]
 RelativePath=baseservices\threading\interlocked\exchange\exchanget\exchanget.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\exchanget
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ExchangeTClass.cmd_362]
 RelativePath=baseservices\threading\interlocked\exchange\ExchangeTClass\ExchangeTClass.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\ExchangeTClass
@@ -2540,62 +2907,71 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ExchangeTString.cmd_363]
 RelativePath=baseservices\threading\interlocked\exchange\ExchangeTString\ExchangeTString.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\ExchangeTString
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ExchangeTString_1.cmd_364]
 RelativePath=baseservices\threading\interlocked\exchange\ExchangeTString_1\ExchangeTString_1.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\ExchangeTString_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ExchangeTString_2.cmd_365]
 RelativePath=baseservices\threading\interlocked\exchange\ExchangeTString_2\ExchangeTString_2.cmd
 WorkingDir=baseservices\threading\interlocked\exchange\ExchangeTString_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [intinc.cmd_366]
 RelativePath=baseservices\threading\interlocked\increment\intinc\intinc.cmd
 WorkingDir=baseservices\threading\interlocked\increment\intinc
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [longinc.cmd_367]
 RelativePath=baseservices\threading\interlocked\increment\longinc\longinc.cmd
 WorkingDir=baseservices\threading\interlocked\increment\longinc
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [interlockedread.cmd_368]
 RelativePath=baseservices\threading\interlocked\read\interlockedread\interlockedread.cmd
 WorkingDir=baseservices\threading\interlocked\read\interlockedread
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [readthreads.cmd_369]
 RelativePath=baseservices\threading\interlocked\read\readthreads\readthreads.cmd
 WorkingDir=baseservices\threading\interlocked\read\readthreads
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ctorchk.cmd_370]
 RelativePath=baseservices\threading\monitor\ctorchk\ctorchk\ctorchk.cmd
 WorkingDir=baseservices\threading\monitor\ctorchk\ctorchk
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [EnterNull.cmd_371]
 RelativePath=baseservices\threading\monitor\enter\EnterNull\EnterNull.cmd
 WorkingDir=baseservices\threading\monitor\enter\EnterNull
@@ -2603,13 +2979,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [monitorenter.cmd_372]
 RelativePath=baseservices\threading\monitor\enter\monitorenter\monitorenter.cmd
 WorkingDir=baseservices\threading\monitor\enter\monitorenter
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ExitNull.cmd_373]
 RelativePath=baseservices\threading\monitor\exit\ExitNull\ExitNull.cmd
 WorkingDir=baseservices\threading\monitor\exit\ExitNull
@@ -2617,13 +2995,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [monitorisentered.cmd_374]
 RelativePath=baseservices\threading\monitor\isentered\monitorisentered\monitorisentered.cmd
 WorkingDir=baseservices\threading\monitor\isentered\monitorisentered
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [PulseNull.cmd_375]
 RelativePath=baseservices\threading\monitor\pulse\PulseNull\PulseNull.cmd
 WorkingDir=baseservices\threading\monitor\pulse\PulseNull
@@ -2631,6 +3011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PulseAllNull.cmd_376]
 RelativePath=baseservices\threading\monitor\pulseall\PulseAllNull\PulseAllNull.cmd
 WorkingDir=baseservices\threading\monitor\pulseall\PulseAllNull
@@ -2638,13 +3019,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [longtimeout.cmd_377]
 RelativePath=baseservices\threading\monitor\tryenter\longtimeout\longtimeout.cmd
 WorkingDir=baseservices\threading\monitor\tryenter\longtimeout
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [EnterExitExit.cmd_378]
 RelativePath=baseservices\threading\monitor\unownedlock\EnterExitExit\EnterExitExit.cmd
 WorkingDir=baseservices\threading\monitor\unownedlock\EnterExitExit
@@ -2652,6 +3035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NoEnterNewObject.cmd_379]
 RelativePath=baseservices\threading\monitor\unownedlock\NoEnterNewObject\NoEnterNewObject.cmd
 WorkingDir=baseservices\threading\monitor\unownedlock\NoEnterNewObject
@@ -2659,6 +3043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NoEnterObject.cmd_380]
 RelativePath=baseservices\threading\monitor\unownedlock\NoEnterObject\NoEnterObject.cmd
 WorkingDir=baseservices\threading\monitor\unownedlock\NoEnterObject
@@ -2666,6 +3051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NoEnterValType.cmd_381]
 RelativePath=baseservices\threading\monitor\unownedlock\NoEnterValType\NoEnterValType.cmd
 WorkingDir=baseservices\threading\monitor\unownedlock\NoEnterValType
@@ -2673,419 +3059,479 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [waitnull.cmd_382]
 RelativePath=baseservices\threading\monitor\wait\waitnull\waitnull.cmd
 WorkingDir=baseservices\threading\monitor\wait\waitnull
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [am01waitallneg.cmd_383]
 RelativePath=baseservices\threading\mutex\abandonedmutex\am01waitallneg\am01waitallneg.cmd
 WorkingDir=baseservices\threading\mutex\abandonedmutex\am01waitallneg
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [am02waitoneneg.cmd_384]
 RelativePath=baseservices\threading\mutex\abandonedmutex\am02waitoneneg\am02waitoneneg.cmd
 WorkingDir=baseservices\threading\mutex\abandonedmutex\am02waitoneneg
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [am04waitany.cmd_385]
 RelativePath=baseservices\threading\mutex\abandonedmutex\am04waitany\am04waitany.cmd
 WorkingDir=baseservices\threading\mutex\abandonedmutex\am04waitany
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [am05waitanymutex.cmd_386]
 RelativePath=baseservices\threading\mutex\abandonedmutex\am05waitanymutex\am05waitanymutex.cmd
 WorkingDir=baseservices\threading\mutex\abandonedmutex\am05waitanymutex
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [am06abandonall.cmd_387]
 RelativePath=baseservices\threading\mutex\abandonedmutex\am06abandonall\am06abandonall.cmd
 WorkingDir=baseservices\threading\mutex\abandonedmutex\am06abandonall
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [am07abandonmultiplemutex.cmd_388]
 RelativePath=baseservices\threading\mutex\abandonedmutex\am07abandonmultiplemutex\am07abandonmultiplemutex.cmd
 WorkingDir=baseservices\threading\mutex\abandonedmutex\am07abandonmultiplemutex
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [am08mixedarray.cmd_389]
 RelativePath=baseservices\threading\mutex\abandonedmutex\am08mixedarray\am08mixedarray.cmd
 WorkingDir=baseservices\threading\mutex\abandonedmutex\am08mixedarray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [mutexctor1.cmd_390]
 RelativePath=baseservices\threading\mutex\misc\mutexctor1\mutexctor1.cmd
 WorkingDir=baseservices\threading\mutex\misc\mutexctor1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [mutexctor2.cmd_391]
 RelativePath=baseservices\threading\mutex\misc\mutexctor2\mutexctor2.cmd
 WorkingDir=baseservices\threading\mutex\misc\mutexctor2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitone1.cmd_392]
 RelativePath=baseservices\threading\mutex\misc\waitone1\waitone1.cmd
 WorkingDir=baseservices\threading\mutex\misc\waitone1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;GCSTRESS_FAIL
 HostStyle=0
+
 [waitone2.cmd_393]
 RelativePath=baseservices\threading\mutex\misc\waitone2\waitone2.cmd
 WorkingDir=baseservices\threading\mutex\misc\waitone2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexneg1.cmd_394]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexneg1\openmutexneg1.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexneg1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexneg2.cmd_395]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexneg2\openmutexneg2.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexneg2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexneg3.cmd_396]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexneg3\openmutexneg3.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexneg3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexneg4.cmd_397]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexneg4\openmutexneg4.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexneg4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexneg5.cmd_398]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexneg5\openmutexneg5.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexneg5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexneg6.cmd_399]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexneg6\openmutexneg6.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexneg6
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexneg7.cmd_400]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexneg7\openmutexneg7.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexneg7
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexneg8.cmd_401]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexneg8\openmutexneg8.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexneg8
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexpos1.cmd_402]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexpos1\openmutexpos1.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexpos1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexpos2.cmd_403]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexpos2\openmutexpos2.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexpos2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexpos3.cmd_404]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexpos3\openmutexpos3.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexpos3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [openmutexpos4.cmd_405]
 RelativePath=baseservices\threading\mutex\openexisting\openmutexpos4\openmutexpos4.cmd
 WorkingDir=baseservices\threading\mutex\openexisting\openmutexpos4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;GCSTRESS_FAIL;ISSUE_6060
+Categories=GCSTRESS_FAIL;EXPECTED_PASS;ISSUE_6060
 HostStyle=0
+
 [threadstartarray.cmd_406]
 RelativePath=baseservices\threading\paramthreadstart\threadstartarray\threadstartarray.cmd
 WorkingDir=baseservices\threading\paramthreadstart\threadstartarray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartBool.cmd_407]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartBool\ThreadStartBool.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartBool
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartBool_1.cmd_408]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartBool_1\ThreadStartBool_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartBool_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartByte.cmd_409]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartByte\ThreadStartByte.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartByte
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartByte_1.cmd_410]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartByte_1\ThreadStartByte_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartByte_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartByte_2.cmd_411]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartByte_2\ThreadStartByte_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartByte_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartCast.cmd_412]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartCast\ThreadStartCast.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartCast
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartCast_1.cmd_413]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartCast_1\ThreadStartCast_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartCast_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartCast_2.cmd_414]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartCast_2\ThreadStartCast_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartCast_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartChar.cmd_415]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartChar\ThreadStartChar.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartChar
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartChar_1.cmd_416]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartChar_1\ThreadStartChar_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartChar_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartChar_2.cmd_417]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartChar_2\ThreadStartChar_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartChar_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartChar_3.cmd_418]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartChar_3\ThreadStartChar_3.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartChar_3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [threadstartclass.cmd_419]
 RelativePath=baseservices\threading\paramthreadstart\threadstartclass\threadstartclass.cmd
 WorkingDir=baseservices\threading\paramthreadstart\threadstartclass
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartDecimal.cmd_420]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartDecimal\ThreadStartDecimal.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartDecimal
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartDecimal_1.cmd_421]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartDecimal_1\ThreadStartDecimal_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartDecimal_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartDecimal_2.cmd_422]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartDecimal_2\ThreadStartDecimal_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartDecimal_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartDelegate.cmd_423]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartDelegate\ThreadStartDelegate.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartDelegate
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartDelegate_1.cmd_424]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartDelegate_1\ThreadStartDelegate_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartDelegate_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartDelegate_2.cmd_425]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartDelegate_2\ThreadStartDelegate_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartDelegate_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartDouble.cmd_426]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartDouble\ThreadStartDouble.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartDouble
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartDouble_1.cmd_427]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartDouble_1\ThreadStartDouble_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartDouble_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartDouble_2.cmd_428]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartDouble_2\ThreadStartDouble_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartDouble_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartFloat.cmd_429]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartFloat\ThreadStartFloat.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartFloat
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartFloat_1.cmd_430]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartFloat_1\ThreadStartFloat_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartFloat_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartFloat_2.cmd_431]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartFloat_2\ThreadStartFloat_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartFloat_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartGenerics.cmd_432]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartGenerics\ThreadStartGenerics.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartGenerics
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartGenerics_1.cmd_433]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartGenerics_1\ThreadStartGenerics_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartGenerics_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartGenerics_2.cmd_434]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartGenerics_2\ThreadStartGenerics_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartGenerics_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartInt.cmd_435]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartInt\ThreadStartInt.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartInt
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartInt_1.cmd_436]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartInt_1\ThreadStartInt_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartInt_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartInt_2.cmd_437]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartInt_2\ThreadStartInt_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartInt_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartLong.cmd_438]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartLong\ThreadStartLong.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartLong
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartLong_1.cmd_439]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartLong_1\ThreadStartLong_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartLong_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartLong_2.cmd_440]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartLong_2\ThreadStartLong_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartLong_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartNeg1.cmd_441]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartNeg1\ThreadStartNeg1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartNeg1
@@ -3093,6 +3539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartNeg3.cmd_442]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartNeg3\ThreadStartNeg3.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartNeg3
@@ -3100,6 +3547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartNeg4.cmd_443]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartNeg4\ThreadStartNeg4.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartNeg4
@@ -3107,6 +3555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartNull.cmd_444]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartNull\ThreadStartNull.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartNull
@@ -3114,6 +3563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartNull2.cmd_445]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartNull2\ThreadStartNull2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartNull2
@@ -3121,223 +3571,255 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartObject.cmd_446]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartObject\ThreadStartObject.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartObject
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartObject_1.cmd_447]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartObject_1\ThreadStartObject_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartObject_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartObject_2.cmd_448]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartObject_2\ThreadStartObject_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartObject_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartOperations.cmd_449]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartOperations\ThreadStartOperations.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartOperations
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartOperations_1.cmd_450]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartOperations_1\ThreadStartOperations_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartOperations_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartOperations_2.cmd_451]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartOperations_2\ThreadStartOperations_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartOperations_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartSByte.cmd_452]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartSByte\ThreadStartSByte.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartSByte
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartSByte_1.cmd_453]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartSByte_1\ThreadStartSByte_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartSByte_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartSByte_2.cmd_454]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartSByte_2\ThreadStartSByte_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartSByte_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartShort.cmd_455]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartShort\ThreadStartShort.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartShort
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartShort_1.cmd_456]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartShort_1\ThreadStartShort_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartShort_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartShort_2.cmd_457]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartShort_2\ThreadStartShort_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartShort_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartString.cmd_458]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartString\ThreadStartString.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartString
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartString_1.cmd_459]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartString_1\ThreadStartString_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartString_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartString_2.cmd_460]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartString_2\ThreadStartString_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartString_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartString_3.cmd_461]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartString_3\ThreadStartString_3.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartString_3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [threadstartstruct.cmd_462]
 RelativePath=baseservices\threading\paramthreadstart\threadstartstruct\threadstartstruct.cmd
 WorkingDir=baseservices\threading\paramthreadstart\threadstartstruct
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartUInt.cmd_463]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartUInt\ThreadStartUInt.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartUInt
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartUInt_1.cmd_464]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartUInt_1\ThreadStartUInt_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartUInt_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartUInt_2.cmd_465]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartUInt_2\ThreadStartUInt_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartUInt_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartULong.cmd_466]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartULong\ThreadStartULong.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartULong
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartULong_1.cmd_467]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartULong_1\ThreadStartULong_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartULong_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartULong_2.cmd_468]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartULong_2\ThreadStartULong_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartULong_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartUShort.cmd_469]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartUShort\ThreadStartUShort.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartUShort
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartUShort_1.cmd_470]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartUShort_1\ThreadStartUShort_1.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartUShort_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStartUShort_2.cmd_471]
 RelativePath=baseservices\threading\paramthreadstart\ThreadStartUShort_2\ThreadStartUShort_2.cmd
 WorkingDir=baseservices\threading\paramthreadstart\ThreadStartUShort_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [13662-a.cmd_472]
 RelativePath=baseservices\threading\regressions\13662\13662-a\13662-a.cmd
 WorkingDir=baseservices\threading\regressions\13662\13662-a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [13662-b.cmd_473]
 RelativePath=baseservices\threading\regressions\13662\13662-b\13662-b.cmd
 WorkingDir=baseservices\threading\regressions\13662\13662-b
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [13662-simple.cmd_474]
 RelativePath=baseservices\threading\regressions\13662\13662-simple\13662-simple.cmd
 WorkingDir=baseservices\threading\regressions\13662\13662-simple
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [objmonhelper.cmd_475]
 RelativePath=baseservices\threading\regressions\269336\objmonhelper\objmonhelper.cmd
 WorkingDir=baseservices\threading\regressions\269336\objmonhelper
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;GCSTRESS_FAIL;ISSUE_6065
+Categories=GCSTRESS_FAIL;ISSUE_6065;EXPECTED_PASS
 HostStyle=0
+
 [30032.cmd_476]
 RelativePath=baseservices\threading\regressions\30032\30032\30032.cmd
 WorkingDir=baseservices\threading\regressions\30032\30032
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [576463.cmd_477]
 RelativePath=baseservices\threading\regressions\576463\576463\576463.cmd
 WorkingDir=baseservices\threading\regressions\576463\576463
@@ -3345,6 +3827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [6906.cmd_478]
 RelativePath=baseservices\threading\regressions\6906\6906\6906.cmd
 WorkingDir=baseservices\threading\regressions\6906\6906
@@ -3352,699 +3835,799 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [347011.cmd_479]
 RelativePath=baseservices\threading\regressions\beta1\347011\347011.cmd
 WorkingDir=baseservices\threading\regressions\beta1\347011
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [437017.cmd_480]
 RelativePath=baseservices\threading\regressions\beta2\437017\437017.cmd
 WorkingDir=baseservices\threading\regressions\beta2\437017
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [437044.cmd_481]
 RelativePath=baseservices\threading\regressions\beta2\437044\437044.cmd
 WorkingDir=baseservices\threading\regressions\beta2\437044
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test489437.cmd_482]
 RelativePath=baseservices\threading\regressions\devdiv489437\test489437\test489437.cmd
 WorkingDir=baseservices\threading\regressions\devdiv489437\test489437
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [200176.cmd_483]
 RelativePath=baseservices\threading\regressions\whidbey_m3\200176\200176.cmd
 WorkingDir=baseservices\threading\regressions\whidbey_m3\200176
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphorector1.cmd_484]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphorector1\semaphorector1.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphorector1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphorector2.cmd_485]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphorector2\semaphorector2.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphorector2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphorector3.cmd_486]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphorector3\semaphorector3.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphorector3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphorector4.cmd_487]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphorector4\semaphorector4.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphorector4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphorector5.cmd_488]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphorector5\semaphorector5.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphorector5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphorectorneg1.cmd_489]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphorectorneg1\semaphorectorneg1.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphorectorneg1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphorectorneg2.cmd_490]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphorectorneg2\semaphorectorneg2.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphorectorneg2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphorectorneg3.cmd_491]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphorectorneg3\semaphorectorneg3.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphorectorneg3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphoreopenneg1.cmd_492]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphoreopenneg1\semaphoreopenneg1.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphoreopenneg1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphoreopenneg2.cmd_493]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphoreopenneg2\semaphoreopenneg2.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphoreopenneg2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphoreopenneg3.cmd_494]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphoreopenneg3\semaphoreopenneg3.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphoreopenneg3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphoreopenneg4.cmd_495]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphoreopenneg4\semaphoreopenneg4.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphoreopenneg4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphoreopenneg5.cmd_496]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphoreopenneg5\semaphoreopenneg5.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphoreopenneg5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphoreopenneg6.cmd_497]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphoreopenneg6\semaphoreopenneg6.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphoreopenneg6
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semaphoreopenneg7.cmd_498]
 RelativePath=baseservices\threading\semaphore\ctoropen\semaphoreopenneg7\semaphoreopenneg7.cmd
 WorkingDir=baseservices\threading\semaphore\ctoropen\semaphoreopenneg7
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semdemo.cmd_499]
 RelativePath=baseservices\threading\semaphore\unit\semdemo\semdemo.cmd
 WorkingDir=baseservices\threading\semaphore\unit\semdemo
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [semtest.cmd_500]
 RelativePath=baseservices\threading\semaphore\unit\semtest\semtest.cmd
 WorkingDir=baseservices\threading\semaphore\unit\semtest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [bindhandle1.cmd_501]
 RelativePath=baseservices\threading\threadpool\bindhandle\bindhandle1\bindhandle1.cmd
 WorkingDir=baseservices\threading\threadpool\bindhandle\bindhandle1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [bindhandleinvalid.cmd_502]
 RelativePath=baseservices\threading\threadpool\bindhandle\bindhandleinvalid\bindhandleinvalid.cmd
 WorkingDir=baseservices\threading\threadpool\bindhandle\bindhandleinvalid
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [bindhandleinvalid3.cmd_503]
 RelativePath=baseservices\threading\threadpool\bindhandle\bindhandleinvalid3\bindhandleinvalid3.cmd
 WorkingDir=baseservices\threading\threadpool\bindhandle\bindhandleinvalid3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [bindhandleinvalid4.cmd_504]
 RelativePath=baseservices\threading\threadpool\bindhandle\bindhandleinvalid4\bindhandleinvalid4.cmd
 WorkingDir=baseservices\threading\threadpool\bindhandle\bindhandleinvalid4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [bindhandleinvalid5.cmd_505]
 RelativePath=baseservices\threading\threadpool\bindhandle\bindhandleinvalid5\bindhandleinvalid5.cmd
 WorkingDir=baseservices\threading\threadpool\bindhandle\bindhandleinvalid5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [bindhandleinvalid6.cmd_506]
 RelativePath=baseservices\threading\threadpool\bindhandle\bindhandleinvalid6\bindhandleinvalid6.cmd
 WorkingDir=baseservices\threading\threadpool\bindhandle\bindhandleinvalid6
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [bindhandlenull.cmd_507]
 RelativePath=baseservices\threading\threadpool\bindhandle\bindhandlenull\bindhandlenull.cmd
 WorkingDir=baseservices\threading\threadpool\bindhandle\bindhandlenull
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ctorchk.cmd_508]
 RelativePath=baseservices\threading\threadpool\ctorchk\ctorchk\ctorchk.cmd
 WorkingDir=baseservices\threading\threadpool\ctorchk\ctorchk
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [regression_749068.cmd_509]
 RelativePath=baseservices\threading\threadpool\unregister\regression_749068\regression_749068.cmd
 WorkingDir=baseservices\threading\threadpool\unregister\regression_749068
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [unregister01.cmd_510]
 RelativePath=baseservices\threading\threadpool\unregister\unregister01\unregister01.cmd
 WorkingDir=baseservices\threading\threadpool\unregister\unregister01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [unregister03.cmd_511]
 RelativePath=baseservices\threading\threadpool\unregister\unregister03\unregister03.cmd
 WorkingDir=baseservices\threading\threadpool\unregister\unregister03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStatic01.cmd_512]
 RelativePath=baseservices\threading\threadstatic\ThreadStatic01\ThreadStatic01.cmd
 WorkingDir=baseservices\threading\threadstatic\ThreadStatic01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStatic02.cmd_513]
 RelativePath=baseservices\threading\threadstatic\ThreadStatic02\ThreadStatic02.cmd
 WorkingDir=baseservices\threading\threadstatic\ThreadStatic02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStatic03.cmd_514]
 RelativePath=baseservices\threading\threadstatic\ThreadStatic03\ThreadStatic03.cmd
 WorkingDir=baseservices\threading\threadstatic\ThreadStatic03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStatic05.cmd_515]
 RelativePath=baseservices\threading\threadstatic\ThreadStatic05\ThreadStatic05.cmd
 WorkingDir=baseservices\threading\threadstatic\ThreadStatic05
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadStatic06.cmd_516]
 RelativePath=baseservices\threading\threadstatic\ThreadStatic06\ThreadStatic06.cmd
 WorkingDir=baseservices\threading\threadstatic\ThreadStatic06
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [threadstatic07.cmd_517]
 RelativePath=baseservices\threading\threadstatic\threadstatic07\threadstatic07.cmd
 WorkingDir=baseservices\threading\threadstatic\threadstatic07
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waithandledispose2.cmd_518]
 RelativePath=baseservices\threading\waithandle\misc\waithandledispose2\waithandledispose2.cmd
 WorkingDir=baseservices\threading\waithandle\misc\waithandledispose2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waithandlewaitone1.cmd_519]
 RelativePath=baseservices\threading\waithandle\misc\waithandlewaitone1\waithandlewaitone1.cmd
 WorkingDir=baseservices\threading\waithandle\misc\waithandlewaitone1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [nullarraymember.cmd_520]
 RelativePath=baseservices\threading\waithandle\waitall\nullarraymember\nullarraymember.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\nullarraymember
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallemptyarray.cmd_521]
 RelativePath=baseservices\threading\waithandle\waitall\waitallemptyarray\waitallemptyarray.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallemptyarray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex1.cmd_522]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex1\waitallex1.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex10.cmd_523]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex10\waitallex10.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex10
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex10a.cmd_524]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex10a\waitallex10a.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex10a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex11.cmd_525]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex11\waitallex11.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex11
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex11a.cmd_526]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex11a\waitallex11a.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex11a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex1a.cmd_527]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex1a\waitallex1a.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex1a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex2.cmd_528]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex2\waitallex2.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex2a.cmd_529]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex2a\waitallex2a.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex2a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex3.cmd_530]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex3\waitallex3.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex3a.cmd_531]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex3a\waitallex3a.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex3a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex4.cmd_532]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex4\waitallex4.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex4a.cmd_533]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex4a\waitallex4a.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex4a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex5.cmd_534]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex5\waitallex5.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex5a.cmd_535]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex5a\waitallex5a.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex5a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex6.cmd_536]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex6\waitallex6.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex6
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex6a.cmd_537]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex6a\waitallex6a.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex6a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex7.cmd_538]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex7\waitallex7.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex7
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex7a.cmd_539]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex7a\waitallex7a.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex7a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex8.cmd_540]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex8\waitallex8.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex8
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex8a.cmd_541]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex8a\waitallex8a.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex8a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex9.cmd_542]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex9\waitallex9.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex9
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallex9a.cmd_543]
 RelativePath=baseservices\threading\waithandle\waitall\waitallex9a\waitallex9a.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallex9a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitallnullarray.cmd_544]
 RelativePath=baseservices\threading\waithandle\waitall\waitallnullarray\waitallnullarray.cmd
 WorkingDir=baseservices\threading\waithandle\waitall\waitallnullarray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [nullarraymemberwaitany.cmd_545]
 RelativePath=baseservices\threading\waithandle\waitany\nullarraymemberwaitany\nullarraymemberwaitany.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\nullarraymemberwaitany
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyemptyarray.cmd_546]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyemptyarray\waitanyemptyarray.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyemptyarray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex1.cmd_547]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex1\waitanyex1.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex10.cmd_548]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex10\waitanyex10.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex10
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex10a.cmd_549]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex10a\waitanyex10a.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex10a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex1a.cmd_550]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex1a\waitanyex1a.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex1a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex2.cmd_551]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex2\waitanyex2.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex2a.cmd_552]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex2a\waitanyex2a.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex2a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex3.cmd_553]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex3\waitanyex3.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex3a.cmd_554]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex3a\waitanyex3a.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex3a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex4.cmd_555]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex4\waitanyex4.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex4a.cmd_556]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex4a\waitanyex4a.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex4a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex5.cmd_557]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex5\waitanyex5.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex5a.cmd_558]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex5a\waitanyex5a.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex5a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex6.cmd_559]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex6\waitanyex6.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex6
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex6a.cmd_560]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex6a\waitanyex6a.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex6a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex7.cmd_561]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex7\waitanyex7.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex7
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex7a.cmd_562]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex7a\waitanyex7a.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex7a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex8.cmd_563]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex8\waitanyex8.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex8
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex8a.cmd_564]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex8a\waitanyex8a.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex8a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex9.cmd_565]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex9\waitanyex9.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex9
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanyex9a.cmd_566]
 RelativePath=baseservices\threading\waithandle\waitany\waitanyex9a\waitanyex9a.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanyex9a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitanynullarray.cmd_567]
 RelativePath=baseservices\threading\waithandle\waitany\waitanynullarray\waitanynullarray.cmd
 WorkingDir=baseservices\threading\waithandle\waitany\waitanynullarray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitoneex1.cmd_568]
 RelativePath=baseservices\threading\waithandle\waitone\waitoneex1\waitoneex1.cmd
 WorkingDir=baseservices\threading\waithandle\waitone\waitoneex1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitoneex1a.cmd_569]
 RelativePath=baseservices\threading\waithandle\waitone\waitoneex1a\waitoneex1a.cmd
 WorkingDir=baseservices\threading\waithandle\waitone\waitoneex1a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitoneex2.cmd_570]
 RelativePath=baseservices\threading\waithandle\waitone\waitoneex2\waitoneex2.cmd
 WorkingDir=baseservices\threading\waithandle\waitone\waitoneex2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitoneex2a.cmd_571]
 RelativePath=baseservices\threading\waithandle\waitone\waitoneex2a\waitoneex2a.cmd
 WorkingDir=baseservices\threading\waithandle\waitone\waitoneex2a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitoneex3.cmd_572]
 RelativePath=baseservices\threading\waithandle\waitone\waitoneex3\waitoneex3.cmd
 WorkingDir=baseservices\threading\waithandle\waitone\waitoneex3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitoneex3a.cmd_573]
 RelativePath=baseservices\threading\waithandle\waitone\waitoneex3a\waitoneex3a.cmd
 WorkingDir=baseservices\threading\waithandle\waitone\waitoneex3a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitoneex4.cmd_574]
 RelativePath=baseservices\threading\waithandle\waitone\waitoneex4\waitoneex4.cmd
 WorkingDir=baseservices\threading\waithandle\waitone\waitoneex4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [waitoneex4a.cmd_575]
 RelativePath=baseservices\threading\waithandle\waitone\waitoneex4a\waitoneex4a.cmd
 WorkingDir=baseservices\threading\waithandle\waitone\waitoneex4a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [varargsupport.cmd_576]
 RelativePath=baseservices\varargs\varargsupport\varargsupport.cmd
 WorkingDir=baseservices\varargs\varargsupport
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [varargsupport_r.cmd_577]
 RelativePath=baseservices\varargs\varargsupport_r\varargsupport_r.cmd
 WorkingDir=baseservices\varargs\varargsupport_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Co9600Ctor.cmd_578]
 RelativePath=CoreMangLib\components\stopwatch\Co9600Ctor\Co9600Ctor.cmd
 WorkingDir=CoreMangLib\components\stopwatch\Co9600Ctor
@@ -4052,6 +4635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Co9604get_IsRunning.cmd_579]
 RelativePath=CoreMangLib\components\stopwatch\Co9604get_IsRunning\Co9604get_IsRunning.cmd
 WorkingDir=CoreMangLib\components\stopwatch\Co9604get_IsRunning
@@ -4059,6 +4643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ActionCtor.cmd_580]
 RelativePath=CoreMangLib\cti\system\action\ActionCtor\ActionCtor.cmd
 WorkingDir=CoreMangLib\cti\system\action\ActionCtor
@@ -4066,6 +4651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ActionInvoke.cmd_581]
 RelativePath=CoreMangLib\cti\system\action\ActionInvoke\ActionInvoke.cmd
 WorkingDir=CoreMangLib\cti\system\action\ActionInvoke
@@ -4073,6 +4659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ActivatorCreateInstance2.cmd_582]
 RelativePath=CoreMangLib\cti\system\activator\ActivatorCreateInstance2\ActivatorCreateInstance2.cmd
 WorkingDir=CoreMangLib\cti\system\activator\ActivatorCreateInstance2
@@ -4080,6 +4667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArgumentExceptionCtor1.cmd_583]
 RelativePath=CoreMangLib\cti\system\argumentexception\ArgumentExceptionCtor1\ArgumentExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\argumentexception\ArgumentExceptionCtor1
@@ -4087,6 +4675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArgumentNullExceptionCtor1.cmd_584]
 RelativePath=CoreMangLib\cti\system\argumentnullexception\ArgumentNullExceptionCtor1\ArgumentNullExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\argumentnullexception\ArgumentNullExceptionCtor1
@@ -4094,6 +4683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArgumentOutOfRangeExceptionCtor.cmd_585]
 RelativePath=CoreMangLib\cti\system\argumentoutofrangeexception\ArgumentOutOfRangeExceptionCtor\ArgumentOutOfRangeExceptionCtor.cmd
 WorkingDir=CoreMangLib\cti\system\argumentoutofrangeexception\ArgumentOutOfRangeExceptionCtor
@@ -4101,6 +4691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArgumentOutOfRangeExceptionMessage.cmd_586]
 RelativePath=CoreMangLib\cti\system\argumentoutofrangeexception\ArgumentOutOfRangeExceptionMessage\ArgumentOutOfRangeExceptionMessage.cmd
 WorkingDir=CoreMangLib\cti\system\argumentoutofrangeexception\ArgumentOutOfRangeExceptionMessage
@@ -4108,6 +4699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArithmeticExceptionCtor1.cmd_587]
 RelativePath=CoreMangLib\cti\system\arithmeticexception\ArithmeticExceptionCtor1\ArithmeticExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\arithmeticexception\ArithmeticExceptionCtor1
@@ -4115,6 +4707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBinarySearch1.cmd_588]
 RelativePath=CoreMangLib\cti\system\array\ArrayBinarySearch1\ArrayBinarySearch1.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayBinarySearch1
@@ -4122,6 +4715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBinarySearch1b.cmd_589]
 RelativePath=CoreMangLib\cti\system\array\ArrayBinarySearch1b\ArrayBinarySearch1b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayBinarySearch1b
@@ -4129,6 +4723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBinarySearch2.cmd_590]
 RelativePath=CoreMangLib\cti\system\array\ArrayBinarySearch2\ArrayBinarySearch2.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayBinarySearch2
@@ -4136,6 +4731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBinarySearch2b.cmd_591]
 RelativePath=CoreMangLib\cti\system\array\ArrayBinarySearch2b\ArrayBinarySearch2b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayBinarySearch2b
@@ -4143,6 +4739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBinarySearch3.cmd_592]
 RelativePath=CoreMangLib\cti\system\array\ArrayBinarySearch3\ArrayBinarySearch3.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayBinarySearch3
@@ -4150,6 +4747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBinarySearch3b.cmd_593]
 RelativePath=CoreMangLib\cti\system\array\ArrayBinarySearch3b\ArrayBinarySearch3b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayBinarySearch3b
@@ -4157,6 +4755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBinarySearch4.cmd_594]
 RelativePath=CoreMangLib\cti\system\array\ArrayBinarySearch4\ArrayBinarySearch4.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayBinarySearch4
@@ -4164,6 +4763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBinarySearch4b.cmd_595]
 RelativePath=CoreMangLib\cti\system\array\ArrayBinarySearch4b\ArrayBinarySearch4b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayBinarySearch4b
@@ -4171,6 +4771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBinarySearch5.cmd_596]
 RelativePath=CoreMangLib\cti\system\array\ArrayBinarySearch5\ArrayBinarySearch5.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayBinarySearch5
@@ -4178,6 +4779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBinarySearch5b.cmd_597]
 RelativePath=CoreMangLib\cti\system\array\ArrayBinarySearch5b\ArrayBinarySearch5b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayBinarySearch5b
@@ -4185,6 +4787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBinarySearch6.cmd_598]
 RelativePath=CoreMangLib\cti\system\array\ArrayBinarySearch6\ArrayBinarySearch6.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayBinarySearch6
@@ -4192,6 +4795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayClear.cmd_599]
 RelativePath=CoreMangLib\cti\system\array\ArrayClear\ArrayClear.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayClear
@@ -4199,6 +4803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayClone.cmd_600]
 RelativePath=CoreMangLib\cti\system\array\ArrayClone\ArrayClone.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayClone
@@ -4206,6 +4811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayCopy1.cmd_601]
 RelativePath=CoreMangLib\cti\system\array\ArrayCopy1\ArrayCopy1.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayCopy1
@@ -4213,6 +4819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayCopy2.cmd_602]
 RelativePath=CoreMangLib\cti\system\array\ArrayCopy2\ArrayCopy2.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayCopy2
@@ -4220,6 +4827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayCopyTo.cmd_603]
 RelativePath=CoreMangLib\cti\system\array\ArrayCopyTo\ArrayCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayCopyTo
@@ -4227,6 +4835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayCreateInstance1.cmd_604]
 RelativePath=CoreMangLib\cti\system\array\ArrayCreateInstance1\ArrayCreateInstance1.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayCreateInstance1
@@ -4234,6 +4843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayCreateInstance1b.cmd_605]
 RelativePath=CoreMangLib\cti\system\array\ArrayCreateInstance1b\ArrayCreateInstance1b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayCreateInstance1b
@@ -4241,6 +4851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayCreateInstance2.cmd_606]
 RelativePath=CoreMangLib\cti\system\array\ArrayCreateInstance2\ArrayCreateInstance2.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayCreateInstance2
@@ -4248,6 +4859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayCreateInstance2b.cmd_607]
 RelativePath=CoreMangLib\cti\system\array\ArrayCreateInstance2b\ArrayCreateInstance2b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayCreateInstance2b
@@ -4255,6 +4867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayGetEnumerator.cmd_608]
 RelativePath=CoreMangLib\cti\system\array\ArrayGetEnumerator\ArrayGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayGetEnumerator
@@ -4262,6 +4875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayGetLength.cmd_609]
 RelativePath=CoreMangLib\cti\system\array\ArrayGetLength\ArrayGetLength.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayGetLength
@@ -4269,6 +4883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayGetLowerBound.cmd_610]
 RelativePath=CoreMangLib\cti\system\array\ArrayGetLowerBound\ArrayGetLowerBound.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayGetLowerBound
@@ -4276,6 +4891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayGetUpperBound.cmd_611]
 RelativePath=CoreMangLib\cti\system\array\ArrayGetUpperBound\ArrayGetUpperBound.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayGetUpperBound
@@ -4283,6 +4899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayGetValue.cmd_612]
 RelativePath=CoreMangLib\cti\system\array\ArrayGetValue\ArrayGetValue.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayGetValue
@@ -4290,6 +4907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayGetValue1.cmd_613]
 RelativePath=CoreMangLib\cti\system\array\ArrayGetValue1\ArrayGetValue1.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayGetValue1
@@ -4297,6 +4915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayGetValue2.cmd_614]
 RelativePath=CoreMangLib\cti\system\array\ArrayGetValue2\ArrayGetValue2.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayGetValue2
@@ -4304,6 +4923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayGetValue2b.cmd_615]
 RelativePath=CoreMangLib\cti\system\array\ArrayGetValue2b\ArrayGetValue2b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayGetValue2b
@@ -4311,6 +4931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayICollectionget_Count.cmd_616]
 RelativePath=CoreMangLib\cti\system\array\ArrayICollectionget_Count\ArrayICollectionget_Count.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayICollectionget_Count
@@ -4318,6 +4939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIListAdd.cmd_617]
 RelativePath=CoreMangLib\cti\system\array\ArrayIListAdd\ArrayIListAdd.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIListAdd
@@ -4325,6 +4947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIListClear.cmd_618]
 RelativePath=CoreMangLib\cti\system\array\ArrayIListClear\ArrayIListClear.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIListClear
@@ -4332,6 +4955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIListContains.cmd_619]
 RelativePath=CoreMangLib\cti\system\array\ArrayIListContains\ArrayIListContains.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIListContains
@@ -4339,6 +4963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIListget_item.cmd_620]
 RelativePath=CoreMangLib\cti\system\array\ArrayIListget_item\ArrayIListget_item.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIListget_item
@@ -4346,6 +4971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIListIndexOF.cmd_621]
 RelativePath=CoreMangLib\cti\system\array\ArrayIListIndexOF\ArrayIListIndexOF.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIListIndexOF
@@ -4353,6 +4979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIListInsert.cmd_622]
 RelativePath=CoreMangLib\cti\system\array\ArrayIListInsert\ArrayIListInsert.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIListInsert
@@ -4360,6 +4987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIListRemove.cmd_623]
 RelativePath=CoreMangLib\cti\system\array\ArrayIListRemove\ArrayIListRemove.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIListRemove
@@ -4367,6 +4995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIListRemoveAt.cmd_624]
 RelativePath=CoreMangLib\cti\system\array\ArrayIListRemoveAt\ArrayIListRemoveAt.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIListRemoveAt
@@ -4374,6 +5003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIListset_item.cmd_625]
 RelativePath=CoreMangLib\cti\system\array\ArrayIListset_item\ArrayIListset_item.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIListset_item
@@ -4381,6 +5011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIndexOf1.cmd_626]
 RelativePath=CoreMangLib\cti\system\array\ArrayIndexOf1\ArrayIndexOf1.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIndexOf1
@@ -4388,6 +5019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIndexOf1b.cmd_627]
 RelativePath=CoreMangLib\cti\system\array\ArrayIndexOf1b\ArrayIndexOf1b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIndexOf1b
@@ -4395,6 +5027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIndexOf2.cmd_628]
 RelativePath=CoreMangLib\cti\system\array\ArrayIndexOf2\ArrayIndexOf2.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIndexOf2
@@ -4402,6 +5035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIndexOf2b.cmd_629]
 RelativePath=CoreMangLib\cti\system\array\ArrayIndexOf2b\ArrayIndexOf2b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIndexOf2b
@@ -4409,6 +5043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIndexOf3.cmd_630]
 RelativePath=CoreMangLib\cti\system\array\ArrayIndexOf3\ArrayIndexOf3.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIndexOf3
@@ -4416,6 +5051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIndexOf3b.cmd_631]
 RelativePath=CoreMangLib\cti\system\array\ArrayIndexOf3b\ArrayIndexOf3b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIndexOf3b
@@ -4423,6 +5059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIndexOf4.cmd_632]
 RelativePath=CoreMangLib\cti\system\array\ArrayIndexOf4\ArrayIndexOf4.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIndexOf4
@@ -4430,6 +5067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayIndexOf4b.cmd_633]
 RelativePath=CoreMangLib\cti\system\array\ArrayIndexOf4b\ArrayIndexOf4b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayIndexOf4b
@@ -4437,6 +5075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayInitialize.cmd_634]
 RelativePath=CoreMangLib\cti\system\array\ArrayInitialize\ArrayInitialize.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayInitialize
@@ -4444,6 +5083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayLastIndexOf1.cmd_635]
 RelativePath=CoreMangLib\cti\system\array\ArrayLastIndexOf1\ArrayLastIndexOf1.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayLastIndexOf1
@@ -4451,6 +5091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayLastIndexOf1b.cmd_636]
 RelativePath=CoreMangLib\cti\system\array\ArrayLastIndexOf1b\ArrayLastIndexOf1b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayLastIndexOf1b
@@ -4458,6 +5099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayLastIndexOf2.cmd_637]
 RelativePath=CoreMangLib\cti\system\array\ArrayLastIndexOf2\ArrayLastIndexOf2.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayLastIndexOf2
@@ -4465,6 +5107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayLastIndexOf2b.cmd_638]
 RelativePath=CoreMangLib\cti\system\array\ArrayLastIndexOf2b\ArrayLastIndexOf2b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayLastIndexOf2b
@@ -4472,6 +5115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayLastIndexOf3.cmd_639]
 RelativePath=CoreMangLib\cti\system\array\ArrayLastIndexOf3\ArrayLastIndexOf3.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayLastIndexOf3
@@ -4479,6 +5123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayLastIndexOf3b.cmd_640]
 RelativePath=CoreMangLib\cti\system\array\ArrayLastIndexOf3b\ArrayLastIndexOf3b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayLastIndexOf3b
@@ -4486,6 +5131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayLastIndexOf4.cmd_641]
 RelativePath=CoreMangLib\cti\system\array\ArrayLastIndexOf4\ArrayLastIndexOf4.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayLastIndexOf4
@@ -4493,6 +5139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayLength.cmd_642]
 RelativePath=CoreMangLib\cti\system\array\ArrayLength\ArrayLength.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayLength
@@ -4500,6 +5147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayRank.cmd_643]
 RelativePath=CoreMangLib\cti\system\array\ArrayRank\ArrayRank.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayRank
@@ -4507,6 +5155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayReserse1.cmd_644]
 RelativePath=CoreMangLib\cti\system\array\ArrayReserse1\ArrayReserse1.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayReserse1
@@ -4514,6 +5163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayReserse2.cmd_645]
 RelativePath=CoreMangLib\cti\system\array\ArrayReserse2\ArrayReserse2.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayReserse2
@@ -4521,6 +5171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayReverse1.cmd_646]
 RelativePath=CoreMangLib\cti\system\array\ArrayReverse1\ArrayReverse1.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayReverse1
@@ -4528,6 +5179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayReverse2.cmd_647]
 RelativePath=CoreMangLib\cti\system\array\ArrayReverse2\ArrayReverse2.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArrayReverse2
@@ -4535,6 +5187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySetValue1.cmd_648]
 RelativePath=CoreMangLib\cti\system\array\ArraySetValue1\ArraySetValue1.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySetValue1
@@ -4542,6 +5195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySetValue1b.cmd_649]
 RelativePath=CoreMangLib\cti\system\array\ArraySetValue1b\ArraySetValue1b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySetValue1b
@@ -4549,6 +5203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySetValue2.cmd_650]
 RelativePath=CoreMangLib\cti\system\array\ArraySetValue2\ArraySetValue2.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySetValue2
@@ -4556,6 +5211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySetValue2b.cmd_651]
 RelativePath=CoreMangLib\cti\system\array\ArraySetValue2b\ArraySetValue2b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySetValue2b
@@ -4563,6 +5219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort1.cmd_652]
 RelativePath=CoreMangLib\cti\system\array\ArraySort1\ArraySort1.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort1
@@ -4570,6 +5227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort10.cmd_653]
 RelativePath=CoreMangLib\cti\system\array\ArraySort10\ArraySort10.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort10
@@ -4577,6 +5235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort11.cmd_654]
 RelativePath=CoreMangLib\cti\system\array\ArraySort11\ArraySort11.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort11
@@ -4584,6 +5243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort12.cmd_655]
 RelativePath=CoreMangLib\cti\system\array\ArraySort12\ArraySort12.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort12
@@ -4591,6 +5251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort13.cmd_656]
 RelativePath=CoreMangLib\cti\system\array\ArraySort13\ArraySort13.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort13
@@ -4598,6 +5259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort14.cmd_657]
 RelativePath=CoreMangLib\cti\system\array\ArraySort14\ArraySort14.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort14
@@ -4605,6 +5267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS;REQ_LARGE_GEN0
 HostStyle=0
+
 [ArraySort1b.cmd_658]
 RelativePath=CoreMangLib\cti\system\array\ArraySort1b\ArraySort1b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort1b
@@ -4612,6 +5275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort2.cmd_659]
 RelativePath=CoreMangLib\cti\system\array\ArraySort2\ArraySort2.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort2
@@ -4619,6 +5283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort2b.cmd_660]
 RelativePath=CoreMangLib\cti\system\array\ArraySort2b\ArraySort2b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort2b
@@ -4626,13 +5291,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort3.cmd_661]
 RelativePath=CoreMangLib\cti\system\array\ArraySort3\ArraySort3.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri1;RT;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort3b.cmd_662]
 RelativePath=CoreMangLib\cti\system\array\ArraySort3b\ArraySort3b.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort3b
@@ -4640,6 +5307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort4.cmd_663]
 RelativePath=CoreMangLib\cti\system\array\ArraySort4\ArraySort4.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort4
@@ -4647,6 +5315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort5.cmd_664]
 RelativePath=CoreMangLib\cti\system\array\ArraySort5\ArraySort5.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort5
@@ -4654,6 +5323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort6.cmd_665]
 RelativePath=CoreMangLib\cti\system\array\ArraySort6\ArraySort6.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort6
@@ -4661,6 +5331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort7.cmd_666]
 RelativePath=CoreMangLib\cti\system\array\ArraySort7\ArraySort7.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort7
@@ -4668,6 +5339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort8.cmd_667]
 RelativePath=CoreMangLib\cti\system\array\ArraySort8\ArraySort8.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort8
@@ -4675,6 +5347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArraySort9.cmd_668]
 RelativePath=CoreMangLib\cti\system\array\ArraySort9\ArraySort9.cmd
 WorkingDir=CoreMangLib\cti\system\array\ArraySort9
@@ -4682,6 +5355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayTypeMismatchExceptionctor1.cmd_669]
 RelativePath=CoreMangLib\cti\system\arraytypemismatchexception\ArrayTypeMismatchExceptionctor1\ArrayTypeMismatchExceptionctor1.cmd
 WorkingDir=CoreMangLib\cti\system\arraytypemismatchexception\ArrayTypeMismatchExceptionctor1
@@ -4689,6 +5363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayTypeMismatchExceptionctor2.cmd_670]
 RelativePath=CoreMangLib\cti\system\arraytypemismatchexception\ArrayTypeMismatchExceptionctor2\ArrayTypeMismatchExceptionctor2.cmd
 WorkingDir=CoreMangLib\cti\system\arraytypemismatchexception\ArrayTypeMismatchExceptionctor2
@@ -4696,6 +5371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayTypeMismatchExceptionctor3.cmd_671]
 RelativePath=CoreMangLib\cti\system\arraytypemismatchexception\ArrayTypeMismatchExceptionctor3\ArrayTypeMismatchExceptionctor3.cmd
 WorkingDir=CoreMangLib\cti\system\arraytypemismatchexception\ArrayTypeMismatchExceptionctor3
@@ -4703,6 +5379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DDB125472_GetHashCode.cmd_672]
 RelativePath=CoreMangLib\cti\system\attribute\DDB125472_GetHashCode\DDB125472_GetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\attribute\DDB125472_GetHashCode
@@ -4710,6 +5387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GetHashCode.cmd_673]
 RelativePath=CoreMangLib\cti\system\attribute\GetHashCode\GetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\attribute\GetHashCode
@@ -4717,6 +5395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsAll.cmd_674]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsAll\AttributeTargetsAll.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsAll
@@ -4724,6 +5403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsAssembly.cmd_675]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsAssembly\AttributeTargetsAssembly.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsAssembly
@@ -4731,6 +5411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsClass.cmd_676]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsClass\AttributeTargetsClass.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsClass
@@ -4738,6 +5419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsConstructor.cmd_677]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsConstructor\AttributeTargetsConstructor.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsConstructor
@@ -4745,6 +5427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsDelegate.cmd_678]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsDelegate\AttributeTargetsDelegate.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsDelegate
@@ -4752,6 +5435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsEnum.cmd_679]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsEnum\AttributeTargetsEnum.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsEnum
@@ -4759,6 +5443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsEvent.cmd_680]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsEvent\AttributeTargetsEvent.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsEvent
@@ -4766,6 +5451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsField.cmd_681]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsField\AttributeTargetsField.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsField
@@ -4773,6 +5459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsGenericParameter.cmd_682]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsGenericParameter\AttributeTargetsGenericParameter.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsGenericParameter
@@ -4780,6 +5467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsInterface.cmd_683]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsInterface\AttributeTargetsInterface.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsInterface
@@ -4787,6 +5475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsMethod.cmd_684]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsMethod\AttributeTargetsMethod.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsMethod
@@ -4794,6 +5483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsModule.cmd_685]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsModule\AttributeTargetsModule.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsModule
@@ -4801,6 +5491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsParameter.cmd_686]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsParameter\AttributeTargetsParameter.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsParameter
@@ -4808,6 +5499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsProperty.cmd_687]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsProperty\AttributeTargetsProperty.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsProperty
@@ -4815,6 +5507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsReturnValue.cmd_688]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsReturnValue\AttributeTargetsReturnValue.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsReturnValue
@@ -4822,6 +5515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeTargetsStruct.cmd_689]
 RelativePath=CoreMangLib\cti\system\attributetargets\AttributeTargetsStruct\AttributeTargetsStruct.cmd
 WorkingDir=CoreMangLib\cti\system\attributetargets\AttributeTargetsStruct
@@ -4829,6 +5523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeUsageAttributeAllowMultiple.cmd_690]
 RelativePath=CoreMangLib\cti\system\attributeusageattribute\AttributeUsageAttributeAllowMultiple\AttributeUsageAttributeAllowMultiple.cmd
 WorkingDir=CoreMangLib\cti\system\attributeusageattribute\AttributeUsageAttributeAllowMultiple
@@ -4836,6 +5531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeUsageAttributeCtor.cmd_691]
 RelativePath=CoreMangLib\cti\system\attributeusageattribute\AttributeUsageAttributeCtor\AttributeUsageAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\attributeusageattribute\AttributeUsageAttributeCtor
@@ -4843,6 +5539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BadImageFormatExceptionCtor1.cmd_692]
 RelativePath=CoreMangLib\cti\system\badimageformatexception\BadImageFormatExceptionCtor1\BadImageFormatExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\badimageformatexception\BadImageFormatExceptionCtor1
@@ -4850,6 +5547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BadImageFormatExceptionCtor2.cmd_693]
 RelativePath=CoreMangLib\cti\system\badimageformatexception\BadImageFormatExceptionCtor2\BadImageFormatExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\badimageformatexception\BadImageFormatExceptionCtor2
@@ -4857,6 +5555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BadImageFormatExceptionCtor3.cmd_694]
 RelativePath=CoreMangLib\cti\system\badimageformatexception\BadImageFormatExceptionCtor3\BadImageFormatExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\badimageformatexception\BadImageFormatExceptionCtor3
@@ -4864,6 +5563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BadImageFormatExceptionMessage.cmd_695]
 RelativePath=CoreMangLib\cti\system\badimageformatexception\BadImageFormatExceptionMessage\BadImageFormatExceptionMessage.cmd
 WorkingDir=CoreMangLib\cti\system\badimageformatexception\BadImageFormatExceptionMessage
@@ -4871,6 +5571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BadImageFormatExceptionToString.cmd_696]
 RelativePath=CoreMangLib\cti\system\badimageformatexception\BadImageFormatExceptionToString\BadImageFormatExceptionToString.cmd
 WorkingDir=CoreMangLib\cti\system\badimageformatexception\BadImageFormatExceptionToString
@@ -4878,6 +5579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanCompareTo_Boolean.cmd_697]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanCompareTo_Boolean\BooleanCompareTo_Boolean.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanCompareTo_Boolean
@@ -4885,6 +5587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanEquals_Boolean.cmd_698]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanEquals_Boolean\BooleanEquals_Boolean.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanEquals_Boolean
@@ -4892,6 +5595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanEquals_Object.cmd_699]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanEquals_Object\BooleanEquals_Object.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanEquals_Object
@@ -4899,6 +5603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanFalseString.cmd_700]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanFalseString\BooleanFalseString.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanFalseString
@@ -4906,6 +5611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanGetHashCode.cmd_701]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanGetHashCode\BooleanGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanGetHashCode
@@ -4913,6 +5619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToBoolean.cmd_702]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToBoolean\BooleanIConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToBoolean
@@ -4920,6 +5627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToByte.cmd_703]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToByte\BooleanIConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToByte
@@ -4927,6 +5635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToChar.cmd_704]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToChar\BooleanIConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToChar
@@ -4934,6 +5643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToDateTime.cmd_705]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToDateTime\BooleanIConvertibleToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToDateTime
@@ -4941,6 +5651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToDecimal.cmd_706]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToDecimal\BooleanIConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToDecimal
@@ -4948,6 +5659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToDouble.cmd_707]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToDouble\BooleanIConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToDouble
@@ -4955,6 +5667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToInt16.cmd_708]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToInt16\BooleanIConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToInt16
@@ -4962,6 +5675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToInt32.cmd_709]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToInt32\BooleanIConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToInt32
@@ -4969,6 +5683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToInt64.cmd_710]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToInt64\BooleanIConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToInt64
@@ -4976,6 +5691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToSByte.cmd_711]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToSByte\BooleanIConvertibleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToSByte
@@ -4983,6 +5699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToSingle.cmd_712]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToSingle\BooleanIConvertibleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToSingle
@@ -4990,6 +5707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToType.cmd_713]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToType\BooleanIConvertibleToType.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToType
@@ -4997,6 +5715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToUInt16.cmd_714]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToUInt16\BooleanIConvertibleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToUInt16
@@ -5004,6 +5723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToUInt32.cmd_715]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToUInt32\BooleanIConvertibleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToUInt32
@@ -5011,6 +5731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanIConvertibleToUInt64.cmd_716]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanIConvertibleToUInt64\BooleanIConvertibleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanIConvertibleToUInt64
@@ -5018,6 +5739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanParse.cmd_717]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanParse\BooleanParse.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanParse
@@ -5025,6 +5747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanToString.cmd_718]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanToString\BooleanToString.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanToString
@@ -5032,6 +5755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanTrueString.cmd_719]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanTrueString\BooleanTrueString.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanTrueString
@@ -5039,6 +5763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BooleanTryParse.cmd_720]
 RelativePath=CoreMangLib\cti\system\boolean\BooleanTryParse\BooleanTryParse.cmd
 WorkingDir=CoreMangLib\cti\system\boolean\BooleanTryParse
@@ -5046,6 +5771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteEquals1.cmd_721]
 RelativePath=CoreMangLib\cti\system\byte\ByteEquals1\ByteEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteEquals1
@@ -5053,6 +5779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteEquals2.cmd_722]
 RelativePath=CoreMangLib\cti\system\byte\ByteEquals2\ByteEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteEquals2
@@ -5060,6 +5787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteGetHashCode.cmd_723]
 RelativePath=CoreMangLib\cti\system\byte\ByteGetHashCode\ByteGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteGetHashCode
@@ -5067,6 +5795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToBoolean.cmd_724]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToBoolean\ByteIConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToBoolean
@@ -5074,6 +5803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToByte.cmd_725]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToByte\ByteIConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToByte
@@ -5081,6 +5811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToChar.cmd_726]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToChar\ByteIConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToChar
@@ -5088,6 +5819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToDateTime.cmd_727]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToDateTime\ByteIConvertibleToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToDateTime
@@ -5095,6 +5827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToDecimal.cmd_728]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToDecimal\ByteIConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToDecimal
@@ -5102,6 +5835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToDouble.cmd_729]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToDouble\ByteIConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToDouble
@@ -5109,6 +5843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToInt16.cmd_730]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToInt16\ByteIConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToInt16
@@ -5116,6 +5851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToInt32.cmd_731]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToInt32\ByteIConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToInt32
@@ -5123,6 +5859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToInt64.cmd_732]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToInt64\ByteIConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToInt64
@@ -5130,6 +5867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToSByte.cmd_733]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToSByte\ByteIConvertibleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToSByte
@@ -5137,6 +5875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToSingle.cmd_734]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToSingle\ByteIConvertibleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToSingle
@@ -5144,6 +5883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToType.cmd_735]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToType\ByteIConvertibleToType.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToType
@@ -5151,6 +5891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToUInt16.cmd_736]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToUInt16\ByteIConvertibleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToUInt16
@@ -5158,6 +5899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToUInt32.cmd_737]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToUInt32\ByteIConvertibleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToUInt32
@@ -5165,6 +5907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteIConvertibleToUInt64.cmd_738]
 RelativePath=CoreMangLib\cti\system\byte\ByteIConvertibleToUInt64\ByteIConvertibleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteIConvertibleToUInt64
@@ -5172,6 +5915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteMaxValue.cmd_739]
 RelativePath=CoreMangLib\cti\system\byte\ByteMaxValue\ByteMaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteMaxValue
@@ -5179,6 +5923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteMinValue.cmd_740]
 RelativePath=CoreMangLib\cti\system\byte\ByteMinValue\ByteMinValue.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteMinValue
@@ -5186,6 +5931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteParse1.cmd_741]
 RelativePath=CoreMangLib\cti\system\byte\ByteParse1\ByteParse1.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteParse1
@@ -5193,6 +5939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteParse3.cmd_742]
 RelativePath=CoreMangLib\cti\system\byte\ByteParse3\ByteParse3.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteParse3
@@ -5200,6 +5947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteToString2.cmd_743]
 RelativePath=CoreMangLib\cti\system\byte\ByteToString2\ByteToString2.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteToString2
@@ -5207,6 +5955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteToString3.cmd_744]
 RelativePath=CoreMangLib\cti\system\byte\ByteToString3\ByteToString3.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteToString3
@@ -5214,6 +5963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteToString4.cmd_745]
 RelativePath=CoreMangLib\cti\system\byte\ByteToString4\ByteToString4.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteToString4
@@ -5221,6 +5971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ByteTryParse.cmd_746]
 RelativePath=CoreMangLib\cti\system\byte\ByteTryParse\ByteTryParse.cmd
 WorkingDir=CoreMangLib\cti\system\byte\ByteTryParse
@@ -5228,6 +5979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharCompateTo1.cmd_747]
 RelativePath=CoreMangLib\cti\system\char\CharCompateTo1\CharCompateTo1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharCompateTo1
@@ -5235,6 +5987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharEquals1.cmd_748]
 RelativePath=CoreMangLib\cti\system\char\CharEquals1\CharEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharEquals1
@@ -5242,6 +5995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharEquals2.cmd_749]
 RelativePath=CoreMangLib\cti\system\char\CharEquals2\CharEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharEquals2
@@ -5249,6 +6003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharGetHashCode.cmd_750]
 RelativePath=CoreMangLib\cti\system\char\CharGetHashCode\CharGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharGetHashCode
@@ -5256,6 +6011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToBoolean.cmd_751]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToBoolean\CharIConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToBoolean
@@ -5263,6 +6019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToByte.cmd_752]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToByte\CharIConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToByte
@@ -5270,6 +6027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToChar.cmd_753]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToChar\CharIConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToChar
@@ -5277,6 +6035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToDateTime.cmd_754]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToDateTime\CharIConvertibleToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToDateTime
@@ -5284,6 +6043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToDecimal.cmd_755]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToDecimal\CharIConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToDecimal
@@ -5291,6 +6051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToDouble.cmd_756]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToDouble\CharIConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToDouble
@@ -5298,6 +6059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToInt16.cmd_757]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToInt16\CharIConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToInt16
@@ -5305,6 +6067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToInt32.cmd_758]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToInt32\CharIConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToInt32
@@ -5312,6 +6075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToInt64.cmd_759]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToInt64\CharIConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToInt64
@@ -5319,6 +6083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToSByte.cmd_760]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToSByte\CharIConvertibleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToSByte
@@ -5326,6 +6091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToSingle.cmd_761]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToSingle\CharIConvertibleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToSingle
@@ -5333,6 +6099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToType.cmd_762]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToType\CharIConvertibleToType.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToType
@@ -5340,6 +6107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToUInt16.cmd_763]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToUInt16\CharIConvertibleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToUInt16
@@ -5347,6 +6115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToUInt32.cmd_764]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToUInt32\CharIConvertibleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToUInt32
@@ -5354,6 +6123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIConvertibleToUInt64.cmd_765]
 RelativePath=CoreMangLib\cti\system\char\CharIConvertibleToUInt64\CharIConvertibleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIConvertibleToUInt64
@@ -5361,6 +6131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsControl1.cmd_766]
 RelativePath=CoreMangLib\cti\system\char\CharIsControl1\CharIsControl1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsControl1
@@ -5368,6 +6139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsControl2.cmd_767]
 RelativePath=CoreMangLib\cti\system\char\CharIsControl2\CharIsControl2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsControl2
@@ -5375,6 +6147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsDigit1.cmd_768]
 RelativePath=CoreMangLib\cti\system\char\CharIsDigit1\CharIsDigit1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsDigit1
@@ -5382,6 +6155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsDigit2.cmd_769]
 RelativePath=CoreMangLib\cti\system\char\CharIsDigit2\CharIsDigit2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsDigit2
@@ -5389,6 +6163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsLetter1.cmd_770]
 RelativePath=CoreMangLib\cti\system\char\CharIsLetter1\CharIsLetter1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsLetter1
@@ -5396,6 +6171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsLetter2.cmd_771]
 RelativePath=CoreMangLib\cti\system\char\CharIsLetter2\CharIsLetter2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsLetter2
@@ -5403,6 +6179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsLetterOrDigit1.cmd_772]
 RelativePath=CoreMangLib\cti\system\char\CharIsLetterOrDigit1\CharIsLetterOrDigit1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsLetterOrDigit1
@@ -5410,6 +6187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsLetterOrDigit2.cmd_773]
 RelativePath=CoreMangLib\cti\system\char\CharIsLetterOrDigit2\CharIsLetterOrDigit2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsLetterOrDigit2
@@ -5417,6 +6195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsLower1.cmd_774]
 RelativePath=CoreMangLib\cti\system\char\CharIsLower1\CharIsLower1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsLower1
@@ -5424,6 +6203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsLower2.cmd_775]
 RelativePath=CoreMangLib\cti\system\char\CharIsLower2\CharIsLower2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsLower2
@@ -5431,6 +6211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsNumber1.cmd_776]
 RelativePath=CoreMangLib\cti\system\char\CharIsNumber1\CharIsNumber1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsNumber1
@@ -5438,6 +6219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsNumber2.cmd_777]
 RelativePath=CoreMangLib\cti\system\char\CharIsNumber2\CharIsNumber2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsNumber2
@@ -5445,6 +6227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsPunctuation2.cmd_778]
 RelativePath=CoreMangLib\cti\system\char\CharIsPunctuation2\CharIsPunctuation2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsPunctuation2
@@ -5452,6 +6235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsSeparator1.cmd_779]
 RelativePath=CoreMangLib\cti\system\char\CharIsSeparator1\CharIsSeparator1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsSeparator1
@@ -5459,6 +6243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsSeparator2.cmd_780]
 RelativePath=CoreMangLib\cti\system\char\CharIsSeparator2\CharIsSeparator2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsSeparator2
@@ -5466,6 +6251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsSurrogate1.cmd_781]
 RelativePath=CoreMangLib\cti\system\char\CharIsSurrogate1\CharIsSurrogate1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsSurrogate1
@@ -5473,6 +6259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsSurrogate2.cmd_782]
 RelativePath=CoreMangLib\cti\system\char\CharIsSurrogate2\CharIsSurrogate2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsSurrogate2
@@ -5480,6 +6267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsSurrogatePair1.cmd_783]
 RelativePath=CoreMangLib\cti\system\char\CharIsSurrogatePair1\CharIsSurrogatePair1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsSurrogatePair1
@@ -5487,6 +6275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsSurrogatePair2.cmd_784]
 RelativePath=CoreMangLib\cti\system\char\CharIsSurrogatePair2\CharIsSurrogatePair2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsSurrogatePair2
@@ -5494,6 +6283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsSymbol1.cmd_785]
 RelativePath=CoreMangLib\cti\system\char\CharIsSymbol1\CharIsSymbol1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsSymbol1
@@ -5501,6 +6291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsUpper1.cmd_786]
 RelativePath=CoreMangLib\cti\system\char\CharIsUpper1\CharIsUpper1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsUpper1
@@ -5508,6 +6299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsUpper2.cmd_787]
 RelativePath=CoreMangLib\cti\system\char\CharIsUpper2\CharIsUpper2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsUpper2
@@ -5515,6 +6307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsWhiteSpace1.cmd_788]
 RelativePath=CoreMangLib\cti\system\char\CharIsWhiteSpace1\CharIsWhiteSpace1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsWhiteSpace1
@@ -5522,6 +6315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharIsWhiteSpace2.cmd_789]
 RelativePath=CoreMangLib\cti\system\char\CharIsWhiteSpace2\CharIsWhiteSpace2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharIsWhiteSpace2
@@ -5529,6 +6323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharMaxValue.cmd_790]
 RelativePath=CoreMangLib\cti\system\char\CharMaxValue\CharMaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharMaxValue
@@ -5536,6 +6331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharMinValue.cmd_791]
 RelativePath=CoreMangLib\cti\system\char\CharMinValue\CharMinValue.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharMinValue
@@ -5543,6 +6339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharToString1.cmd_792]
 RelativePath=CoreMangLib\cti\system\char\CharToString1\CharToString1.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharToString1
@@ -5550,6 +6347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharToString2.cmd_793]
 RelativePath=CoreMangLib\cti\system\char\CharToString2\CharToString2.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharToString2
@@ -5557,6 +6355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharTryParse.cmd_794]
 RelativePath=CoreMangLib\cti\system\char\CharTryParse\CharTryParse.cmd
 WorkingDir=CoreMangLib\cti\system\char\CharTryParse
@@ -5564,6 +6363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharEnumeratorCurrent.cmd_795]
 RelativePath=CoreMangLib\cti\system\charenumerator\CharEnumeratorCurrent\CharEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\charenumerator\CharEnumeratorCurrent
@@ -5571,6 +6371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharEnumeratorIEnumeratorCurrent.cmd_796]
 RelativePath=CoreMangLib\cti\system\charenumerator\CharEnumeratorIEnumeratorCurrent\CharEnumeratorIEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\charenumerator\CharEnumeratorIEnumeratorCurrent
@@ -5578,6 +6379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharEnumeratorIEnumgetCurrent.cmd_797]
 RelativePath=CoreMangLib\cti\system\charenumerator\CharEnumeratorIEnumgetCurrent\CharEnumeratorIEnumgetCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\charenumerator\CharEnumeratorIEnumgetCurrent
@@ -5585,6 +6387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharEnumeratorMoveNext.cmd_798]
 RelativePath=CoreMangLib\cti\system\charenumerator\CharEnumeratorMoveNext\CharEnumeratorMoveNext.cmd
 WorkingDir=CoreMangLib\cti\system\charenumerator\CharEnumeratorMoveNext
@@ -5592,6 +6395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharEnumeratorReset.cmd_799]
 RelativePath=CoreMangLib\cti\system\charenumerator\CharEnumeratorReset\CharEnumeratorReset.cmd
 WorkingDir=CoreMangLib\cti\system\charenumerator\CharEnumeratorReset
@@ -5599,6 +6403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CLSCompliantAttributeCtor.cmd_800]
 RelativePath=CoreMangLib\cti\system\clscompliantattribute\CLSCompliantAttributeCtor\CLSCompliantAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\clscompliantattribute\CLSCompliantAttributeCtor
@@ -5606,6 +6411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CLSCompliantAttributeIsCompliant.cmd_801]
 RelativePath=CoreMangLib\cti\system\clscompliantattribute\CLSCompliantAttributeIsCompliant\CLSCompliantAttributeIsCompliant.cmd
 WorkingDir=CoreMangLib\cti\system\clscompliantattribute\CLSCompliantAttributeIsCompliant
@@ -5613,6 +6419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryEntryCtor.cmd_802]
 RelativePath=CoreMangLib\cti\system\collections\dictionaryentry\DictionaryEntryCtor\DictionaryEntryCtor.cmd
 WorkingDir=CoreMangLib\cti\system\collections\dictionaryentry\DictionaryEntryCtor
@@ -5620,6 +6427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryEntryKey.cmd_803]
 RelativePath=CoreMangLib\cti\system\collections\dictionaryentry\DictionaryEntryKey\DictionaryEntryKey.cmd
 WorkingDir=CoreMangLib\cti\system\collections\dictionaryentry\DictionaryEntryKey
@@ -5627,6 +6435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryEntryValue.cmd_804]
 RelativePath=CoreMangLib\cti\system\collections\dictionaryentry\DictionaryEntryValue\DictionaryEntryValue.cmd
 WorkingDir=CoreMangLib\cti\system\collections\dictionaryentry\DictionaryEntryValue
@@ -5634,6 +6443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ComparerCompare1.cmd_805]
 RelativePath=CoreMangLib\cti\system\collections\generic\comparer\ComparerCompare1\ComparerCompare1.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\comparer\ComparerCompare1
@@ -5641,6 +6451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ComparerCompare2.cmd_806]
 RelativePath=CoreMangLib\cti\system\collections\generic\comparer\ComparerCompare2\ComparerCompare2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\comparer\ComparerCompare2
@@ -5648,6 +6459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ComparerCtor.cmd_807]
 RelativePath=CoreMangLib\cti\system\collections\generic\comparer\ComparerCtor\ComparerCtor.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\comparer\ComparerCtor
@@ -5655,6 +6467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ComparerDefault.cmd_808]
 RelativePath=CoreMangLib\cti\system\collections\generic\comparer\ComparerDefault\ComparerDefault.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\comparer\ComparerDefault
@@ -5662,6 +6475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryAdd.cmd_809]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryAdd\DictionaryAdd.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryAdd
@@ -5669,6 +6483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryClear.cmd_810]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryClear\DictionaryClear.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryClear
@@ -5676,6 +6491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryComparer.cmd_811]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryComparer\DictionaryComparer.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryComparer
@@ -5683,6 +6499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryContainsKey.cmd_812]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryContainsKey\DictionaryContainsKey.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryContainsKey
@@ -5690,6 +6507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryContainsValue.cmd_813]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryContainsValue\DictionaryContainsValue.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryContainsValue
@@ -5697,6 +6515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryCount.cmd_814]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCount\DictionaryCount.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCount
@@ -5704,6 +6523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryCtor1.cmd_815]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor1\DictionaryCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor1
@@ -5711,6 +6531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryCtor2.cmd_816]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor2\DictionaryCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor2
@@ -5718,6 +6539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryCtor3.cmd_817]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor3\DictionaryCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor3
@@ -5725,6 +6547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryCtor4.cmd_818]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor4\DictionaryCtor4.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor4
@@ -5732,6 +6555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryCtor5.cmd_819]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor5\DictionaryCtor5.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor5
@@ -5739,6 +6563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryCtor6.cmd_820]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor6\DictionaryCtor6.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryCtor6
@@ -5746,6 +6571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryGetEnumerator.cmd_821]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryGetEnumerator\DictionaryGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryGetEnumerator
@@ -5753,6 +6579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryICollectionAdd.cmd_822]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionAdd\DictionaryICollectionAdd.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionAdd
@@ -5760,6 +6587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryICollectionContains.cmd_823]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionContains\DictionaryICollectionContains.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionContains
@@ -5767,6 +6595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryICollectionCopyTo.cmd_824]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionCopyTo\DictionaryICollectionCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionCopyTo
@@ -5774,6 +6603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryICollectionCopyTo2.cmd_825]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionCopyTo2\DictionaryICollectionCopyTo2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionCopyTo2
@@ -5781,6 +6611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryICollectionIsReadOnly.cmd_826]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionIsReadOnly\DictionaryICollectionIsReadOnly.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionIsReadOnly
@@ -5788,6 +6619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryICollectionIsReadOnly2.cmd_827]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionIsReadOnly2\DictionaryICollectionIsReadOnly2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionIsReadOnly2
@@ -5795,6 +6627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryICollectionIsSynchronized.cmd_828]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionIsSynchronized\DictionaryICollectionIsSynchronized.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionIsSynchronized
@@ -5802,6 +6635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryICollectionIsSynchronized2.cmd_829]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionIsSynchronized2\DictionaryICollectionIsSynchronized2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionIsSynchronized2
@@ -5809,6 +6643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryICollectionRemove.cmd_830]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionRemove\DictionaryICollectionRemove.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionRemove
@@ -5816,6 +6651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryICollectionSyncRoot.cmd_831]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionSyncRoot\DictionaryICollectionSyncRoot.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionSyncRoot
@@ -5823,6 +6659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryICollectionSyncRoot2.cmd_832]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionSyncRoot2\DictionaryICollectionSyncRoot2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryICollectionSyncRoot2
@@ -5830,6 +6667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryAdd.cmd_833]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryAdd\DictionaryIDictionaryAdd.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryAdd
@@ -5837,6 +6675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryContains.cmd_834]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryContains\DictionaryIDictionaryContains.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryContains
@@ -5844,6 +6683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryGetEnumerator.cmd_835]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryGetEnumerator\DictionaryIDictionaryGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryGetEnumerator
@@ -5851,6 +6691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryIsFixedSize.cmd_836]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryIsFixedSize\DictionaryIDictionaryIsFixedSize.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryIsFixedSize
@@ -5858,6 +6699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryIsFixedSize2.cmd_837]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryIsFixedSize2\DictionaryIDictionaryIsFixedSize2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryIsFixedSize2
@@ -5865,6 +6707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryIsReadOnly.cmd_838]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryIsReadOnly\DictionaryIDictionaryIsReadOnly.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryIsReadOnly
@@ -5872,6 +6715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryIsReadOnly2.cmd_839]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryIsReadOnly2\DictionaryIDictionaryIsReadOnly2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryIsReadOnly2
@@ -5879,6 +6723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryItem.cmd_840]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryItem\DictionaryIDictionaryItem.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryItem
@@ -5886,6 +6731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryItem2.cmd_841]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryItem2\DictionaryIDictionaryItem2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryItem2
@@ -5893,6 +6739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryKeys.cmd_842]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryKeys\DictionaryIDictionaryKeys.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryKeys
@@ -5900,6 +6747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryKeys2.cmd_843]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryKeys2\DictionaryIDictionaryKeys2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryKeys2
@@ -5907,6 +6755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryKeys3.cmd_844]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryKeys3\DictionaryIDictionaryKeys3.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryKeys3
@@ -5914,6 +6763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryKeys4.cmd_845]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryKeys4\DictionaryIDictionaryKeys4.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryKeys4
@@ -5921,6 +6771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryRemove.cmd_846]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryRemove\DictionaryIDictionaryRemove.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryRemove
@@ -5928,6 +6779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryValue2.cmd_847]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryValue2\DictionaryIDictionaryValue2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryValue2
@@ -5935,6 +6787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryValue3.cmd_848]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryValue3\DictionaryIDictionaryValue3.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryValue3
@@ -5942,6 +6795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryValue4.cmd_849]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryValue4\DictionaryIDictionaryValue4.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryValue4
@@ -5949,6 +6803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIDictionaryValues.cmd_850]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryValues\DictionaryIDictionaryValues.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIDictionaryValues
@@ -5956,6 +6811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIEnumerableGetEnumerator.cmd_851]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIEnumerableGetEnumerator\DictionaryIEnumerableGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIEnumerableGetEnumerator
@@ -5963,6 +6819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryIEnumerableGetEnumerator2.cmd_852]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIEnumerableGetEnumerator2\DictionaryIEnumerableGetEnumerator2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryIEnumerableGetEnumerator2
@@ -5970,6 +6827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryRemove.cmd_853]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryRemove\DictionaryRemove.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryRemove
@@ -5977,6 +6835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryTryGetValue.cmd_854]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryTryGetValue\DictionaryTryGetValue.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionary\DictionaryTryGetValue
@@ -5984,6 +6843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictEnumIDictEnumget_Entry.cmd_855]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictEnumIDictEnumget_Entry\DictEnumIDictEnumget_Entry.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictEnumIDictEnumget_Entry
@@ -5991,6 +6851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictEnumIDictEnumget_Key.cmd_856]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictEnumIDictEnumget_Key\DictEnumIDictEnumget_Key.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictEnumIDictEnumget_Key
@@ -5998,6 +6859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictEnumIDictEnumget_Value.cmd_857]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictEnumIDictEnumget_Value\DictEnumIDictEnumget_Value.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictEnumIDictEnumget_Value
@@ -6005,6 +6867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictEnumIEnumget_Current.cmd_858]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictEnumIEnumget_Current\DictEnumIEnumget_Current.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictEnumIEnumget_Current
@@ -6012,6 +6875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictEnumIEnumReset.cmd_859]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictEnumIEnumReset\DictEnumIEnumReset.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictEnumIEnumReset
@@ -6019,6 +6883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryEnumeratorCurrent.cmd_860]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictionaryEnumeratorCurrent\DictionaryEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictionaryEnumeratorCurrent
@@ -6026,6 +6891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryEnumeratorDispose.cmd_861]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictionaryEnumeratorDispose\DictionaryEnumeratorDispose.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictionaryEnumeratorDispose
@@ -6033,6 +6899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryEnumeratorMoveNext.cmd_862]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictionaryEnumeratorMoveNext\DictionaryEnumeratorMoveNext.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryenumerator\DictionaryEnumeratorMoveNext
@@ -6040,6 +6907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GenericICollectionRemove.cmd_863]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\GenericICollectionRemove\GenericICollectionRemove.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\GenericICollectionRemove
@@ -6047,6 +6915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionIsSynchronized.cmd_864]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\ICollectionIsSynchronized\ICollectionIsSynchronized.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\ICollectionIsSynchronized
@@ -6054,6 +6923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionSyncRoot.cmd_865]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\ICollectionSyncRoot\ICollectionSyncRoot.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\ICollectionSyncRoot
@@ -6061,6 +6931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IEnumerableGetEnumerator.cmd_866]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\IEnumerableGetEnumerator\IEnumerableGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\IEnumerableGetEnumerator
@@ -6068,6 +6939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyCollectionCopyTo.cmd_867]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\KeyCollectionCopyTo\KeyCollectionCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\KeyCollectionCopyTo
@@ -6075,6 +6947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyCollectionCount.cmd_868]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\KeyCollectionCount\KeyCollectionCount.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\KeyCollectionCount
@@ -6082,6 +6955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyCollectionCtor.cmd_869]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\KeyCollectionCtor\KeyCollectionCtor.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\KeyCollectionCtor
@@ -6089,6 +6963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyCollectionGetEnumerator.cmd_870]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\KeyCollectionGetEnumerator\KeyCollectionGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\KeyCollectionGetEnumerator
@@ -6096,6 +6971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SystemCollectionsICollectionCopyTo.cmd_871]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollectionsICollectionCopyTo\SystemCollectionsICollectionCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollectionsICollectionCopyTo
@@ -6103,6 +6979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SystemCollGenericICollClear.cmd_872]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollGenericICollClear\SystemCollGenericICollClear.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollGenericICollClear
@@ -6110,6 +6987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SystemCollGenericICollContains.cmd_873]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollGenericICollContains\SystemCollGenericICollContains.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollGenericICollContains
@@ -6117,6 +6995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SystemCollGenericICollectionAdd.cmd_874]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollGenericICollectionAdd\SystemCollGenericICollectionAdd.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollGenericICollectionAdd
@@ -6124,6 +7003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SystemCollGenICollIsReadOnly.cmd_875]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollGenICollIsReadOnly\SystemCollGenICollIsReadOnly.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollGenICollIsReadOnly
@@ -6131,6 +7011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SystemCollGenIEnumGetEnumerator.cmd_876]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollGenIEnumGetEnumerator\SystemCollGenIEnumGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionarykeycollection\SystemCollGenIEnumGetEnumerator
@@ -6138,6 +7019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryValueCollectionCopyTo.cmd_877]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\DictionaryValueCollectionCopyTo\DictionaryValueCollectionCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\DictionaryValueCollectionCopyTo
@@ -6145,6 +7027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryValueCollectionCount.cmd_878]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\DictionaryValueCollectionCount\DictionaryValueCollectionCount.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\DictionaryValueCollectionCount
@@ -6152,6 +7035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryValueCollectionctor.cmd_879]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\DictionaryValueCollectionctor\DictionaryValueCollectionctor.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\DictionaryValueCollectionctor
@@ -6159,6 +7043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GenericICollectionIsReadOnly.cmd_880]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\GenericICollectionIsReadOnly\GenericICollectionIsReadOnly.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\GenericICollectionIsReadOnly
@@ -6166,6 +7051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GenericICollectionRemove.cmd_881]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\GenericICollectionRemove\GenericICollectionRemove.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\GenericICollectionRemove
@@ -6173,6 +7059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GetEnumerator.cmd_882]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\GetEnumerator\GetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\GetEnumerator
@@ -6180,6 +7067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionIsSynchronized.cmd_883]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\ICollectionIsSynchronized\ICollectionIsSynchronized.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\ICollectionIsSynchronized
@@ -6187,6 +7075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IEnumerableGetEnumerator.cmd_884]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\IEnumerableGetEnumerator\IEnumerableGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\IEnumerableGetEnumerator
@@ -6194,6 +7083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SystemCollectionsICollectionCopyTo.cmd_885]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\SystemCollectionsICollectionCopyTo\SystemCollectionsICollectionCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\SystemCollectionsICollectionCopyTo
@@ -6201,6 +7091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SystemCollICollectionSyncRoot.cmd_886]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\SystemCollICollectionSyncRoot\SystemCollICollectionSyncRoot.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\SystemCollICollectionSyncRoot
@@ -6208,6 +7099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ValueCollGenericICollAdd.cmd_887]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\ValueCollGenericICollAdd\ValueCollGenericICollAdd.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\ValueCollGenericICollAdd
@@ -6215,6 +7107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ValueCollGenericICollClear.cmd_888]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\ValueCollGenericICollClear\ValueCollGenericICollClear.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\ValueCollGenericICollClear
@@ -6222,6 +7115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ValueCollGenericICollContains.cmd_889]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\ValueCollGenericICollContains\ValueCollGenericICollContains.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\ValueCollGenericICollContains
@@ -6229,6 +7123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ValueCollGenericIEnumGetEnumerator.cmd_890]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\ValueCollGenericIEnumGetEnumerator\ValueCollGenericIEnumGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictionaryvaluecollection\ValueCollGenericIEnumGetEnumerator
@@ -6236,6 +7131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryKeyCollectionEnumeratorCurrent.cmd_891]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryKeyCollectionEnumeratorCurrent\DictionaryKeyCollectionEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryKeyCollectionEnumeratorCurrent
@@ -6243,6 +7139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryKeyCollectionEnumeratorDispose.cmd_892]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryKeyCollectionEnumeratorDispose\DictionaryKeyCollectionEnumeratorDispose.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryKeyCollectionEnumeratorDispose
@@ -6250,6 +7147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryKeyCollectionEnumeratorMoveNext.cmd_893]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryKeyCollectionEnumeratorMoveNext\DictionaryKeyCollectionEnumeratorMoveNext.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryKeyCollectionEnumeratorMoveNext
@@ -6257,6 +7155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryValueCollectionEnumeratorCurrent.cmd_894]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryValueCollectionEnumeratorCurrent\DictionaryValueCollectionEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryValueCollectionEnumeratorCurrent
@@ -6264,6 +7163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryValueCollectionEnumeratorDispose.cmd_895]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryValueCollectionEnumeratorDispose\DictionaryValueCollectionEnumeratorDispose.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryValueCollectionEnumeratorDispose
@@ -6271,6 +7171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryValueCollectionEnumeratorMoveNext.cmd_896]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryValueCollectionEnumeratorMoveNext\DictionaryValueCollectionEnumeratorMoveNext.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictkeycollenum\DictionaryValueCollectionEnumeratorMoveNext
@@ -6278,6 +7179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyCollectionEnumeratorIEnumeratorCurrent.cmd_897]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictkeycollenum\KeyCollectionEnumeratorIEnumeratorCurrent\KeyCollectionEnumeratorIEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictkeycollenum\KeyCollectionEnumeratorIEnumeratorCurrent
@@ -6285,6 +7187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyCollectionEnumeratorIEnumeratorReset.cmd_898]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictkeycollenum\KeyCollectionEnumeratorIEnumeratorReset\KeyCollectionEnumeratorIEnumeratorReset.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictkeycollenum\KeyCollectionEnumeratorIEnumeratorReset
@@ -6292,6 +7195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ValueCollectionEnumeratorIEnumeratorCurrent.cmd_899]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictkeycollenum\ValueCollectionEnumeratorIEnumeratorCurrent\ValueCollectionEnumeratorIEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictkeycollenum\ValueCollectionEnumeratorIEnumeratorCurrent
@@ -6299,6 +7203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ValueCollectionEnumeratorIEnumeratorReset.cmd_900]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictkeycollenum\ValueCollectionEnumeratorIEnumeratorReset\ValueCollectionEnumeratorIEnumeratorReset.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictkeycollenum\ValueCollectionEnumeratorIEnumeratorReset
@@ -6306,6 +7211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryValueCollectionEnumeratorCurrent.cmd_901]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictvalcollenum\DictionaryValueCollectionEnumeratorCurrent\DictionaryValueCollectionEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictvalcollenum\DictionaryValueCollectionEnumeratorCurrent
@@ -6313,6 +7219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryValueCollectionEnumeratorDispose.cmd_902]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictvalcollenum\DictionaryValueCollectionEnumeratorDispose\DictionaryValueCollectionEnumeratorDispose.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictvalcollenum\DictionaryValueCollectionEnumeratorDispose
@@ -6320,6 +7227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DictionaryValueCollectionEnumeratorMoveNext.cmd_903]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictvalcollenum\DictionaryValueCollectionEnumeratorMoveNext\DictionaryValueCollectionEnumeratorMoveNext.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictvalcollenum\DictionaryValueCollectionEnumeratorMoveNext
@@ -6327,6 +7235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ValueCollectionEnumeratorIEnumeratorCurrent.cmd_904]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictvalcollenum\ValueCollectionEnumeratorIEnumeratorCurrent\ValueCollectionEnumeratorIEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictvalcollenum\ValueCollectionEnumeratorIEnumeratorCurrent
@@ -6334,6 +7243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ValueCollectionEnumeratorIEnumeratorReset.cmd_905]
 RelativePath=CoreMangLib\cti\system\collections\generic\dictvalcollenum\ValueCollectionEnumeratorIEnumeratorReset\ValueCollectionEnumeratorIEnumeratorReset.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\dictvalcollenum\ValueCollectionEnumeratorIEnumeratorReset
@@ -6341,6 +7251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EqualityComparerEquals.cmd_906]
 RelativePath=CoreMangLib\cti\system\collections\generic\equalitycomparer\EqualityComparerEquals\EqualityComparerEquals.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\equalitycomparer\EqualityComparerEquals
@@ -6348,6 +7259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EqualityComparerGetHashCode.cmd_907]
 RelativePath=CoreMangLib\cti\system\collections\generic\equalitycomparer\EqualityComparerGetHashCode\EqualityComparerGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\equalitycomparer\EqualityComparerGetHashCode
@@ -6355,6 +7267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EqulityComparerDefault.cmd_908]
 RelativePath=CoreMangLib\cti\system\collections\generic\equalitycomparer\EqulityComparerDefault\EqulityComparerDefault.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\equalitycomparer\EqulityComparerDefault
@@ -6362,6 +7275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionAdd.cmd_909]
 RelativePath=CoreMangLib\cti\system\collections\generic\icollection\ICollectionAdd\ICollectionAdd.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\icollection\ICollectionAdd
@@ -6369,6 +7283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionClear.cmd_910]
 RelativePath=CoreMangLib\cti\system\collections\generic\icollection\ICollectionClear\ICollectionClear.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\icollection\ICollectionClear
@@ -6376,6 +7291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionContains.cmd_911]
 RelativePath=CoreMangLib\cti\system\collections\generic\icollection\ICollectionContains\ICollectionContains.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\icollection\ICollectionContains
@@ -6383,6 +7299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionCopyTo.cmd_912]
 RelativePath=CoreMangLib\cti\system\collections\generic\icollection\ICollectionCopyTo\ICollectionCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\icollection\ICollectionCopyTo
@@ -6390,6 +7307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionCount.cmd_913]
 RelativePath=CoreMangLib\cti\system\collections\generic\icollection\ICollectionCount\ICollectionCount.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\icollection\ICollectionCount
@@ -6397,6 +7315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionIsReadOnly.cmd_914]
 RelativePath=CoreMangLib\cti\system\collections\generic\icollection\ICollectionIsReadOnly\ICollectionIsReadOnly.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\icollection\ICollectionIsReadOnly
@@ -6404,6 +7323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionRemove.cmd_915]
 RelativePath=CoreMangLib\cti\system\collections\generic\icollection\ICollectionRemove\ICollectionRemove.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\icollection\ICollectionRemove
@@ -6411,6 +7331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryContainsKey.cmd_916]
 RelativePath=CoreMangLib\cti\system\collections\generic\idictionary\IDictionaryContainsKey\IDictionaryContainsKey.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\idictionary\IDictionaryContainsKey
@@ -6418,6 +7339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryItem.cmd_917]
 RelativePath=CoreMangLib\cti\system\collections\generic\idictionary\IDictionaryItem\IDictionaryItem.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\idictionary\IDictionaryItem
@@ -6425,6 +7347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryKeys.cmd_918]
 RelativePath=CoreMangLib\cti\system\collections\generic\idictionary\IDictionaryKeys\IDictionaryKeys.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\idictionary\IDictionaryKeys
@@ -6432,6 +7355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryTryGetValue.cmd_919]
 RelativePath=CoreMangLib\cti\system\collections\generic\idictionary\IDictionaryTryGetValue\IDictionaryTryGetValue.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\idictionary\IDictionaryTryGetValue
@@ -6439,6 +7363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryValues.cmd_920]
 RelativePath=CoreMangLib\cti\system\collections\generic\idictionary\IDictionaryValues\IDictionaryValues.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\idictionary\IDictionaryValues
@@ -6446,6 +7371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IEnumerableGetEnumerator.cmd_921]
 RelativePath=CoreMangLib\cti\system\collections\generic\ienumerable\IEnumerableGetEnumerator\IEnumerableGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\ienumerable\IEnumerableGetEnumerator
@@ -6453,6 +7379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IEnumeratorCurrent.cmd_922]
 RelativePath=CoreMangLib\cti\system\collections\generic\ienumerator\IEnumeratorCurrent\IEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\ienumerator\IEnumeratorCurrent
@@ -6460,6 +7387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IEqualityComparerEquals.cmd_923]
 RelativePath=CoreMangLib\cti\system\collections\generic\iequalitycomparer\IEqualityComparerEquals\IEqualityComparerEquals.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\iequalitycomparer\IEqualityComparerEquals
@@ -6467,6 +7395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IEqualityComparerGetHashCode.cmd_924]
 RelativePath=CoreMangLib\cti\system\collections\generic\iequalitycomparer\IEqualityComparerGetHashCode\IEqualityComparerGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\iequalitycomparer\IEqualityComparerGetHashCode
@@ -6474,6 +7403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IListIndexOf.cmd_925]
 RelativePath=CoreMangLib\cti\system\collections\generic\ilist\IListIndexOf\IListIndexOf.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\ilist\IListIndexOf
@@ -6481,6 +7411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IListInsert.cmd_926]
 RelativePath=CoreMangLib\cti\system\collections\generic\ilist\IListInsert\IListInsert.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\ilist\IListInsert
@@ -6488,6 +7419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IListItem.cmd_927]
 RelativePath=CoreMangLib\cti\system\collections\generic\ilist\IListItem\IListItem.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\ilist\IListItem
@@ -6495,6 +7427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IListRemoveAt.cmd_928]
 RelativePath=CoreMangLib\cti\system\collections\generic\ilist\IListRemoveAt\IListRemoveAt.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\ilist\IListRemoveAt
@@ -6502,6 +7435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyNotFoundExceptionCtor1.cmd_929]
 RelativePath=CoreMangLib\cti\system\collections\generic\keynotfoundexception\KeyNotFoundExceptionCtor1\KeyNotFoundExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\keynotfoundexception\KeyNotFoundExceptionCtor1
@@ -6509,6 +7443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyNotFoundExceptionCtor2.cmd_930]
 RelativePath=CoreMangLib\cti\system\collections\generic\keynotfoundexception\KeyNotFoundExceptionCtor2\KeyNotFoundExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\keynotfoundexception\KeyNotFoundExceptionCtor2
@@ -6516,6 +7451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyValuePairctor.cmd_931]
 RelativePath=CoreMangLib\cti\system\collections\generic\keyvaluepair\KeyValuePairctor\KeyValuePairctor.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\keyvaluepair\KeyValuePairctor
@@ -6523,6 +7459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyValuePairKey.cmd_932]
 RelativePath=CoreMangLib\cti\system\collections\generic\keyvaluepair\KeyValuePairKey\KeyValuePairKey.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\keyvaluepair\KeyValuePairKey
@@ -6530,6 +7467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyValuePairToString.cmd_933]
 RelativePath=CoreMangLib\cti\system\collections\generic\keyvaluepair\KeyValuePairToString\KeyValuePairToString.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\keyvaluepair\KeyValuePairToString
@@ -6537,6 +7475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [KeyValuePairValue.cmd_934]
 RelativePath=CoreMangLib\cti\system\collections\generic\keyvaluepair\KeyValuePairValue\KeyValuePairValue.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\keyvaluepair\KeyValuePairValue
@@ -6544,6 +7483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BinarySearch1.cmd_935]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\BinarySearch1\BinarySearch1.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\BinarySearch1
@@ -6551,6 +7491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BinarySearch2.cmd_936]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\BinarySearch2\BinarySearch2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\BinarySearch2
@@ -6558,6 +7499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BinarySearch3.cmd_937]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\BinarySearch3\BinarySearch3.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\BinarySearch3
@@ -6565,6 +7507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CopyTo1.cmd_938]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\CopyTo1\CopyTo1.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\CopyTo1
@@ -6572,6 +7515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CopyTo2.cmd_939]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\CopyTo2\CopyTo2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\CopyTo2
@@ -6579,6 +7523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CopyTo3.cmd_940]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\CopyTo3\CopyTo3.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\CopyTo3
@@ -6586,6 +7531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListAdd.cmd_941]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListAdd\ListAdd.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListAdd
@@ -6593,6 +7539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListAddRange.cmd_942]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListAddRange\ListAddRange.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListAddRange
@@ -6600,6 +7547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListCapacity.cmd_943]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListCapacity\ListCapacity.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListCapacity
@@ -6607,6 +7555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListClear.cmd_944]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListClear\ListClear.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListClear
@@ -6614,6 +7563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListContains.cmd_945]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListContains\ListContains.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListContains
@@ -6621,6 +7571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListCount.cmd_946]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListCount\ListCount.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListCount
@@ -6628,6 +7579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListCtor1.cmd_947]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListCtor1\ListCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListCtor1
@@ -6635,6 +7587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListCtor2.cmd_948]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListCtor2\ListCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListCtor2
@@ -6642,6 +7595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListCtor3.cmd_949]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListCtor3\ListCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListCtor3
@@ -6649,6 +7603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListForEach.cmd_950]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListForEach\ListForEach.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListForEach
@@ -6656,6 +7611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListGetEnumerator.cmd_951]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListGetEnumerator\ListGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListGetEnumerator
@@ -6663,6 +7619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListGetRange.cmd_952]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListGetRange\ListGetRange.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListGetRange
@@ -6670,6 +7627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListICollectionCopyTo.cmd_953]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListICollectionCopyTo\ListICollectionCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListICollectionCopyTo
@@ -6677,6 +7635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListICollectionIsReadOnly.cmd_954]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListICollectionIsReadOnly\ListICollectionIsReadOnly.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListICollectionIsReadOnly
@@ -6684,6 +7643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListICollectionIsSynchronized.cmd_955]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListICollectionIsSynchronized\ListICollectionIsSynchronized.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListICollectionIsSynchronized
@@ -6691,6 +7651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListICollectionSyncRoot.cmd_956]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListICollectionSyncRoot\ListICollectionSyncRoot.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListICollectionSyncRoot
@@ -6698,6 +7659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIEnumerableGetEnumerator.cmd_957]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIEnumerableGetEnumerator\ListIEnumerableGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIEnumerableGetEnumerator
@@ -6705,6 +7667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIEnumerableGetEnumerator2.cmd_958]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIEnumerableGetEnumerator2\ListIEnumerableGetEnumerator2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIEnumerableGetEnumerator2
@@ -6712,6 +7675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIListAdd.cmd_959]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIListAdd\ListIListAdd.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIListAdd
@@ -6719,6 +7683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIListContains.cmd_960]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIListContains\ListIListContains.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIListContains
@@ -6726,6 +7691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIListIndexOf.cmd_961]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIListIndexOf\ListIListIndexOf.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIListIndexOf
@@ -6733,6 +7699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIListInsert.cmd_962]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIListInsert\ListIListInsert.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIListInsert
@@ -6740,6 +7707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIListIsFixedSize.cmd_963]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIListIsFixedSize\ListIListIsFixedSize.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIListIsFixedSize
@@ -6747,6 +7715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIListIsReadOnly.cmd_964]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIListIsReadOnly\ListIListIsReadOnly.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIListIsReadOnly
@@ -6754,6 +7723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIListItem.cmd_965]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIListItem\ListIListItem.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIListItem
@@ -6761,6 +7731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIListRemove.cmd_966]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIListRemove\ListIListRemove.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIListRemove
@@ -6768,6 +7739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIndexOf1.cmd_967]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIndexOf1\ListIndexOf1.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIndexOf1
@@ -6775,6 +7747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIndexOf2.cmd_968]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIndexOf2\ListIndexOf2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIndexOf2
@@ -6782,6 +7755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListIndexOf3.cmd_969]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListIndexOf3\ListIndexOf3.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListIndexOf3
@@ -6789,6 +7763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListInsertRange.cmd_970]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListInsertRange\ListInsertRange.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListInsertRange
@@ -6796,6 +7771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListLastIndexOf1.cmd_971]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListLastIndexOf1\ListLastIndexOf1.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListLastIndexOf1
@@ -6803,6 +7779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListLastIndexOf2.cmd_972]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListLastIndexOf2\ListLastIndexOf2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListLastIndexOf2
@@ -6810,6 +7787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListLastIndexOf3.cmd_973]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListLastIndexOf3\ListLastIndexOf3.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListLastIndexOf3
@@ -6817,6 +7795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListRemoveAt.cmd_974]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListRemoveAt\ListRemoveAt.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListRemoveAt
@@ -6824,6 +7803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListRemoveRange.cmd_975]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListRemoveRange\ListRemoveRange.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListRemoveRange
@@ -6831,6 +7811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListReverse.cmd_976]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListReverse\ListReverse.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListReverse
@@ -6838,6 +7819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListReverse2.cmd_977]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListReverse2\ListReverse2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListReverse2
@@ -6845,6 +7827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListToArray.cmd_978]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListToArray\ListToArray.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListToArray
@@ -6852,6 +7835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ListTrimExcess.cmd_979]
 RelativePath=CoreMangLib\cti\system\collections\generic\list\ListTrimExcess\ListTrimExcess.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\list\ListTrimExcess
@@ -6859,6 +7843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueueClear.cmd_980]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueueClear\QueueClear.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueueClear
@@ -6866,6 +7851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueueContains.cmd_981]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueueContains\QueueContains.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueueContains
@@ -6873,6 +7859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueueCopyTo.cmd_982]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueueCopyTo\QueueCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueueCopyTo
@@ -6880,6 +7867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueueCount.cmd_983]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueueCount\QueueCount.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueueCount
@@ -6887,6 +7875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueueCtor1.cmd_984]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueueCtor1\QueueCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueueCtor1
@@ -6894,6 +7883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueueCtor2.cmd_985]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueueCtor2\QueueCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueueCtor2
@@ -6901,6 +7891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueueCtor3.cmd_986]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueueCtor3\QueueCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueueCtor3
@@ -6908,6 +7899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueueDequeue.cmd_987]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueueDequeue\QueueDequeue.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueueDequeue
@@ -6915,6 +7907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueueEnqueue.cmd_988]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueueEnqueue\QueueEnqueue.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueueEnqueue
@@ -6922,6 +7915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueueGetEnumerator.cmd_989]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueueGetEnumerator\QueueGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueueGetEnumerator
@@ -6929,6 +7923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueuePeek.cmd_990]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueuePeek\QueuePeek.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueuePeek
@@ -6936,6 +7931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [QueueToArray.cmd_991]
 RelativePath=CoreMangLib\cti\system\collections\generic\queue\QueueToArray\QueueToArray.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queue\QueueToArray
@@ -6943,6 +7939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumeratorCurrent.cmd_992]
 RelativePath=CoreMangLib\cti\system\collections\generic\queueenumerator\EnumeratorCurrent\EnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queueenumerator\EnumeratorCurrent
@@ -6950,6 +7947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumeratorDispose.cmd_993]
 RelativePath=CoreMangLib\cti\system\collections\generic\queueenumerator\EnumeratorDispose\EnumeratorDispose.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queueenumerator\EnumeratorDispose
@@ -6957,6 +7955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumeratorMoveNext.cmd_994]
 RelativePath=CoreMangLib\cti\system\collections\generic\queueenumerator\EnumeratorMoveNext\EnumeratorMoveNext.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\queueenumerator\EnumeratorMoveNext
@@ -6964,6 +7963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackClear.cmd_995]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackClear\StackClear.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackClear
@@ -6971,6 +7971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackContains.cmd_996]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackContains\StackContains.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackContains
@@ -6978,6 +7979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackCopyTo.cmd_997]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackCopyTo\StackCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackCopyTo
@@ -6985,6 +7987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackCount.cmd_998]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackCount\StackCount.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackCount
@@ -6992,6 +7995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackCtor1.cmd_999]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackCtor1\StackCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackCtor1
@@ -6999,6 +8003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackCtor2.cmd_1000]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackCtor2\StackCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackCtor2
@@ -7006,6 +8011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackCtor3.cmd_1001]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackCtor3\StackCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackCtor3
@@ -7013,6 +8019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackGetEnumerator.cmd_1002]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackGetEnumerator\StackGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackGetEnumerator
@@ -7020,6 +8027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackPeek.cmd_1003]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackPeek\StackPeek.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackPeek
@@ -7027,6 +8035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackPop.cmd_1004]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackPop\StackPop.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackPop
@@ -7034,6 +8043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackPush.cmd_1005]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackPush\StackPush.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackPush
@@ -7041,6 +8051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackToArray.cmd_1006]
 RelativePath=CoreMangLib\cti\system\collections\generic\stack\StackToArray\StackToArray.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stack\StackToArray
@@ -7048,6 +8059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackEnumeratorCurrent.cmd_1007]
 RelativePath=CoreMangLib\cti\system\collections\generic\stackenumerator\StackEnumeratorCurrent\StackEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stackenumerator\StackEnumeratorCurrent
@@ -7055,6 +8067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackEnumeratorDispose.cmd_1008]
 RelativePath=CoreMangLib\cti\system\collections\generic\stackenumerator\StackEnumeratorDispose\StackEnumeratorDispose.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stackenumerator\StackEnumeratorDispose
@@ -7062,6 +8075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackEnumeratorMoveNext.cmd_1009]
 RelativePath=CoreMangLib\cti\system\collections\generic\stackenumerator\StackEnumeratorMoveNext\StackEnumeratorMoveNext.cmd
 WorkingDir=CoreMangLib\cti\system\collections\generic\stackenumerator\StackEnumeratorMoveNext
@@ -7069,6 +8083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionCopyTo.cmd_1010]
 RelativePath=CoreMangLib\cti\system\collections\icollection\ICollectionCopyTo\ICollectionCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\collections\icollection\ICollectionCopyTo
@@ -7076,6 +8091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionCount.cmd_1011]
 RelativePath=CoreMangLib\cti\system\collections\icollection\ICollectionCount\ICollectionCount.cmd
 WorkingDir=CoreMangLib\cti\system\collections\icollection\ICollectionCount
@@ -7083,6 +8099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionIsSynchronized.cmd_1012]
 RelativePath=CoreMangLib\cti\system\collections\icollection\ICollectionIsSynchronized\ICollectionIsSynchronized.cmd
 WorkingDir=CoreMangLib\cti\system\collections\icollection\ICollectionIsSynchronized
@@ -7090,6 +8107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ICollectionSyncRoot.cmd_1013]
 RelativePath=CoreMangLib\cti\system\collections\icollection\ICollectionSyncRoot\ICollectionSyncRoot.cmd
 WorkingDir=CoreMangLib\cti\system\collections\icollection\ICollectionSyncRoot
@@ -7097,6 +8115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IComparerCompare.cmd_1014]
 RelativePath=CoreMangLib\cti\system\collections\icomparer\IComparerCompare\IComparerCompare.cmd
 WorkingDir=CoreMangLib\cti\system\collections\icomparer\IComparerCompare
@@ -7104,6 +8123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryAdd.cmd_1015]
 RelativePath=CoreMangLib\cti\system\collections\idictionary\IDictionaryAdd\IDictionaryAdd.cmd
 WorkingDir=CoreMangLib\cti\system\collections\idictionary\IDictionaryAdd
@@ -7111,6 +8131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryClear.cmd_1016]
 RelativePath=CoreMangLib\cti\system\collections\idictionary\IDictionaryClear\IDictionaryClear.cmd
 WorkingDir=CoreMangLib\cti\system\collections\idictionary\IDictionaryClear
@@ -7118,6 +8139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryContains.cmd_1017]
 RelativePath=CoreMangLib\cti\system\collections\idictionary\IDictionaryContains\IDictionaryContains.cmd
 WorkingDir=CoreMangLib\cti\system\collections\idictionary\IDictionaryContains
@@ -7125,6 +8147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryGetEnumerator.cmd_1018]
 RelativePath=CoreMangLib\cti\system\collections\idictionary\IDictionaryGetEnumerator\IDictionaryGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\collections\idictionary\IDictionaryGetEnumerator
@@ -7132,6 +8155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryIsFixedSize.cmd_1019]
 RelativePath=CoreMangLib\cti\system\collections\idictionary\IDictionaryIsFixedSize\IDictionaryIsFixedSize.cmd
 WorkingDir=CoreMangLib\cti\system\collections\idictionary\IDictionaryIsFixedSize
@@ -7139,6 +8163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryIsReadOnly.cmd_1020]
 RelativePath=CoreMangLib\cti\system\collections\idictionary\IDictionaryIsReadOnly\IDictionaryIsReadOnly.cmd
 WorkingDir=CoreMangLib\cti\system\collections\idictionary\IDictionaryIsReadOnly
@@ -7146,6 +8171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDictionaryRemove.cmd_1021]
 RelativePath=CoreMangLib\cti\system\collections\idictionary\IDictionaryRemove\IDictionaryRemove.cmd
 WorkingDir=CoreMangLib\cti\system\collections\idictionary\IDictionaryRemove
@@ -7153,6 +8179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IEnumeratorCurrent.cmd_1022]
 RelativePath=CoreMangLib\cti\system\collections\ienumerator\IEnumeratorCurrent\IEnumeratorCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\collections\ienumerator\IEnumeratorCurrent
@@ -7160,6 +8187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IEnumeratorMoveNext.cmd_1023]
 RelativePath=CoreMangLib\cti\system\collections\ienumerator\IEnumeratorMoveNext\IEnumeratorMoveNext.cmd
 WorkingDir=CoreMangLib\cti\system\collections\ienumerator\IEnumeratorMoveNext
@@ -7167,6 +8195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IEnumeratorReset.cmd_1024]
 RelativePath=CoreMangLib\cti\system\collections\ienumerator\IEnumeratorReset\IEnumeratorReset.cmd
 WorkingDir=CoreMangLib\cti\system\collections\ienumerator\IEnumeratorReset
@@ -7174,6 +8203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IListIsFixedSize.cmd_1025]
 RelativePath=CoreMangLib\cti\system\collections\ilist\IListIsFixedSize\IListIsFixedSize.cmd
 WorkingDir=CoreMangLib\cti\system\collections\ilist\IListIsFixedSize
@@ -7181,6 +8211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IListItem.cmd_1026]
 RelativePath=CoreMangLib\cti\system\collections\ilist\IListItem\IListItem.cmd
 WorkingDir=CoreMangLib\cti\system\collections\ilist\IListItem
@@ -7188,6 +8219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ComparisonBeginInvoke.cmd_1027]
 RelativePath=CoreMangLib\cti\system\comparison\ComparisonBeginInvoke\ComparisonBeginInvoke.cmd
 WorkingDir=CoreMangLib\cti\system\comparison\ComparisonBeginInvoke
@@ -7195,6 +8227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ComparisonEndInvoke.cmd_1028]
 RelativePath=CoreMangLib\cti\system\comparison\ComparisonEndInvoke\ComparisonEndInvoke.cmd
 WorkingDir=CoreMangLib\cti\system\comparison\ComparisonEndInvoke
@@ -7202,6 +8235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ComparisonInvoke.cmd_1029]
 RelativePath=CoreMangLib\cti\system\comparison\ComparisonInvoke\ComparisonInvoke.cmd
 WorkingDir=CoreMangLib\cti\system\comparison\ComparisonInvoke
@@ -7209,6 +8243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [consoleseterror_PSC.cmd_1030]
 RelativePath=CoreMangLib\cti\system\console\consoleseterror_PSC\consoleseterror_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\console\consoleseterror_PSC
@@ -7216,6 +8251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConsoleSetOut_PSC.cmd_1031]
 RelativePath=CoreMangLib\cti\system\console\ConsoleSetOut_PSC\ConsoleSetOut_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\console\ConsoleSetOut_PSC
@@ -7223,6 +8259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertChangeType2.cmd_1032]
 RelativePath=CoreMangLib\cti\system\convert\ConvertChangeType2\ConvertChangeType2.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertChangeType2
@@ -7230,6 +8267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertFromBase64CharArray.cmd_1033]
 RelativePath=CoreMangLib\cti\system\convert\ConvertFromBase64CharArray\ConvertFromBase64CharArray.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertFromBase64CharArray
@@ -7237,6 +8275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertFromBase64String.cmd_1034]
 RelativePath=CoreMangLib\cti\system\convert\ConvertFromBase64String\ConvertFromBase64String.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertFromBase64String
@@ -7244,6 +8283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToBase64CharArray.cmd_1035]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToBase64CharArray\ConvertToBase64CharArray.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToBase64CharArray
@@ -7251,6 +8291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToBase64String1.cmd_1036]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToBase64String1\ConvertToBase64String1.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToBase64String1
@@ -7258,6 +8299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToBase64String2.cmd_1037]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToBase64String2\ConvertToBase64String2.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToBase64String2
@@ -7265,6 +8307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToBoolean.cmd_1038]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToBoolean\ConvertToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToBoolean
@@ -7272,6 +8315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToBoolean2.cmd_1039]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToBoolean2\ConvertToBoolean2.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToBoolean2
@@ -7279,6 +8323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToBoolean4.cmd_1040]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToBoolean4\ConvertToBoolean4.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToBoolean4
@@ -7286,6 +8331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToBoolean5.cmd_1041]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToBoolean5\ConvertToBoolean5.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToBoolean5
@@ -7293,6 +8339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToBoolean6.cmd_1042]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToBoolean6\ConvertToBoolean6.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToBoolean6
@@ -7300,6 +8347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToBoolean7.cmd_1043]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToBoolean7\ConvertToBoolean7.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToBoolean7
@@ -7307,6 +8355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToBoolean8.cmd_1044]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToBoolean8\ConvertToBoolean8.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToBoolean8
@@ -7314,6 +8363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToByte.cmd_1045]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToByte\ConvertToByte.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToByte
@@ -7321,6 +8371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToByte1.cmd_1046]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToByte1\ConvertToByte1.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToByte1
@@ -7328,6 +8379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToByte2.cmd_1047]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToByte2\ConvertToByte2.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToByte2
@@ -7335,6 +8387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToByte3.cmd_1048]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToByte3\ConvertToByte3.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToByte3
@@ -7342,6 +8395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToByte4.cmd_1049]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToByte4\ConvertToByte4.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToByte4
@@ -7349,6 +8403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToByte6.cmd_1050]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToByte6\ConvertToByte6.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToByte6
@@ -7356,6 +8411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToByte7.cmd_1051]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToByte7\ConvertToByte7.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToByte7
@@ -7363,6 +8419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToByte8.cmd_1052]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToByte8\ConvertToByte8.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToByte8
@@ -7370,6 +8427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar.cmd_1053]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar\ConvertToChar.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar
@@ -7377,6 +8435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar10.cmd_1054]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar10\ConvertToChar10.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar10
@@ -7384,6 +8443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar11.cmd_1055]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar11\ConvertToChar11.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar11
@@ -7391,6 +8451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar12.cmd_1056]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar12\ConvertToChar12.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar12
@@ -7398,6 +8459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar13.cmd_1057]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar13\ConvertToChar13.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar13
@@ -7405,6 +8467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar14.cmd_1058]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar14\ConvertToChar14.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar14
@@ -7412,6 +8475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar15.cmd_1059]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar15\ConvertToChar15.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar15
@@ -7419,6 +8483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar16.cmd_1060]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar16\ConvertToChar16.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar16
@@ -7426,6 +8491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar5.cmd_1061]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar5\ConvertToChar5.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar5
@@ -7433,6 +8499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar6.cmd_1062]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar6\ConvertToChar6.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar6
@@ -7440,6 +8507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar7.cmd_1063]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar7\ConvertToChar7.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar7
@@ -7447,6 +8515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar8.cmd_1064]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar8\ConvertToChar8.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar8
@@ -7454,6 +8523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToChar9.cmd_1065]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToChar9\ConvertToChar9.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToChar9
@@ -7461,6 +8531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDateTime.cmd_1066]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDateTime\ConvertToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDateTime
@@ -7468,6 +8539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal.cmd_1067]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal\ConvertToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal
@@ -7475,6 +8547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal1.cmd_1068]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal1\ConvertToDecimal1.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal1
@@ -7482,6 +8555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal10.cmd_1069]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal10\ConvertToDecimal10.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal10
@@ -7489,6 +8563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal11.cmd_1070]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal11\ConvertToDecimal11.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal11
@@ -7496,6 +8571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal12.cmd_1071]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal12\ConvertToDecimal12.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal12
@@ -7503,6 +8579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal13.cmd_1072]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal13\ConvertToDecimal13.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal13
@@ -7510,6 +8587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal14.cmd_1073]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal14\ConvertToDecimal14.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal14
@@ -7517,6 +8595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal15.cmd_1074]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal15\ConvertToDecimal15.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal15
@@ -7524,6 +8603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal16.cmd_1075]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal16\ConvertToDecimal16.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal16
@@ -7531,6 +8611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal17.cmd_1076]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal17\ConvertToDecimal17.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal17
@@ -7538,6 +8619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal18.cmd_1077]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal18\ConvertToDecimal18.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal18
@@ -7545,6 +8627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal2.cmd_1078]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal2\ConvertToDecimal2.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal2
@@ -7552,6 +8635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal5.cmd_1079]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal5\ConvertToDecimal5.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal5
@@ -7559,6 +8643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal6.cmd_1080]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal6\ConvertToDecimal6.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal6
@@ -7566,6 +8651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal8.cmd_1081]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal8\ConvertToDecimal8.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal8
@@ -7573,6 +8659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDecimal9.cmd_1082]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDecimal9\ConvertToDecimal9.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDecimal9
@@ -7580,6 +8667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble.cmd_1083]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble\ConvertToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble
@@ -7587,6 +8675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble10.cmd_1084]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble10\ConvertToDouble10.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble10
@@ -7594,6 +8683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble11.cmd_1085]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble11\ConvertToDouble11.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble11
@@ -7601,6 +8691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble12.cmd_1086]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble12\ConvertToDouble12.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble12
@@ -7608,6 +8699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble13.cmd_1087]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble13\ConvertToDouble13.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble13
@@ -7615,6 +8707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble14.cmd_1088]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble14\ConvertToDouble14.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble14
@@ -7622,6 +8715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble15.cmd_1089]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble15\ConvertToDouble15.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble15
@@ -7629,6 +8723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble16.cmd_1090]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble16\ConvertToDouble16.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble16
@@ -7636,6 +8731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble17.cmd_1091]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble17\ConvertToDouble17.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble17
@@ -7643,6 +8739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble5.cmd_1092]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble5\ConvertToDouble5.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble5
@@ -7650,6 +8747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble6.cmd_1093]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble6\ConvertToDouble6.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble6
@@ -7657,6 +8755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble7.cmd_1094]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble7\ConvertToDouble7.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble7
@@ -7664,6 +8763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble8.cmd_1095]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble8\ConvertToDouble8.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble8
@@ -7671,6 +8771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToDouble9.cmd_1096]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToDouble9\ConvertToDouble9.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToDouble9
@@ -7678,6 +8779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16.cmd_1097]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16\ConvertToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16
@@ -7685,6 +8787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_1.cmd_1098]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_1\ConvertToInt16_1.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_1
@@ -7692,6 +8795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_10.cmd_1099]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_10\ConvertToInt16_10.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_10
@@ -7699,6 +8803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_11.cmd_1100]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_11\ConvertToInt16_11.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_11
@@ -7706,6 +8811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_16.cmd_1101]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_16\ConvertToInt16_16.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_16
@@ -7713,6 +8819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_17.cmd_1102]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_17\ConvertToInt16_17.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_17
@@ -7720,6 +8827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_18.cmd_1103]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_18\ConvertToInt16_18.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_18
@@ -7727,6 +8835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_2.cmd_1104]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_2\ConvertToInt16_2.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_2
@@ -7734,6 +8843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_3.cmd_1105]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_3\ConvertToInt16_3.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_3
@@ -7741,6 +8851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_4.cmd_1106]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_4\ConvertToInt16_4.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_4
@@ -7748,6 +8859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_5.cmd_1107]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_5\ConvertToInt16_5.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_5
@@ -7755,6 +8867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_6.cmd_1108]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_6\ConvertToInt16_6.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_6
@@ -7762,6 +8875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_7.cmd_1109]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_7\ConvertToInt16_7.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_7
@@ -7769,6 +8883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_8.cmd_1110]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_8\ConvertToInt16_8.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_8
@@ -7776,6 +8891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt16_9.cmd_1111]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt16_9\ConvertToInt16_9.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt16_9
@@ -7783,6 +8899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32.cmd_1112]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32\ConvertToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32
@@ -7790,6 +8907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_1.cmd_1113]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_1\ConvertToInt32_1.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_1
@@ -7797,6 +8915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_10.cmd_1114]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_10\ConvertToInt32_10.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_10
@@ -7804,6 +8923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_11.cmd_1115]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_11\ConvertToInt32_11.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_11
@@ -7811,6 +8931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_16.cmd_1116]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_16\ConvertToInt32_16.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_16
@@ -7818,6 +8939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_17.cmd_1117]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_17\ConvertToInt32_17.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_17
@@ -7825,6 +8947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_18.cmd_1118]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_18\ConvertToInt32_18.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_18
@@ -7832,6 +8955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_2.cmd_1119]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_2\ConvertToInt32_2.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_2
@@ -7839,6 +8963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_3.cmd_1120]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_3\ConvertToInt32_3.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_3
@@ -7846,6 +8971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_4.cmd_1121]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_4\ConvertToInt32_4.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_4
@@ -7853,6 +8979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_5.cmd_1122]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_5\ConvertToInt32_5.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_5
@@ -7860,6 +8987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_6.cmd_1123]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_6\ConvertToInt32_6.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_6
@@ -7867,6 +8995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_7.cmd_1124]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_7\ConvertToInt32_7.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_7
@@ -7874,6 +9003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_8.cmd_1125]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_8\ConvertToInt32_8.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_8
@@ -7881,6 +9011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt32_9.cmd_1126]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt32_9\ConvertToInt32_9.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt32_9
@@ -7888,6 +9019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64.cmd_1127]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64\ConvertToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64
@@ -7895,6 +9027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_1.cmd_1128]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_1\ConvertToInt64_1.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_1
@@ -7902,6 +9035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_10.cmd_1129]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_10\ConvertToInt64_10.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_10
@@ -7909,6 +9043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_11.cmd_1130]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_11\ConvertToInt64_11.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_11
@@ -7916,6 +9051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_16.cmd_1131]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_16\ConvertToInt64_16.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_16
@@ -7923,6 +9059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_17.cmd_1132]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_17\ConvertToInt64_17.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_17
@@ -7930,6 +9067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_18.cmd_1133]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_18\ConvertToInt64_18.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_18
@@ -7937,6 +9075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_2.cmd_1134]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_2\ConvertToInt64_2.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_2
@@ -7944,6 +9083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_3.cmd_1135]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_3\ConvertToInt64_3.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_3
@@ -7951,6 +9091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_4.cmd_1136]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_4\ConvertToInt64_4.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_4
@@ -7958,6 +9099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_5.cmd_1137]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_5\ConvertToInt64_5.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_5
@@ -7965,6 +9107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_6.cmd_1138]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_6\ConvertToInt64_6.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_6
@@ -7972,6 +9115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_7.cmd_1139]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_7\ConvertToInt64_7.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_7
@@ -7979,6 +9123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_8.cmd_1140]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_8\ConvertToInt64_8.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_8
@@ -7986,6 +9131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToInt64_9.cmd_1141]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToInt64_9\ConvertToInt64_9.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToInt64_9
@@ -7993,6 +9139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte.cmd_1142]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte\ConvertToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte
@@ -8000,6 +9147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte1.cmd_1143]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte1\ConvertToSByte1.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte1
@@ -8007,6 +9155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte10.cmd_1144]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte10\ConvertToSByte10.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte10
@@ -8014,6 +9163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte11.cmd_1145]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte11\ConvertToSByte11.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte11
@@ -8021,6 +9171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte16.cmd_1146]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte16\ConvertToSByte16.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte16
@@ -8028,6 +9179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte2.cmd_1147]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte2\ConvertToSByte2.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte2
@@ -8035,6 +9187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte3.cmd_1148]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte3\ConvertToSByte3.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte3
@@ -8042,6 +9195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte4.cmd_1149]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte4\ConvertToSByte4.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte4
@@ -8049,6 +9203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte5.cmd_1150]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte5\ConvertToSByte5.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte5
@@ -8056,6 +9211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte6.cmd_1151]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte6\ConvertToSByte6.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte6
@@ -8063,6 +9219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte7.cmd_1152]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte7\ConvertToSByte7.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte7
@@ -8070,6 +9227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte8.cmd_1153]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte8\ConvertToSByte8.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte8
@@ -8077,6 +9235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSByte9.cmd_1154]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSByte9\ConvertToSByte9.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSByte9
@@ -8084,6 +9243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSingle.cmd_1155]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSingle\ConvertToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSingle
@@ -8091,6 +9251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSingle13.cmd_1156]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSingle13\ConvertToSingle13.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSingle13
@@ -8098,6 +9259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSingle14.cmd_1157]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSingle14\ConvertToSingle14.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSingle14
@@ -8105,6 +9267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSingle15.cmd_1158]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSingle15\ConvertToSingle15.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSingle15
@@ -8112,6 +9275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSingle16.cmd_1159]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSingle16\ConvertToSingle16.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSingle16
@@ -8119,6 +9283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToSingle17.cmd_1160]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToSingle17\ConvertToSingle17.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToSingle17
@@ -8126,6 +9291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString1.cmd_1161]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString1\ConvertToString1.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString1
@@ -8133,6 +9299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString10.cmd_1162]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString10\ConvertToString10.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString10
@@ -8140,6 +9307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString11.cmd_1163]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString11\ConvertToString11.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString11
@@ -8147,6 +9315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString12.cmd_1164]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString12\ConvertToString12.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString12
@@ -8154,6 +9323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString13.cmd_1165]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString13\ConvertToString13.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString13
@@ -8161,6 +9331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString14.cmd_1166]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString14\ConvertToString14.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString14
@@ -8168,6 +9339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString15.cmd_1167]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString15\ConvertToString15.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString15
@@ -8175,6 +9347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString16.cmd_1168]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString16\ConvertToString16.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString16
@@ -8182,6 +9355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString17.cmd_1169]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString17\ConvertToString17.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString17
@@ -8189,6 +9363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString18.cmd_1170]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString18\ConvertToString18.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString18
@@ -8196,6 +9371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString19.cmd_1171]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString19\ConvertToString19.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString19
@@ -8203,6 +9379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString2.cmd_1172]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString2\ConvertToString2.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString2
@@ -8210,6 +9387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString20.cmd_1173]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString20\ConvertToString20.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString20
@@ -8217,6 +9395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString21.cmd_1174]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString21\ConvertToString21.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString21
@@ -8224,6 +9403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString22.cmd_1175]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString22\ConvertToString22.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString22
@@ -8231,6 +9411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString23.cmd_1176]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString23\ConvertToString23.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString23
@@ -8238,6 +9419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString24.cmd_1177]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString24\ConvertToString24.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString24
@@ -8245,6 +9427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString25.cmd_1178]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString25\ConvertToString25.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString25
@@ -8252,6 +9435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString28.cmd_1179]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString28\ConvertToString28.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString28
@@ -8259,6 +9443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString29.cmd_1180]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString29\ConvertToString29.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString29
@@ -8266,6 +9451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString30.cmd_1181]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString30\ConvertToString30.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString30
@@ -8273,6 +9459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString31.cmd_1182]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString31\ConvertToString31.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString31
@@ -8280,6 +9467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString32.cmd_1183]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString32\ConvertToString32.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString32
@@ -8287,6 +9475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString33.cmd_1184]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString33\ConvertToString33.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString33
@@ -8294,6 +9483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString4.cmd_1185]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString4\ConvertToString4.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString4
@@ -8301,6 +9491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString5.cmd_1186]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString5\ConvertToString5.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString5
@@ -8308,6 +9499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString6.cmd_1187]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString6\ConvertToString6.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString6
@@ -8315,6 +9507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString7.cmd_1188]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString7\ConvertToString7.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString7
@@ -8322,6 +9515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString8.cmd_1189]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString8\ConvertToString8.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString8
@@ -8329,6 +9523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToString9.cmd_1190]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToString9\ConvertToString9.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToString9
@@ -8336,6 +9531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt16.cmd_1191]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt16\ConvertToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt16
@@ -8343,6 +9539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt161.cmd_1192]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt161\ConvertToUInt161.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt161
@@ -8350,6 +9547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt1610.cmd_1193]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt1610\ConvertToUInt1610.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt1610
@@ -8357,6 +9555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt1611.cmd_1194]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt1611\ConvertToUInt1611.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt1611
@@ -8364,6 +9563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt1612.cmd_1195]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt1612\ConvertToUInt1612.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt1612
@@ -8371,6 +9571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt1613.cmd_1196]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt1613\ConvertToUInt1613.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt1613
@@ -8378,6 +9579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt1614.cmd_1197]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt1614\ConvertToUInt1614.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt1614
@@ -8385,6 +9587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt1615.cmd_1198]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt1615\ConvertToUInt1615.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt1615
@@ -8392,6 +9595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt1616.cmd_1199]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt1616\ConvertToUInt1616.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt1616
@@ -8399,6 +9603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt1617.cmd_1200]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt1617\ConvertToUInt1617.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt1617
@@ -8406,6 +9611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt1618.cmd_1201]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt1618\ConvertToUInt1618.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt1618
@@ -8413,6 +9619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt162.cmd_1202]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt162\ConvertToUInt162.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt162
@@ -8420,6 +9627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt163.cmd_1203]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt163\ConvertToUInt163.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt163
@@ -8427,6 +9635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt164.cmd_1204]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt164\ConvertToUInt164.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt164
@@ -8434,6 +9643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt165.cmd_1205]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt165\ConvertToUInt165.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt165
@@ -8441,6 +9651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt166.cmd_1206]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt166\ConvertToUInt166.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt166
@@ -8448,6 +9659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt167.cmd_1207]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt167\ConvertToUInt167.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt167
@@ -8455,6 +9667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt168.cmd_1208]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt168\ConvertToUInt168.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt168
@@ -8462,6 +9675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt169.cmd_1209]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt169\ConvertToUInt169.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt169
@@ -8469,6 +9683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt32.cmd_1210]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt32\ConvertToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt32
@@ -8476,6 +9691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt321.cmd_1211]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt321\ConvertToUInt321.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt321
@@ -8483,6 +9699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt3210.cmd_1212]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt3210\ConvertToUInt3210.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt3210
@@ -8490,6 +9707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt3211.cmd_1213]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt3211\ConvertToUInt3211.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt3211
@@ -8497,6 +9715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt3212.cmd_1214]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt3212\ConvertToUInt3212.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt3212
@@ -8504,6 +9723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt3213.cmd_1215]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt3213\ConvertToUInt3213.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt3213
@@ -8511,6 +9731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt3215.cmd_1216]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt3215\ConvertToUInt3215.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt3215
@@ -8518,6 +9739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt3216.cmd_1217]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt3216\ConvertToUInt3216.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt3216
@@ -8525,6 +9747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt3217.cmd_1218]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt3217\ConvertToUInt3217.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt3217
@@ -8532,6 +9755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt3218.cmd_1219]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt3218\ConvertToUInt3218.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt3218
@@ -8539,6 +9763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt3219.cmd_1220]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt3219\ConvertToUInt3219.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt3219
@@ -8546,6 +9771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt322.cmd_1221]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt322\ConvertToUInt322.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt322
@@ -8553,6 +9779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt323.cmd_1222]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt323\ConvertToUInt323.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt323
@@ -8560,6 +9787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt324.cmd_1223]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt324\ConvertToUInt324.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt324
@@ -8567,6 +9795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt325.cmd_1224]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt325\ConvertToUInt325.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt325
@@ -8574,6 +9803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt326.cmd_1225]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt326\ConvertToUInt326.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt326
@@ -8581,6 +9811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt327.cmd_1226]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt327\ConvertToUInt327.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt327
@@ -8588,6 +9819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt328.cmd_1227]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt328\ConvertToUInt328.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt328
@@ -8595,6 +9827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt329.cmd_1228]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt329\ConvertToUInt329.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt329
@@ -8602,6 +9835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt64.cmd_1229]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt64\ConvertToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt64
@@ -8609,6 +9843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt641.cmd_1230]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt641\ConvertToUInt641.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt641
@@ -8616,6 +9851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt6410.cmd_1231]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt6410\ConvertToUInt6410.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt6410
@@ -8623,6 +9859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt6411.cmd_1232]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt6411\ConvertToUInt6411.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt6411
@@ -8630,6 +9867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt6412.cmd_1233]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt6412\ConvertToUInt6412.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt6412
@@ -8637,6 +9875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt6413.cmd_1234]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt6413\ConvertToUInt6413.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt6413
@@ -8644,6 +9883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt6414.cmd_1235]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt6414\ConvertToUInt6414.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt6414
@@ -8651,6 +9891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt6415.cmd_1236]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt6415\ConvertToUInt6415.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt6415
@@ -8658,6 +9899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt6416.cmd_1237]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt6416\ConvertToUInt6416.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt6416
@@ -8665,6 +9907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt6417.cmd_1238]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt6417\ConvertToUInt6417.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt6417
@@ -8672,6 +9915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt6418.cmd_1239]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt6418\ConvertToUInt6418.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt6418
@@ -8679,6 +9923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt642.cmd_1240]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt642\ConvertToUInt642.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt642
@@ -8686,6 +9931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt643.cmd_1241]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt643\ConvertToUInt643.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt643
@@ -8693,6 +9939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt644.cmd_1242]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt644\ConvertToUInt644.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt644
@@ -8700,6 +9947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt645.cmd_1243]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt645\ConvertToUInt645.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt645
@@ -8707,6 +9955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt646.cmd_1244]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt646\ConvertToUInt646.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt646
@@ -8714,6 +9963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt647.cmd_1245]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt647\ConvertToUInt647.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt647
@@ -8721,6 +9971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt648.cmd_1246]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt648\ConvertToUInt648.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt648
@@ -8728,6 +9979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConvertToUInt649.cmd_1247]
 RelativePath=CoreMangLib\cti\system\convert\ConvertToUInt649\ConvertToUInt649.cmd
 WorkingDir=CoreMangLib\cti\system\convert\ConvertToUInt649
@@ -8735,272 +9987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
-[DateTimeCompare.cmd_1248]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeCompare\DateTimeCompare.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeCompare
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeCompareTo1.cmd_1249]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeCompareTo1\DateTimeCompareTo1.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeCompareTo1
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeCtor1.cmd_1250]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeCtor1\DateTimeCtor1.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeCtor1
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeCtor3.cmd_1251]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeCtor3\DateTimeCtor3.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeCtor3
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeCtor4.cmd_1252]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeCtor4\DateTimeCtor4.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeCtor4
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeCtor6.cmd_1253]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeCtor6\DateTimeCtor6.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeCtor6
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeCtor7.cmd_1254]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeCtor7\DateTimeCtor7.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeCtor7
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeDate.cmd_1255]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeDate\DateTimeDate.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeDate
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeGetHashCode.cmd_1256]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeGetHashCode\DateTimeGetHashCode.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeGetHashCode
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeHour.cmd_1257]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeHour\DateTimeHour.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeHour
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeKind.cmd_1258]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeKind\DateTimeKind.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeKind
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeMaxValue.cmd_1259]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeMaxValue\DateTimeMaxValue.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeMaxValue
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeMillisecond.cmd_1260]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeMillisecond\DateTimeMillisecond.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeMillisecond
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeMinute.cmd_1261]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeMinute\DateTimeMinute.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeMinute
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeMinValue.cmd_1262]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeMinValue\DateTimeMinValue.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeMinValue
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeNow.cmd_1263]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeNow\DateTimeNow.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeNow
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeParse1.cmd_1264]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeParse1\DateTimeParse1.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeParse1
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeParse2.cmd_1265]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeParse2\DateTimeParse2.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeParse2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeParse3.cmd_1266]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeParse3\DateTimeParse3.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeParse3
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeParseExact1.cmd_1267]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeParseExact1\DateTimeParseExact1.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeParseExact1
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeParseExact2.cmd_1268]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeParseExact2\DateTimeParseExact2.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeParseExact2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeParseExact3.cmd_1269]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeParseExact3\DateTimeParseExact3.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeParseExact3
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeSecond.cmd_1270]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeSecond\DateTimeSecond.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeSecond
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeSubtract1.cmd_1271]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeSubtract1\DateTimeSubtract1.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeSubtract1
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeSubtract2.cmd_1272]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeSubtract2\DateTimeSubtract2.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeSubtract2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeTicks.cmd_1273]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeTicks\DateTimeTicks.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeTicks
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeTimeOfDay.cmd_1274]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeTimeOfDay\DateTimeTimeOfDay.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeTimeOfDay
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimetoday.cmd_1275]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimetoday\DateTimetoday.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimetoday
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeToFileTime.cmd_1276]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeToFileTime\DateTimeToFileTime.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeToFileTime
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeToFileTimeUtc.cmd_1277]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeToFileTimeUtc\DateTimeToFileTimeUtc.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeToFileTimeUtc
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeToLocalTime.cmd_1278]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeToLocalTime\DateTimeToLocalTime.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeToLocalTime
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeToString1.cmd_1279]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeToString1\DateTimeToString1.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeToString1
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeToString2.cmd_1280]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeToString2\DateTimeToString2.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeToString2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeToString3.cmd_1281]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeToString3\DateTimeToString3.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeToString3
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeUtcNow.cmd_1282]
-RelativePath=CoreMangLib\cti\system\datetime\DateTimeUtcNow\DateTimeUtcNow.cmd
-WorkingDir=CoreMangLib\cti\system\datetime\DateTimeUtcNow
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeKindLocal.cmd_1283]
-RelativePath=CoreMangLib\cti\system\datetimekind\DateTimeKindLocal\DateTimeKindLocal.cmd
-WorkingDir=CoreMangLib\cti\system\datetimekind\DateTimeKindLocal
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeKindUnspecified.cmd_1284]
-RelativePath=CoreMangLib\cti\system\datetimekind\DateTimeKindUnspecified\DateTimeKindUnspecified.cmd
-WorkingDir=CoreMangLib\cti\system\datetimekind\DateTimeKindUnspecified
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeKindUtc.cmd_1285]
-RelativePath=CoreMangLib\cti\system\datetimekind\DateTimeKindUtc\DateTimeKindUtc.cmd
-WorkingDir=CoreMangLib\cti\system\datetimekind\DateTimeKindUtc
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
+
 [DayOfWeekFriday.cmd_1286]
 RelativePath=CoreMangLib\cti\system\dayofweek\DayOfWeekFriday\DayOfWeekFriday.cmd
 WorkingDir=CoreMangLib\cti\system\dayofweek\DayOfWeekFriday
@@ -9008,6 +9995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DayOfWeekMonday.cmd_1287]
 RelativePath=CoreMangLib\cti\system\dayofweek\DayOfWeekMonday\DayOfWeekMonday.cmd
 WorkingDir=CoreMangLib\cti\system\dayofweek\DayOfWeekMonday
@@ -9015,6 +10003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DayOfWeekSaturday.cmd_1288]
 RelativePath=CoreMangLib\cti\system\dayofweek\DayOfWeekSaturday\DayOfWeekSaturday.cmd
 WorkingDir=CoreMangLib\cti\system\dayofweek\DayOfWeekSaturday
@@ -9022,6 +10011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DayOfWeekSunday.cmd_1289]
 RelativePath=CoreMangLib\cti\system\dayofweek\DayOfWeekSunday\DayOfWeekSunday.cmd
 WorkingDir=CoreMangLib\cti\system\dayofweek\DayOfWeekSunday
@@ -9029,6 +10019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DayOfWeekThursday.cmd_1290]
 RelativePath=CoreMangLib\cti\system\dayofweek\DayOfWeekThursday\DayOfWeekThursday.cmd
 WorkingDir=CoreMangLib\cti\system\dayofweek\DayOfWeekThursday
@@ -9036,6 +10027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DayOfWeekTuesDay.cmd_1291]
 RelativePath=CoreMangLib\cti\system\dayofweek\DayOfWeekTuesDay\DayOfWeekTuesDay.cmd
 WorkingDir=CoreMangLib\cti\system\dayofweek\DayOfWeekTuesDay
@@ -9043,6 +10035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DayOfWeekWednesday.cmd_1292]
 RelativePath=CoreMangLib\cti\system\dayofweek\DayOfWeekWednesday\DayOfWeekWednesday.cmd
 WorkingDir=CoreMangLib\cti\system\dayofweek\DayOfWeekWednesday
@@ -9050,6 +10043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimaFloor.cmd_1293]
 RelativePath=CoreMangLib\cti\system\decimal\DecimaFloor\DecimaFloor.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimaFloor
@@ -9057,6 +10051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalAdd.cmd_1294]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalAdd\DecimalAdd.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalAdd
@@ -9064,6 +10059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalCompare.cmd_1295]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalCompare\DecimalCompare.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalCompare
@@ -9071,6 +10067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalCtor1.cmd_1296]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalCtor1\DecimalCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalCtor1
@@ -9078,6 +10075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalCtor2.cmd_1297]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalCtor2\DecimalCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalCtor2
@@ -9085,6 +10083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalCtor3.cmd_1298]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalCtor3\DecimalCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalCtor3
@@ -9092,6 +10091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalCtor4.cmd_1299]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalCtor4\DecimalCtor4.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalCtor4
@@ -9099,6 +10099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalCtor5.cmd_1300]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalCtor5\DecimalCtor5.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalCtor5
@@ -9106,6 +10107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalCtor6.cmd_1301]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalCtor6\DecimalCtor6.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalCtor6
@@ -9113,6 +10115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalCtor7.cmd_1302]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalCtor7\DecimalCtor7.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalCtor7
@@ -9120,6 +10123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalCtor8.cmd_1303]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalCtor8\DecimalCtor8.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalCtor8
@@ -9127,6 +10131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalDivide.cmd_1304]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalDivide\DecimalDivide.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalDivide
@@ -9134,6 +10139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalEquals1.cmd_1305]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalEquals1\DecimalEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalEquals1
@@ -9141,6 +10147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalEquals2.cmd_1306]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalEquals2\DecimalEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalEquals2
@@ -9148,6 +10155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalEquals3.cmd_1307]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalEquals3\DecimalEquals3.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalEquals3
@@ -9155,6 +10163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalGetBits.cmd_1308]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalGetBits\DecimalGetBits.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalGetBits
@@ -9162,6 +10171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalMaxValue.cmd_1309]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalMaxValue\DecimalMaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalMaxValue
@@ -9169,6 +10179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalMinusOne.cmd_1310]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalMinusOne\DecimalMinusOne.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalMinusOne
@@ -9176,6 +10187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalMinValue.cmd_1311]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalMinValue\DecimalMinValue.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalMinValue
@@ -9183,6 +10195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalMultiply.cmd_1312]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalMultiply\DecimalMultiply.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalMultiply
@@ -9190,6 +10203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalNegate.cmd_1313]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalNegate\DecimalNegate.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalNegate
@@ -9197,6 +10211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalOne.cmd_1314]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalOne\DecimalOne.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalOne
@@ -9204,6 +10219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalParse.cmd_1315]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalParse\DecimalParse.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalParse
@@ -9211,6 +10227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalParse2.cmd_1316]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalParse2\DecimalParse2.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalParse2
@@ -9218,6 +10235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalParse3.cmd_1317]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalParse3\DecimalParse3.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalParse3
@@ -9225,6 +10243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalParse4.cmd_1318]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalParse4\DecimalParse4.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalParse4
@@ -9232,6 +10251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalRemainder.cmd_1319]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalRemainder\DecimalRemainder.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalRemainder
@@ -9239,6 +10259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [DecimalSubtract.cmd_1320]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalSubtract\DecimalSubtract.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalSubtract
@@ -9246,6 +10267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToBoolean.cmd_1321]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToBoolean\DecimalToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToBoolean
@@ -9253,6 +10275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToByte.cmd_1322]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToByte\DecimalToByte.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToByte
@@ -9260,6 +10283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToByte1.cmd_1323]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToByte1\DecimalToByte1.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToByte1
@@ -9267,6 +10291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToChar.cmd_1324]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToChar\DecimalToChar.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToChar
@@ -9274,6 +10299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToDateTime.cmd_1325]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToDateTime\DecimalToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToDateTime
@@ -9281,6 +10307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToDecimal.cmd_1326]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToDecimal\DecimalToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToDecimal
@@ -9288,6 +10315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToDouble.cmd_1327]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToDouble\DecimalToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToDouble
@@ -9295,6 +10323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToInt16.cmd_1328]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToInt16\DecimalToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToInt16
@@ -9302,6 +10331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToInt32.cmd_1329]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToInt32\DecimalToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToInt32
@@ -9309,6 +10339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToInt64.cmd_1330]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToInt64\DecimalToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToInt64
@@ -9316,6 +10347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToSByte.cmd_1331]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToSByte\DecimalToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToSByte
@@ -9323,6 +10355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToSingle.cmd_1332]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToSingle\DecimalToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToSingle
@@ -9330,6 +10363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToString1.cmd_1333]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToString1\DecimalToString1.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToString1
@@ -9337,6 +10371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToString2.cmd_1334]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToString2\DecimalToString2.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToString2
@@ -9344,6 +10379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToString3.cmd_1335]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToString3\DecimalToString3.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToString3
@@ -9351,6 +10387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToString4.cmd_1336]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToString4\DecimalToString4.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToString4
@@ -9358,6 +10395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToUInt16.cmd_1337]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToUInt16\DecimalToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToUInt16
@@ -9365,6 +10403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToUInt32.cmd_1338]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToUInt32\DecimalToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToUInt32
@@ -9372,6 +10411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalToUInt64.cmd_1339]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalToUInt64\DecimalToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalToUInt64
@@ -9379,6 +10419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalTruncate.cmd_1340]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalTruncate\DecimalTruncate.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalTruncate
@@ -9386,6 +10427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalTryParse.cmd_1341]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalTryParse\DecimalTryParse.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalTryParse
@@ -9393,6 +10435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalZero.cmd_1342]
 RelativePath=CoreMangLib\cti\system\decimal\DecimalZero\DecimalZero.cmd
 WorkingDir=CoreMangLib\cti\system\decimal\DecimalZero
@@ -9400,13 +10443,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DelegateABI.cmd_1343]
 RelativePath=CoreMangLib\cti\system\delegate\DelegateABI\DelegateABI.cmd
 WorkingDir=CoreMangLib\cti\system\delegate\DelegateABI
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [DelegateCombine1.cmd_1344]
 RelativePath=CoreMangLib\cti\system\delegate\DelegateCombine1\DelegateCombine1.cmd
 WorkingDir=CoreMangLib\cti\system\delegate\DelegateCombine1
@@ -9414,6 +10459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DelegateCombineImpl.cmd_1345]
 RelativePath=CoreMangLib\cti\system\delegate\DelegateCombineImpl\DelegateCombineImpl.cmd
 WorkingDir=CoreMangLib\cti\system\delegate\DelegateCombineImpl
@@ -9421,6 +10467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DelegateEquals1.cmd_1346]
 RelativePath=CoreMangLib\cti\system\delegate\DelegateEquals1\DelegateEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\delegate\DelegateEquals1
@@ -9428,6 +10475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DelegateGetHashCode1.cmd_1347]
 RelativePath=CoreMangLib\cti\system\delegate\DelegateGetHashCode1\DelegateGetHashCode1.cmd
 WorkingDir=CoreMangLib\cti\system\delegate\DelegateGetHashCode1
@@ -9435,6 +10483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DelegateGetInvocationList1.cmd_1348]
 RelativePath=CoreMangLib\cti\system\delegate\DelegateGetInvocationList1\DelegateGetInvocationList1.cmd
 WorkingDir=CoreMangLib\cti\system\delegate\DelegateGetInvocationList1
@@ -9442,6 +10491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DelegateRemove.cmd_1349]
 RelativePath=CoreMangLib\cti\system\delegate\DelegateRemove\DelegateRemove.cmd
 WorkingDir=CoreMangLib\cti\system\delegate\DelegateRemove
@@ -9449,6 +10499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [delegateRemoveImpl.cmd_1350]
 RelativePath=CoreMangLib\cti\system\delegate\delegateRemoveImpl\delegateRemoveImpl.cmd
 WorkingDir=CoreMangLib\cti\system\delegate\delegateRemoveImpl
@@ -9456,6 +10507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConditionalAttributeConditionString.cmd_1351]
 RelativePath=CoreMangLib\cti\system\diagnostics\conditionalattribute\ConditionalAttributeConditionString\ConditionalAttributeConditionString.cmd
 WorkingDir=CoreMangLib\cti\system\diagnostics\conditionalattribute\ConditionalAttributeConditionString
@@ -9463,6 +10515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConditionalAttributeCtor.cmd_1352]
 RelativePath=CoreMangLib\cti\system\diagnostics\conditionalattribute\ConditionalAttributeCtor\ConditionalAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\diagnostics\conditionalattribute\ConditionalAttributeCtor
@@ -9470,6 +10523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DebuggingModesDefault.cmd_1353]
 RelativePath=CoreMangLib\cti\system\diagnostics\debuggingmodes\DebuggingModesDefault\DebuggingModesDefault.cmd
 WorkingDir=CoreMangLib\cti\system\diagnostics\debuggingmodes\DebuggingModesDefault
@@ -9477,6 +10531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DebuggingModesDisableOptimizations.cmd_1354]
 RelativePath=CoreMangLib\cti\system\diagnostics\debuggingmodes\DebuggingModesDisableOptimizations\DebuggingModesDisableOptimizations.cmd
 WorkingDir=CoreMangLib\cti\system\diagnostics\debuggingmodes\DebuggingModesDisableOptimizations
@@ -9484,6 +10539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DebuggingModesEnableEditAndContinue.cmd_1355]
 RelativePath=CoreMangLib\cti\system\diagnostics\debuggingmodes\DebuggingModesEnableEditAndContinue\DebuggingModesEnableEditAndContinue.cmd
 WorkingDir=CoreMangLib\cti\system\diagnostics\debuggingmodes\DebuggingModesEnableEditAndContinue
@@ -9491,6 +10547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DebuggingModesIgnoreSymbolStoreSequencePoints.cmd_1356]
 RelativePath=CoreMangLib\cti\system\diagnostics\debuggingmodes\DebuggingModesIgnoreSymbolStoreSequencePoints\DebuggingModesIgnoreSymbolStoreSequencePoints.cmd
 WorkingDir=CoreMangLib\cti\system\diagnostics\debuggingmodes\DebuggingModesIgnoreSymbolStoreSequencePoints
@@ -9498,6 +10555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DebuggingModesNone.cmd_1357]
 RelativePath=CoreMangLib\cti\system\diagnostics\debuggingmodes\DebuggingModesNone\DebuggingModesNone.cmd
 WorkingDir=CoreMangLib\cti\system\diagnostics\debuggingmodes\DebuggingModesNone
@@ -9505,6 +10563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DivideByZeroExceptionCtor.cmd_1358]
 RelativePath=CoreMangLib\cti\system\dividebyzeroexception\DivideByZeroExceptionCtor\DivideByZeroExceptionCtor.cmd
 WorkingDir=CoreMangLib\cti\system\dividebyzeroexception\DivideByZeroExceptionCtor
@@ -9512,6 +10571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DivideByZeroExceptionCtor2.cmd_1359]
 RelativePath=CoreMangLib\cti\system\dividebyzeroexception\DivideByZeroExceptionCtor2\DivideByZeroExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\dividebyzeroexception\DivideByZeroExceptionCtor2
@@ -9519,6 +10579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DivideByZeroExceptionCtor3.cmd_1360]
 RelativePath=CoreMangLib\cti\system\dividebyzeroexception\DivideByZeroExceptionCtor3\DivideByZeroExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\dividebyzeroexception\DivideByZeroExceptionCtor3
@@ -9526,6 +10587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DllNotFoundException1.cmd_1361]
 RelativePath=CoreMangLib\cti\system\dllnotfoundexception\DllNotFoundException1\DllNotFoundException1.cmd
 WorkingDir=CoreMangLib\cti\system\dllnotfoundexception\DllNotFoundException1
@@ -9533,6 +10595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DllNotFoundExceptionCtor2.cmd_1362]
 RelativePath=CoreMangLib\cti\system\dllnotfoundexception\DllNotFoundExceptionCtor2\DllNotFoundExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\dllnotfoundexception\DllNotFoundExceptionCtor2
@@ -9540,6 +10603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DllNotFoundExceptionCtor3.cmd_1363]
 RelativePath=CoreMangLib\cti\system\dllnotfoundexception\DllNotFoundExceptionCtor3\DllNotFoundExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\dllnotfoundexception\DllNotFoundExceptionCtor3
@@ -9547,6 +10611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleCompareTo1.cmd_1364]
 RelativePath=CoreMangLib\cti\system\double\DoubleCompareTo1\DoubleCompareTo1.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleCompareTo1
@@ -9554,6 +10619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleEpsilon.cmd_1365]
 RelativePath=CoreMangLib\cti\system\double\DoubleEpsilon\DoubleEpsilon.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleEpsilon
@@ -9561,6 +10627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleEquals1.cmd_1366]
 RelativePath=CoreMangLib\cti\system\double\DoubleEquals1\DoubleEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleEquals1
@@ -9568,6 +10635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleEquals2.cmd_1367]
 RelativePath=CoreMangLib\cti\system\double\DoubleEquals2\DoubleEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleEquals2
@@ -9575,6 +10643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleGetHashCode.cmd_1368]
 RelativePath=CoreMangLib\cti\system\double\DoubleGetHashCode\DoubleGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleGetHashCode
@@ -9582,6 +10651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIConvertibleToBoolean.cmd_1369]
 RelativePath=CoreMangLib\cti\system\double\DoubleIConvertibleToBoolean\DoubleIConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIConvertibleToBoolean
@@ -9589,6 +10659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIConvertibleToByte.cmd_1370]
 RelativePath=CoreMangLib\cti\system\double\DoubleIConvertibleToByte\DoubleIConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIConvertibleToByte
@@ -9596,6 +10667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIConvertibleToDateTime.cmd_1371]
 RelativePath=CoreMangLib\cti\system\double\DoubleIConvertibleToDateTime\DoubleIConvertibleToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIConvertibleToDateTime
@@ -9603,6 +10675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIConvertibleToDecimal.cmd_1372]
 RelativePath=CoreMangLib\cti\system\double\DoubleIConvertibleToDecimal\DoubleIConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIConvertibleToDecimal
@@ -9610,6 +10683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIConvertibleToDouble.cmd_1373]
 RelativePath=CoreMangLib\cti\system\double\DoubleIConvertibleToDouble\DoubleIConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIConvertibleToDouble
@@ -9617,6 +10691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIConvertibleToInt16.cmd_1374]
 RelativePath=CoreMangLib\cti\system\double\DoubleIConvertibleToInt16\DoubleIConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIConvertibleToInt16
@@ -9624,6 +10699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIConvertibleToInt32.cmd_1375]
 RelativePath=CoreMangLib\cti\system\double\DoubleIConvertibleToInt32\DoubleIConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIConvertibleToInt32
@@ -9631,6 +10707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIConvertibleToInt64.cmd_1376]
 RelativePath=CoreMangLib\cti\system\double\DoubleIConvertibleToInt64\DoubleIConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIConvertibleToInt64
@@ -9638,6 +10715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIConvertibleToSByte.cmd_1377]
 RelativePath=CoreMangLib\cti\system\double\DoubleIConvertibleToSByte\DoubleIConvertibleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIConvertibleToSByte
@@ -9645,6 +10723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIConvertibleToSingle.cmd_1378]
 RelativePath=CoreMangLib\cti\system\double\DoubleIConvertibleToSingle\DoubleIConvertibleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIConvertibleToSingle
@@ -9652,6 +10731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIsInfinity.cmd_1379]
 RelativePath=CoreMangLib\cti\system\double\DoubleIsInfinity\DoubleIsInfinity.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIsInfinity
@@ -9659,6 +10739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIsNaN.cmd_1380]
 RelativePath=CoreMangLib\cti\system\double\DoubleIsNaN\DoubleIsNaN.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIsNaN
@@ -9666,6 +10747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIsNegativeInfinity.cmd_1381]
 RelativePath=CoreMangLib\cti\system\double\DoubleIsNegativeInfinity\DoubleIsNegativeInfinity.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIsNegativeInfinity
@@ -9673,6 +10755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleIsPositiveInfinity.cmd_1382]
 RelativePath=CoreMangLib\cti\system\double\DoubleIsPositiveInfinity\DoubleIsPositiveInfinity.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleIsPositiveInfinity
@@ -9680,6 +10763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleMaxValue.cmd_1383]
 RelativePath=CoreMangLib\cti\system\double\DoubleMaxValue\DoubleMaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleMaxValue
@@ -9687,6 +10771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleMinValue.cmd_1384]
 RelativePath=CoreMangLib\cti\system\double\DoubleMinValue\DoubleMinValue.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleMinValue
@@ -9694,6 +10779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleNaN.cmd_1385]
 RelativePath=CoreMangLib\cti\system\double\DoubleNaN\DoubleNaN.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleNaN
@@ -9701,6 +10787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleNegativeInfinity.cmd_1386]
 RelativePath=CoreMangLib\cti\system\double\DoubleNegativeInfinity\DoubleNegativeInfinity.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleNegativeInfinity
@@ -9708,6 +10795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleParse3.cmd_1387]
 RelativePath=CoreMangLib\cti\system\double\DoubleParse3\DoubleParse3.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleParse3
@@ -9715,6 +10803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoublePositiveInfinity.cmd_1388]
 RelativePath=CoreMangLib\cti\system\double\DoublePositiveInfinity\DoublePositiveInfinity.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoublePositiveInfinity
@@ -9722,6 +10811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleToString1.cmd_1389]
 RelativePath=CoreMangLib\cti\system\double\DoubleToString1\DoubleToString1.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleToString1
@@ -9729,6 +10819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleToString2.cmd_1390]
 RelativePath=CoreMangLib\cti\system\double\DoubleToString2\DoubleToString2.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleToString2
@@ -9736,6 +10827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleToString3.cmd_1391]
 RelativePath=CoreMangLib\cti\system\double\DoubleToString3\DoubleToString3.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleToString3
@@ -9743,6 +10835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleToString4.cmd_1392]
 RelativePath=CoreMangLib\cti\system\double\DoubleToString4\DoubleToString4.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleToString4
@@ -9750,6 +10843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DoubleTryParse.cmd_1393]
 RelativePath=CoreMangLib\cti\system\double\DoubleTryParse\DoubleTryParse.cmd
 WorkingDir=CoreMangLib\cti\system\double\DoubleTryParse
@@ -9757,6 +10851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumIConvertibleToInt64.cmd_1394]
 RelativePath=CoreMangLib\cti\system\enum\EnumIConvertibleToInt64\EnumIConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\enum\EnumIConvertibleToInt64
@@ -9764,6 +10859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumIConvertibleToSingle.cmd_1395]
 RelativePath=CoreMangLib\cti\system\enum\EnumIConvertibleToSingle\EnumIConvertibleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\enum\EnumIConvertibleToSingle
@@ -9771,6 +10867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumIConvertibleToType.cmd_1396]
 RelativePath=CoreMangLib\cti\system\enum\EnumIConvertibleToType\EnumIConvertibleToType.cmd
 WorkingDir=CoreMangLib\cti\system\enum\EnumIConvertibleToType
@@ -9778,6 +10875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumIConvertibleToUint16.cmd_1397]
 RelativePath=CoreMangLib\cti\system\enum\EnumIConvertibleToUint16\EnumIConvertibleToUint16.cmd
 WorkingDir=CoreMangLib\cti\system\enum\EnumIConvertibleToUint16
@@ -9785,6 +10883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumIConvertibleToUint32.cmd_1398]
 RelativePath=CoreMangLib\cti\system\enum\EnumIConvertibleToUint32\EnumIConvertibleToUint32.cmd
 WorkingDir=CoreMangLib\cti\system\enum\EnumIConvertibleToUint32
@@ -9792,6 +10891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumIConvertibleToUint64.cmd_1399]
 RelativePath=CoreMangLib\cti\system\enum\EnumIConvertibleToUint64\EnumIConvertibleToUint64.cmd
 WorkingDir=CoreMangLib\cti\system\enum\EnumIConvertibleToUint64
@@ -9799,6 +10899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumIsDefined.cmd_1400]
 RelativePath=CoreMangLib\cti\system\enum\EnumIsDefined\EnumIsDefined.cmd
 WorkingDir=CoreMangLib\cti\system\enum\EnumIsDefined
@@ -9806,6 +10907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumToObjectb.cmd_1401]
 RelativePath=CoreMangLib\cti\system\enum\EnumToObjectb\EnumToObjectb.cmd
 WorkingDir=CoreMangLib\cti\system\enum\EnumToObjectb
@@ -9813,6 +10915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumToString.cmd_1402]
 RelativePath=CoreMangLib\cti\system\enum\EnumToString\EnumToString.cmd
 WorkingDir=CoreMangLib\cti\system\enum\EnumToString
@@ -9820,6 +10923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnumToString3.cmd_1403]
 RelativePath=CoreMangLib\cti\system\enum\EnumToString3\EnumToString3.cmd
 WorkingDir=CoreMangLib\cti\system\enum\EnumToString3
@@ -9827,6 +10931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EnvironmentNewLine.cmd_1404]
 RelativePath=CoreMangLib\cti\system\environment\EnvironmentNewLine\EnvironmentNewLine.cmd
 WorkingDir=CoreMangLib\cti\system\environment\EnvironmentNewLine
@@ -9834,6 +10939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EventArgsctor.cmd_1405]
 RelativePath=CoreMangLib\cti\system\eventargs\EventArgsctor\EventArgsctor.cmd
 WorkingDir=CoreMangLib\cti\system\eventargs\EventArgsctor
@@ -9841,6 +10947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EventHandlerInvoke.cmd_1406]
 RelativePath=CoreMangLib\cti\system\eventhandler\EventHandlerInvoke\EventHandlerInvoke.cmd
 WorkingDir=CoreMangLib\cti\system\eventhandler\EventHandlerInvoke
@@ -9848,6 +10955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EventHandlerBeginInvoke.cmd_1407]
 RelativePath=CoreMangLib\cti\system\eventhandler_generic\EventHandlerBeginInvoke\EventHandlerBeginInvoke.cmd
 WorkingDir=CoreMangLib\cti\system\eventhandler_generic\EventHandlerBeginInvoke
@@ -9855,6 +10963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EventHandlerCtor.cmd_1408]
 RelativePath=CoreMangLib\cti\system\eventhandler_generic\EventHandlerCtor\EventHandlerCtor.cmd
 WorkingDir=CoreMangLib\cti\system\eventhandler_generic\EventHandlerCtor
@@ -9862,6 +10971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EventHandlerEndInvoke.cmd_1409]
 RelativePath=CoreMangLib\cti\system\eventhandler_generic\EventHandlerEndInvoke\EventHandlerEndInvoke.cmd
 WorkingDir=CoreMangLib\cti\system\eventhandler_generic\EventHandlerEndInvoke
@@ -9869,6 +10979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EventHandlerInvoke.cmd_1410]
 RelativePath=CoreMangLib\cti\system\eventhandler_generic\EventHandlerInvoke\EventHandlerInvoke.cmd
 WorkingDir=CoreMangLib\cti\system\eventhandler_generic\EventHandlerInvoke
@@ -9876,6 +10987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ExceptionCtor1.cmd_1411]
 RelativePath=CoreMangLib\cti\system\exception\ExceptionCtor1\ExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\exception\ExceptionCtor1
@@ -9883,6 +10995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ExceptionCtor2.cmd_1412]
 RelativePath=CoreMangLib\cti\system\exception\ExceptionCtor2\ExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\exception\ExceptionCtor2
@@ -9890,6 +11003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ExceptionCtor3.cmd_1413]
 RelativePath=CoreMangLib\cti\system\exception\ExceptionCtor3\ExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\exception\ExceptionCtor3
@@ -9897,6 +11011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ExceptionGetBaseException.cmd_1414]
 RelativePath=CoreMangLib\cti\system\exception\ExceptionGetBaseException\ExceptionGetBaseException.cmd
 WorkingDir=CoreMangLib\cti\system\exception\ExceptionGetBaseException
@@ -9904,6 +11019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FlagsAttributeCtor.cmd_1415]
 RelativePath=CoreMangLib\cti\system\flagsattribute\FlagsAttributeCtor\FlagsAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\flagsattribute\FlagsAttributeCtor
@@ -9911,6 +11027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FormatExceptionCtor1.cmd_1416]
 RelativePath=CoreMangLib\cti\system\formatexception\FormatExceptionCtor1\FormatExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\formatexception\FormatExceptionCtor1
@@ -9918,6 +11035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FormatExceptionCtor2.cmd_1417]
 RelativePath=CoreMangLib\cti\system\formatexception\FormatExceptionCtor2\FormatExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\formatexception\FormatExceptionCtor2
@@ -9925,6 +11043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FormatExceptionCtor3.cmd_1418]
 RelativePath=CoreMangLib\cti\system\formatexception\FormatExceptionCtor3\FormatExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\formatexception\FormatExceptionCtor3
@@ -9932,13 +11051,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCCollect.cmd_1419]
 RelativePath=CoreMangLib\cti\system\gc\GCCollect\GCCollect.cmd
 WorkingDir=CoreMangLib\cti\system\gc\GCCollect
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
+Categories=Pri1;RT;EXPECTED_PASS;GCSTRESS_FAIL;10070
 HostStyle=0
+
 [GCGetTotalMemory.cmd_1420]
 RelativePath=CoreMangLib\cti\system\gc\GCGetTotalMemory\GCGetTotalMemory.cmd
 WorkingDir=CoreMangLib\cti\system\gc\GCGetTotalMemory
@@ -9946,6 +11067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCKeepAlive.cmd_1421]
 RelativePath=CoreMangLib\cti\system\gc\GCKeepAlive\GCKeepAlive.cmd
 WorkingDir=CoreMangLib\cti\system\gc\GCKeepAlive
@@ -9953,6 +11075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCMaxGeneration.cmd_1422]
 RelativePath=CoreMangLib\cti\system\gc\GCMaxGeneration\GCMaxGeneration.cmd
 WorkingDir=CoreMangLib\cti\system\gc\GCMaxGeneration
@@ -9960,13 +11083,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCReRegisterForFinalize.cmd_1423]
 RelativePath=CoreMangLib\cti\system\gc\GCReRegisterForFinalize\GCReRegisterForFinalize.cmd
 WorkingDir=CoreMangLib\cti\system\gc\GCReRegisterForFinalize
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
+Categories=Pri1;3392;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [GCSuppressFinalize.cmd_1424]
 RelativePath=CoreMangLib\cti\system\gc\GCSuppressFinalize\GCSuppressFinalize.cmd
 WorkingDir=CoreMangLib\cti\system\gc\GCSuppressFinalize
@@ -9974,6 +11099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCWaitForPendingFinalizers.cmd_1425]
 RelativePath=CoreMangLib\cti\system\gc\GCWaitForPendingFinalizers\GCWaitForPendingFinalizers.cmd
 WorkingDir=CoreMangLib\cti\system\gc\GCWaitForPendingFinalizers
@@ -9981,965 +11107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
-[CalendarWeekRuleFirstDay.cmd_1426]
-RelativePath=CoreMangLib\cti\system\globalization\calendarweekrule\CalendarWeekRuleFirstDay\CalendarWeekRuleFirstDay.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\calendarweekrule\CalendarWeekRuleFirstDay
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CalendarWeekRuleFirstFourDayWeek.cmd_1427]
-RelativePath=CoreMangLib\cti\system\globalization\calendarweekrule\CalendarWeekRuleFirstFourDayWeek\CalendarWeekRuleFirstFourDayWeek.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\calendarweekrule\CalendarWeekRuleFirstFourDayWeek
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CalendarWeekRuleFirstFullWeek.cmd_1428]
-RelativePath=CoreMangLib\cti\system\globalization\calendarweekrule\CalendarWeekRuleFirstFullWeek\CalendarWeekRuleFirstFullWeek.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\calendarweekrule\CalendarWeekRuleFirstFullWeek
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CharUnicodeInfoGetNumericValue1.cmd_1429]
-RelativePath=CoreMangLib\cti\system\globalization\charunicodeinfo\CharUnicodeInfoGetNumericValue1\CharUnicodeInfoGetNumericValue1.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\charunicodeinfo\CharUnicodeInfoGetNumericValue1
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CharUnicodeInfoGetNumericValue2.cmd_1430]
-RelativePath=CoreMangLib\cti\system\globalization\charunicodeinfo\CharUnicodeInfoGetNumericValue2\CharUnicodeInfoGetNumericValue2.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\charunicodeinfo\CharUnicodeInfoGetNumericValue2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CharUnicodeInfoGetUnicodeCategory1.cmd_1431]
-RelativePath=CoreMangLib\cti\system\globalization\charunicodeinfo\CharUnicodeInfoGetUnicodeCategory1\CharUnicodeInfoGetUnicodeCategory1.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\charunicodeinfo\CharUnicodeInfoGetUnicodeCategory1
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CharUnicodeInfoGetUnicodeCategory2.cmd_1432]
-RelativePath=CoreMangLib\cti\system\globalization\charunicodeinfo\CharUnicodeInfoGetUnicodeCategory2\CharUnicodeInfoGetUnicodeCategory2.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\charunicodeinfo\CharUnicodeInfoGetUnicodeCategory2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CompareInfoCompare2.cmd_1433]
-RelativePath=CoreMangLib\cti\system\globalization\compareinfo\CompareInfoCompare2\CompareInfoCompare2.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\compareinfo\CompareInfoCompare2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CompareInfoIndexOf2.cmd_1434]
-RelativePath=CoreMangLib\cti\system\globalization\compareinfo\CompareInfoIndexOf2\CompareInfoIndexOf2.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\compareinfo\CompareInfoIndexOf2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CompareOptionsIgnoreCase.cmd_1435]
-RelativePath=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsIgnoreCase\CompareOptionsIgnoreCase.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsIgnoreCase
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CompareOptionsIgnoreKanaType.cmd_1436]
-RelativePath=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsIgnoreKanaType\CompareOptionsIgnoreKanaType.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsIgnoreKanaType
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CompareOptionsIgnoreNonSpace.cmd_1437]
-RelativePath=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsIgnoreNonSpace\CompareOptionsIgnoreNonSpace.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsIgnoreNonSpace
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CompareOptionsIgnoreSymbols.cmd_1438]
-RelativePath=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsIgnoreSymbols\CompareOptionsIgnoreSymbols.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsIgnoreSymbols
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CompareOptionsIgnoreWidth.cmd_1439]
-RelativePath=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsIgnoreWidth\CompareOptionsIgnoreWidth.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsIgnoreWidth
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CompareOptionsNone.cmd_1440]
-RelativePath=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsNone\CompareOptionsNone.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsNone
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CompareOptionsOrdinal.cmd_1441]
-RelativePath=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsOrdinal\CompareOptionsOrdinal.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsOrdinal
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CompareOptionsOrdinalIgoreCase.cmd_1442]
-RelativePath=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsOrdinalIgoreCase\CompareOptionsOrdinalIgoreCase.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsOrdinalIgoreCase
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CompareOptionsStringSort.cmd_1443]
-RelativePath=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsStringSort\CompareOptionsStringSort.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\compareoptions\CompareOptionsStringSort
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoClone.cmd_1444]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoClone\CultureInfoClone.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoClone
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoEnglishName.cmd_1445]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoEnglishName\CultureInfoEnglishName.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoEnglishName
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoEquals.cmd_1446]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoEquals\CultureInfoEquals.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoEquals
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoGetCultureInfo2.cmd_1447]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoGetCultureInfo2\CultureInfoGetCultureInfo2.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoGetCultureInfo2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoGetHashCode.cmd_1448]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoGetHashCode\CultureInfoGetHashCode.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoGetHashCode
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoInvariantCulture.cmd_1449]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoInvariantCulture\CultureInfoInvariantCulture.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoInvariantCulture
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoIsNeutralCulture.cmd_1450]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoIsNeutralCulture\CultureInfoIsNeutralCulture.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoIsNeutralCulture
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoName.cmd_1451]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoName\CultureInfoName.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoName
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoNativeName.cmd_1452]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoNativeName\CultureInfoNativeName.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoNativeName
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoParent.cmd_1453]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoParent\CultureInfoParent.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoParent
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoReadOnly.cmd_1454]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoReadOnly\CultureInfoReadOnly.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoReadOnly
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoTextInfo.cmd_1455]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoTextInfo\CultureInfoTextInfo.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoTextInfo
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoToString.cmd_1456]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoToString\CultureInfoToString.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoToString
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[CultureInfoTwoLetterISOLanguageName.cmd_1457]
-RelativePath=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoTwoLetterISOLanguageName\CultureInfoTwoLetterISOLanguageName.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\cultureinfo\CultureInfoTwoLetterISOLanguageName
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeFormatInfoClone.cmd_1458]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoClone\DateTimeFormatInfoClone.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoClone
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeFormatInfoCurrentInfo.cmd_1459]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoCurrentInfo\DateTimeFormatInfoCurrentInfo.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoCurrentInfo
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeFormatInfoGetAbbreviatedMonthName.cmd_1460]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoGetAbbreviatedMonthName\DateTimeFormatInfoGetAbbreviatedMonthName.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoGetAbbreviatedMonthName
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeFormatInfoGetFormat.cmd_1461]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoGetFormat\DateTimeFormatInfoGetFormat.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoGetFormat
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeFormatInfoGetInstance.cmd_1462]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoGetInstance\DateTimeFormatInfoGetInstance.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoGetInstance
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeFormatInfoGetMonthName.cmd_1463]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoGetMonthName\DateTimeFormatInfoGetMonthName.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoGetMonthName
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeFormatInfoInvariantInfo.cmd_1464]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoInvariantInfo\DateTimeFormatInfoInvariantInfo.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoInvariantInfo
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeFormatInfoIsReadOnly.cmd_1465]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoIsReadOnly\DateTimeFormatInfoIsReadOnly.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoIsReadOnly
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeFormatInfoReadOnly.cmd_1466]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoReadOnly\DateTimeFormatInfoReadOnly.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoReadOnly
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeFormatInfoRFC1123Pattern.cmd_1467]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoRFC1123Pattern\DateTimeFormatInfoRFC1123Pattern.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoRFC1123Pattern
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeFormatInfoSortableDateTimePattern.cmd_1468]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoSortableDateTimePattern\DateTimeFormatInfoSortableDateTimePattern.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\DateTimeFormatInfoSortableDateTimePattern
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UniversalSortableDateTimePattern.cmd_1469]
-RelativePath=CoreMangLib\cti\system\globalization\datetimeformatinfo\UniversalSortableDateTimePattern\UniversalSortableDateTimePattern.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimeformatinfo\UniversalSortableDateTimePattern
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeStyleAllowInnerWhite.cmd_1470]
-RelativePath=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStyleAllowInnerWhite\DateTimeStyleAllowInnerWhite.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStyleAllowInnerWhite
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeStylesAdjustToUniversal.cmd_1471]
-RelativePath=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAdjustToUniversal\DateTimeStylesAdjustToUniversal.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAdjustToUniversal
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeStylesAllowLeadingWhite.cmd_1472]
-RelativePath=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAllowLeadingWhite\DateTimeStylesAllowLeadingWhite.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAllowLeadingWhite
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeStylesAllowTrailingWhite.cmd_1473]
-RelativePath=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAllowTrailingWhite\DateTimeStylesAllowTrailingWhite.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAllowTrailingWhite
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeStylesAllowWhiteSpaces.cmd_1474]
-RelativePath=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAllowWhiteSpaces\DateTimeStylesAllowWhiteSpaces.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAllowWhiteSpaces
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeStylesAssumeLocal.cmd_1475]
-RelativePath=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAssumeLocal\DateTimeStylesAssumeLocal.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAssumeLocal
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeStylesAssumeUniversal.cmd_1476]
-RelativePath=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAssumeUniversal\DateTimeStylesAssumeUniversal.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesAssumeUniversal
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeStylesNoCurrentDateDefault.cmd_1477]
-RelativePath=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesNoCurrentDateDefault\DateTimeStylesNoCurrentDateDefault.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesNoCurrentDateDefault
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeStylesNone.cmd_1478]
-RelativePath=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesNone\DateTimeStylesNone.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesNone
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[DateTimeStylesRoundTripKind.cmd_1479]
-RelativePath=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesRoundTripKind\DateTimeStylesRoundTripKind.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\datetimestyles\DateTimeStylesRoundTripKind
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberFormatInfoClone.cmd_1480]
-RelativePath=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoClone\NumberFormatInfoClone.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoClone
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberFormatInfoCtor.cmd_1481]
-RelativePath=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoCtor\NumberFormatInfoCtor.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoCtor
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberFormatInfoCurrencyDecimalSeparator.cmd_1482]
-RelativePath=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoCurrencyDecimalSeparator\NumberFormatInfoCurrencyDecimalSeparator.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoCurrencyDecimalSeparator
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberFormatInfoCurrencyGroupSeparator.cmd_1483]
-RelativePath=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoCurrencyGroupSeparator\NumberFormatInfoCurrencyGroupSeparator.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoCurrencyGroupSeparator
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberFormatInfoGetFormat.cmd_1484]
-RelativePath=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoGetFormat\NumberFormatInfoGetFormat.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoGetFormat
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberFormatInfoGetInstance.cmd_1485]
-RelativePath=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoGetInstance\NumberFormatInfoGetInstance.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoGetInstance
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberFormatInfoReadOnly.cmd_1486]
-RelativePath=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoReadOnly\NumberFormatInfoReadOnly.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberformatinfo\NumberFormatInfoReadOnly
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesAllowCurrencySymbol.cmd_1487]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowCurrencySymbol\NumberStylesAllowCurrencySymbol.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowCurrencySymbol
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesAllowDecimalPoint.cmd_1488]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowDecimalPoint\NumberStylesAllowDecimalPoint.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowDecimalPoint
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesAllowExponent.cmd_1489]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowExponent\NumberStylesAllowExponent.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowExponent
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesAllowHexSpecifier.cmd_1490]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowHexSpecifier\NumberStylesAllowHexSpecifier.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowHexSpecifier
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesAllowLeadingSign.cmd_1491]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowLeadingSign\NumberStylesAllowLeadingSign.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowLeadingSign
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesAllowLeadingWhite.cmd_1492]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowLeadingWhite\NumberStylesAllowLeadingWhite.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowLeadingWhite
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesAllowParentheses.cmd_1493]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowParentheses\NumberStylesAllowParentheses.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowParentheses
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesAllowThousands.cmd_1494]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowThousands\NumberStylesAllowThousands.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowThousands
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesAllowTrailingSign.cmd_1495]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowTrailingSign\NumberStylesAllowTrailingSign.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowTrailingSign
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesAllowTrailingWhite.cmd_1496]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowTrailingWhite\NumberStylesAllowTrailingWhite.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAllowTrailingWhite
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesAny.cmd_1497]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAny\NumberStylesAny.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesAny
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesCurrency.cmd_1498]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesCurrency\NumberStylesCurrency.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesCurrency
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesFloat.cmd_1499]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesFloat\NumberStylesFloat.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesFloat
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesHexNumber.cmd_1500]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesHexNumber\NumberStylesHexNumber.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesHexNumber
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesInteger.cmd_1501]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesInteger\NumberStylesInteger.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesInteger
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesNone.cmd_1502]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesNone\NumberStylesNone.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesNone
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[NumberStylesNumber.cmd_1503]
-RelativePath=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesNumber\NumberStylesNumber.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\numberstyles\NumberStylesNumber
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[RegionInfoCurrentRegion.cmd_1504]
-RelativePath=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoCurrentRegion\RegionInfoCurrentRegion.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoCurrentRegion
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_FAIL
-HostStyle=0
-[RegionInfoEquals.cmd_1505]
-RelativePath=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoEquals\RegionInfoEquals.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoEquals
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[RegionInfoGetHashCode.cmd_1506]
-RelativePath=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoGetHashCode\RegionInfoGetHashCode.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoGetHashCode
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[RegionInfoIsMetric.cmd_1507]
-RelativePath=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoIsMetric\RegionInfoIsMetric.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoIsMetric
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[RegionInfoISOCurrencySymbol.cmd_1508]
-RelativePath=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoISOCurrencySymbol\RegionInfoISOCurrencySymbol.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoISOCurrencySymbol
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[RegionInfoName.cmd_1509]
-RelativePath=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoName\RegionInfoName.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoName
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[RegionInfoToString.cmd_1510]
-RelativePath=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoToString\RegionInfoToString.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoToString
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[RegionInfoTwoLetterISORegionName.cmd_1511]
-RelativePath=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoTwoLetterISORegionName\RegionInfoTwoLetterISORegionName.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\regioninfo\RegionInfoTwoLetterISORegionName
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[StringInfoCtor1.cmd_1512]
-RelativePath=CoreMangLib\cti\system\globalization\stringinfo\StringInfoCtor1\StringInfoCtor1.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\stringinfo\StringInfoCtor1
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[StringInfoCtor2.cmd_1513]
-RelativePath=CoreMangLib\cti\system\globalization\stringinfo\StringInfoCtor2\StringInfoCtor2.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\stringinfo\StringInfoCtor2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[StringInfoEquals.cmd_1514]
-RelativePath=CoreMangLib\cti\system\globalization\stringinfo\StringInfoEquals\StringInfoEquals.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\stringinfo\StringInfoEquals
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[StringInfoGetHashCode.cmd_1515]
-RelativePath=CoreMangLib\cti\system\globalization\stringinfo\StringInfoGetHashCode\StringInfoGetHashCode.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\stringinfo\StringInfoGetHashCode
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[StringInfoGetNextTextElement2.cmd_1516]
-RelativePath=CoreMangLib\cti\system\globalization\stringinfo\StringInfoGetNextTextElement2\StringInfoGetNextTextElement2.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\stringinfo\StringInfoGetNextTextElement2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[StringInfoGetTextElementEnumerator1.cmd_1517]
-RelativePath=CoreMangLib\cti\system\globalization\stringinfo\StringInfoGetTextElementEnumerator1\StringInfoGetTextElementEnumerator1.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\stringinfo\StringInfoGetTextElementEnumerator1
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[StringInfoGetTextElementEnumerator2.cmd_1518]
-RelativePath=CoreMangLib\cti\system\globalization\stringinfo\StringInfoGetTextElementEnumerator2\StringInfoGetTextElementEnumerator2.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\stringinfo\StringInfoGetTextElementEnumerator2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[StringInfoLengthInTextElements.cmd_1519]
-RelativePath=CoreMangLib\cti\system\globalization\stringinfo\StringInfoLengthInTextElements\StringInfoLengthInTextElements.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\stringinfo\StringInfoLengthInTextElements
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[StringInfoParseCombiningCharacters.cmd_1520]
-RelativePath=CoreMangLib\cti\system\globalization\stringinfo\StringInfoParseCombiningCharacters\StringInfoParseCombiningCharacters.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\stringinfo\StringInfoParseCombiningCharacters
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[StringInfoString.cmd_1521]
-RelativePath=CoreMangLib\cti\system\globalization\stringinfo\StringInfoString\StringInfoString.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\stringinfo\StringInfoString
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextElementEnumeratorCurrent.cmd_1522]
-RelativePath=CoreMangLib\cti\system\globalization\textelementenumerator\TextElementEnumeratorCurrent\TextElementEnumeratorCurrent.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textelementenumerator\TextElementEnumeratorCurrent
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextElementEnumeratorElementIndex.cmd_1523]
-RelativePath=CoreMangLib\cti\system\globalization\textelementenumerator\TextElementEnumeratorElementIndex\TextElementEnumeratorElementIndex.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textelementenumerator\TextElementEnumeratorElementIndex
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextElementEnumeratorGetTextElement.cmd_1524]
-RelativePath=CoreMangLib\cti\system\globalization\textelementenumerator\TextElementEnumeratorGetTextElement\TextElementEnumeratorGetTextElement.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textelementenumerator\TextElementEnumeratorGetTextElement
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextElementEnumeratorMoveNext.cmd_1525]
-RelativePath=CoreMangLib\cti\system\globalization\textelementenumerator\TextElementEnumeratorMoveNext\TextElementEnumeratorMoveNext.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textelementenumerator\TextElementEnumeratorMoveNext
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextElementEnumeratorReset.cmd_1526]
-RelativePath=CoreMangLib\cti\system\globalization\textelementenumerator\TextElementEnumeratorReset\TextElementEnumeratorReset.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textelementenumerator\TextElementEnumeratorReset
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextInfoCultureName.cmd_1527]
-RelativePath=CoreMangLib\cti\system\globalization\textinfo\TextInfoCultureName\TextInfoCultureName.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textinfo\TextInfoCultureName
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextInfoEquals.cmd_1528]
-RelativePath=CoreMangLib\cti\system\globalization\textinfo\TextInfoEquals\TextInfoEquals.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textinfo\TextInfoEquals
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextInfoGetHashCode.cmd_1529]
-RelativePath=CoreMangLib\cti\system\globalization\textinfo\TextInfoGetHashCode\TextInfoGetHashCode.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textinfo\TextInfoGetHashCode
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextInfoIsReadOnly.cmd_1530]
-RelativePath=CoreMangLib\cti\system\globalization\textinfo\TextInfoIsReadOnly\TextInfoIsReadOnly.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textinfo\TextInfoIsReadOnly
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextInfoToString.cmd_1531]
-RelativePath=CoreMangLib\cti\system\globalization\textinfo\TextInfoToString\TextInfoToString.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textinfo\TextInfoToString
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextInfoToUpper1.cmd_1532]
-RelativePath=CoreMangLib\cti\system\globalization\textinfo\TextInfoToUpper1\TextInfoToUpper1.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textinfo\TextInfoToUpper1
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[TextInfoToUpper2.cmd_1533]
-RelativePath=CoreMangLib\cti\system\globalization\textinfo\TextInfoToUpper2\TextInfoToUpper2.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\textinfo\TextInfoToUpper2
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryClosePunctuation.cmd_1534]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryClosePunctuation\UnicodeCategoryClosePunctuation.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryClosePunctuation
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryConnectorPunctuation.cmd_1535]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryConnectorPunctuation\UnicodeCategoryConnectorPunctuation.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryConnectorPunctuation
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryControl.cmd_1536]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryControl\UnicodeCategoryControl.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryControl
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryDashPunctuation.cmd_1537]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryDashPunctuation\UnicodeCategoryDashPunctuation.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryDashPunctuation
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryDecimalDigitNumber.cmd_1538]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryDecimalDigitNumber\UnicodeCategoryDecimalDigitNumber.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryDecimalDigitNumber
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryEnclosingMark.cmd_1539]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryEnclosingMark\UnicodeCategoryEnclosingMark.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryEnclosingMark
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryFinalQuotePunctuation.cmd_1540]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryFinalQuotePunctuation\UnicodeCategoryFinalQuotePunctuation.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryFinalQuotePunctuation
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryFormat.cmd_1541]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryFormat\UnicodeCategoryFormat.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryFormat
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryInitialQuotePunctuation.cmd_1542]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryInitialQuotePunctuation\UnicodeCategoryInitialQuotePunctuation.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryInitialQuotePunctuation
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryLetterNumber.cmd_1543]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryLetterNumber\UnicodeCategoryLetterNumber.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryLetterNumber
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryLineSeparator.cmd_1544]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryLineSeparator\UnicodeCategoryLineSeparator.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryLineSeparator
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryLowercaseLetter.cmd_1545]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryLowercaseLetter\UnicodeCategoryLowercaseLetter.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryLowercaseLetter
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryMathSymbol.cmd_1546]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryMathSymbol\UnicodeCategoryMathSymbol.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryMathSymbol
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryModifierLetter.cmd_1547]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryModifierLetter\UnicodeCategoryModifierLetter.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryModifierLetter
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryModifierSymbol.cmd_1548]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryModifierSymbol\UnicodeCategoryModifierSymbol.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryModifierSymbol
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryNonSpacingMark.cmd_1549]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryNonSpacingMark\UnicodeCategoryNonSpacingMark.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryNonSpacingMark
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryOpenPunctuation.cmd_1550]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOpenPunctuation\UnicodeCategoryOpenPunctuation.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOpenPunctuation
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryOtherLetter.cmd_1551]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOtherLetter\UnicodeCategoryOtherLetter.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOtherLetter
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryOtherNotAssigned.cmd_1552]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOtherNotAssigned\UnicodeCategoryOtherNotAssigned.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOtherNotAssigned
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryOtherNumber.cmd_1553]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOtherNumber\UnicodeCategoryOtherNumber.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOtherNumber
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryOtherPunctuation.cmd_1554]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOtherPunctuation\UnicodeCategoryOtherPunctuation.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOtherPunctuation
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryOtherSymbol.cmd_1555]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOtherSymbol\UnicodeCategoryOtherSymbol.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryOtherSymbol
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryParagraphSeparator.cmd_1556]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryParagraphSeparator\UnicodeCategoryParagraphSeparator.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryParagraphSeparator
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryPrivateUse.cmd_1557]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryPrivateUse\UnicodeCategoryPrivateUse.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryPrivateUse
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategorySpaceSeparator.cmd_1558]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategorySpaceSeparator\UnicodeCategorySpaceSeparator.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategorySpaceSeparator
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategorySpacingCombiningMark.cmd_1559]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategorySpacingCombiningMark\UnicodeCategorySpacingCombiningMark.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategorySpacingCombiningMark
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategorySurrogate.cmd_1560]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategorySurrogate\UnicodeCategorySurrogate.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategorySurrogate
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryTitlecaseLetter.cmd_1561]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryTitlecaseLetter\UnicodeCategoryTitlecaseLetter.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryTitlecaseLetter
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
-[UnicodeCategoryUppercaseLetter.cmd_1562]
-RelativePath=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryUppercaseLetter\UnicodeCategoryUppercaseLetter.cmd
-WorkingDir=CoreMangLib\cti\system\globalization\unicodecategory\UnicodeCategoryUppercaseLetter
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
+
 [GuidCompareTo1_cti.cmd_1563]
 RelativePath=CoreMangLib\cti\system\guid\GuidCompareTo1_cti\GuidCompareTo1_cti.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidCompareTo1_cti
@@ -10947,6 +11115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidCompareTo2.cmd_1564]
 RelativePath=CoreMangLib\cti\system\guid\GuidCompareTo2\GuidCompareTo2.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidCompareTo2
@@ -10954,6 +11123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidCtor1.cmd_1565]
 RelativePath=CoreMangLib\cti\system\guid\GuidCtor1\GuidCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidCtor1
@@ -10961,6 +11131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidCtor1_cti.cmd_1566]
 RelativePath=CoreMangLib\cti\system\guid\GuidCtor1_cti\GuidCtor1_cti.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidCtor1_cti
@@ -10968,6 +11139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidCtor2_cti.cmd_1567]
 RelativePath=CoreMangLib\cti\system\guid\GuidCtor2_cti\GuidCtor2_cti.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidCtor2_cti
@@ -10975,6 +11147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidCtor3.cmd_1568]
 RelativePath=CoreMangLib\cti\system\guid\GuidCtor3\GuidCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidCtor3
@@ -10982,6 +11155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidCtor3_cti.cmd_1569]
 RelativePath=CoreMangLib\cti\system\guid\GuidCtor3_cti\GuidCtor3_cti.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidCtor3_cti
@@ -10989,6 +11163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidEmpty.cmd_1570]
 RelativePath=CoreMangLib\cti\system\guid\GuidEmpty\GuidEmpty.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidEmpty
@@ -10996,6 +11171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidEquals1.cmd_1571]
 RelativePath=CoreMangLib\cti\system\guid\GuidEquals1\GuidEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidEquals1
@@ -11003,6 +11179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidEquals1_cti.cmd_1572]
 RelativePath=CoreMangLib\cti\system\guid\GuidEquals1_cti\GuidEquals1_cti.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidEquals1_cti
@@ -11010,6 +11187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidEquals2.cmd_1573]
 RelativePath=CoreMangLib\cti\system\guid\GuidEquals2\GuidEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidEquals2
@@ -11017,6 +11195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidEquals2_cti.cmd_1574]
 RelativePath=CoreMangLib\cti\system\guid\GuidEquals2_cti\GuidEquals2_cti.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidEquals2_cti
@@ -11024,6 +11203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidEquals3.cmd_1575]
 RelativePath=CoreMangLib\cti\system\guid\GuidEquals3\GuidEquals3.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidEquals3
@@ -11031,6 +11211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidGetHashCode.cmd_1576]
 RelativePath=CoreMangLib\cti\system\guid\GuidGetHashCode\GuidGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidGetHashCode
@@ -11038,6 +11219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidNewGuid.cmd_1577]
 RelativePath=CoreMangLib\cti\system\guid\GuidNewGuid\GuidNewGuid.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidNewGuid
@@ -11045,6 +11227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidToByteArray.cmd_1578]
 RelativePath=CoreMangLib\cti\system\guid\GuidToByteArray\GuidToByteArray.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidToByteArray
@@ -11052,6 +11235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GuidToString1.cmd_1579]
 RelativePath=CoreMangLib\cti\system\guid\GuidToString1\GuidToString1.cmd
 WorkingDir=CoreMangLib\cti\system\guid\GuidToString1
@@ -11059,6 +11243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IComparableCompareTo.cmd_1580]
 RelativePath=CoreMangLib\cti\system\icomparable\IComparableCompareTo\IComparableCompareTo.cmd
 WorkingDir=CoreMangLib\cti\system\icomparable\IComparableCompareTo
@@ -11066,6 +11251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IComparable_GenericCompareTo.cmd_1581]
 RelativePath=CoreMangLib\cti\system\icomparable_generic\IComparable_GenericCompareTo\IComparable_GenericCompareTo.cmd
 WorkingDir=CoreMangLib\cti\system\icomparable_generic\IComparable_GenericCompareTo
@@ -11073,6 +11259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IConvertibleToBoolean.cmd_1582]
 RelativePath=CoreMangLib\cti\system\iconvertible\IConvertibleToBoolean\IConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\iconvertible\IConvertibleToBoolean
@@ -11080,6 +11267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IConvertibleToByte.cmd_1583]
 RelativePath=CoreMangLib\cti\system\iconvertible\IConvertibleToByte\IConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\iconvertible\IConvertibleToByte
@@ -11087,6 +11275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IConvertibleToChar.cmd_1584]
 RelativePath=CoreMangLib\cti\system\iconvertible\IConvertibleToChar\IConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\iconvertible\IConvertibleToChar
@@ -11094,6 +11283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IConvertibleToDateTime.cmd_1585]
 RelativePath=CoreMangLib\cti\system\iconvertible\IConvertibleToDateTime\IConvertibleToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\iconvertible\IConvertibleToDateTime
@@ -11101,6 +11291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IConvertibleToDecimal.cmd_1586]
 RelativePath=CoreMangLib\cti\system\iconvertible\IConvertibleToDecimal\IConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\iconvertible\IConvertibleToDecimal
@@ -11108,6 +11299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IConvertibleToDouble.cmd_1587]
 RelativePath=CoreMangLib\cti\system\iconvertible\IConvertibleToDouble\IConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\iconvertible\IConvertibleToDouble
@@ -11115,6 +11307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IConvertibleToInt16.cmd_1588]
 RelativePath=CoreMangLib\cti\system\iconvertible\IConvertibleToInt16\IConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\iconvertible\IConvertibleToInt16
@@ -11122,6 +11315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IConvertibleToInt32.cmd_1589]
 RelativePath=CoreMangLib\cti\system\iconvertible\IConvertibleToInt32\IConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\iconvertible\IConvertibleToInt32
@@ -11129,6 +11323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IConvertibleToInt64.cmd_1590]
 RelativePath=CoreMangLib\cti\system\iconvertible\IConvertibleToInt64\IConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\iconvertible\IConvertibleToInt64
@@ -11136,6 +11331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IDisposableDispose.cmd_1591]
 RelativePath=CoreMangLib\cti\system\idisposable\IDisposableDispose\IDisposableDispose.cmd
 WorkingDir=CoreMangLib\cti\system\idisposable\IDisposableDispose
@@ -11143,6 +11339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IFormatableToString.cmd_1592]
 RelativePath=CoreMangLib\cti\system\iformatable\IFormatableToString\IFormatableToString.cmd
 WorkingDir=CoreMangLib\cti\system\iformatable\IFormatableToString
@@ -11150,6 +11347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IndexOutOfRangeExceptionctor1.cmd_1593]
 RelativePath=CoreMangLib\cti\system\indexoutofrangeexception\IndexOutOfRangeExceptionctor1\IndexOutOfRangeExceptionctor1.cmd
 WorkingDir=CoreMangLib\cti\system\indexoutofrangeexception\IndexOutOfRangeExceptionctor1
@@ -11157,6 +11355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IndexOutOfRangeExceptionctor2.cmd_1594]
 RelativePath=CoreMangLib\cti\system\indexoutofrangeexception\IndexOutOfRangeExceptionctor2\IndexOutOfRangeExceptionctor2.cmd
 WorkingDir=CoreMangLib\cti\system\indexoutofrangeexception\IndexOutOfRangeExceptionctor2
@@ -11164,6 +11363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IndexOutOfRangeExceptionctor3.cmd_1595]
 RelativePath=CoreMangLib\cti\system\indexoutofrangeexception\IndexOutOfRangeExceptionctor3\IndexOutOfRangeExceptionctor3.cmd
 WorkingDir=CoreMangLib\cti\system\indexoutofrangeexception\IndexOutOfRangeExceptionctor3
@@ -11171,6 +11371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32CompareTo1.cmd_1596]
 RelativePath=CoreMangLib\cti\system\int\Int32CompareTo1\Int32CompareTo1.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32CompareTo1
@@ -11178,6 +11379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32Equals1.cmd_1597]
 RelativePath=CoreMangLib\cti\system\int\Int32Equals1\Int32Equals1.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32Equals1
@@ -11185,6 +11387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32Equals2.cmd_1598]
 RelativePath=CoreMangLib\cti\system\int\Int32Equals2\Int32Equals2.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32Equals2
@@ -11192,6 +11395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32GetHashCode.cmd_1599]
 RelativePath=CoreMangLib\cti\system\int\Int32GetHashCode\Int32GetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32GetHashCode
@@ -11199,6 +11403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToBoolean.cmd_1600]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToBoolean\Int32IConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToBoolean
@@ -11206,6 +11411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToByte.cmd_1601]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToByte\Int32IConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToByte
@@ -11213,6 +11419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToChar.cmd_1602]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToChar\Int32IConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToChar
@@ -11220,6 +11427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToDateTime.cmd_1603]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToDateTime\Int32IConvertibleToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToDateTime
@@ -11227,6 +11435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToDecimal.cmd_1604]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToDecimal\Int32IConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToDecimal
@@ -11234,6 +11443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToDouble.cmd_1605]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToDouble\Int32IConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToDouble
@@ -11241,6 +11451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToInt16.cmd_1606]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToInt16\Int32IConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToInt16
@@ -11248,6 +11459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToInt32.cmd_1607]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToInt32\Int32IConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToInt32
@@ -11255,6 +11467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToInt64.cmd_1608]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToInt64\Int32IConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToInt64
@@ -11262,6 +11475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToSByte.cmd_1609]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToSByte\Int32IConvertibleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToSByte
@@ -11269,6 +11483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToSingle.cmd_1610]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToSingle\Int32IConvertibleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToSingle
@@ -11276,6 +11491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToType.cmd_1611]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToType\Int32IConvertibleToType.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToType
@@ -11283,6 +11499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToUInt16.cmd_1612]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToUInt16\Int32IConvertibleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToUInt16
@@ -11290,6 +11507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToUInt32.cmd_1613]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToUInt32\Int32IConvertibleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToUInt32
@@ -11297,6 +11515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32IConvertibleToUInt64.cmd_1614]
 RelativePath=CoreMangLib\cti\system\int\Int32IConvertibleToUInt64\Int32IConvertibleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32IConvertibleToUInt64
@@ -11304,6 +11523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32MaxValue.cmd_1615]
 RelativePath=CoreMangLib\cti\system\int\Int32MaxValue\Int32MaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32MaxValue
@@ -11311,6 +11531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32MinValue.cmd_1616]
 RelativePath=CoreMangLib\cti\system\int\Int32MinValue\Int32MinValue.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32MinValue
@@ -11318,6 +11539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32Parse1.cmd_1617]
 RelativePath=CoreMangLib\cti\system\int\Int32Parse1\Int32Parse1.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32Parse1
@@ -11325,6 +11547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32Parse2.cmd_1618]
 RelativePath=CoreMangLib\cti\system\int\Int32Parse2\Int32Parse2.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32Parse2
@@ -11332,6 +11555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32Parse3.cmd_1619]
 RelativePath=CoreMangLib\cti\system\int\Int32Parse3\Int32Parse3.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32Parse3
@@ -11339,6 +11563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32Parse4.cmd_1620]
 RelativePath=CoreMangLib\cti\system\int\Int32Parse4\Int32Parse4.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32Parse4
@@ -11346,6 +11571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32ToString3.cmd_1621]
 RelativePath=CoreMangLib\cti\system\int\Int32ToString3\Int32ToString3.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32ToString3
@@ -11353,6 +11579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int32TryParse.cmd_1622]
 RelativePath=CoreMangLib\cti\system\int\Int32TryParse\Int32TryParse.cmd
 WorkingDir=CoreMangLib\cti\system\int\Int32TryParse
@@ -11360,6 +11587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16Equals1.cmd_1623]
 RelativePath=CoreMangLib\cti\system\int16\Int16Equals1\Int16Equals1.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16Equals1
@@ -11367,6 +11595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16Equals2.cmd_1624]
 RelativePath=CoreMangLib\cti\system\int16\Int16Equals2\Int16Equals2.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16Equals2
@@ -11374,6 +11603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16GetHashCode.cmd_1625]
 RelativePath=CoreMangLib\cti\system\int16\Int16GetHashCode\Int16GetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16GetHashCode
@@ -11381,6 +11611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToBoolean.cmd_1626]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToBoolean\Int16IConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToBoolean
@@ -11388,6 +11619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToByte.cmd_1627]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToByte\Int16IConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToByte
@@ -11395,6 +11627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToChar.cmd_1628]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToChar\Int16IConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToChar
@@ -11402,6 +11635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToDateTime.cmd_1629]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToDateTime\Int16IConvertibleToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToDateTime
@@ -11409,6 +11643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToDecimal.cmd_1630]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToDecimal\Int16IConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToDecimal
@@ -11416,6 +11651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToDouble.cmd_1631]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToDouble\Int16IConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToDouble
@@ -11423,6 +11659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToInt16.cmd_1632]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToInt16\Int16IConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToInt16
@@ -11430,6 +11667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToInt32.cmd_1633]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToInt32\Int16IConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToInt32
@@ -11437,6 +11675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToInt64.cmd_1634]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToInt64\Int16IConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToInt64
@@ -11444,6 +11683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToSByte.cmd_1635]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToSByte\Int16IConvertibleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToSByte
@@ -11451,6 +11691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToSingle.cmd_1636]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToSingle\Int16IConvertibleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToSingle
@@ -11458,6 +11699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToType.cmd_1637]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToType\Int16IConvertibleToType.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToType
@@ -11465,6 +11707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToUInt16.cmd_1638]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToUInt16\Int16IConvertibleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToUInt16
@@ -11472,6 +11715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToUInt32.cmd_1639]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToUInt32\Int16IConvertibleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToUInt32
@@ -11479,6 +11723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16IConvertibleToUInt64.cmd_1640]
 RelativePath=CoreMangLib\cti\system\int16\Int16IConvertibleToUInt64\Int16IConvertibleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16IConvertibleToUInt64
@@ -11486,6 +11731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16MaxValue.cmd_1641]
 RelativePath=CoreMangLib\cti\system\int16\Int16MaxValue\Int16MaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16MaxValue
@@ -11493,6 +11739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16MinValue.cmd_1642]
 RelativePath=CoreMangLib\cti\system\int16\Int16MinValue\Int16MinValue.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16MinValue
@@ -11500,6 +11747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16Parse1.cmd_1643]
 RelativePath=CoreMangLib\cti\system\int16\Int16Parse1\Int16Parse1.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16Parse1
@@ -11507,6 +11755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16Parse2.cmd_1644]
 RelativePath=CoreMangLib\cti\system\int16\Int16Parse2\Int16Parse2.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16Parse2
@@ -11514,6 +11763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16Parse3.cmd_1645]
 RelativePath=CoreMangLib\cti\system\int16\Int16Parse3\Int16Parse3.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16Parse3
@@ -11521,6 +11771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int16TryParse.cmd_1646]
 RelativePath=CoreMangLib\cti\system\int16\Int16TryParse\Int16TryParse.cmd
 WorkingDir=CoreMangLib\cti\system\int16\Int16TryParse
@@ -11528,6 +11779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64CompareTo1.cmd_1647]
 RelativePath=CoreMangLib\cti\system\int64\Int64CompareTo1\Int64CompareTo1.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64CompareTo1
@@ -11535,6 +11787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64Equals1.cmd_1648]
 RelativePath=CoreMangLib\cti\system\int64\Int64Equals1\Int64Equals1.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64Equals1
@@ -11542,6 +11795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64Equals2.cmd_1649]
 RelativePath=CoreMangLib\cti\system\int64\Int64Equals2\Int64Equals2.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64Equals2
@@ -11549,6 +11803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64GetHashCode.cmd_1650]
 RelativePath=CoreMangLib\cti\system\int64\Int64GetHashCode\Int64GetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64GetHashCode
@@ -11556,6 +11811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToBoolean.cmd_1651]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToBoolean\Int64IConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToBoolean
@@ -11563,6 +11819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToByte.cmd_1652]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToByte\Int64IConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToByte
@@ -11570,6 +11827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToChar.cmd_1653]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToChar\Int64IConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToChar
@@ -11577,6 +11835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToDateTime.cmd_1654]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToDateTime\Int64IConvertibleToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToDateTime
@@ -11584,6 +11843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToDecimal.cmd_1655]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToDecimal\Int64IConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToDecimal
@@ -11591,6 +11851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToDouble.cmd_1656]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToDouble\Int64IConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToDouble
@@ -11598,6 +11859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToInt16.cmd_1657]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToInt16\Int64IConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToInt16
@@ -11605,6 +11867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToInt32.cmd_1658]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToInt32\Int64IConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToInt32
@@ -11612,6 +11875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToInt64.cmd_1659]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToInt64\Int64IConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToInt64
@@ -11619,6 +11883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToSByte.cmd_1660]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToSByte\Int64IConvertibleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToSByte
@@ -11626,6 +11891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToSingle.cmd_1661]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToSingle\Int64IConvertibleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToSingle
@@ -11633,6 +11899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToType.cmd_1662]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToType\Int64IConvertibleToType.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToType
@@ -11640,6 +11907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToUInt16.cmd_1663]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToUInt16\Int64IConvertibleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToUInt16
@@ -11647,6 +11915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToUInt32.cmd_1664]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToUInt32\Int64IConvertibleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToUInt32
@@ -11654,6 +11923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64IConvertibleToUInt64.cmd_1665]
 RelativePath=CoreMangLib\cti\system\int64\Int64IConvertibleToUInt64\Int64IConvertibleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64IConvertibleToUInt64
@@ -11661,6 +11931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64MaxValue.cmd_1666]
 RelativePath=CoreMangLib\cti\system\int64\Int64MaxValue\Int64MaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64MaxValue
@@ -11668,6 +11939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64MinValue.cmd_1667]
 RelativePath=CoreMangLib\cti\system\int64\Int64MinValue\Int64MinValue.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64MinValue
@@ -11675,6 +11947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64Parse1.cmd_1668]
 RelativePath=CoreMangLib\cti\system\int64\Int64Parse1\Int64Parse1.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64Parse1
@@ -11682,6 +11955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64Parse2.cmd_1669]
 RelativePath=CoreMangLib\cti\system\int64\Int64Parse2\Int64Parse2.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64Parse2
@@ -11689,6 +11963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64Parse3.cmd_1670]
 RelativePath=CoreMangLib\cti\system\int64\Int64Parse3\Int64Parse3.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64Parse3
@@ -11696,6 +11971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64ToString3.cmd_1671]
 RelativePath=CoreMangLib\cti\system\int64\Int64ToString3\Int64ToString3.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64ToString3
@@ -11703,6 +11979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Int64TryParse.cmd_1672]
 RelativePath=CoreMangLib\cti\system\int64\Int64TryParse\Int64TryParse.cmd
 WorkingDir=CoreMangLib\cti\system\int64\Int64TryParse
@@ -11710,6 +11987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IntPtrCtor_Int32.cmd_1673]
 RelativePath=CoreMangLib\cti\system\intptr\IntPtrCtor_Int32\IntPtrCtor_Int32.cmd
 WorkingDir=CoreMangLib\cti\system\intptr\IntPtrCtor_Int32
@@ -11717,6 +11995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IntPtrCtor_Int64.cmd_1674]
 RelativePath=CoreMangLib\cti\system\intptr\IntPtrCtor_Int64\IntPtrCtor_Int64.cmd
 WorkingDir=CoreMangLib\cti\system\intptr\IntPtrCtor_Int64
@@ -11724,6 +12003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IntPtrCtor_Void.cmd_1675]
 RelativePath=CoreMangLib\cti\system\intptr\IntPtrCtor_Void\IntPtrCtor_Void.cmd
 WorkingDir=CoreMangLib\cti\system\intptr\IntPtrCtor_Void
@@ -11731,6 +12011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IntPtrEquals.cmd_1676]
 RelativePath=CoreMangLib\cti\system\intptr\IntPtrEquals\IntPtrEquals.cmd
 WorkingDir=CoreMangLib\cti\system\intptr\IntPtrEquals
@@ -11738,6 +12019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IntPtrGetHashCode.cmd_1677]
 RelativePath=CoreMangLib\cti\system\intptr\IntPtrGetHashCode\IntPtrGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\intptr\IntPtrGetHashCode
@@ -11745,6 +12027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IntPtrToInt32.cmd_1678]
 RelativePath=CoreMangLib\cti\system\intptr\IntPtrToInt32\IntPtrToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\intptr\IntPtrToInt32
@@ -11752,6 +12035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IntPtrToInt64.cmd_1679]
 RelativePath=CoreMangLib\cti\system\intptr\IntPtrToInt64\IntPtrToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\intptr\IntPtrToInt64
@@ -11759,6 +12043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IntPtrToPointer.cmd_1680]
 RelativePath=CoreMangLib\cti\system\intptr\IntPtrToPointer\IntPtrToPointer.cmd
 WorkingDir=CoreMangLib\cti\system\intptr\IntPtrToPointer
@@ -11766,6 +12051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IntPtrToString.cmd_1681]
 RelativePath=CoreMangLib\cti\system\intptr\IntPtrToString\IntPtrToString.cmd
 WorkingDir=CoreMangLib\cti\system\intptr\IntPtrToString
@@ -11773,6 +12059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IntPtrZero.cmd_1682]
 RelativePath=CoreMangLib\cti\system\intptr\IntPtrZero\IntPtrZero.cmd
 WorkingDir=CoreMangLib\cti\system\intptr\IntPtrZero
@@ -11780,6 +12067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InvalidCastExceptionctor1.cmd_1683]
 RelativePath=CoreMangLib\cti\system\invalidcastexception\InvalidCastExceptionctor1\InvalidCastExceptionctor1.cmd
 WorkingDir=CoreMangLib\cti\system\invalidcastexception\InvalidCastExceptionctor1
@@ -11787,6 +12075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InvalidCastExceptionctor2.cmd_1684]
 RelativePath=CoreMangLib\cti\system\invalidcastexception\InvalidCastExceptionctor2\InvalidCastExceptionctor2.cmd
 WorkingDir=CoreMangLib\cti\system\invalidcastexception\InvalidCastExceptionctor2
@@ -11794,6 +12083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InvalidCastExceptionctor3.cmd_1685]
 RelativePath=CoreMangLib\cti\system\invalidcastexception\InvalidCastExceptionctor3\InvalidCastExceptionctor3.cmd
 WorkingDir=CoreMangLib\cti\system\invalidcastexception\InvalidCastExceptionctor3
@@ -11801,6 +12091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InvalidOperationExceptionctor1.cmd_1686]
 RelativePath=CoreMangLib\cti\system\invalidoperationexception\InvalidOperationExceptionctor1\InvalidOperationExceptionctor1.cmd
 WorkingDir=CoreMangLib\cti\system\invalidoperationexception\InvalidOperationExceptionctor1
@@ -11808,6 +12099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InvalidOperationExceptionctor2.cmd_1687]
 RelativePath=CoreMangLib\cti\system\invalidoperationexception\InvalidOperationExceptionctor2\InvalidOperationExceptionctor2.cmd
 WorkingDir=CoreMangLib\cti\system\invalidoperationexception\InvalidOperationExceptionctor2
@@ -11815,6 +12107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InvalidOperationExceptionctor3.cmd_1688]
 RelativePath=CoreMangLib\cti\system\invalidoperationexception\InvalidOperationExceptionctor3\InvalidOperationExceptionctor3.cmd
 WorkingDir=CoreMangLib\cti\system\invalidoperationexception\InvalidOperationExceptionctor3
@@ -11822,6 +12115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InvalidProgramExceptionctor1.cmd_1689]
 RelativePath=CoreMangLib\cti\system\invalidprogramexception\InvalidProgramExceptionctor1\InvalidProgramExceptionctor1.cmd
 WorkingDir=CoreMangLib\cti\system\invalidprogramexception\InvalidProgramExceptionctor1
@@ -11829,6 +12123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InvalidProgramExceptionctor2.cmd_1690]
 RelativePath=CoreMangLib\cti\system\invalidprogramexception\InvalidProgramExceptionctor2\InvalidProgramExceptionctor2.cmd
 WorkingDir=CoreMangLib\cti\system\invalidprogramexception\InvalidProgramExceptionctor2
@@ -11836,6 +12131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InvalidProgramExceptionctor3.cmd_1691]
 RelativePath=CoreMangLib\cti\system\invalidprogramexception\InvalidProgramExceptionctor3\InvalidProgramExceptionctor3.cmd
 WorkingDir=CoreMangLib\cti\system\invalidprogramexception\InvalidProgramExceptionctor3
@@ -11843,6 +12139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [BinaryWriterOutStream_PSC.cmd_1692]
 RelativePath=CoreMangLib\cti\system\io\binarywriter\BinaryWriterOutStream_PSC\BinaryWriterOutStream_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\binarywriter\BinaryWriterOutStream_PSC
@@ -11850,6 +12147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DirectoryNotFoundExceptionctor1.cmd_1693]
 RelativePath=CoreMangLib\cti\system\io\directorynotfoundexception\DirectoryNotFoundExceptionctor1\DirectoryNotFoundExceptionctor1.cmd
 WorkingDir=CoreMangLib\cti\system\io\directorynotfoundexception\DirectoryNotFoundExceptionctor1
@@ -11857,6 +12155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DirectoryNotFoundExceptionctor2.cmd_1694]
 RelativePath=CoreMangLib\cti\system\io\directorynotfoundexception\DirectoryNotFoundExceptionctor2\DirectoryNotFoundExceptionctor2.cmd
 WorkingDir=CoreMangLib\cti\system\io\directorynotfoundexception\DirectoryNotFoundExceptionctor2
@@ -11864,6 +12163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [endofstreamexceptionctor1_PSC.cmd_1695]
 RelativePath=CoreMangLib\cti\system\io\endofstreamexception\endofstreamexceptionctor1_PSC\endofstreamexceptionctor1_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\endofstreamexception\endofstreamexceptionctor1_PSC
@@ -11871,6 +12171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [endofstreamexceptionctor2_PSC.cmd_1696]
 RelativePath=CoreMangLib\cti\system\io\endofstreamexception\endofstreamexceptionctor2_PSC\endofstreamexceptionctor2_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\endofstreamexception\endofstreamexceptionctor2_PSC
@@ -11878,6 +12179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAccessEnum.cmd_1697]
 RelativePath=CoreMangLib\cti\system\io\fileaccess\FileAccessEnum\FileAccessEnum.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileaccess\FileAccessEnum
@@ -11885,6 +12187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAccessRead.cmd_1698]
 RelativePath=CoreMangLib\cti\system\io\fileaccess\FileAccessRead\FileAccessRead.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileaccess\FileAccessRead
@@ -11892,6 +12195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAccessReadWrite.cmd_1699]
 RelativePath=CoreMangLib\cti\system\io\fileaccess\FileAccessReadWrite\FileAccessReadWrite.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileaccess\FileAccessReadWrite
@@ -11899,6 +12203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAccessWrite.cmd_1700]
 RelativePath=CoreMangLib\cti\system\io\fileaccess\FileAccessWrite\FileAccessWrite.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileaccess\FileAccessWrite
@@ -11906,6 +12211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesArchive.cmd_1701]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesArchive\FileAttributesArchive.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesArchive
@@ -11913,6 +12219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesCompressed.cmd_1702]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesCompressed\FileAttributesCompressed.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesCompressed
@@ -11920,6 +12227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesDeivce.cmd_1703]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesDeivce\FileAttributesDeivce.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesDeivce
@@ -11927,6 +12235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesDirectory.cmd_1704]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesDirectory\FileAttributesDirectory.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesDirectory
@@ -11934,6 +12243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesEncrypted.cmd_1705]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesEncrypted\FileAttributesEncrypted.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesEncrypted
@@ -11941,6 +12251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesEnum.cmd_1706]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesEnum\FileAttributesEnum.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesEnum
@@ -11948,6 +12259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesHidden.cmd_1707]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesHidden\FileAttributesHidden.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesHidden
@@ -11955,6 +12267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesNormal.cmd_1708]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesNormal\FileAttributesNormal.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesNormal
@@ -11962,6 +12275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesNotContentIndexed.cmd_1709]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesNotContentIndexed\FileAttributesNotContentIndexed.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesNotContentIndexed
@@ -11969,6 +12283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesOffline.cmd_1710]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesOffline\FileAttributesOffline.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesOffline
@@ -11976,6 +12291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesReadOnly.cmd_1711]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesReadOnly\FileAttributesReadOnly.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesReadOnly
@@ -11983,6 +12299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesReparsePoint.cmd_1712]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesReparsePoint\FileAttributesReparsePoint.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesReparsePoint
@@ -11990,6 +12307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesSystem.cmd_1713]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesSystem\FileAttributesSystem.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesSystem
@@ -11997,6 +12315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileAttributesTemporary.cmd_1714]
 RelativePath=CoreMangLib\cti\system\io\fileattributes\FileAttributesTemporary\FileAttributesTemporary.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileattributes\FileAttributesTemporary
@@ -12004,6 +12323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileModeAppend.cmd_1715]
 RelativePath=CoreMangLib\cti\system\io\filemode\FileModeAppend\FileModeAppend.cmd
 WorkingDir=CoreMangLib\cti\system\io\filemode\FileModeAppend
@@ -12011,6 +12331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileModeCreate.cmd_1716]
 RelativePath=CoreMangLib\cti\system\io\filemode\FileModeCreate\FileModeCreate.cmd
 WorkingDir=CoreMangLib\cti\system\io\filemode\FileModeCreate
@@ -12018,6 +12339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileModeCreateNew.cmd_1717]
 RelativePath=CoreMangLib\cti\system\io\filemode\FileModeCreateNew\FileModeCreateNew.cmd
 WorkingDir=CoreMangLib\cti\system\io\filemode\FileModeCreateNew
@@ -12025,6 +12347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileModeEnum.cmd_1718]
 RelativePath=CoreMangLib\cti\system\io\filemode\FileModeEnum\FileModeEnum.cmd
 WorkingDir=CoreMangLib\cti\system\io\filemode\FileModeEnum
@@ -12032,6 +12355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileModeOpen.cmd_1719]
 RelativePath=CoreMangLib\cti\system\io\filemode\FileModeOpen\FileModeOpen.cmd
 WorkingDir=CoreMangLib\cti\system\io\filemode\FileModeOpen
@@ -12039,6 +12363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileModeOpenOrCreate.cmd_1720]
 RelativePath=CoreMangLib\cti\system\io\filemode\FileModeOpenOrCreate\FileModeOpenOrCreate.cmd
 WorkingDir=CoreMangLib\cti\system\io\filemode\FileModeOpenOrCreate
@@ -12046,6 +12371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileModeTruncate.cmd_1721]
 RelativePath=CoreMangLib\cti\system\io\filemode\FileModeTruncate\FileModeTruncate.cmd
 WorkingDir=CoreMangLib\cti\system\io\filemode\FileModeTruncate
@@ -12053,6 +12379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileNotFoundExceptionCtor.cmd_1722]
 RelativePath=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionCtor\FileNotFoundExceptionCtor.cmd
 WorkingDir=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionCtor
@@ -12060,6 +12387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileNotFoundExceptionctor1.cmd_1723]
 RelativePath=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionctor1\FileNotFoundExceptionctor1.cmd
 WorkingDir=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionctor1
@@ -12067,6 +12395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileNotFoundExceptionCtor2.cmd_1724]
 RelativePath=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionCtor2\FileNotFoundExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionCtor2
@@ -12074,6 +12403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileNotFoundExceptionGetMessage.cmd_1725]
 RelativePath=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionGetMessage\FileNotFoundExceptionGetMessage.cmd
 WorkingDir=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionGetMessage
@@ -12081,6 +12411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileNotFoundExceptionMessage.cmd_1726]
 RelativePath=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionMessage\FileNotFoundExceptionMessage.cmd
 WorkingDir=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionMessage
@@ -12088,6 +12419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileNotFoundExceptionToString.cmd_1727]
 RelativePath=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionToString\FileNotFoundExceptionToString.cmd
 WorkingDir=CoreMangLib\cti\system\io\filenotfoundexception\FileNotFoundExceptionToString
@@ -12095,6 +12427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileShareEnum.cmd_1728]
 RelativePath=CoreMangLib\cti\system\io\fileshare\FileShareEnum\FileShareEnum.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileshare\FileShareEnum
@@ -12102,6 +12435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileShareNone.cmd_1729]
 RelativePath=CoreMangLib\cti\system\io\fileshare\FileShareNone\FileShareNone.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileshare\FileShareNone
@@ -12109,6 +12443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileShareRead.cmd_1730]
 RelativePath=CoreMangLib\cti\system\io\fileshare\FileShareRead\FileShareRead.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileshare\FileShareRead
@@ -12116,6 +12451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileShareReadWrite.cmd_1731]
 RelativePath=CoreMangLib\cti\system\io\fileshare\FileShareReadWrite\FileShareReadWrite.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileshare\FileShareReadWrite
@@ -12123,6 +12459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileShareWrite.cmd_1732]
 RelativePath=CoreMangLib\cti\system\io\fileshare\FileShareWrite\FileShareWrite.cmd
 WorkingDir=CoreMangLib\cti\system\io\fileshare\FileShareWrite
@@ -12130,6 +12467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FileStreamDispose_PSC.cmd_1733]
 RelativePath=CoreMangLib\cti\system\io\filestream\FileStreamDispose_PSC\FileStreamDispose_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\filestream\FileStreamDispose_PSC
@@ -12137,6 +12475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IOExceptionctor1.cmd_1734]
 RelativePath=CoreMangLib\cti\system\io\ioexception\IOExceptionctor1\IOExceptionctor1.cmd
 WorkingDir=CoreMangLib\cti\system\io\ioexception\IOExceptionctor1
@@ -12144,6 +12483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IOExceptionctor2.cmd_1735]
 RelativePath=CoreMangLib\cti\system\io\ioexception\IOExceptionctor2\IOExceptionctor2.cmd
 WorkingDir=CoreMangLib\cti\system\io\ioexception\IOExceptionctor2
@@ -12151,6 +12491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MemoryStreamCtor.cmd_1736]
 RelativePath=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor\MemoryStreamCtor.cmd
 WorkingDir=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor
@@ -12158,6 +12499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MemoryStreamCtor2.cmd_1737]
 RelativePath=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor2\MemoryStreamCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor2
@@ -12165,6 +12507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MemoryStreamCtor3.cmd_1738]
 RelativePath=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor3\MemoryStreamCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor3
@@ -12172,6 +12515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MemoryStreamCtor4.cmd_1739]
 RelativePath=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor4\MemoryStreamCtor4.cmd
 WorkingDir=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor4
@@ -12179,6 +12523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MemoryStreamCtor5.cmd_1740]
 RelativePath=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor5\MemoryStreamCtor5.cmd
 WorkingDir=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor5
@@ -12186,6 +12531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MemoryStreamCtor6.cmd_1741]
 RelativePath=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor6\MemoryStreamCtor6.cmd
 WorkingDir=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor6
@@ -12193,6 +12539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MemoryStreamCtor7.cmd_1742]
 RelativePath=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor7\MemoryStreamCtor7.cmd
 WorkingDir=CoreMangLib\cti\system\io\memorystream\MemoryStreamCtor7
@@ -12200,6 +12547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PathTooLongExceptionctor1.cmd_1743]
 RelativePath=CoreMangLib\cti\system\io\pathtoolongexception\PathTooLongExceptionctor1\PathTooLongExceptionctor1.cmd
 WorkingDir=CoreMangLib\cti\system\io\pathtoolongexception\PathTooLongExceptionctor1
@@ -12207,6 +12555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PathTooLongExceptionctor2.cmd_1744]
 RelativePath=CoreMangLib\cti\system\io\pathtoolongexception\PathTooLongExceptionctor2\PathTooLongExceptionctor2.cmd
 WorkingDir=CoreMangLib\cti\system\io\pathtoolongexception\PathTooLongExceptionctor2
@@ -12214,6 +12563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SeekOriginBegin.cmd_1745]
 RelativePath=CoreMangLib\cti\system\io\seekorigin\SeekOriginBegin\SeekOriginBegin.cmd
 WorkingDir=CoreMangLib\cti\system\io\seekorigin\SeekOriginBegin
@@ -12221,6 +12571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SeekOriginCurrent.cmd_1746]
 RelativePath=CoreMangLib\cti\system\io\seekorigin\SeekOriginCurrent\SeekOriginCurrent.cmd
 WorkingDir=CoreMangLib\cti\system\io\seekorigin\SeekOriginCurrent
@@ -12228,6 +12579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SeekOriginEnd.cmd_1747]
 RelativePath=CoreMangLib\cti\system\io\seekorigin\SeekOriginEnd\SeekOriginEnd.cmd
 WorkingDir=CoreMangLib\cti\system\io\seekorigin\SeekOriginEnd
@@ -12235,6 +12587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SeekOriginEnum.cmd_1748]
 RelativePath=CoreMangLib\cti\system\io\seekorigin\SeekOriginEnum\SeekOriginEnum.cmd
 WorkingDir=CoreMangLib\cti\system\io\seekorigin\SeekOriginEnum
@@ -12242,6 +12595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StreamDispose1_PSC.cmd_1749]
 RelativePath=CoreMangLib\cti\system\io\stream\StreamDispose1_PSC\StreamDispose1_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\stream\StreamDispose1_PSC
@@ -12249,6 +12603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StreamDispose2_PSC.cmd_1750]
 RelativePath=CoreMangLib\cti\system\io\stream\StreamDispose2_PSC\StreamDispose2_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\stream\StreamDispose2_PSC
@@ -12256,6 +12611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StreamNull_PSC.cmd_1751]
 RelativePath=CoreMangLib\cti\system\io\stream\StreamNull_PSC\StreamNull_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\stream\StreamNull_PSC
@@ -12263,6 +12619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StreamReadTimeOut_PSC.cmd_1752]
 RelativePath=CoreMangLib\cti\system\io\stream\StreamReadTimeOut_PSC\StreamReadTimeOut_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\stream\StreamReadTimeOut_PSC
@@ -12270,6 +12627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StreamWriteTimeOut_PSC.cmd_1753]
 RelativePath=CoreMangLib\cti\system\io\stream\StreamWriteTimeOut_PSC\StreamWriteTimeOut_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\stream\StreamWriteTimeOut_PSC
@@ -12277,6 +12635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StreamReaderNull_PSC.cmd_1754]
 RelativePath=CoreMangLib\cti\system\io\streamreader\StreamReaderNull_PSC\StreamReaderNull_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\streamreader\StreamReaderNull_PSC
@@ -12284,6 +12643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringWriterEncoding_PSC.cmd_1755]
 RelativePath=CoreMangLib\cti\system\io\stringwriter\StringWriterEncoding_PSC\StringWriterEncoding_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\stringwriter\StringWriterEncoding_PSC
@@ -12291,6 +12651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TextReaderNull_PSC.cmd_1756]
 RelativePath=CoreMangLib\cti\system\io\textreader\TextReaderNull_PSC\TextReaderNull_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\textreader\TextReaderNull_PSC
@@ -12298,6 +12659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TextWriterNull_PSC.cmd_1757]
 RelativePath=CoreMangLib\cti\system\io\textwriter\TextWriterNull_PSC\TextWriterNull_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\io\textwriter\TextWriterNull_PSC
@@ -12305,6 +12667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathAbs1.cmd_1758]
 RelativePath=CoreMangLib\cti\system\math\MathAbs1\MathAbs1.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathAbs1
@@ -12312,6 +12675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathAbs2.cmd_1759]
 RelativePath=CoreMangLib\cti\system\math\MathAbs2\MathAbs2.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathAbs2
@@ -12319,6 +12683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathAbs3.cmd_1760]
 RelativePath=CoreMangLib\cti\system\math\MathAbs3\MathAbs3.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathAbs3
@@ -12326,6 +12691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathAbs4.cmd_1761]
 RelativePath=CoreMangLib\cti\system\math\MathAbs4\MathAbs4.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathAbs4
@@ -12333,6 +12699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathAbs5.cmd_1762]
 RelativePath=CoreMangLib\cti\system\math\MathAbs5\MathAbs5.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathAbs5
@@ -12340,6 +12707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathAbs6.cmd_1763]
 RelativePath=CoreMangLib\cti\system\math\MathAbs6\MathAbs6.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathAbs6
@@ -12347,6 +12715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathAbs7.cmd_1764]
 RelativePath=CoreMangLib\cti\system\math\MathAbs7\MathAbs7.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathAbs7
@@ -12354,6 +12723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathAcos.cmd_1765]
 RelativePath=CoreMangLib\cti\system\math\MathAcos\MathAcos.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathAcos
@@ -12361,6 +12731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathAtan.cmd_1766]
 RelativePath=CoreMangLib\cti\system\math\MathAtan\MathAtan.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathAtan
@@ -12368,6 +12739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathAtan2.cmd_1767]
 RelativePath=CoreMangLib\cti\system\math\MathAtan2\MathAtan2.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathAtan2
@@ -12375,6 +12747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathCeiling.cmd_1768]
 RelativePath=CoreMangLib\cti\system\math\MathCeiling\MathCeiling.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathCeiling
@@ -12382,6 +12755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathCos.cmd_1769]
 RelativePath=CoreMangLib\cti\system\math\MathCos\MathCos.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathCos
@@ -12389,6 +12763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathCosh.cmd_1770]
 RelativePath=CoreMangLib\cti\system\math\MathCosh\MathCosh.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathCosh
@@ -12396,6 +12771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathE.cmd_1771]
 RelativePath=CoreMangLib\cti\system\math\MathE\MathE.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathE
@@ -12403,6 +12779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathExp.cmd_1772]
 RelativePath=CoreMangLib\cti\system\math\MathExp\MathExp.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathExp
@@ -12410,6 +12787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathFloor.cmd_1773]
 RelativePath=CoreMangLib\cti\system\math\MathFloor\MathFloor.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathFloor
@@ -12417,6 +12795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathIEEERemainder.cmd_1774]
 RelativePath=CoreMangLib\cti\system\math\MathIEEERemainder\MathIEEERemainder.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathIEEERemainder
@@ -12424,6 +12803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathLog.cmd_1775]
 RelativePath=CoreMangLib\cti\system\math\MathLog\MathLog.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathLog
@@ -12431,6 +12811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathLog10.cmd_1776]
 RelativePath=CoreMangLib\cti\system\math\MathLog10\MathLog10.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathLog10
@@ -12438,6 +12819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMax1.cmd_1777]
 RelativePath=CoreMangLib\cti\system\math\MathMax1\MathMax1.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMax1
@@ -12445,6 +12827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMax10.cmd_1778]
 RelativePath=CoreMangLib\cti\system\math\MathMax10\MathMax10.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMax10
@@ -12452,6 +12835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMax11.cmd_1779]
 RelativePath=CoreMangLib\cti\system\math\MathMax11\MathMax11.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMax11
@@ -12459,6 +12843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMax2.cmd_1780]
 RelativePath=CoreMangLib\cti\system\math\MathMax2\MathMax2.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMax2
@@ -12466,6 +12851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMax3.cmd_1781]
 RelativePath=CoreMangLib\cti\system\math\MathMax3\MathMax3.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMax3
@@ -12473,6 +12859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMax4.cmd_1782]
 RelativePath=CoreMangLib\cti\system\math\MathMax4\MathMax4.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMax4
@@ -12480,6 +12867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMax5.cmd_1783]
 RelativePath=CoreMangLib\cti\system\math\MathMax5\MathMax5.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMax5
@@ -12487,6 +12875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMax6.cmd_1784]
 RelativePath=CoreMangLib\cti\system\math\MathMax6\MathMax6.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMax6
@@ -12494,6 +12883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMax7.cmd_1785]
 RelativePath=CoreMangLib\cti\system\math\MathMax7\MathMax7.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMax7
@@ -12501,6 +12891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMax8.cmd_1786]
 RelativePath=CoreMangLib\cti\system\math\MathMax8\MathMax8.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMax8
@@ -12508,6 +12899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMax9.cmd_1787]
 RelativePath=CoreMangLib\cti\system\math\MathMax9\MathMax9.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMax9
@@ -12515,6 +12907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMin1.cmd_1788]
 RelativePath=CoreMangLib\cti\system\math\MathMin1\MathMin1.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMin1
@@ -12522,6 +12915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMin10.cmd_1789]
 RelativePath=CoreMangLib\cti\system\math\MathMin10\MathMin10.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMin10
@@ -12529,6 +12923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMin11.cmd_1790]
 RelativePath=CoreMangLib\cti\system\math\MathMin11\MathMin11.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMin11
@@ -12536,6 +12931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMin2.cmd_1791]
 RelativePath=CoreMangLib\cti\system\math\MathMin2\MathMin2.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMin2
@@ -12543,6 +12939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMin3.cmd_1792]
 RelativePath=CoreMangLib\cti\system\math\MathMin3\MathMin3.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMin3
@@ -12550,6 +12947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMin4.cmd_1793]
 RelativePath=CoreMangLib\cti\system\math\MathMin4\MathMin4.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMin4
@@ -12557,6 +12955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMin5.cmd_1794]
 RelativePath=CoreMangLib\cti\system\math\MathMin5\MathMin5.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMin5
@@ -12564,6 +12963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMin6.cmd_1795]
 RelativePath=CoreMangLib\cti\system\math\MathMin6\MathMin6.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMin6
@@ -12571,6 +12971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMin7.cmd_1796]
 RelativePath=CoreMangLib\cti\system\math\MathMin7\MathMin7.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMin7
@@ -12578,6 +12979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMin8.cmd_1797]
 RelativePath=CoreMangLib\cti\system\math\MathMin8\MathMin8.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMin8
@@ -12585,6 +12987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathMin9.cmd_1798]
 RelativePath=CoreMangLib\cti\system\math\MathMin9\MathMin9.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathMin9
@@ -12592,6 +12995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathPI.cmd_1799]
 RelativePath=CoreMangLib\cti\system\math\MathPI\MathPI.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathPI
@@ -12599,6 +13003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathPow.cmd_1800]
 RelativePath=CoreMangLib\cti\system\math\MathPow\MathPow.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathPow
@@ -12606,6 +13011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [mathRound1.cmd_1801]
 RelativePath=CoreMangLib\cti\system\math\mathRound1\mathRound1.cmd
 WorkingDir=CoreMangLib\cti\system\math\mathRound1
@@ -12613,6 +13019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathRound2.cmd_1802]
 RelativePath=CoreMangLib\cti\system\math\MathRound2\MathRound2.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathRound2
@@ -12620,6 +13027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathRound3.cmd_1803]
 RelativePath=CoreMangLib\cti\system\math\MathRound3\MathRound3.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathRound3
@@ -12627,6 +13035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathRound4.cmd_1804]
 RelativePath=CoreMangLib\cti\system\math\MathRound4\MathRound4.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathRound4
@@ -12634,6 +13043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathSign1.cmd_1805]
 RelativePath=CoreMangLib\cti\system\math\MathSign1\MathSign1.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathSign1
@@ -12641,6 +13051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathSign2.cmd_1806]
 RelativePath=CoreMangLib\cti\system\math\MathSign2\MathSign2.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathSign2
@@ -12648,6 +13059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathSign3.cmd_1807]
 RelativePath=CoreMangLib\cti\system\math\MathSign3\MathSign3.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathSign3
@@ -12655,6 +13067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathSign4.cmd_1808]
 RelativePath=CoreMangLib\cti\system\math\MathSign4\MathSign4.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathSign4
@@ -12662,6 +13075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathSign5.cmd_1809]
 RelativePath=CoreMangLib\cti\system\math\MathSign5\MathSign5.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathSign5
@@ -12669,6 +13083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathSign6.cmd_1810]
 RelativePath=CoreMangLib\cti\system\math\MathSign6\MathSign6.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathSign6
@@ -12676,6 +13091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathSign7.cmd_1811]
 RelativePath=CoreMangLib\cti\system\math\MathSign7\MathSign7.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathSign7
@@ -12683,6 +13099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathSin.cmd_1812]
 RelativePath=CoreMangLib\cti\system\math\MathSin\MathSin.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathSin
@@ -12690,6 +13107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathSinh.cmd_1813]
 RelativePath=CoreMangLib\cti\system\math\MathSinh\MathSinh.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathSinh
@@ -12697,6 +13115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathSqrt.cmd_1814]
 RelativePath=CoreMangLib\cti\system\math\MathSqrt\MathSqrt.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathSqrt
@@ -12704,6 +13123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathTan.cmd_1815]
 RelativePath=CoreMangLib\cti\system\math\MathTan\MathTan.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathTan
@@ -12711,6 +13131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MathTanh.cmd_1816]
 RelativePath=CoreMangLib\cti\system\math\MathTanh\MathTanh.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathTanh
@@ -12718,6 +13139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MemberAccessExceptionCtor1.cmd_1817]
 RelativePath=CoreMangLib\cti\system\memberaccessexception\MemberAccessExceptionCtor1\MemberAccessExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\memberaccessexception\MemberAccessExceptionCtor1
@@ -12725,6 +13147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MemberAccessExceptionCtor2.cmd_1818]
 RelativePath=CoreMangLib\cti\system\memberaccessexception\MemberAccessExceptionCtor2\MemberAccessExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\memberaccessexception\MemberAccessExceptionCtor2
@@ -12732,6 +13155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MemberAccessExceptionCtor3.cmd_1819]
 RelativePath=CoreMangLib\cti\system\memberaccessexception\MemberAccessExceptionCtor3\MemberAccessExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\memberaccessexception\MemberAccessExceptionCtor3
@@ -12739,6 +13163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAccessExceptionCtor1.cmd_1820]
 RelativePath=CoreMangLib\cti\system\methodaccessexception\MethodAccessExceptionCtor1\MethodAccessExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\methodaccessexception\MethodAccessExceptionCtor1
@@ -12746,6 +13171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAccessExceptionCtor2.cmd_1821]
 RelativePath=CoreMangLib\cti\system\methodaccessexception\MethodAccessExceptionCtor2\MethodAccessExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\methodaccessexception\MethodAccessExceptionCtor2
@@ -12753,6 +13179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAccessExceptionCtor3.cmd_1822]
 RelativePath=CoreMangLib\cti\system\methodaccessexception\MethodAccessExceptionCtor3\MethodAccessExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\methodaccessexception\MethodAccessExceptionCtor3
@@ -12760,6 +13187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingFieldExceptionCtor1.cmd_1823]
 RelativePath=CoreMangLib\cti\system\missingfieldexception\MissingFieldExceptionCtor1\MissingFieldExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\missingfieldexception\MissingFieldExceptionCtor1
@@ -12767,6 +13195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingFieldExceptionCtor2.cmd_1824]
 RelativePath=CoreMangLib\cti\system\missingfieldexception\MissingFieldExceptionCtor2\MissingFieldExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\missingfieldexception\MissingFieldExceptionCtor2
@@ -12774,6 +13203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingFieldExceptionCtor3.cmd_1825]
 RelativePath=CoreMangLib\cti\system\missingfieldexception\MissingFieldExceptionCtor3\MissingFieldExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\missingfieldexception\MissingFieldExceptionCtor3
@@ -12781,6 +13211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingFieldExceptionMessage.cmd_1826]
 RelativePath=CoreMangLib\cti\system\missingfieldexception\MissingFieldExceptionMessage\MissingFieldExceptionMessage.cmd
 WorkingDir=CoreMangLib\cti\system\missingfieldexception\MissingFieldExceptionMessage
@@ -12788,6 +13219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingMemberExceptionCtor1.cmd_1827]
 RelativePath=CoreMangLib\cti\system\missingmemberexception\MissingMemberExceptionCtor1\MissingMemberExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\missingmemberexception\MissingMemberExceptionCtor1
@@ -12795,6 +13227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingMemberExceptionCtor2.cmd_1828]
 RelativePath=CoreMangLib\cti\system\missingmemberexception\MissingMemberExceptionCtor2\MissingMemberExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\missingmemberexception\MissingMemberExceptionCtor2
@@ -12802,6 +13235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingMemberExceptionCtor3.cmd_1829]
 RelativePath=CoreMangLib\cti\system\missingmemberexception\MissingMemberExceptionCtor3\MissingMemberExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\missingmemberexception\MissingMemberExceptionCtor3
@@ -12809,6 +13243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingMemberExceptionMessage.cmd_1830]
 RelativePath=CoreMangLib\cti\system\missingmemberexception\MissingMemberExceptionMessage\MissingMemberExceptionMessage.cmd
 WorkingDir=CoreMangLib\cti\system\missingmemberexception\MissingMemberExceptionMessage
@@ -12816,6 +13251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingMethodExceptionCtor1.cmd_1831]
 RelativePath=CoreMangLib\cti\system\missingmethodexception\MissingMethodExceptionCtor1\MissingMethodExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\missingmethodexception\MissingMethodExceptionCtor1
@@ -12823,6 +13259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingMethodExceptionCtor2.cmd_1832]
 RelativePath=CoreMangLib\cti\system\missingmethodexception\MissingMethodExceptionCtor2\MissingMethodExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\missingmethodexception\MissingMethodExceptionCtor2
@@ -12830,6 +13267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingMethodExceptionCtor3.cmd_1833]
 RelativePath=CoreMangLib\cti\system\missingmethodexception\MissingMethodExceptionCtor3\MissingMethodExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\missingmethodexception\MissingMethodExceptionCtor3
@@ -12837,6 +13275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingMethodExceptionMessage.cmd_1834]
 RelativePath=CoreMangLib\cti\system\missingmethodexception\MissingMethodExceptionMessage\MissingMethodExceptionMessage.cmd
 WorkingDir=CoreMangLib\cti\system\missingmethodexception\MissingMethodExceptionMessage
@@ -12844,6 +13283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MulticastDelegateCombineImpl.cmd_1835]
 RelativePath=CoreMangLib\cti\system\multicastdelegate\MulticastDelegateCombineImpl\MulticastDelegateCombineImpl.cmd
 WorkingDir=CoreMangLib\cti\system\multicastdelegate\MulticastDelegateCombineImpl
@@ -12851,6 +13291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MulticastDelegateEquals.cmd_1836]
 RelativePath=CoreMangLib\cti\system\multicastdelegate\MulticastDelegateEquals\MulticastDelegateEquals.cmd
 WorkingDir=CoreMangLib\cti\system\multicastdelegate\MulticastDelegateEquals
@@ -12858,6 +13299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MulticastDelegateGetHashCode.cmd_1837]
 RelativePath=CoreMangLib\cti\system\multicastdelegate\MulticastDelegateGetHashCode\MulticastDelegateGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\multicastdelegate\MulticastDelegateGetHashCode
@@ -12865,6 +13307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MulticastDelegateGetInvocationList.cmd_1838]
 RelativePath=CoreMangLib\cti\system\multicastdelegate\MulticastDelegateGetInvocationList\MulticastDelegateGetInvocationList.cmd
 WorkingDir=CoreMangLib\cti\system\multicastdelegate\MulticastDelegateGetInvocationList
@@ -12872,6 +13315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NotImplementedExceptionCtor1.cmd_1839]
 RelativePath=CoreMangLib\cti\system\notimplementedexception\NotImplementedExceptionCtor1\NotImplementedExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\notimplementedexception\NotImplementedExceptionCtor1
@@ -12879,6 +13323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NotImplementedExceptionCtor2.cmd_1840]
 RelativePath=CoreMangLib\cti\system\notimplementedexception\NotImplementedExceptionCtor2\NotImplementedExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\notimplementedexception\NotImplementedExceptionCtor2
@@ -12886,6 +13331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NotImplementedExceptionCtor3.cmd_1841]
 RelativePath=CoreMangLib\cti\system\notimplementedexception\NotImplementedExceptionCtor3\NotImplementedExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\notimplementedexception\NotImplementedExceptionCtor3
@@ -12893,6 +13339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NotSupportedExceptionCtor1.cmd_1842]
 RelativePath=CoreMangLib\cti\system\notsupportedexception\NotSupportedExceptionCtor1\NotSupportedExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\notsupportedexception\NotSupportedExceptionCtor1
@@ -12900,6 +13347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NotSupportedExceptionCtor2.cmd_1843]
 RelativePath=CoreMangLib\cti\system\notsupportedexception\NotSupportedExceptionCtor2\NotSupportedExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\notsupportedexception\NotSupportedExceptionCtor2
@@ -12907,6 +13355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NotSupportedExceptionCtor3.cmd_1844]
 RelativePath=CoreMangLib\cti\system\notsupportedexception\NotSupportedExceptionCtor3\NotSupportedExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\notsupportedexception\NotSupportedExceptionCtor3
@@ -12914,6 +13363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullableCompare.cmd_1845]
 RelativePath=CoreMangLib\cti\system\nullable\NullableCompare\NullableCompare.cmd
 WorkingDir=CoreMangLib\cti\system\nullable\NullableCompare
@@ -12921,6 +13371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullableCtor.cmd_1846]
 RelativePath=CoreMangLib\cti\system\nullable\NullableCtor\NullableCtor.cmd
 WorkingDir=CoreMangLib\cti\system\nullable\NullableCtor
@@ -12928,6 +13379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullableEquals.cmd_1847]
 RelativePath=CoreMangLib\cti\system\nullable\NullableEquals\NullableEquals.cmd
 WorkingDir=CoreMangLib\cti\system\nullable\NullableEquals
@@ -12935,6 +13387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullableEquals2.cmd_1848]
 RelativePath=CoreMangLib\cti\system\nullable\NullableEquals2\NullableEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\nullable\NullableEquals2
@@ -12942,6 +13395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullableGetHashCode.cmd_1849]
 RelativePath=CoreMangLib\cti\system\nullable\NullableGetHashCode\NullableGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\nullable\NullableGetHashCode
@@ -12949,6 +13403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullableGetUnderlyingType.cmd_1850]
 RelativePath=CoreMangLib\cti\system\nullable\NullableGetUnderlyingType\NullableGetUnderlyingType.cmd
 WorkingDir=CoreMangLib\cti\system\nullable\NullableGetUnderlyingType
@@ -12956,6 +13411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullableGetValueOrDefault1.cmd_1851]
 RelativePath=CoreMangLib\cti\system\nullable\NullableGetValueOrDefault1\NullableGetValueOrDefault1.cmd
 WorkingDir=CoreMangLib\cti\system\nullable\NullableGetValueOrDefault1
@@ -12963,6 +13419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullableGetValueOrDefault2.cmd_1852]
 RelativePath=CoreMangLib\cti\system\nullable\NullableGetValueOrDefault2\NullableGetValueOrDefault2.cmd
 WorkingDir=CoreMangLib\cti\system\nullable\NullableGetValueOrDefault2
@@ -12970,6 +13427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullableHasValue.cmd_1853]
 RelativePath=CoreMangLib\cti\system\nullable\NullableHasValue\NullableHasValue.cmd
 WorkingDir=CoreMangLib\cti\system\nullable\NullableHasValue
@@ -12977,6 +13435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullableToString.cmd_1854]
 RelativePath=CoreMangLib\cti\system\nullable\NullableToString\NullableToString.cmd
 WorkingDir=CoreMangLib\cti\system\nullable\NullableToString
@@ -12984,6 +13443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullableValue.cmd_1855]
 RelativePath=CoreMangLib\cti\system\nullable\NullableValue\NullableValue.cmd
 WorkingDir=CoreMangLib\cti\system\nullable\NullableValue
@@ -12991,6 +13451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NullReferenceExceptionCtor1.cmd_1856]
 RelativePath=CoreMangLib\cti\system\nullreferenceexception\NullReferenceExceptionCtor1\NullReferenceExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\nullreferenceexception\NullReferenceExceptionCtor1
@@ -12998,6 +13459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObjectCtor.cmd_1857]
 RelativePath=CoreMangLib\cti\system\object\ObjectCtor\ObjectCtor.cmd
 WorkingDir=CoreMangLib\cti\system\object\ObjectCtor
@@ -13005,6 +13467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObjectEquals1.cmd_1858]
 RelativePath=CoreMangLib\cti\system\object\ObjectEquals1\ObjectEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\object\ObjectEquals1
@@ -13012,6 +13475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObjectEquals2.cmd_1859]
 RelativePath=CoreMangLib\cti\system\object\ObjectEquals2\ObjectEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\object\ObjectEquals2
@@ -13019,6 +13483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObjectFinalize.cmd_1860]
 RelativePath=CoreMangLib\cti\system\object\ObjectFinalize\ObjectFinalize.cmd
 WorkingDir=CoreMangLib\cti\system\object\ObjectFinalize
@@ -13026,6 +13491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObjectGetHashCode.cmd_1861]
 RelativePath=CoreMangLib\cti\system\object\ObjectGetHashCode\ObjectGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\object\ObjectGetHashCode
@@ -13033,6 +13499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObjectMemberwiseClone.cmd_1862]
 RelativePath=CoreMangLib\cti\system\object\ObjectMemberwiseClone\ObjectMemberwiseClone.cmd
 WorkingDir=CoreMangLib\cti\system\object\ObjectMemberwiseClone
@@ -13040,6 +13507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObjectReferenceEquals.cmd_1863]
 RelativePath=CoreMangLib\cti\system\object\ObjectReferenceEquals\ObjectReferenceEquals.cmd
 WorkingDir=CoreMangLib\cti\system\object\ObjectReferenceEquals
@@ -13047,6 +13515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObjectToString.cmd_1864]
 RelativePath=CoreMangLib\cti\system\object\ObjectToString\ObjectToString.cmd
 WorkingDir=CoreMangLib\cti\system\object\ObjectToString
@@ -13054,6 +13523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObjectDisposedExceptionMessage.cmd_1865]
 RelativePath=CoreMangLib\cti\system\objectdisposedexception\ObjectDisposedExceptionMessage\ObjectDisposedExceptionMessage.cmd
 WorkingDir=CoreMangLib\cti\system\objectdisposedexception\ObjectDisposedExceptionMessage
@@ -13061,6 +13531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObjectDisposedExceptionObjectName.cmd_1866]
 RelativePath=CoreMangLib\cti\system\objectdisposedexception\ObjectDisposedExceptionObjectName\ObjectDisposedExceptionObjectName.cmd
 WorkingDir=CoreMangLib\cti\system\objectdisposedexception\ObjectDisposedExceptionObjectName
@@ -13068,6 +13539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObsoleteAttributeCtor1.cmd_1867]
 RelativePath=CoreMangLib\cti\system\obsoleteattribute\ObsoleteAttributeCtor1\ObsoleteAttributeCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\obsoleteattribute\ObsoleteAttributeCtor1
@@ -13075,6 +13547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObsoleteAttributeCtor2.cmd_1868]
 RelativePath=CoreMangLib\cti\system\obsoleteattribute\ObsoleteAttributeCtor2\ObsoleteAttributeCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\obsoleteattribute\ObsoleteAttributeCtor2
@@ -13082,6 +13555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObsoleteAttributeCtor3.cmd_1869]
 RelativePath=CoreMangLib\cti\system\obsoleteattribute\ObsoleteAttributeCtor3\ObsoleteAttributeCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\obsoleteattribute\ObsoleteAttributeCtor3
@@ -13089,6 +13563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObsoleteAttributeIsError.cmd_1870]
 RelativePath=CoreMangLib\cti\system\obsoleteattribute\ObsoleteAttributeIsError\ObsoleteAttributeIsError.cmd
 WorkingDir=CoreMangLib\cti\system\obsoleteattribute\ObsoleteAttributeIsError
@@ -13096,6 +13571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ObsoleteAttributeMessage.cmd_1871]
 RelativePath=CoreMangLib\cti\system\obsoleteattribute\ObsoleteAttributeMessage\ObsoleteAttributeMessage.cmd
 WorkingDir=CoreMangLib\cti\system\obsoleteattribute\ObsoleteAttributeMessage
@@ -13103,6 +13579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OutOfMemoryExceptionCtor1.cmd_1872]
 RelativePath=CoreMangLib\cti\system\outofmemoryexception\OutOfMemoryExceptionCtor1\OutOfMemoryExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\outofmemoryexception\OutOfMemoryExceptionCtor1
@@ -13110,6 +13587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OutOfMemoryExceptionCtor2.cmd_1873]
 RelativePath=CoreMangLib\cti\system\outofmemoryexception\OutOfMemoryExceptionCtor2\OutOfMemoryExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\outofmemoryexception\OutOfMemoryExceptionCtor2
@@ -13117,6 +13595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OutOfMemoryExceptionCtor3.cmd_1874]
 RelativePath=CoreMangLib\cti\system\outofmemoryexception\OutOfMemoryExceptionCtor3\OutOfMemoryExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\outofmemoryexception\OutOfMemoryExceptionCtor3
@@ -13124,6 +13603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OverflowExceptionCtor1.cmd_1875]
 RelativePath=CoreMangLib\cti\system\overflowexception\OverflowExceptionCtor1\OverflowExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\overflowexception\OverflowExceptionCtor1
@@ -13131,6 +13611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OverflowExceptionCtor2.cmd_1876]
 RelativePath=CoreMangLib\cti\system\overflowexception\OverflowExceptionCtor2\OverflowExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\overflowexception\OverflowExceptionCtor2
@@ -13138,6 +13619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OverflowExceptionCtor3.cmd_1877]
 RelativePath=CoreMangLib\cti\system\overflowexception\OverflowExceptionCtor3\OverflowExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\overflowexception\OverflowExceptionCtor3
@@ -13145,6 +13627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ParamArrayAttributeCtor.cmd_1878]
 RelativePath=CoreMangLib\cti\system\paramarrayattribute\ParamArrayAttributeCtor\ParamArrayAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\paramarrayattribute\ParamArrayAttributeCtor
@@ -13152,6 +13635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PlatformNotSupportedExceptionCtor1.cmd_1879]
 RelativePath=CoreMangLib\cti\system\platformnotsupportedexception\PlatformNotSupportedExceptionCtor1\PlatformNotSupportedExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\platformnotsupportedexception\PlatformNotSupportedExceptionCtor1
@@ -13159,6 +13643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PlatformNotSupportedExceptionCtor2.cmd_1880]
 RelativePath=CoreMangLib\cti\system\platformnotsupportedexception\PlatformNotSupportedExceptionCtor2\PlatformNotSupportedExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\platformnotsupportedexception\PlatformNotSupportedExceptionCtor2
@@ -13166,6 +13651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PlatformNotSupportedExceptionCtor3.cmd_1881]
 RelativePath=CoreMangLib\cti\system\platformnotsupportedexception\PlatformNotSupportedExceptionCtor3\PlatformNotSupportedExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\platformnotsupportedexception\PlatformNotSupportedExceptionCtor3
@@ -13173,6 +13659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PredicateBeginInvoke.cmd_1882]
 RelativePath=CoreMangLib\cti\system\predicate\PredicateBeginInvoke\PredicateBeginInvoke.cmd
 WorkingDir=CoreMangLib\cti\system\predicate\PredicateBeginInvoke
@@ -13180,6 +13667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PredicateEndInvoke.cmd_1883]
 RelativePath=CoreMangLib\cti\system\predicate\PredicateEndInvoke\PredicateEndInvoke.cmd
 WorkingDir=CoreMangLib\cti\system\predicate\PredicateEndInvoke
@@ -13187,6 +13675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PredicateInvoke.cmd_1884]
 RelativePath=CoreMangLib\cti\system\predicate\PredicateInvoke\PredicateInvoke.cmd
 WorkingDir=CoreMangLib\cti\system\predicate\PredicateInvoke
@@ -13194,6 +13683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RandomCtor1.cmd_1885]
 RelativePath=CoreMangLib\cti\system\random\RandomCtor1\RandomCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\random\RandomCtor1
@@ -13201,6 +13691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RandomCtor2.cmd_1886]
 RelativePath=CoreMangLib\cti\system\random\RandomCtor2\RandomCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\random\RandomCtor2
@@ -13208,6 +13699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RandomNext1.cmd_1887]
 RelativePath=CoreMangLib\cti\system\random\RandomNext1\RandomNext1.cmd
 WorkingDir=CoreMangLib\cti\system\random\RandomNext1
@@ -13215,6 +13707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RandomNext2.cmd_1888]
 RelativePath=CoreMangLib\cti\system\random\RandomNext2\RandomNext2.cmd
 WorkingDir=CoreMangLib\cti\system\random\RandomNext2
@@ -13222,6 +13715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RandomNext3.cmd_1889]
 RelativePath=CoreMangLib\cti\system\random\RandomNext3\RandomNext3.cmd
 WorkingDir=CoreMangLib\cti\system\random\RandomNext3
@@ -13229,6 +13723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RandomNextBytes.cmd_1890]
 RelativePath=CoreMangLib\cti\system\random\RandomNextBytes\RandomNextBytes.cmd
 WorkingDir=CoreMangLib\cti\system\random\RandomNextBytes
@@ -13236,6 +13731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RandomNextDouble.cmd_1891]
 RelativePath=CoreMangLib\cti\system\random\RandomNextDouble\RandomNextDouble.cmd
 WorkingDir=CoreMangLib\cti\system\random\RandomNextDouble
@@ -13243,6 +13739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RandomSample.cmd_1892]
 RelativePath=CoreMangLib\cti\system\random\RandomSample\RandomSample.cmd
 WorkingDir=CoreMangLib\cti\system\random\RandomSample
@@ -13250,6 +13747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RankExceptionCtor1.cmd_1893]
 RelativePath=CoreMangLib\cti\system\rankexception\RankExceptionCtor1\RankExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\rankexception\RankExceptionCtor1
@@ -13257,6 +13755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RankExceptionCtor2.cmd_1894]
 RelativePath=CoreMangLib\cti\system\rankexception\RankExceptionCtor2\RankExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\rankexception\RankExceptionCtor2
@@ -13264,6 +13763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RankExceptionCtor3.cmd_1895]
 RelativePath=CoreMangLib\cti\system\rankexception\RankExceptionCtor3\RankExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\rankexception\RankExceptionCtor3
@@ -13271,6 +13771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AmbiguousMatchExceptionCtor1.cmd_1896]
 RelativePath=CoreMangLib\cti\system\reflection\ambiguousmatchexception\AmbiguousMatchExceptionCtor1\AmbiguousMatchExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\ambiguousmatchexception\AmbiguousMatchExceptionCtor1
@@ -13278,6 +13779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AmbiguousMatchExceptionCtor2.cmd_1897]
 RelativePath=CoreMangLib\cti\system\reflection\ambiguousmatchexception\AmbiguousMatchExceptionCtor2\AmbiguousMatchExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\ambiguousmatchexception\AmbiguousMatchExceptionCtor2
@@ -13285,6 +13787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AmbiguousMatchExceptionCtor3.cmd_1898]
 RelativePath=CoreMangLib\cti\system\reflection\ambiguousmatchexception\AmbiguousMatchExceptionCtor3\AmbiguousMatchExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\ambiguousmatchexception\AmbiguousMatchExceptionCtor3
@@ -13292,13 +13795,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyConfigurationAttribute.cmd_1899]
 RelativePath=CoreMangLib\cti\system\reflection\assemblyconfigurationattribute\AssemblyConfigurationAttribute\AssemblyConfigurationAttribute.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblyconfigurationattribute\AssemblyConfigurationAttribute
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AssemblyConfigurationAttributeCtor.cmd_1900]
 RelativePath=CoreMangLib\cti\system\reflection\assemblyconfigurationattribute\AssemblyConfigurationAttributeCtor\AssemblyConfigurationAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblyconfigurationattribute\AssemblyConfigurationAttributeCtor
@@ -13306,13 +13811,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyDefaultAliasAttribute.cmd_1901]
 RelativePath=CoreMangLib\cti\system\reflection\assemblydefaultaliasattribute\AssemblyDefaultAliasAttribute\AssemblyDefaultAliasAttribute.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblydefaultaliasattribute\AssemblyDefaultAliasAttribute
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AssemblyDefaultAliasAttributeCtor.cmd_1902]
 RelativePath=CoreMangLib\cti\system\reflection\assemblydefaultaliasattribute\AssemblyDefaultAliasAttributeCtor\AssemblyDefaultAliasAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblydefaultaliasattribute\AssemblyDefaultAliasAttributeCtor
@@ -13320,6 +13827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyDelaySignAttributeCtor.cmd_1903]
 RelativePath=CoreMangLib\cti\system\reflection\assemblydelaysignattribute\AssemblyDelaySignAttributeCtor\AssemblyDelaySignAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblydelaysignattribute\AssemblyDelaySignAttributeCtor
@@ -13327,6 +13835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyDelaySignAttributeDelaySign.cmd_1904]
 RelativePath=CoreMangLib\cti\system\reflection\assemblydelaysignattribute\AssemblyDelaySignAttributeDelaySign\AssemblyDelaySignAttributeDelaySign.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblydelaysignattribute\AssemblyDelaySignAttributeDelaySign
@@ -13334,6 +13843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyDescriptionAttributeCtor.cmd_1905]
 RelativePath=CoreMangLib\cti\system\reflection\assemblydescriptionattribute\AssemblyDescriptionAttributeCtor\AssemblyDescriptionAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblydescriptionattribute\AssemblyDescriptionAttributeCtor
@@ -13341,6 +13851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyDescriptionAttributeDescription.cmd_1906]
 RelativePath=CoreMangLib\cti\system\reflection\assemblydescriptionattribute\AssemblyDescriptionAttributeDescription\AssemblyDescriptionAttributeDescription.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblydescriptionattribute\AssemblyDescriptionAttributeDescription
@@ -13348,6 +13859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyKeyFileAttributeCtor.cmd_1907]
 RelativePath=CoreMangLib\cti\system\reflection\assemblykeyfileattribute\AssemblyKeyFileAttributeCtor\AssemblyKeyFileAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblykeyfileattribute\AssemblyKeyFileAttributeCtor
@@ -13355,6 +13867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyKeyFileAttributeKeyFile.cmd_1908]
 RelativePath=CoreMangLib\cti\system\reflection\assemblykeyfileattribute\AssemblyKeyFileAttributeKeyFile\AssemblyKeyFileAttributeKeyFile.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblykeyfileattribute\AssemblyKeyFileAttributeKeyFile
@@ -13362,6 +13875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyKeyNameAttributeCtor.cmd_1909]
 RelativePath=CoreMangLib\cti\system\reflection\assemblykeynameattribute\AssemblyKeyNameAttributeCtor\AssemblyKeyNameAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblykeynameattribute\AssemblyKeyNameAttributeCtor
@@ -13369,6 +13883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyKeyNameAttributeKeyName.cmd_1910]
 RelativePath=CoreMangLib\cti\system\reflection\assemblykeynameattribute\AssemblyKeyNameAttributeKeyName\AssemblyKeyNameAttributeKeyName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblykeynameattribute\AssemblyKeyNameAttributeKeyName
@@ -13376,6 +13891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyNameGetPublicKey.cmd_1911]
 RelativePath=CoreMangLib\cti\system\reflection\assemblyname\AssemblyNameGetPublicKey\AssemblyNameGetPublicKey.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblyname\AssemblyNameGetPublicKey
@@ -13383,6 +13899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyNameGetPublicKeyToken.cmd_1912]
 RelativePath=CoreMangLib\cti\system\reflection\assemblyname\AssemblyNameGetPublicKeyToken\AssemblyNameGetPublicKeyToken.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblyname\AssemblyNameGetPublicKeyToken
@@ -13390,6 +13907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyNameSetPublicKey.cmd_1913]
 RelativePath=CoreMangLib\cti\system\reflection\assemblyname\AssemblyNameSetPublicKey\AssemblyNameSetPublicKey.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblyname\AssemblyNameSetPublicKey
@@ -13397,6 +13915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyNameSetPublicKeyToken.cmd_1914]
 RelativePath=CoreMangLib\cti\system\reflection\assemblyname\AssemblyNameSetPublicKeyToken\AssemblyNameSetPublicKeyToken.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblyname\AssemblyNameSetPublicKeyToken
@@ -13404,6 +13923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyNameVersion.cmd_1915]
 RelativePath=CoreMangLib\cti\system\reflection\assemblyname\AssemblyNameVersion\AssemblyNameVersion.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblyname\AssemblyNameVersion
@@ -13411,6 +13931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyNameFlagsNone.cmd_1916]
 RelativePath=CoreMangLib\cti\system\reflection\assemblynameflags\AssemblyNameFlagsNone\AssemblyNameFlagsNone.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblynameflags\AssemblyNameFlagsNone
@@ -13418,6 +13939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyNameFlagsPublicKey.cmd_1917]
 RelativePath=CoreMangLib\cti\system\reflection\assemblynameflags\AssemblyNameFlagsPublicKey\AssemblyNameFlagsPublicKey.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblynameflags\AssemblyNameFlagsPublicKey
@@ -13425,6 +13947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyNameFlagsRetargetable.cmd_1918]
 RelativePath=CoreMangLib\cti\system\reflection\assemblynameflags\AssemblyNameFlagsRetargetable\AssemblyNameFlagsRetargetable.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblynameflags\AssemblyNameFlagsRetargetable
@@ -13432,6 +13955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyTitleAttributeCtor.cmd_1919]
 RelativePath=CoreMangLib\cti\system\reflection\assemblytitleattribute\AssemblyTitleAttributeCtor\AssemblyTitleAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblytitleattribute\AssemblyTitleAttributeCtor
@@ -13439,6 +13963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyTitleAttributeTitle.cmd_1920]
 RelativePath=CoreMangLib\cti\system\reflection\assemblytitleattribute\AssemblyTitleAttributeTitle\AssemblyTitleAttributeTitle.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\assemblytitleattribute\AssemblyTitleAttributeTitle
@@ -13446,6 +13971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CallingConventionsAny.cmd_1921]
 RelativePath=CoreMangLib\cti\system\reflection\callingconventions\CallingConventionsAny\CallingConventionsAny.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\callingconventions\CallingConventionsAny
@@ -13453,6 +13979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CallingConventionsExplicitThis.cmd_1922]
 RelativePath=CoreMangLib\cti\system\reflection\callingconventions\CallingConventionsExplicitThis\CallingConventionsExplicitThis.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\callingconventions\CallingConventionsExplicitThis
@@ -13460,6 +13987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CallingConventionsHasThis.cmd_1923]
 RelativePath=CoreMangLib\cti\system\reflection\callingconventions\CallingConventionsHasThis\CallingConventionsHasThis.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\callingconventions\CallingConventionsHasThis
@@ -13467,6 +13995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CallingConventionsStandard.cmd_1924]
 RelativePath=CoreMangLib\cti\system\reflection\callingconventions\CallingConventionsStandard\CallingConventionsStandard.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\callingconventions\CallingConventionsStandard
@@ -13474,6 +14003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CallingConventionsVarArgs.cmd_1925]
 RelativePath=CoreMangLib\cti\system\reflection\callingconventions\CallingConventionsVarArgs\CallingConventionsVarArgs.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\callingconventions\CallingConventionsVarArgs
@@ -13481,6 +14011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConstructorInfoConstructorName.cmd_1926]
 RelativePath=CoreMangLib\cti\system\reflection\constructorinfo\ConstructorInfoConstructorName\ConstructorInfoConstructorName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\constructorinfo\ConstructorInfoConstructorName
@@ -13488,6 +14019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ConstructorInfoTypeConstructorName.cmd_1927]
 RelativePath=CoreMangLib\cti\system\reflection\constructorinfo\ConstructorInfoTypeConstructorName\ConstructorInfoTypeConstructorName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\constructorinfo\ConstructorInfoTypeConstructorName
@@ -13495,6 +14027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DefaultMemberAttributeCtor.cmd_1928]
 RelativePath=CoreMangLib\cti\system\reflection\defaultmemberattribute\DefaultMemberAttributeCtor\DefaultMemberAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\defaultmemberattribute\DefaultMemberAttributeCtor
@@ -13502,6 +14035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DefaultMemberAttributeMemberName.cmd_1929]
 RelativePath=CoreMangLib\cti\system\reflection\defaultmemberattribute\DefaultMemberAttributeMemberName\DefaultMemberAttributeMemberName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\defaultmemberattribute\DefaultMemberAttributeMemberName
@@ -13509,6 +14043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FlowControlBranch.cmd_1930]
 RelativePath=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlBranch\FlowControlBranch.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlBranch
@@ -13516,6 +14051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FlowControlCall.cmd_1931]
 RelativePath=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlCall\FlowControlCall.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlCall
@@ -13523,6 +14059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FlowControlCond_Branch.cmd_1932]
 RelativePath=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlCond_Branch\FlowControlCond_Branch.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlCond_Branch
@@ -13530,6 +14067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FlowControlMeta.cmd_1933]
 RelativePath=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlMeta\FlowControlMeta.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlMeta
@@ -13537,6 +14075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FlowControlNext.cmd_1934]
 RelativePath=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlNext\FlowControlNext.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlNext
@@ -13544,6 +14083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FlowControlReturn.cmd_1935]
 RelativePath=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlReturn\FlowControlReturn.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlReturn
@@ -13551,6 +14091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FlowControlThrow.cmd_1936]
 RelativePath=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlThrow\FlowControlThrow.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\flowcontrol\FlowControlThrow
@@ -13558,6 +14099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeEquals1.cmd_1937]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeEquals1\OpCodeEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeEquals1
@@ -13565,6 +14107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeEquals2.cmd_1938]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeEquals2\OpCodeEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeEquals2
@@ -13572,6 +14115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeFlowControl.cmd_1939]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeFlowControl\OpCodeFlowControl.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeFlowControl
@@ -13579,6 +14123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeGetHashCode.cmd_1940]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeGetHashCode\OpCodeGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeGetHashCode
@@ -13586,6 +14131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeName.cmd_1941]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeName\OpCodeName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeName
@@ -13593,6 +14139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeOpCodeType.cmd_1942]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeOpCodeType\OpCodeOpCodeType.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeOpCodeType
@@ -13600,6 +14147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeOperandType.cmd_1943]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeOperandType\OpCodeOperandType.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeOperandType
@@ -13607,6 +14155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesAdd_Ovf.cmd_1944]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesAdd_Ovf\OpCodesAdd_Ovf.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesAdd_Ovf
@@ -13614,6 +14163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesAdd_Ovf_Un.cmd_1945]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesAdd_Ovf_Un\OpCodesAdd_Ovf_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesAdd_Ovf_Un
@@ -13621,6 +14171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesAnd.cmd_1946]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesAnd\OpCodesAnd.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesAnd
@@ -13628,6 +14179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesArglist.cmd_1947]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesArglist\OpCodesArglist.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesArglist
@@ -13635,6 +14187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBeq.cmd_1948]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBeq\OpCodesBeq.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBeq
@@ -13642,6 +14195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBeq_S.cmd_1949]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBeq_S\OpCodesBeq_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBeq_S
@@ -13649,6 +14203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBge.cmd_1950]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBge\OpCodesBge.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBge
@@ -13656,6 +14211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBge_S.cmd_1951]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBge_S\OpCodesBge_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBge_S
@@ -13663,6 +14219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBge_Un.cmd_1952]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBge_Un\OpCodesBge_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBge_Un
@@ -13670,6 +14227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBge_Un_S.cmd_1953]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBge_Un_S\OpCodesBge_Un_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBge_Un_S
@@ -13677,6 +14235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBgt.cmd_1954]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBgt\OpCodesBgt.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBgt
@@ -13684,6 +14243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBgt_S.cmd_1955]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBgt_S\OpCodesBgt_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBgt_S
@@ -13691,6 +14251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBgt_Un.cmd_1956]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBgt_Un\OpCodesBgt_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBgt_Un
@@ -13698,6 +14259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBgt_Un_S.cmd_1957]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBgt_Un_S\OpCodesBgt_Un_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBgt_Un_S
@@ -13705,6 +14267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBle.cmd_1958]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBle\OpCodesBle.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBle
@@ -13712,6 +14275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBle_S.cmd_1959]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBle_S\OpCodesBle_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBle_S
@@ -13719,6 +14283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBle_Un.cmd_1960]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBle_Un\OpCodesBle_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBle_Un
@@ -13726,6 +14291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBle_Un_S.cmd_1961]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBle_Un_S\OpCodesBle_Un_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBle_Un_S
@@ -13733,6 +14299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBlt.cmd_1962]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBlt\OpCodesBlt.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBlt
@@ -13740,6 +14307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBlt_S.cmd_1963]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBlt_S\OpCodesBlt_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBlt_S
@@ -13747,6 +14315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBlt_Un.cmd_1964]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBlt_Un\OpCodesBlt_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBlt_Un
@@ -13754,6 +14323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBlt_Un_S.cmd_1965]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBlt_Un_S\OpCodesBlt_Un_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBlt_Un_S
@@ -13761,6 +14331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBne_Un.cmd_1966]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBne_Un\OpCodesBne_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBne_Un
@@ -13768,6 +14339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBne_Un_S.cmd_1967]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBne_Un_S\OpCodesBne_Un_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBne_Un_S
@@ -13775,6 +14347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBox.cmd_1968]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBox\OpCodesBox.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBox
@@ -13782,6 +14355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBr.cmd_1969]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBr\OpCodesBr.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBr
@@ -13789,6 +14363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBreak.cmd_1970]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBreak\OpCodesBreak.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBreak
@@ -13796,6 +14371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBrfalse.cmd_1971]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBrfalse\OpCodesBrfalse.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBrfalse
@@ -13803,6 +14379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBrfalse_S.cmd_1972]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBrfalse_S\OpCodesBrfalse_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBrfalse_S
@@ -13810,6 +14387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBrtrue.cmd_1973]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBrtrue\OpCodesBrtrue.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBrtrue
@@ -13817,6 +14395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBrtrue_S.cmd_1974]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBrtrue_S\OpCodesBrtrue_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBrtrue_S
@@ -13824,6 +14403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesBr_S.cmd_1975]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBr_S\OpCodesBr_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesBr_S
@@ -13831,6 +14411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesCall.cmd_1976]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCall\OpCodesCall.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCall
@@ -13838,6 +14419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesCalli.cmd_1977]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCalli\OpCodesCalli.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCalli
@@ -13845,6 +14427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesCallvirt.cmd_1978]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCallvirt\OpCodesCallvirt.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCallvirt
@@ -13852,6 +14435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesCastclass.cmd_1979]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCastclass\OpCodesCastclass.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCastclass
@@ -13859,6 +14443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesCeq.cmd_1980]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCeq\OpCodesCeq.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCeq
@@ -13866,6 +14451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesCgt.cmd_1981]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCgt\OpCodesCgt.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCgt
@@ -13873,6 +14459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesCgt_Un.cmd_1982]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCgt_Un\OpCodesCgt_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCgt_Un
@@ -13880,6 +14467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesCkfinite.cmd_1983]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCkfinite\OpCodesCkfinite.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCkfinite
@@ -13887,6 +14475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesClt.cmd_1984]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesClt\OpCodesClt.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesClt
@@ -13894,6 +14483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesClt_Un.cmd_1985]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesClt_Un\OpCodesClt_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesClt_Un
@@ -13901,6 +14491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConstrained.cmd_1986]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConstrained\OpCodesConstrained.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConstrained
@@ -13908,6 +14499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_I.cmd_1987]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_I\OpCodesConv_I.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_I
@@ -13915,6 +14507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_I1.cmd_1988]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_I1\OpCodesConv_I1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_I1
@@ -13922,6 +14515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_I2.cmd_1989]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_I2\OpCodesConv_I2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_I2
@@ -13929,6 +14523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_I4.cmd_1990]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_I4\OpCodesConv_I4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_I4
@@ -13936,6 +14531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_I8.cmd_1991]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_I8\OpCodesConv_I8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_I8
@@ -13943,6 +14539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_I.cmd_1992]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I\OpCodesConv_Ovf_I.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I
@@ -13950,6 +14547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_I1.cmd_1993]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I1\OpCodesConv_Ovf_I1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I1
@@ -13957,6 +14555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_I1_Un.cmd_1994]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I1_Un\OpCodesConv_Ovf_I1_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I1_Un
@@ -13964,6 +14563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_I2.cmd_1995]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I2\OpCodesConv_Ovf_I2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I2
@@ -13971,6 +14571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_I2_Un.cmd_1996]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I2_Un\OpCodesConv_Ovf_I2_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I2_Un
@@ -13978,6 +14579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_I4.cmd_1997]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I4\OpCodesConv_Ovf_I4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I4
@@ -13985,6 +14587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_I4_Un.cmd_1998]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I4_Un\OpCodesConv_Ovf_I4_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I4_Un
@@ -13992,6 +14595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_I8.cmd_1999]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I8\OpCodesConv_Ovf_I8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I8
@@ -13999,6 +14603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_I8_Un.cmd_2000]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I8_Un\OpCodesConv_Ovf_I8_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I8_Un
@@ -14006,6 +14611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_I_Un.cmd_2001]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I_Un\OpCodesConv_Ovf_I_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_I_Un
@@ -14013,6 +14619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_U.cmd_2002]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U\OpCodesConv_Ovf_U.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U
@@ -14020,6 +14627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_U1.cmd_2003]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U1\OpCodesConv_Ovf_U1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U1
@@ -14027,6 +14635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_U1_Un.cmd_2004]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U1_Un\OpCodesConv_Ovf_U1_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U1_Un
@@ -14034,6 +14643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_U2.cmd_2005]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U2\OpCodesConv_Ovf_U2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U2
@@ -14041,6 +14651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_U2_Un.cmd_2006]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U2_Un\OpCodesConv_Ovf_U2_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U2_Un
@@ -14048,6 +14659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_U4.cmd_2007]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U4\OpCodesConv_Ovf_U4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U4
@@ -14055,6 +14667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_U4_Un.cmd_2008]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U4_Un\OpCodesConv_Ovf_U4_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U4_Un
@@ -14062,6 +14675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_U8.cmd_2009]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U8\OpCodesConv_Ovf_U8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U8
@@ -14069,6 +14683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_U8_Un.cmd_2010]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U8_Un\OpCodesConv_Ovf_U8_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U8_Un
@@ -14076,6 +14691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_Ovf_U_Un.cmd_2011]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U_Un\OpCodesConv_Ovf_U_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_Ovf_U_Un
@@ -14083,6 +14699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_R4.cmd_2012]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_R4\OpCodesConv_R4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_R4
@@ -14090,6 +14707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_R8.cmd_2013]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_R8\OpCodesConv_R8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_R8
@@ -14097,6 +14715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_R_Un.cmd_2014]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_R_Un\OpCodesConv_R_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_R_Un
@@ -14104,6 +14723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_U.cmd_2015]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_U\OpCodesConv_U.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_U
@@ -14111,6 +14731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_U1.cmd_2016]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_U1\OpCodesConv_U1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_U1
@@ -14118,6 +14739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_U2.cmd_2017]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_U2\OpCodesConv_U2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_U2
@@ -14125,6 +14747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_U4.cmd_2018]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_U4\OpCodesConv_U4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_U4
@@ -14132,6 +14755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesConv_U8.cmd_2019]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_U8\OpCodesConv_U8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesConv_U8
@@ -14139,6 +14763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesCpblk.cmd_2020]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCpblk\OpCodesCpblk.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCpblk
@@ -14146,6 +14771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesCpobj.cmd_2021]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCpobj\OpCodesCpobj.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesCpobj
@@ -14153,6 +14779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesDiv.cmd_2022]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesDiv\OpCodesDiv.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesDiv
@@ -14160,6 +14787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesDiv_Un.cmd_2023]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesDiv_Un\OpCodesDiv_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesDiv_Un
@@ -14167,6 +14795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesDup.cmd_2024]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesDup\OpCodesDup.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesDup
@@ -14174,6 +14803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesEndfilter.cmd_2025]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesEndfilter\OpCodesEndfilter.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesEndfilter
@@ -14181,6 +14811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesEndfinally.cmd_2026]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesEndfinally\OpCodesEndfinally.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesEndfinally
@@ -14188,6 +14819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesInitblk.cmd_2027]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesInitblk\OpCodesInitblk.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesInitblk
@@ -14195,6 +14827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesInitobj.cmd_2028]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesInitobj\OpCodesInitobj.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesInitobj
@@ -14202,6 +14835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesIsinst.cmd_2029]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesIsinst\OpCodesIsinst.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesIsinst
@@ -14209,6 +14843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeSize.cmd_2030]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeSize\OpCodeSize.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeSize
@@ -14216,6 +14851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesJmp.cmd_2031]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesJmp\OpCodesJmp.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesJmp
@@ -14223,6 +14859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdarg.cmd_2032]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg\OpCodesLdarg.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg
@@ -14230,6 +14867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdarga.cmd_2033]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarga\OpCodesLdarga.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarga
@@ -14237,6 +14875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdarga_S.cmd_2034]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarga_S\OpCodesLdarga_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarga_S
@@ -14244,6 +14883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdarg_0.cmd_2035]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg_0\OpCodesLdarg_0.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg_0
@@ -14251,6 +14891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdarg_1.cmd_2036]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg_1\OpCodesLdarg_1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg_1
@@ -14258,6 +14899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdarg_2.cmd_2037]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg_2\OpCodesLdarg_2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg_2
@@ -14265,6 +14907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdarg_3.cmd_2038]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg_3\OpCodesLdarg_3.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg_3
@@ -14272,6 +14915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdarg_S.cmd_2039]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg_S\OpCodesLdarg_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdarg_S
@@ -14279,6 +14923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4.cmd_2040]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4\OpCodesLdc_I4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4
@@ -14286,6 +14931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4_0.cmd_2041]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_0\OpCodesLdc_I4_0.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_0
@@ -14293,6 +14939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4_1.cmd_2042]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_1\OpCodesLdc_I4_1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_1
@@ -14300,6 +14947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4_2.cmd_2043]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_2\OpCodesLdc_I4_2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_2
@@ -14307,6 +14955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4_3.cmd_2044]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_3\OpCodesLdc_I4_3.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_3
@@ -14314,6 +14963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4_4.cmd_2045]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_4\OpCodesLdc_I4_4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_4
@@ -14321,6 +14971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4_5.cmd_2046]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_5\OpCodesLdc_I4_5.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_5
@@ -14328,6 +14979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4_6.cmd_2047]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_6\OpCodesLdc_I4_6.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_6
@@ -14335,6 +14987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4_7.cmd_2048]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_7\OpCodesLdc_I4_7.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_7
@@ -14342,6 +14995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4_8.cmd_2049]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_8\OpCodesLdc_I4_8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_8
@@ -14349,6 +15003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4_M1.cmd_2050]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_M1\OpCodesLdc_I4_M1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_M1
@@ -14356,6 +15011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I4_S.cmd_2051]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_S\OpCodesLdc_I4_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I4_S
@@ -14363,6 +15019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_I8.cmd_2052]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I8\OpCodesLdc_I8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_I8
@@ -14370,6 +15027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_R4.cmd_2053]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_R4\OpCodesLdc_R4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_R4
@@ -14377,6 +15035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdc_R8.cmd_2054]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_R8\OpCodesLdc_R8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdc_R8
@@ -14384,6 +15043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem.cmd_2055]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem\OpCodesLdelem.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem
@@ -14391,6 +15051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelema.cmd_2056]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelema\OpCodesLdelema.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelema
@@ -14398,6 +15059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem_I.cmd_2057]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_I\OpCodesLdelem_I.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_I
@@ -14405,6 +15067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem_I1.cmd_2058]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_I1\OpCodesLdelem_I1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_I1
@@ -14412,6 +15075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem_I2.cmd_2059]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_I2\OpCodesLdelem_I2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_I2
@@ -14419,6 +15083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem_I4.cmd_2060]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_I4\OpCodesLdelem_I4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_I4
@@ -14426,6 +15091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem_I8.cmd_2061]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_I8\OpCodesLdelem_I8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_I8
@@ -14433,6 +15099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem_R4.cmd_2062]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_R4\OpCodesLdelem_R4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_R4
@@ -14440,6 +15107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem_R8.cmd_2063]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_R8\OpCodesLdelem_R8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_R8
@@ -14447,6 +15115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem_Ref.cmd_2064]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_Ref\OpCodesLdelem_Ref.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_Ref
@@ -14454,6 +15123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem_U1.cmd_2065]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_U1\OpCodesLdelem_U1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_U1
@@ -14461,6 +15131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem_U2.cmd_2066]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_U2\OpCodesLdelem_U2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_U2
@@ -14468,6 +15139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdelem_U4.cmd_2067]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_U4\OpCodesLdelem_U4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdelem_U4
@@ -14475,6 +15147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdfld.cmd_2068]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdfld\OpCodesLdfld.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdfld
@@ -14482,6 +15155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdflda.cmd_2069]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdflda\OpCodesLdflda.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdflda
@@ -14489,6 +15163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdftn.cmd_2070]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdftn\OpCodesLdftn.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdftn
@@ -14496,6 +15171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdind_I.cmd_2071]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_I\OpCodesLdind_I.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_I
@@ -14503,6 +15179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdind_I1.cmd_2072]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_I1\OpCodesLdind_I1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_I1
@@ -14510,6 +15187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdind_I2.cmd_2073]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_I2\OpCodesLdind_I2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_I2
@@ -14517,6 +15195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdind_I4.cmd_2074]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_I4\OpCodesLdind_I4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_I4
@@ -14524,6 +15203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdind_I8.cmd_2075]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_I8\OpCodesLdind_I8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_I8
@@ -14531,6 +15211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdind_R4.cmd_2076]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_R4\OpCodesLdind_R4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_R4
@@ -14538,6 +15219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdind_R8.cmd_2077]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_R8\OpCodesLdind_R8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_R8
@@ -14545,6 +15227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdind_Ref.cmd_2078]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_Ref\OpCodesLdind_Ref.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_Ref
@@ -14552,6 +15235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdind_U1.cmd_2079]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_U1\OpCodesLdind_U1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_U1
@@ -14559,6 +15243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdind_U2.cmd_2080]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_U2\OpCodesLdind_U2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_U2
@@ -14566,6 +15251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdind_U4.cmd_2081]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_U4\OpCodesLdind_U4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdind_U4
@@ -14573,6 +15259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdlen.cmd_2082]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdlen\OpCodesLdlen.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdlen
@@ -14580,6 +15267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdloc.cmd_2083]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc\OpCodesLdloc.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc
@@ -14587,6 +15275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdloca.cmd_2084]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloca\OpCodesLdloca.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloca
@@ -14594,6 +15283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdloca_S.cmd_2085]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloca_S\OpCodesLdloca_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloca_S
@@ -14601,6 +15291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdloc_0.cmd_2086]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc_0\OpCodesLdloc_0.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc_0
@@ -14608,6 +15299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdloc_1.cmd_2087]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc_1\OpCodesLdloc_1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc_1
@@ -14615,6 +15307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdloc_2.cmd_2088]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc_2\OpCodesLdloc_2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc_2
@@ -14622,6 +15315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdloc_3.cmd_2089]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc_3\OpCodesLdloc_3.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc_3
@@ -14629,6 +15323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdloc_S.cmd_2090]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc_S\OpCodesLdloc_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdloc_S
@@ -14636,6 +15331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdnull.cmd_2091]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdnull\OpCodesLdnull.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdnull
@@ -14643,6 +15339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdobj.cmd_2092]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdobj\OpCodesLdobj.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdobj
@@ -14650,6 +15347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdsfld.cmd_2093]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdsfld\OpCodesLdsfld.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdsfld
@@ -14657,6 +15355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdsflda.cmd_2094]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdsflda\OpCodesLdsflda.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdsflda
@@ -14664,6 +15363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdstr.cmd_2095]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdstr\OpCodesLdstr.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdstr
@@ -14671,6 +15371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdtoken.cmd_2096]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdtoken\OpCodesLdtoken.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdtoken
@@ -14678,6 +15379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLdvirtftn.cmd_2097]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdvirtftn\OpCodesLdvirtftn.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLdvirtftn
@@ -14685,6 +15387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLeave.cmd_2098]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLeave\OpCodesLeave.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLeave
@@ -14692,6 +15395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLeave_S.cmd_2099]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLeave_S\OpCodesLeave_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLeave_S
@@ -14699,6 +15403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesLocalloc.cmd_2100]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLocalloc\OpCodesLocalloc.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesLocalloc
@@ -14706,6 +15411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesMkrefany.cmd_2101]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesMkrefany\OpCodesMkrefany.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesMkrefany
@@ -14713,6 +15419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesMul.cmd_2102]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesMul\OpCodesMul.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesMul
@@ -14720,6 +15427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesMul_Ovf.cmd_2103]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesMul_Ovf\OpCodesMul_Ovf.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesMul_Ovf
@@ -14727,6 +15435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesMul_Ovf_Un.cmd_2104]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesMul_Ovf_Un\OpCodesMul_Ovf_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesMul_Ovf_Un
@@ -14734,6 +15443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesNeg.cmd_2105]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesNeg\OpCodesNeg.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesNeg
@@ -14741,6 +15451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesNewarr.cmd_2106]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesNewarr\OpCodesNewarr.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesNewarr
@@ -14748,6 +15459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesNewobj.cmd_2107]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesNewobj\OpCodesNewobj.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesNewobj
@@ -14755,6 +15467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesNop.cmd_2108]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesNop\OpCodesNop.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesNop
@@ -14762,6 +15475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesNot.cmd_2109]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesNot\OpCodesNot.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesNot
@@ -14769,6 +15483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesOr.cmd_2110]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesOr\OpCodesOr.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesOr
@@ -14776,6 +15491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesPop.cmd_2111]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPop\OpCodesPop.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPop
@@ -14783,6 +15499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesPrefix1.cmd_2112]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix1\OpCodesPrefix1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix1
@@ -14790,6 +15507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesPrefix2.cmd_2113]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix2\OpCodesPrefix2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix2
@@ -14797,6 +15515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesPrefix3.cmd_2114]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix3\OpCodesPrefix3.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix3
@@ -14804,6 +15523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesPrefix4.cmd_2115]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix4\OpCodesPrefix4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix4
@@ -14811,6 +15531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesPrefix5.cmd_2116]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix5\OpCodesPrefix5.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix5
@@ -14818,6 +15539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesPrefix6.cmd_2117]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix6\OpCodesPrefix6.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix6
@@ -14825,6 +15547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesPrefix7.cmd_2118]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix7\OpCodesPrefix7.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefix7
@@ -14832,6 +15555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesPrefixref.cmd_2119]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefixref\OpCodesPrefixref.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesPrefixref
@@ -14839,6 +15563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesReadonly.cmd_2120]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesReadonly\OpCodesReadonly.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesReadonly
@@ -14846,6 +15571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesRefanytype.cmd_2121]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRefanytype\OpCodesRefanytype.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRefanytype
@@ -14853,6 +15579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesRefanyval.cmd_2122]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRefanyval\OpCodesRefanyval.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRefanyval
@@ -14860,6 +15587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesRem.cmd_2123]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRem\OpCodesRem.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRem
@@ -14867,6 +15595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesRem_Un.cmd_2124]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRem_Un\OpCodesRem_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRem_Un
@@ -14874,6 +15603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesRet.cmd_2125]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRet\OpCodesRet.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRet
@@ -14881,6 +15611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesRethrow.cmd_2126]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRethrow\OpCodesRethrow.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesRethrow
@@ -14888,6 +15619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesShl.cmd_2127]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesShl\OpCodesShl.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesShl
@@ -14895,6 +15627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesShr.cmd_2128]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesShr\OpCodesShr.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesShr
@@ -14902,6 +15635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesShr_Un.cmd_2129]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesShr_Un\OpCodesShr_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesShr_Un
@@ -14909,6 +15643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesSizeof.cmd_2130]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesSizeof\OpCodesSizeof.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesSizeof
@@ -14916,6 +15651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStarg.cmd_2131]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStarg\OpCodesStarg.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStarg
@@ -14923,6 +15659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStarg_S.cmd_2132]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStarg_S\OpCodesStarg_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStarg_S
@@ -14930,6 +15667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStelem.cmd_2133]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem\OpCodesStelem.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem
@@ -14937,6 +15675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStelem_I.cmd_2134]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_I\OpCodesStelem_I.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_I
@@ -14944,6 +15683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStelem_I1.cmd_2135]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_I1\OpCodesStelem_I1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_I1
@@ -14951,6 +15691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStelem_I2.cmd_2136]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_I2\OpCodesStelem_I2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_I2
@@ -14958,6 +15699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStelem_I4.cmd_2137]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_I4\OpCodesStelem_I4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_I4
@@ -14965,6 +15707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStelem_I8.cmd_2138]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_I8\OpCodesStelem_I8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_I8
@@ -14972,6 +15715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStelem_R4.cmd_2139]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_R4\OpCodesStelem_R4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_R4
@@ -14979,6 +15723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStelem_R8.cmd_2140]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_R8\OpCodesStelem_R8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_R8
@@ -14986,6 +15731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStelem_Ref.cmd_2141]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_Ref\OpCodesStelem_Ref.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStelem_Ref
@@ -14993,6 +15739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStfld.cmd_2142]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStfld\OpCodesStfld.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStfld
@@ -15000,6 +15747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStind_I.cmd_2143]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_I\OpCodesStind_I.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_I
@@ -15007,6 +15755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStind_I1.cmd_2144]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_I1\OpCodesStind_I1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_I1
@@ -15014,6 +15763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStind_I2.cmd_2145]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_I2\OpCodesStind_I2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_I2
@@ -15021,6 +15771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStind_I4.cmd_2146]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_I4\OpCodesStind_I4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_I4
@@ -15028,6 +15779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStind_I8.cmd_2147]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_I8\OpCodesStind_I8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_I8
@@ -15035,6 +15787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStind_R4.cmd_2148]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_R4\OpCodesStind_R4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_R4
@@ -15042,6 +15795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStind_R8.cmd_2149]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_R8\OpCodesStind_R8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_R8
@@ -15049,6 +15803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStind_Ref.cmd_2150]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_Ref\OpCodesStind_Ref.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStind_Ref
@@ -15056,6 +15811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStloc.cmd_2151]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc\OpCodesStloc.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc
@@ -15063,6 +15819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStloc_0.cmd_2152]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc_0\OpCodesStloc_0.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc_0
@@ -15070,6 +15827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStloc_1.cmd_2153]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc_1\OpCodesStloc_1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc_1
@@ -15077,6 +15835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStloc_2.cmd_2154]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc_2\OpCodesStloc_2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc_2
@@ -15084,6 +15843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStloc_3.cmd_2155]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc_3\OpCodesStloc_3.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc_3
@@ -15091,6 +15851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStloc_S.cmd_2156]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc_S\OpCodesStloc_S.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStloc_S
@@ -15098,6 +15859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStobj.cmd_2157]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStobj\OpCodesStobj.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStobj
@@ -15105,6 +15867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesStsfld.cmd_2158]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStsfld\OpCodesStsfld.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesStsfld
@@ -15112,6 +15875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesSub.cmd_2159]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesSub\OpCodesSub.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesSub
@@ -15119,6 +15883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesSub_Ovf.cmd_2160]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesSub_Ovf\OpCodesSub_Ovf.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesSub_Ovf
@@ -15126,6 +15891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesSub_Ovf_Un.cmd_2161]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesSub_Ovf_Un\OpCodesSub_Ovf_Un.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesSub_Ovf_Un
@@ -15133,6 +15899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesSwitch.cmd_2162]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesSwitch\OpCodesSwitch.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesSwitch
@@ -15140,6 +15907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeStackBehaviourPop.cmd_2163]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeStackBehaviourPop\OpCodeStackBehaviourPop.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeStackBehaviourPop
@@ -15147,6 +15915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeStackBehaviourPush.cmd_2164]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeStackBehaviourPush\OpCodeStackBehaviourPush.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeStackBehaviourPush
@@ -15154,6 +15923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesTailcall.cmd_2165]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesTailcall\OpCodesTailcall.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesTailcall
@@ -15161,6 +15931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesTakesSingleByteArgument.cmd_2166]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesTakesSingleByteArgument\OpCodesTakesSingleByteArgument.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesTakesSingleByteArgument
@@ -15168,6 +15939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesThrow.cmd_2167]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesThrow\OpCodesThrow.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesThrow
@@ -15175,6 +15947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesUnaligned.cmd_2168]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesUnaligned\OpCodesUnaligned.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesUnaligned
@@ -15182,6 +15955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesUnbox.cmd_2169]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesUnbox\OpCodesUnbox.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesUnbox
@@ -15189,6 +15963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesUnbox_Any.cmd_2170]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesUnbox_Any\OpCodesUnbox_Any.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesUnbox_Any
@@ -15196,6 +15971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesVolatile.cmd_2171]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesVolatile\OpCodesVolatile.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesVolatile
@@ -15203,6 +15979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodesXor.cmd_2172]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesXor\OpCodesXor.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodesXor
@@ -15210,6 +15987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeToString.cmd_2173]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeToString\OpCodeToString.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeToString
@@ -15217,6 +15995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeValue.cmd_2174]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeValue\OpCodeValue.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodes\OpCodeValue
@@ -15224,6 +16003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeTypeMacro.cmd_2175]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodetype\OpCodeTypeMacro\OpCodeTypeMacro.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodetype\OpCodeTypeMacro
@@ -15231,6 +16011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeTypeNternal.cmd_2176]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodetype\OpCodeTypeNternal\OpCodeTypeNternal.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodetype\OpCodeTypeNternal
@@ -15238,6 +16019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeTypeObjmodel.cmd_2177]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodetype\OpCodeTypeObjmodel\OpCodeTypeObjmodel.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodetype\OpCodeTypeObjmodel
@@ -15245,6 +16027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeTypePrefix.cmd_2178]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodetype\OpCodeTypePrefix\OpCodeTypePrefix.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodetype\OpCodeTypePrefix
@@ -15252,6 +16035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpCodeTypePrimitive.cmd_2179]
 RelativePath=CoreMangLib\cti\system\reflection\emit\opcodetype\OpCodeTypePrimitive\OpCodeTypePrimitive.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\opcodetype\OpCodeTypePrimitive
@@ -15259,6 +16043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineBrTarget.cmd_2180]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineBrTarget\OperandTypeInlineBrTarget.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineBrTarget
@@ -15266,6 +16051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineField.cmd_2181]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineField\OperandTypeInlineField.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineField
@@ -15273,6 +16059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineI.cmd_2182]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineI\OperandTypeInlineI.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineI
@@ -15280,6 +16067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineI8.cmd_2183]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineI8\OperandTypeInlineI8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineI8
@@ -15287,6 +16075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineMethod.cmd_2184]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineMethod\OperandTypeInlineMethod.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineMethod
@@ -15294,6 +16083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineNone.cmd_2185]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineNone\OperandTypeInlineNone.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineNone
@@ -15301,6 +16091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineR.cmd_2186]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineR\OperandTypeInlineR.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineR
@@ -15308,6 +16099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineSig.cmd_2187]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineSig\OperandTypeInlineSig.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineSig
@@ -15315,6 +16107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineString.cmd_2188]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineString\OperandTypeInlineString.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineString
@@ -15322,6 +16115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineSwitch.cmd_2189]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineSwitch\OperandTypeInlineSwitch.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineSwitch
@@ -15329,6 +16123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineTok.cmd_2190]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineTok\OperandTypeInlineTok.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineTok
@@ -15336,6 +16131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineType.cmd_2191]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineType\OperandTypeInlineType.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineType
@@ -15343,6 +16139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeInlineVar.cmd_2192]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineVar\OperandTypeInlineVar.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeInlineVar
@@ -15350,6 +16147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeShortInlineBrTarget.cmd_2193]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeShortInlineBrTarget\OperandTypeShortInlineBrTarget.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeShortInlineBrTarget
@@ -15357,6 +16155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeShortInlineI.cmd_2194]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeShortInlineI\OperandTypeShortInlineI.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeShortInlineI
@@ -15364,6 +16163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeShortInlineR.cmd_2195]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeShortInlineR\OperandTypeShortInlineR.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeShortInlineR
@@ -15371,6 +16171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OperandTypeShortInlineVar.cmd_2196]
 RelativePath=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeShortInlineVar\OperandTypeShortInlineVar.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\operandtype\OperandTypeShortInlineVar
@@ -15378,6 +16179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PackingSize16.cmd_2197]
 RelativePath=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSize16\PackingSize16.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSize16
@@ -15385,6 +16187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PackingSize2.cmd_2198]
 RelativePath=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSize2\PackingSize2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSize2
@@ -15392,6 +16195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PackingSize4.cmd_2199]
 RelativePath=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSize4\PackingSize4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSize4
@@ -15399,6 +16203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PackingSizeSize1.cmd_2200]
 RelativePath=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeSize1\PackingSizeSize1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeSize1
@@ -15406,6 +16211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PackingSizeSize128.cmd_2201]
 RelativePath=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeSize128\PackingSizeSize128.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeSize128
@@ -15413,6 +16219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PackingSizeSize32.cmd_2202]
 RelativePath=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeSize32\PackingSizeSize32.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeSize32
@@ -15420,6 +16227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PackingSizeSize64.cmd_2203]
 RelativePath=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeSize64\PackingSizeSize64.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeSize64
@@ -15427,6 +16235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PackingSizeSize8.cmd_2204]
 RelativePath=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeSize8\PackingSizeSize8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeSize8
@@ -15434,6 +16243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PackingSizeUnspecified.cmd_2205]
 RelativePath=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeUnspecified\PackingSizeUnspecified.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\packingsize\PackingSizeUnspecified
@@ -15441,6 +16251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPop0.cmd_2206]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPop0\StackBehaviourPop0.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPop0
@@ -15448,6 +16259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPop1.cmd_2207]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPop1\StackBehaviourPop1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPop1
@@ -15455,6 +16267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPop1_pop1.cmd_2208]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPop1_pop1\StackBehaviourPop1_pop1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPop1_pop1
@@ -15462,6 +16275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopi.cmd_2209]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi\StackBehaviourPopi.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi
@@ -15469,6 +16283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopi_pop1.cmd_2210]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_pop1\StackBehaviourPopi_pop1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_pop1
@@ -15476,6 +16291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopi_popi.cmd_2211]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_popi\StackBehaviourPopi_popi.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_popi
@@ -15483,6 +16299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopi_popi8.cmd_2212]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_popi8\StackBehaviourPopi_popi8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_popi8
@@ -15490,6 +16307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopi_popi_popi.cmd_2213]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_popi_popi\StackBehaviourPopi_popi_popi.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_popi_popi
@@ -15497,6 +16315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopi_popr4.cmd_2214]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_popr4\StackBehaviourPopi_popr4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_popr4
@@ -15504,6 +16323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopi_popr8.cmd_2215]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_popr8\StackBehaviourPopi_popr8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopi_popr8
@@ -15511,6 +16331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopref.cmd_2216]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref\StackBehaviourPopref.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref
@@ -15518,6 +16339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopref_pop1.cmd_2217]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_pop1\StackBehaviourPopref_pop1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_pop1
@@ -15525,6 +16347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopref_popi.cmd_2218]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi\StackBehaviourPopref_popi.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi
@@ -15532,6 +16355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopref_popi_pop1.cmd_2219]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_pop1\StackBehaviourPopref_popi_pop1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_pop1
@@ -15539,6 +16363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopref_popi_popi.cmd_2220]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_popi\StackBehaviourPopref_popi_popi.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_popi
@@ -15546,6 +16371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopref_popi_popi8.cmd_2221]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_popi8\StackBehaviourPopref_popi_popi8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_popi8
@@ -15553,6 +16379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopref_popi_popr4.cmd_2222]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_popr4\StackBehaviourPopref_popi_popr4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_popr4
@@ -15560,6 +16387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopref_popi_popr8.cmd_2223]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_popr8\StackBehaviourPopref_popi_popr8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_popr8
@@ -15567,6 +16395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPopref_popi_popref.cmd_2224]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_popref\StackBehaviourPopref_popi_popref.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPopref_popi_popref
@@ -15574,6 +16403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPush0.cmd_2225]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPush0\StackBehaviourPush0.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPush0
@@ -15581,6 +16411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPush1.cmd_2226]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPush1\StackBehaviourPush1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPush1
@@ -15588,6 +16419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPush1_push1.cmd_2227]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPush1_push1\StackBehaviourPush1_push1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPush1_push1
@@ -15595,6 +16427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPushi.cmd_2228]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPushi\StackBehaviourPushi.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPushi
@@ -15602,6 +16435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPushi8.cmd_2229]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPushi8\StackBehaviourPushi8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPushi8
@@ -15609,6 +16443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPushr4.cmd_2230]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPushr4\StackBehaviourPushr4.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPushr4
@@ -15616,6 +16451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPushr8.cmd_2231]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPushr8\StackBehaviourPushr8.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPushr8
@@ -15623,6 +16459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourPushref.cmd_2232]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPushref\StackBehaviourPushref.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourPushref
@@ -15630,6 +16467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourVarpop.cmd_2233]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourVarpop\StackBehaviourVarpop.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourVarpop
@@ -15637,6 +16475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StackBehaviourVarpush.cmd_2234]
 RelativePath=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourVarpush\StackBehaviourVarpush.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\emit\stackbehaviour\StackBehaviourVarpush
@@ -15644,6 +16483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EventAttributesNone.cmd_2235]
 RelativePath=CoreMangLib\cti\system\reflection\eventattributes\EventAttributesNone\EventAttributesNone.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\eventattributes\EventAttributesNone
@@ -15651,6 +16491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EventAttributesRTSpecialName.cmd_2236]
 RelativePath=CoreMangLib\cti\system\reflection\eventattributes\EventAttributesRTSpecialName\EventAttributesRTSpecialName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\eventattributes\EventAttributesRTSpecialName
@@ -15658,6 +16499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EventAttributesSpecialName.cmd_2237]
 RelativePath=CoreMangLib\cti\system\reflection\eventattributes\EventAttributesSpecialName\EventAttributesSpecialName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\eventattributes\EventAttributesSpecialName
@@ -15665,6 +16507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesAssembly.cmd_2238]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesAssembly\FieldAttributesAssembly.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesAssembly
@@ -15672,6 +16515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesFamANDAssem.cmd_2239]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesFamANDAssem\FieldAttributesFamANDAssem.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesFamANDAssem
@@ -15679,6 +16523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesFamily.cmd_2240]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesFamily\FieldAttributesFamily.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesFamily
@@ -15686,6 +16531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesFamORAssem.cmd_2241]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesFamORAssem\FieldAttributesFamORAssem.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesFamORAssem
@@ -15693,6 +16539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesFieldAccessMask.cmd_2242]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesFieldAccessMask\FieldAttributesFieldAccessMask.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesFieldAccessMask
@@ -15700,6 +16547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesHasDefault.cmd_2243]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesHasDefault\FieldAttributesHasDefault.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesHasDefault
@@ -15707,6 +16555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesHasFieldRVA.cmd_2244]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesHasFieldRVA\FieldAttributesHasFieldRVA.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesHasFieldRVA
@@ -15714,6 +16563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesInitOnly.cmd_2245]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesInitOnly\FieldAttributesInitOnly.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesInitOnly
@@ -15721,6 +16571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesLiteral.cmd_2246]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesLiteral\FieldAttributesLiteral.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesLiteral
@@ -15728,6 +16579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesNotSerialized.cmd_2247]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesNotSerialized\FieldAttributesNotSerialized.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesNotSerialized
@@ -15735,6 +16587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesPinvokeImpl.cmd_2248]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesPinvokeImpl\FieldAttributesPinvokeImpl.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesPinvokeImpl
@@ -15742,6 +16595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesPrivate.cmd_2249]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesPrivate\FieldAttributesPrivate.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesPrivate
@@ -15749,6 +16603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesPrivateScope.cmd_2250]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesPrivateScope\FieldAttributesPrivateScope.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesPrivateScope
@@ -15756,6 +16611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesPublic.cmd_2251]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesPublic\FieldAttributesPublic.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesPublic
@@ -15763,6 +16619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesRTSpecialName.cmd_2252]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesRTSpecialName\FieldAttributesRTSpecialName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesRTSpecialName
@@ -15770,6 +16627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesSpecialName.cmd_2253]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesSpecialName\FieldAttributesSpecialName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesSpecialName
@@ -15777,6 +16635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldAttributesStatic.cmd_2254]
 RelativePath=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesStatic\FieldAttributesStatic.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\fieldattributes\FieldAttributesStatic
@@ -15784,6 +16643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesAbstract.cmd_2255]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesAbstract\MethodAttributesAbstract.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesAbstract
@@ -15791,6 +16651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesFamANDAssem.cmd_2256]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesFamANDAssem\MethodAttributesFamANDAssem.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesFamANDAssem
@@ -15798,6 +16659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesFamily.cmd_2257]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesFamily\MethodAttributesFamily.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesFamily
@@ -15805,6 +16667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesFamORAssem.cmd_2258]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesFamORAssem\MethodAttributesFamORAssem.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesFamORAssem
@@ -15812,6 +16675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesFinal.cmd_2259]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesFinal\MethodAttributesFinal.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesFinal
@@ -15819,6 +16683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesHasSecurity.cmd_2260]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesHasSecurity\MethodAttributesHasSecurity.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesHasSecurity
@@ -15826,6 +16691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesHideBySig.cmd_2261]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesHideBySig\MethodAttributesHideBySig.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesHideBySig
@@ -15833,6 +16699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesMemberAccessMask.cmd_2262]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesMemberAccessMask\MethodAttributesMemberAccessMask.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesMemberAccessMask
@@ -15840,6 +16707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesNewSlot.cmd_2263]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesNewSlot\MethodAttributesNewSlot.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesNewSlot
@@ -15847,6 +16715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesPinvokeImpl.cmd_2264]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesPinvokeImpl\MethodAttributesPinvokeImpl.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesPinvokeImpl
@@ -15854,6 +16723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesPrivate.cmd_2265]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesPrivate\MethodAttributesPrivate.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesPrivate
@@ -15861,6 +16731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesPrivateScope.cmd_2266]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesPrivateScope\MethodAttributesPrivateScope.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesPrivateScope
@@ -15868,6 +16739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesPublic.cmd_2267]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesPublic\MethodAttributesPublic.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesPublic
@@ -15875,6 +16747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesRequireSecObject.cmd_2268]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesRequireSecObject\MethodAttributesRequireSecObject.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesRequireSecObject
@@ -15882,6 +16755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesReuseSlot.cmd_2269]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesReuseSlot\MethodAttributesReuseSlot.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesReuseSlot
@@ -15889,6 +16763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesRTSpecialName.cmd_2270]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesRTSpecialName\MethodAttributesRTSpecialName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesRTSpecialName
@@ -15896,6 +16771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesSpecialName.cmd_2271]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesSpecialName\MethodAttributesSpecialName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesSpecialName
@@ -15903,6 +16779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesStatic.cmd_2272]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesStatic\MethodAttributesStatic.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesStatic
@@ -15910,6 +16787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesUnmanagedExport.cmd_2273]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesUnmanagedExport\MethodAttributesUnmanagedExport.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesUnmanagedExport
@@ -15917,6 +16795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesVirtual.cmd_2274]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesVirtual\MethodAttributesVirtual.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesVirtual
@@ -15924,6 +16803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodAttributesVtableLayoutMask.cmd_2275]
 RelativePath=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesVtableLayoutMask\MethodAttributesVtableLayoutMask.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodattributes\MethodAttributesVtableLayoutMask
@@ -15931,6 +16811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesCodeTypeMask.cmd_2276]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesCodeTypeMask\MethodImplAttributesCodeTypeMask.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesCodeTypeMask
@@ -15938,6 +16819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesForwardRef.cmd_2277]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesForwardRef\MethodImplAttributesForwardRef.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesForwardRef
@@ -15945,6 +16827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesIL.cmd_2278]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesIL\MethodImplAttributesIL.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesIL
@@ -15952,6 +16835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesInternalCall.cmd_2279]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesInternalCall\MethodImplAttributesInternalCall.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesInternalCall
@@ -15959,6 +16843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesManaged.cmd_2280]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesManaged\MethodImplAttributesManaged.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesManaged
@@ -15966,6 +16851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesManagedMask.cmd_2281]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesManagedMask\MethodImplAttributesManagedMask.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesManagedMask
@@ -15973,6 +16859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesNative.cmd_2282]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesNative\MethodImplAttributesNative.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesNative
@@ -15980,6 +16867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesNoInlining.cmd_2283]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesNoInlining\MethodImplAttributesNoInlining.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesNoInlining
@@ -15987,6 +16875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesOPTIL.cmd_2284]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesOPTIL\MethodImplAttributesOPTIL.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesOPTIL
@@ -15994,6 +16883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesPreserveSig.cmd_2285]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesPreserveSig\MethodImplAttributesPreserveSig.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesPreserveSig
@@ -16001,6 +16891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesRuntime.cmd_2286]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesRuntime\MethodImplAttributesRuntime.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesRuntime
@@ -16008,6 +16899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesSynchronized.cmd_2287]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesSynchronized\MethodImplAttributesSynchronized.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesSynchronized
@@ -16015,6 +16907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplAttributesUnmanaged.cmd_2288]
 RelativePath=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesUnmanaged\MethodImplAttributesUnmanaged.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\methodimplattributes\MethodImplAttributesUnmanaged
@@ -16022,6 +16915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ParameterAttributesHasDefault.cmd_2289]
 RelativePath=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesHasDefault\ParameterAttributesHasDefault.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesHasDefault
@@ -16029,6 +16923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ParameterAttributesIn.cmd_2290]
 RelativePath=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesIn\ParameterAttributesIn.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesIn
@@ -16036,6 +16931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ParameterAttributesNone.cmd_2291]
 RelativePath=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesNone\ParameterAttributesNone.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesNone
@@ -16043,6 +16939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ParameterAttributesOptional.cmd_2292]
 RelativePath=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesOptional\ParameterAttributesOptional.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesOptional
@@ -16050,6 +16947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ParameterAttributesOut.cmd_2293]
 RelativePath=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesOut\ParameterAttributesOut.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesOut
@@ -16057,6 +16955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ParameterAttributesRetval.cmd_2294]
 RelativePath=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesRetval\ParameterAttributesRetval.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\parameterattributes\ParameterAttributesRetval
@@ -16064,6 +16963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PropertyAttributesHasDefault.cmd_2295]
 RelativePath=CoreMangLib\cti\system\reflection\propertyattributes\PropertyAttributesHasDefault\PropertyAttributesHasDefault.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\propertyattributes\PropertyAttributesHasDefault
@@ -16071,6 +16971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PropertyAttributesNone.cmd_2296]
 RelativePath=CoreMangLib\cti\system\reflection\propertyattributes\PropertyAttributesNone\PropertyAttributesNone.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\propertyattributes\PropertyAttributesNone
@@ -16078,6 +16979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PropertyAttributesRTSpecialName.cmd_2297]
 RelativePath=CoreMangLib\cti\system\reflection\propertyattributes\PropertyAttributesRTSpecialName\PropertyAttributesRTSpecialName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\propertyattributes\PropertyAttributesRTSpecialName
@@ -16085,6 +16987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PropertyAttributesSpecialName.cmd_2298]
 RelativePath=CoreMangLib\cti\system\reflection\propertyattributes\PropertyAttributesSpecialName\PropertyAttributesSpecialName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\propertyattributes\PropertyAttributesSpecialName
@@ -16092,6 +16995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TargetInvocationExceptionCtor1.cmd_2299]
 RelativePath=CoreMangLib\cti\system\reflection\targetinvocationexception\TargetInvocationExceptionCtor1\TargetInvocationExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\targetinvocationexception\TargetInvocationExceptionCtor1
@@ -16099,6 +17003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TargetInvocationExceptionCtor2.cmd_2300]
 RelativePath=CoreMangLib\cti\system\reflection\targetinvocationexception\TargetInvocationExceptionCtor2\TargetInvocationExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\targetinvocationexception\TargetInvocationExceptionCtor2
@@ -16106,6 +17011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TargetParameterCountExceptionCtor1.cmd_2301]
 RelativePath=CoreMangLib\cti\system\reflection\targetparametercountexception\TargetParameterCountExceptionCtor1\TargetParameterCountExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\targetparametercountexception\TargetParameterCountExceptionCtor1
@@ -16113,6 +17019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TargetParameterCountExceptionCtor2.cmd_2302]
 RelativePath=CoreMangLib\cti\system\reflection\targetparametercountexception\TargetParameterCountExceptionCtor2\TargetParameterCountExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\targetparametercountexception\TargetParameterCountExceptionCtor2
@@ -16120,6 +17027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TargetParameterCountExceptionCtor3.cmd_2303]
 RelativePath=CoreMangLib\cti\system\reflection\targetparametercountexception\TargetParameterCountExceptionCtor3\TargetParameterCountExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\targetparametercountexception\TargetParameterCountExceptionCtor3
@@ -16127,6 +17035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesAbstract.cmd_2304]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesAbstract\TypeAttributesAbstract.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesAbstract
@@ -16134,6 +17043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesAnsiClass.cmd_2305]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesAnsiClass\TypeAttributesAnsiClass.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesAnsiClass
@@ -16141,6 +17051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesAutoClass.cmd_2306]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesAutoClass\TypeAttributesAutoClass.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesAutoClass
@@ -16148,6 +17059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesAutoLayout.cmd_2307]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesAutoLayout\TypeAttributesAutoLayout.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesAutoLayout
@@ -16155,6 +17067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesBeforeFieldInit.cmd_2308]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesBeforeFieldInit\TypeAttributesBeforeFieldInit.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesBeforeFieldInit
@@ -16162,6 +17075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesClass.cmd_2309]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesClass\TypeAttributesClass.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesClass
@@ -16169,6 +17083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesClassSemanticsMask.cmd_2310]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesClassSemanticsMask\TypeAttributesClassSemanticsMask.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesClassSemanticsMask
@@ -16176,6 +17091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesExplicitLayout.cmd_2311]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesExplicitLayout\TypeAttributesExplicitLayout.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesExplicitLayout
@@ -16183,6 +17099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesHasSecurity.cmd_2312]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesHasSecurity\TypeAttributesHasSecurity.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesHasSecurity
@@ -16190,6 +17107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesImport.cmd_2313]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesImport\TypeAttributesImport.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesImport
@@ -16197,6 +17115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesInterface.cmd_2314]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesInterface\TypeAttributesInterface.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesInterface
@@ -16204,6 +17123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesLayoutMask.cmd_2315]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesLayoutMask\TypeAttributesLayoutMask.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesLayoutMask
@@ -16211,6 +17131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesNestedAssembly.cmd_2316]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedAssembly\TypeAttributesNestedAssembly.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedAssembly
@@ -16218,6 +17139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesNestedFamANDAssem.cmd_2317]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedFamANDAssem\TypeAttributesNestedFamANDAssem.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedFamANDAssem
@@ -16225,6 +17147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesNestedFamily.cmd_2318]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedFamily\TypeAttributesNestedFamily.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedFamily
@@ -16232,6 +17155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesNestedFamORAssem.cmd_2319]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedFamORAssem\TypeAttributesNestedFamORAssem.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedFamORAssem
@@ -16239,6 +17163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesNestedPrivate.cmd_2320]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedPrivate\TypeAttributesNestedPrivate.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedPrivate
@@ -16246,6 +17171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesNestedPublic.cmd_2321]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedPublic\TypeAttributesNestedPublic.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesNestedPublic
@@ -16253,6 +17179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesPublic.cmd_2322]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesPublic\TypeAttributesPublic.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesPublic
@@ -16260,6 +17187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesRTSpecialName.cmd_2323]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesRTSpecialName\TypeAttributesRTSpecialName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesRTSpecialName
@@ -16267,6 +17195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesSealed.cmd_2324]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesSealed\TypeAttributesSealed.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesSealed
@@ -16274,6 +17203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesSequentialLayout.cmd_2325]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesSequentialLayout\TypeAttributesSequentialLayout.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesSequentialLayout
@@ -16281,6 +17211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesSerializable.cmd_2326]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesSerializable\TypeAttributesSerializable.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesSerializable
@@ -16288,6 +17219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesSpecialName.cmd_2327]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesSpecialName\TypeAttributesSpecialName.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesSpecialName
@@ -16295,6 +17227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesStringFormatMask.cmd_2328]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesStringFormatMask\TypeAttributesStringFormatMask.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesStringFormatMask
@@ -16302,6 +17235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesUnicodeClass.cmd_2329]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesUnicodeClass\TypeAttributesUnicodeClass.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesUnicodeClass
@@ -16309,6 +17243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttributesVisibilityMask.cmd_2330]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesVisibilityMask\TypeAttributesVisibilityMask.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttributesVisibilityMask
@@ -16316,6 +17251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeAttribytesNotPublic.cmd_2331]
 RelativePath=CoreMangLib\cti\system\reflection\typeattributes\TypeAttribytesNotPublic\TypeAttribytesNotPublic.cmd
 WorkingDir=CoreMangLib\cti\system\reflection\typeattributes\TypeAttribytesNotPublic
@@ -16323,6 +17259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingManifestResourceExceptionCtor1.cmd_2332]
 RelativePath=CoreMangLib\cti\system\resources\missingmanifestresourceexception\MissingManifestResourceExceptionCtor1\MissingManifestResourceExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\resources\missingmanifestresourceexception\MissingManifestResourceExceptionCtor1
@@ -16330,6 +17267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingManifestResourceExceptionCtor2.cmd_2333]
 RelativePath=CoreMangLib\cti\system\resources\missingmanifestresourceexception\MissingManifestResourceExceptionCtor2\MissingManifestResourceExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\resources\missingmanifestresourceexception\MissingManifestResourceExceptionCtor2
@@ -16337,6 +17275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MissingManifestResourceExceptionCtor3.cmd_2334]
 RelativePath=CoreMangLib\cti\system\resources\missingmanifestresourceexception\MissingManifestResourceExceptionCtor3\MissingManifestResourceExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\resources\missingmanifestresourceexception\MissingManifestResourceExceptionCtor3
@@ -16344,6 +17283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CultureName.cmd_2335]
 RelativePath=CoreMangLib\cti\system\resources\neutralresourceslanguageattribute\CultureName\CultureName.cmd
 WorkingDir=CoreMangLib\cti\system\resources\neutralresourceslanguageattribute\CultureName
@@ -16351,6 +17291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NeutralResourcesLanguageAttributeCtor.cmd_2336]
 RelativePath=CoreMangLib\cti\system\resources\neutralresourceslanguageattribute\NeutralResourcesLanguageAttributeCtor\NeutralResourcesLanguageAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\resources\neutralresourceslanguageattribute\NeutralResourcesLanguageAttributeCtor
@@ -16358,6 +17299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeCtor.cmd_2337]
 RelativePath=CoreMangLib\cti\system\resources\satellitecontractversionattribute\AttributeCtor\AttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\resources\satellitecontractversionattribute\AttributeCtor
@@ -16365,6 +17307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeVersion.cmd_2338]
 RelativePath=CoreMangLib\cti\system\resources\satellitecontractversionattribute\AttributeVersion\AttributeVersion.cmd
 WorkingDir=CoreMangLib\cti\system\resources\satellitecontractversionattribute\AttributeVersion
@@ -16372,6 +17315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ATPACtor.cmd_2339]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\accessedthroughpropertyattribute\ATPACtor\ATPACtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\accessedthroughpropertyattribute\ATPACtor
@@ -16379,6 +17323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ATPAPropertyName.cmd_2340]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\accessedthroughpropertyattribute\ATPAPropertyName\ATPAPropertyName.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\accessedthroughpropertyattribute\ATPAPropertyName
@@ -16386,6 +17331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeCtor1.cmd_2341]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\compilationrelaxations\AttributeCtor1\AttributeCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\compilationrelaxations\AttributeCtor1
@@ -16393,6 +17339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CompilerGeneratedAttributeCtor.cmd_2342]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\compilergeneratedattribute\CompilerGeneratedAttributeCtor\CompilerGeneratedAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\compilergeneratedattribute\CompilerGeneratedAttributeCtor
@@ -16400,6 +17347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CustomConstantAttributector.cmd_2343]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\customconstantattribute\CustomConstantAttributector\CustomConstantAttributector.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\customconstantattribute\CustomConstantAttributector
@@ -16407,6 +17355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IndexerNameAttributeCtor.cmd_2344]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\indexernameattribute\IndexerNameAttributeCtor\IndexerNameAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\indexernameattribute\IndexerNameAttributeCtor
@@ -16414,6 +17363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IVTAAssemblyName.cmd_2345]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\internalsvisibletoattribute\IVTAAssemblyName\IVTAAssemblyName.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\internalsvisibletoattribute\IVTAAssemblyName
@@ -16421,6 +17371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [IVTACtor.cmd_2346]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\internalsvisibletoattribute\IVTACtor\IVTACtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\internalsvisibletoattribute\IVTACtor
@@ -16428,6 +17379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplOptionsNoInlining.cmd_2347]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\methodimploptions\MethodImplOptionsNoInlining\MethodImplOptionsNoInlining.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\methodimploptions\MethodImplOptionsNoInlining
@@ -16435,6 +17387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MethodImplOptionsPreserveSig.cmd_2348]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\methodimploptions\MethodImplOptionsPreserveSig\MethodImplOptionsPreserveSig.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\methodimploptions\MethodImplOptionsPreserveSig
@@ -16442,6 +17395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RCAttrWrapNEThrows.cmd_2349]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\runtimecompatibilityattribute\RCAttrWrapNEThrows\RCAttrWrapNEThrows.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\runtimecompatibilityattribute\RCAttrWrapNEThrows
@@ -16449,6 +17403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RuntimeCompatAttrCtor.cmd_2350]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\runtimecompatibilityattribute\RuntimeCompatAttrCtor\RuntimeCompatAttrCtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\runtimecompatibilityattribute\RuntimeCompatAttrCtor
@@ -16456,6 +17411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GetHashCode.cmd_2351]
 RelativePath=CoreMangLib\cti\system\runtime\compilerservices\runtimehelpers\GetHashCode\GetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\compilerservices\runtimehelpers\GetHashCode
@@ -16463,6 +17419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalConstantAttributeCtor.cmd_2352]
 RelativePath=CoreMangLib\cti\system\runtime\decimalconstantattribute\DecimalConstantAttributeCtor\DecimalConstantAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\decimalconstantattribute\DecimalConstantAttributeCtor
@@ -16470,6 +17427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecimalConstantAttributeValue.cmd_2353]
 RelativePath=CoreMangLib\cti\system\runtime\decimalconstantattribute\DecimalConstantAttributeValue\DecimalConstantAttributeValue.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\decimalconstantattribute\DecimalConstantAttributeValue
@@ -16477,6 +17435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FixedBufferAttributeCtor.cmd_2354]
 RelativePath=CoreMangLib\cti\system\runtime\fixedbufferattribute\FixedBufferAttributeCtor\FixedBufferAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\fixedbufferattribute\FixedBufferAttributeCtor
@@ -16484,6 +17443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FixedBufferAttributeElementType.cmd_2355]
 RelativePath=CoreMangLib\cti\system\runtime\fixedbufferattribute\FixedBufferAttributeElementType\FixedBufferAttributeElementType.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\fixedbufferattribute\FixedBufferAttributeElementType
@@ -16491,6 +17451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FixedBufferAttributeLength.cmd_2356]
 RelativePath=CoreMangLib\cti\system\runtime\fixedbufferattribute\FixedBufferAttributeLength\FixedBufferAttributeLength.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\fixedbufferattribute\FixedBufferAttributeLength
@@ -16498,6 +17459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CallingConventionWinapi.cmd_2357]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\callingconvention\CallingConventionWinapi\CallingConventionWinapi.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\callingconvention\CallingConventionWinapi
@@ -16505,6 +17467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [CharSetUnicode.cmd_2358]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\charset\CharSetUnicode\CharSetUnicode.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\charset\CharSetUnicode
@@ -16512,6 +17475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldOffsetAttributeCtor.cmd_2359]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\fieldoffsetattribute\FieldOffsetAttributeCtor\FieldOffsetAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\fieldoffsetattribute\FieldOffsetAttributeCtor
@@ -16519,6 +17483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FieldOffsetAttributeValue.cmd_2360]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\fieldoffsetattribute\FieldOffsetAttributeValue\FieldOffsetAttributeValue.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\fieldoffsetattribute\FieldOffsetAttributeValue
@@ -16526,6 +17491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCHandleAddrOfPinnedObject_PSC.cmd_2361]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\gchandle\GCHandleAddrOfPinnedObject_PSC\GCHandleAddrOfPinnedObject_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\gchandle\GCHandleAddrOfPinnedObject_PSC
@@ -16533,6 +17499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCHandleAlloc1_PSC.cmd_2362]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\gchandle\GCHandleAlloc1_PSC\GCHandleAlloc1_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\gchandle\GCHandleAlloc1_PSC
@@ -16540,6 +17507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCHandleFree_PSC.cmd_2363]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\gchandle\GCHandleFree_PSC\GCHandleFree_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\gchandle\GCHandleFree_PSC
@@ -16547,6 +17515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCHandleTarget_PSC.cmd_2364]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\gchandle\GCHandleTarget_PSC\GCHandleTarget_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\gchandle\GCHandleTarget_PSC
@@ -16554,6 +17523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCHandleTypeNormal.cmd_2365]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\gchandletype\GCHandleTypeNormal\GCHandleTypeNormal.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\gchandletype\GCHandleTypeNormal
@@ -16561,6 +17531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCHandleTypePinned.cmd_2366]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\gchandletype\GCHandleTypePinned\GCHandleTypePinned.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\gchandletype\GCHandleTypePinned
@@ -16568,6 +17539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCHandleTypeWeak.cmd_2367]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\gchandletype\GCHandleTypeWeak\GCHandleTypeWeak.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\gchandletype\GCHandleTypeWeak
@@ -16575,6 +17547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [GCHandleTypeWeakTrackResurrection.cmd_2368]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\gchandletype\GCHandleTypeWeakTrackResurrection\GCHandleTypeWeakTrackResurrection.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\gchandletype\GCHandleTypeWeakTrackResurrection
@@ -16582,6 +17555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InAttributeCtor.cmd_2369]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\inattribute\InAttributeCtor\InAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\inattribute\InAttributeCtor
@@ -16589,6 +17563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [LayoutKindAuto.cmd_2370]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\layoutkind\LayoutKindAuto\LayoutKindAuto.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\layoutkind\LayoutKindAuto
@@ -16596,6 +17571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [LayoutKindSequential.cmd_2371]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\layoutkind\LayoutKindSequential\LayoutKindSequential.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\layoutkind\LayoutKindSequential
@@ -16603,6 +17579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MarshalSizeOf1_PSC.cmd_2372]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\marshal\MarshalSizeOf1_PSC\MarshalSizeOf1_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\marshal\MarshalSizeOf1_PSC
@@ -16610,6 +17587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MarshalSizeOf2_PSC.cmd_2373]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\marshal\MarshalSizeOf2_PSC\MarshalSizeOf2_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\marshal\MarshalSizeOf2_PSC
@@ -16617,6 +17595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MarshalAsAttributeArraySubType.cmd_2374]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeArraySubType\MarshalAsAttributeArraySubType.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeArraySubType
@@ -16624,6 +17603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MarshalAsAttributeCtor1.cmd_2375]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeCtor1\MarshalAsAttributeCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeCtor1
@@ -16631,6 +17611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MarshalAsAttributeCtor2.cmd_2376]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeCtor2\MarshalAsAttributeCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeCtor2
@@ -16638,6 +17619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MarshalAsAttributeMarshalCookie.cmd_2377]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeMarshalCookie\MarshalAsAttributeMarshalCookie.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeMarshalCookie
@@ -16645,6 +17627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MarshalAsAttributeMarshalType.cmd_2378]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeMarshalType\MarshalAsAttributeMarshalType.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeMarshalType
@@ -16652,6 +17635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MarshalAsAttributeMarshalTypeRef.cmd_2379]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeMarshalTypeRef\MarshalAsAttributeMarshalTypeRef.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeMarshalTypeRef
@@ -16659,6 +17643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MarshalAsAttributeSizeConst.cmd_2380]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeSizeConst\MarshalAsAttributeSizeConst.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeSizeConst
@@ -16666,6 +17651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MarshalAsAttributeSizeParamIndex.cmd_2381]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeSizeParamIndex\MarshalAsAttributeSizeParamIndex.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeSizeParamIndex
@@ -16673,6 +17659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [MarshalAsAttributeValue.cmd_2382]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeValue\MarshalAsAttributeValue.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\marshalasattribute\MarshalAsAttributeValue
@@ -16680,6 +17667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OutAttributeCtor.cmd_2383]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\outattribute\OutAttributeCtor\OutAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\outattribute\OutAttributeCtor
@@ -16687,6 +17675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [PreserveSigAttributeCtor.cmd_2384]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\preservesigattribute\PreserveSigAttributeCtor\PreserveSigAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\preservesigattribute\PreserveSigAttributeCtor
@@ -16694,6 +17683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SafeHandleCtor_cti_PSC.cmd_2385]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleCtor_cti_PSC\SafeHandleCtor_cti_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleCtor_cti_PSC
@@ -16701,6 +17691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SafeHandleDangerousAddRef_PSC.cmd_2386]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleDangerousAddRef_PSC\SafeHandleDangerousAddRef_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleDangerousAddRef_PSC
@@ -16708,6 +17699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SafeHandleDangerousGetHandle_PSC.cmd_2387]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleDangerousGetHandle_PSC\SafeHandleDangerousGetHandle_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleDangerousGetHandle_PSC
@@ -16715,6 +17707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SafeHandleDangerousRelease_PSC.cmd_2388]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleDangerousRelease_PSC\SafeHandleDangerousRelease_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleDangerousRelease_PSC
@@ -16722,6 +17715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SafeHandleDispose1_PSC.cmd_2389]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleDispose1_PSC\SafeHandleDispose1_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleDispose1_PSC
@@ -16729,6 +17723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SafeHandleDispose2_PSC.cmd_2390]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleDispose2_PSC\SafeHandleDispose2_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleDispose2_PSC
@@ -16736,6 +17731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SafeHandleHandle_PSC.cmd_2391]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleHandle_PSC\SafeHandleHandle_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleHandle_PSC
@@ -16743,6 +17739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SafeHandleIsClosed_PSC.cmd_2392]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleIsClosed_PSC\SafeHandleIsClosed_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleIsClosed_PSC
@@ -16750,6 +17747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SafeHandleIsInvalid_PSC.cmd_2393]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleIsInvalid_PSC\SafeHandleIsInvalid_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleIsInvalid_PSC
@@ -16757,6 +17755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SafeHandleSetHandleAsInvalid_PSC.cmd_2394]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleSetHandleAsInvalid_PSC\SafeHandleSetHandleAsInvalid_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleSetHandleAsInvalid_PSC
@@ -16764,6 +17763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SafeHandleSetHandle_PSC.cmd_2395]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleSetHandle_PSC\SafeHandleSetHandle_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\safehandle\SafeHandleSetHandle_PSC
@@ -16771,6 +17771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StructLayoutAttributeCharSet.cmd_2396]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\structlayoutattribute\StructLayoutAttributeCharSet\StructLayoutAttributeCharSet.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\structlayoutattribute\StructLayoutAttributeCharSet
@@ -16778,6 +17779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StructLayoutAttributeCtor.cmd_2397]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\structlayoutattribute\StructLayoutAttributeCtor\StructLayoutAttributeCtor.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\structlayoutattribute\StructLayoutAttributeCtor
@@ -16785,6 +17787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StructLayoutAttributePack.cmd_2398]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\structlayoutattribute\StructLayoutAttributePack\StructLayoutAttributePack.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\structlayoutattribute\StructLayoutAttributePack
@@ -16792,6 +17795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StructLayoutAttributeSize.cmd_2399]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\structlayoutattribute\StructLayoutAttributeSize\StructLayoutAttributeSize.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\structlayoutattribute\StructLayoutAttributeSize
@@ -16799,6 +17803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StructLayoutAttributeValue.cmd_2400]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\structlayoutattribute\StructLayoutAttributeValue\StructLayoutAttributeValue.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\structlayoutattribute\StructLayoutAttributeValue
@@ -16806,6 +17811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnmanagedType.cmd_2401]
 RelativePath=CoreMangLib\cti\system\runtime\interopservices\unmanagedtype\UnmanagedType\UnmanagedType.cmd
 WorkingDir=CoreMangLib\cti\system\runtime\interopservices\unmanagedtype\UnmanagedType
@@ -16813,6 +17819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RuntimeFieldHandleEquals.cmd_2402]
 RelativePath=CoreMangLib\cti\system\runtimefieldhandle\RuntimeFieldHandleEquals\RuntimeFieldHandleEquals.cmd
 WorkingDir=CoreMangLib\cti\system\runtimefieldhandle\RuntimeFieldHandleEquals
@@ -16820,6 +17827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RuntimeFieldHandleGetHashCode.cmd_2403]
 RelativePath=CoreMangLib\cti\system\runtimefieldhandle\RuntimeFieldHandleGetHashCode\RuntimeFieldHandleGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\runtimefieldhandle\RuntimeFieldHandleGetHashCode
@@ -16827,6 +17835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RuntimeMethodHandleEquals.cmd_2404]
 RelativePath=CoreMangLib\cti\system\runtimemethodhandle\RuntimeMethodHandleEquals\RuntimeMethodHandleEquals.cmd
 WorkingDir=CoreMangLib\cti\system\runtimemethodhandle\RuntimeMethodHandleEquals
@@ -16834,6 +17843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RuntimeMethodHanldeGetHashCode.cmd_2405]
 RelativePath=CoreMangLib\cti\system\runtimemethodhandle\RuntimeMethodHanldeGetHashCode\RuntimeMethodHanldeGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\runtimemethodhandle\RuntimeMethodHanldeGetHashCode
@@ -16841,6 +17851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RuntimeTypeHandleEquals.cmd_2406]
 RelativePath=CoreMangLib\cti\system\runtimetypehandle\RuntimeTypeHandleEquals\RuntimeTypeHandleEquals.cmd
 WorkingDir=CoreMangLib\cti\system\runtimetypehandle\RuntimeTypeHandleEquals
@@ -16848,6 +17859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [RuntimeTypeHandleGetHashCode.cmd_2407]
 RelativePath=CoreMangLib\cti\system\runtimetypehandle\RuntimeTypeHandleGetHashCode\RuntimeTypeHandleGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\runtimetypehandle\RuntimeTypeHandleGetHashCode
@@ -16855,6 +17867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteCompareTo2.cmd_2408]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteCompareTo2\SByteCompareTo2.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteCompareTo2
@@ -16862,6 +17875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteEquals1.cmd_2409]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteEquals1\SByteEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteEquals1
@@ -16869,6 +17883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteEquals2.cmd_2410]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteEquals2\SByteEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteEquals2
@@ -16876,6 +17891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteGetHashCode.cmd_2411]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteGetHashCode\SByteGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteGetHashCode
@@ -16883,6 +17899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteIConvertibleToBoolean.cmd_2412]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteIConvertibleToBoolean\SByteIConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteIConvertibleToBoolean
@@ -16890,6 +17907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteIConvertibleToByte.cmd_2413]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteIConvertibleToByte\SByteIConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteIConvertibleToByte
@@ -16897,6 +17915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteIConvertibleToChar.cmd_2414]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteIConvertibleToChar\SByteIConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteIConvertibleToChar
@@ -16904,6 +17923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteIConvertibleToDecimal.cmd_2415]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteIConvertibleToDecimal\SByteIConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteIConvertibleToDecimal
@@ -16911,6 +17931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteIConvertibleToDouble.cmd_2416]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteIConvertibleToDouble\SByteIConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteIConvertibleToDouble
@@ -16918,6 +17939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteIConvertibleToInt16.cmd_2417]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteIConvertibleToInt16\SByteIConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteIConvertibleToInt16
@@ -16925,6 +17947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteIConvertibleToInt32.cmd_2418]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteIConvertibleToInt32\SByteIConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteIConvertibleToInt32
@@ -16932,6 +17955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteIConvertibleToInt64.cmd_2419]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteIConvertibleToInt64\SByteIConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteIConvertibleToInt64
@@ -16939,6 +17963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteIConvertibleToUInt16.cmd_2420]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteIConvertibleToUInt16\SByteIConvertibleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteIConvertibleToUInt16
@@ -16946,6 +17971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteIConvertibleToUInt32.cmd_2421]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteIConvertibleToUInt32\SByteIConvertibleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteIConvertibleToUInt32
@@ -16953,6 +17979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteIConvertibleToUInt64.cmd_2422]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteIConvertibleToUInt64\SByteIConvertibleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteIConvertibleToUInt64
@@ -16960,6 +17987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteMaxValue.cmd_2423]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteMaxValue\SByteMaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteMaxValue
@@ -16967,6 +17995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteMinValue.cmd_2424]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteMinValue\SByteMinValue.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteMinValue
@@ -16974,6 +18003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteParse1.cmd_2425]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteParse1\SByteParse1.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteParse1
@@ -16981,6 +18011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteParse2.cmd_2426]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteParse2\SByteParse2.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteParse2
@@ -16988,6 +18019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteParse3.cmd_2427]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteParse3\SByteParse3.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteParse3
@@ -16995,6 +18027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SByteTryParse.cmd_2428]
 RelativePath=CoreMangLib\cti\system\sbyte\SByteTryParse\SByteTryParse.cmd
 WorkingDir=CoreMangLib\cti\system\sbyte\SByteTryParse
@@ -17002,6 +18035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SecurityExceptionCtor1.cmd_2429]
 RelativePath=CoreMangLib\cti\system\security\securityexception\SecurityExceptionCtor1\SecurityExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\security\securityexception\SecurityExceptionCtor1
@@ -17009,6 +18043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SecurityExceptionCtor2.cmd_2430]
 RelativePath=CoreMangLib\cti\system\security\securityexception\SecurityExceptionCtor2\SecurityExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\security\securityexception\SecurityExceptionCtor2
@@ -17016,6 +18051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SecurityExceptionCtor3.cmd_2431]
 RelativePath=CoreMangLib\cti\system\security\securityexception\SecurityExceptionCtor3\SecurityExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\security\securityexception\SecurityExceptionCtor3
@@ -17023,6 +18059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SecurityExceptionToString.cmd_2432]
 RelativePath=CoreMangLib\cti\system\security\securityexception\SecurityExceptionToString\SecurityExceptionToString.cmd
 WorkingDir=CoreMangLib\cti\system\security\securityexception\SecurityExceptionToString
@@ -17030,6 +18067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleEpsilon.cmd_2433]
 RelativePath=CoreMangLib\cti\system\single\SingleEpsilon\SingleEpsilon.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleEpsilon
@@ -17037,6 +18075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleGetHashCode.cmd_2434]
 RelativePath=CoreMangLib\cti\system\single\SingleGetHashCode\SingleGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleGetHashCode
@@ -17044,6 +18083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleIsInfinity.cmd_2435]
 RelativePath=CoreMangLib\cti\system\single\SingleIsInfinity\SingleIsInfinity.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleIsInfinity
@@ -17051,6 +18091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleIsNaN.cmd_2436]
 RelativePath=CoreMangLib\cti\system\single\SingleIsNaN\SingleIsNaN.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleIsNaN
@@ -17058,6 +18099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleIsNegativeInfinity.cmd_2437]
 RelativePath=CoreMangLib\cti\system\single\SingleIsNegativeInfinity\SingleIsNegativeInfinity.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleIsNegativeInfinity
@@ -17065,6 +18107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleIsPositiveInfinity.cmd_2438]
 RelativePath=CoreMangLib\cti\system\single\SingleIsPositiveInfinity\SingleIsPositiveInfinity.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleIsPositiveInfinity
@@ -17072,6 +18115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleMaxValue.cmd_2439]
 RelativePath=CoreMangLib\cti\system\single\SingleMaxValue\SingleMaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleMaxValue
@@ -17079,6 +18123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleMinValue.cmd_2440]
 RelativePath=CoreMangLib\cti\system\single\SingleMinValue\SingleMinValue.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleMinValue
@@ -17086,6 +18131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleNaN.cmd_2441]
 RelativePath=CoreMangLib\cti\system\single\SingleNaN\SingleNaN.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleNaN
@@ -17093,6 +18139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleParse1.cmd_2442]
 RelativePath=CoreMangLib\cti\system\single\SingleParse1\SingleParse1.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleParse1
@@ -17100,6 +18147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleParse2.cmd_2443]
 RelativePath=CoreMangLib\cti\system\single\SingleParse2\SingleParse2.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleParse2
@@ -17107,6 +18155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToBoolean.cmd_2444]
 RelativePath=CoreMangLib\cti\system\single\SingleToBoolean\SingleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToBoolean
@@ -17114,6 +18163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToByte.cmd_2445]
 RelativePath=CoreMangLib\cti\system\single\SingleToByte\SingleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToByte
@@ -17121,6 +18171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToChar.cmd_2446]
 RelativePath=CoreMangLib\cti\system\single\SingleToChar\SingleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToChar
@@ -17128,6 +18179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToDateTime.cmd_2447]
 RelativePath=CoreMangLib\cti\system\single\SingleToDateTime\SingleToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToDateTime
@@ -17135,6 +18187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToDecimal.cmd_2448]
 RelativePath=CoreMangLib\cti\system\single\SingleToDecimal\SingleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToDecimal
@@ -17142,6 +18195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToDouble.cmd_2449]
 RelativePath=CoreMangLib\cti\system\single\SingleToDouble\SingleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToDouble
@@ -17149,6 +18203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToInt16.cmd_2450]
 RelativePath=CoreMangLib\cti\system\single\SingleToInt16\SingleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToInt16
@@ -17156,6 +18211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToInt32.cmd_2451]
 RelativePath=CoreMangLib\cti\system\single\SingleToInt32\SingleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToInt32
@@ -17163,6 +18219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToInt64.cmd_2452]
 RelativePath=CoreMangLib\cti\system\single\SingleToInt64\SingleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToInt64
@@ -17170,6 +18227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToSByte.cmd_2453]
 RelativePath=CoreMangLib\cti\system\single\SingleToSByte\SingleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToSByte
@@ -17177,6 +18235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToSingle.cmd_2454]
 RelativePath=CoreMangLib\cti\system\single\SingleToSingle\SingleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToSingle
@@ -17184,6 +18243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToUInt16.cmd_2455]
 RelativePath=CoreMangLib\cti\system\single\SingleToUInt16\SingleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToUInt16
@@ -17191,6 +18251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToUInt32.cmd_2456]
 RelativePath=CoreMangLib\cti\system\single\SingleToUInt32\SingleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToUInt32
@@ -17198,6 +18259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleToUInt64.cmd_2457]
 RelativePath=CoreMangLib\cti\system\single\SingleToUInt64\SingleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleToUInt64
@@ -17205,6 +18267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SingleTryParse.cmd_2458]
 RelativePath=CoreMangLib\cti\system\single\SingleTryParse\SingleTryParse.cmd
 WorkingDir=CoreMangLib\cti\system\single\SingleTryParse
@@ -17212,6 +18275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringChars.cmd_2459]
 RelativePath=CoreMangLib\cti\system\string\StringChars\StringChars.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringChars
@@ -17219,6 +18283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringCompare1.cmd_2460]
 RelativePath=CoreMangLib\cti\system\string\StringCompare1\StringCompare1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringCompare1
@@ -17226,6 +18291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringCompare15.cmd_2461]
 RelativePath=CoreMangLib\cti\system\string\StringCompare15\StringCompare15.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringCompare15
@@ -17233,6 +18299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringCompare2.cmd_2462]
 RelativePath=CoreMangLib\cti\system\string\StringCompare2\StringCompare2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringCompare2
@@ -17240,6 +18307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringCompare9.cmd_2463]
 RelativePath=CoreMangLib\cti\system\string\StringCompare9\StringCompare9.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringCompare9
@@ -17247,6 +18315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringCompareOrdinal1.cmd_2464]
 RelativePath=CoreMangLib\cti\system\string\StringCompareOrdinal1\StringCompareOrdinal1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringCompareOrdinal1
@@ -17254,6 +18323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringCompareOrdinal2.cmd_2465]
 RelativePath=CoreMangLib\cti\system\string\StringCompareOrdinal2\StringCompareOrdinal2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringCompareOrdinal2
@@ -17261,6 +18331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringConcat1.cmd_2466]
 RelativePath=CoreMangLib\cti\system\string\StringConcat1\StringConcat1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringConcat1
@@ -17268,6 +18339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringConcat2.cmd_2467]
 RelativePath=CoreMangLib\cti\system\string\StringConcat2\StringConcat2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringConcat2
@@ -17275,6 +18347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringConcat3.cmd_2468]
 RelativePath=CoreMangLib\cti\system\string\StringConcat3\StringConcat3.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringConcat3
@@ -17282,13 +18355,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringConcat4.cmd_2469]
 RelativePath=CoreMangLib\cti\system\string\StringConcat4\StringConcat4.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringConcat4
 Expected=0
 MaxAllowedDurationSeconds=1000
-Categories=Pri1;RT;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri1;RT;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [StringConcat5.cmd_2470]
 RelativePath=CoreMangLib\cti\system\string\StringConcat5\StringConcat5.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringConcat5
@@ -17296,6 +18371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringConcat6.cmd_2471]
 RelativePath=CoreMangLib\cti\system\string\StringConcat6\StringConcat6.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringConcat6
@@ -17303,6 +18379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringConcat7.cmd_2472]
 RelativePath=CoreMangLib\cti\system\string\StringConcat7\StringConcat7.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringConcat7
@@ -17310,13 +18387,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringConcat8.cmd_2473]
 RelativePath=CoreMangLib\cti\system\string\StringConcat8\StringConcat8.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringConcat8
 Expected=0
 MaxAllowedDurationSeconds=1000
-Categories=Pri1;RT;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri1;RT;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [StringCopyTo.cmd_2474]
 RelativePath=CoreMangLib\cti\system\string\StringCopyTo\StringCopyTo.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringCopyTo
@@ -17324,6 +18403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringCtor5.cmd_2475]
 RelativePath=CoreMangLib\cti\system\string\StringCtor5\StringCtor5.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringCtor5
@@ -17331,6 +18411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringCtorChar.cmd_2476]
 RelativePath=CoreMangLib\cti\system\string\StringCtorChar\StringCtorChar.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringCtorChar
@@ -17338,6 +18419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringEmpty.cmd_2477]
 RelativePath=CoreMangLib\cti\system\string\StringEmpty\StringEmpty.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringEmpty
@@ -17345,6 +18427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringEquals1.cmd_2478]
 RelativePath=CoreMangLib\cti\system\string\StringEquals1\StringEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringEquals1
@@ -17352,6 +18435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringEquals2.cmd_2479]
 RelativePath=CoreMangLib\cti\system\string\StringEquals2\StringEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringEquals2
@@ -17359,6 +18443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringEquals3.cmd_2480]
 RelativePath=CoreMangLib\cti\system\string\StringEquals3\StringEquals3.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringEquals3
@@ -17366,6 +18451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringEquals6.cmd_2481]
 RelativePath=CoreMangLib\cti\system\string\StringEquals6\StringEquals6.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringEquals6
@@ -17373,20 +18459,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringFormat1.cmd_2482]
 RelativePath=CoreMangLib\cti\system\string\StringFormat1\StringFormat1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringFormat1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
+Categories=Pri1;RT;EXPECTED_FAIL;10115
 HostStyle=0
+
 [StringFormat2.cmd_2483]
 RelativePath=CoreMangLib\cti\system\string\StringFormat2\StringFormat2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringFormat2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
+Categories=Pri1;RT;EXPECTED_FAIL;10115
 HostStyle=0
+
 [StringGetEnumerator.cmd_2484]
 RelativePath=CoreMangLib\cti\system\string\StringGetEnumerator\StringGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringGetEnumerator
@@ -17394,6 +18483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringGetHashCode.cmd_2485]
 RelativePath=CoreMangLib\cti\system\string\StringGetHashCode\StringGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringGetHashCode
@@ -17401,6 +18491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIConvertibleToBoolean.cmd_2486]
 RelativePath=CoreMangLib\cti\system\string\StringIConvertibleToBoolean\StringIConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIConvertibleToBoolean
@@ -17408,6 +18499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIConvertibleToByte.cmd_2487]
 RelativePath=CoreMangLib\cti\system\string\StringIConvertibleToByte\StringIConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIConvertibleToByte
@@ -17415,6 +18507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIConvertibleToChar.cmd_2488]
 RelativePath=CoreMangLib\cti\system\string\StringIConvertibleToChar\StringIConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIConvertibleToChar
@@ -17422,6 +18515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIConvertibleToInt16.cmd_2489]
 RelativePath=CoreMangLib\cti\system\string\StringIConvertibleToInt16\StringIConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIConvertibleToInt16
@@ -17429,6 +18523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIConvertibleToInt32.cmd_2490]
 RelativePath=CoreMangLib\cti\system\string\StringIConvertibleToInt32\StringIConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIConvertibleToInt32
@@ -17436,6 +18531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIConvertibleToInt64.cmd_2491]
 RelativePath=CoreMangLib\cti\system\string\StringIConvertibleToInt64\StringIConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIConvertibleToInt64
@@ -17443,6 +18539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIConvertibleToSByte.cmd_2492]
 RelativePath=CoreMangLib\cti\system\string\StringIConvertibleToSByte\StringIConvertibleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIConvertibleToSByte
@@ -17450,6 +18547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIConvertibleToUInt16.cmd_2493]
 RelativePath=CoreMangLib\cti\system\string\StringIConvertibleToUInt16\StringIConvertibleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIConvertibleToUInt16
@@ -17457,6 +18555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIConvertibleToUInt32.cmd_2494]
 RelativePath=CoreMangLib\cti\system\string\StringIConvertibleToUInt32\StringIConvertibleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIConvertibleToUInt32
@@ -17464,6 +18563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIConvertibleToUInt64.cmd_2495]
 RelativePath=CoreMangLib\cti\system\string\StringIConvertibleToUInt64\StringIConvertibleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIConvertibleToUInt64
@@ -17471,6 +18571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIEnumerableGetEnumerator.cmd_2496]
 RelativePath=CoreMangLib\cti\system\string\StringIEnumerableGetEnumerator\StringIEnumerableGetEnumerator.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIEnumerableGetEnumerator
@@ -17478,6 +18579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIndexOf10.cmd_2497]
 RelativePath=CoreMangLib\cti\system\string\StringIndexOf10\StringIndexOf10.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIndexOf10
@@ -17485,6 +18587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringInsert.cmd_2498]
 RelativePath=CoreMangLib\cti\system\string\StringInsert\StringInsert.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringInsert
@@ -17492,6 +18595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringIsNullOrEmpty.cmd_2499]
 RelativePath=CoreMangLib\cti\system\string\StringIsNullOrEmpty\StringIsNullOrEmpty.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringIsNullOrEmpty
@@ -17499,6 +18603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringJoin.cmd_2500]
 RelativePath=CoreMangLib\cti\system\string\StringJoin\StringJoin.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringJoin
@@ -17506,6 +18611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringJoin1.cmd_2501]
 RelativePath=CoreMangLib\cti\system\string\StringJoin1\StringJoin1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringJoin1
@@ -17513,6 +18619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringJoin2.cmd_2502]
 RelativePath=CoreMangLib\cti\system\string\StringJoin2\StringJoin2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringJoin2
@@ -17520,6 +18627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringLength.cmd_2503]
 RelativePath=CoreMangLib\cti\system\string\StringLength\StringLength.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringLength
@@ -17527,6 +18635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringPadLeft.cmd_2504]
 RelativePath=CoreMangLib\cti\system\string\StringPadLeft\StringPadLeft.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringPadLeft
@@ -17534,6 +18643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringPadLeft1.cmd_2505]
 RelativePath=CoreMangLib\cti\system\string\StringPadLeft1\StringPadLeft1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringPadLeft1
@@ -17541,6 +18651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringPadLeft2.cmd_2506]
 RelativePath=CoreMangLib\cti\system\string\StringPadLeft2\StringPadLeft2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringPadLeft2
@@ -17548,6 +18659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringPadRight.cmd_2507]
 RelativePath=CoreMangLib\cti\system\string\StringPadRight\StringPadRight.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringPadRight
@@ -17555,6 +18667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringPadRight1.cmd_2508]
 RelativePath=CoreMangLib\cti\system\string\StringPadRight1\StringPadRight1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringPadRight1
@@ -17562,6 +18675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringPadRight2.cmd_2509]
 RelativePath=CoreMangLib\cti\system\string\StringPadRight2\StringPadRight2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringPadRight2
@@ -17569,6 +18683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringRemove1.cmd_2510]
 RelativePath=CoreMangLib\cti\system\string\StringRemove1\StringRemove1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringRemove1
@@ -17576,6 +18691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringRemove2.cmd_2511]
 RelativePath=CoreMangLib\cti\system\string\StringRemove2\StringRemove2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringRemove2
@@ -17583,6 +18699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringReplace1.cmd_2512]
 RelativePath=CoreMangLib\cti\system\string\StringReplace1\StringReplace1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringReplace1
@@ -17590,6 +18707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringReplace2.cmd_2513]
 RelativePath=CoreMangLib\cti\system\string\StringReplace2\StringReplace2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringReplace2
@@ -17597,6 +18715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringSplit1.cmd_2514]
 RelativePath=CoreMangLib\cti\system\string\StringSplit1\StringSplit1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringSplit1
@@ -17604,6 +18723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringSubString1.cmd_2515]
 RelativePath=CoreMangLib\cti\system\string\StringSubString1\StringSubString1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringSubString1
@@ -17611,6 +18731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringSubString2.cmd_2516]
 RelativePath=CoreMangLib\cti\system\string\StringSubString2\StringSubString2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringSubString2
@@ -17618,6 +18739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringToCharArray.cmd_2517]
 RelativePath=CoreMangLib\cti\system\string\StringToCharArray\StringToCharArray.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringToCharArray
@@ -17625,6 +18747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringToString1.cmd_2518]
 RelativePath=CoreMangLib\cti\system\string\StringToString1\StringToString1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringToString1
@@ -17632,6 +18755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringTrim1.cmd_2519]
 RelativePath=CoreMangLib\cti\system\string\StringTrim1\StringTrim1.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringTrim1
@@ -17639,6 +18763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringTrim1b.cmd_2520]
 RelativePath=CoreMangLib\cti\system\string\StringTrim1b\StringTrim1b.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringTrim1b
@@ -17646,6 +18771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringTrim2.cmd_2521]
 RelativePath=CoreMangLib\cti\system\string\StringTrim2\StringTrim2.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringTrim2
@@ -17653,6 +18779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringTrim3.cmd_2522]
 RelativePath=CoreMangLib\cti\system\string\StringTrim3\StringTrim3.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringTrim3
@@ -17660,6 +18787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringTrim4.cmd_2523]
 RelativePath=CoreMangLib\cti\system\string\StringTrim4\StringTrim4.cmd
 WorkingDir=CoreMangLib\cti\system\string\StringTrim4
@@ -17667,6 +18795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringComparerCtor.cmd_2524]
 RelativePath=CoreMangLib\cti\system\stringcompare\StringComparerCtor\StringComparerCtor.cmd
 WorkingDir=CoreMangLib\cti\system\stringcompare\StringComparerCtor
@@ -17674,6 +18803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringComparerCompare2.cmd_2525]
 RelativePath=CoreMangLib\cti\system\stringcomparer\StringComparerCompare2\StringComparerCompare2.cmd
 WorkingDir=CoreMangLib\cti\system\stringcomparer\StringComparerCompare2
@@ -17681,6 +18811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringComparerEquals1.cmd_2526]
 RelativePath=CoreMangLib\cti\system\stringcomparer\StringComparerEquals1\StringComparerEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\stringcomparer\StringComparerEquals1
@@ -17688,6 +18819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringComparerEquals3.cmd_2527]
 RelativePath=CoreMangLib\cti\system\stringcomparer\StringComparerEquals3\StringComparerEquals3.cmd
 WorkingDir=CoreMangLib\cti\system\stringcomparer\StringComparerEquals3
@@ -17695,6 +18827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringComparerGetType.cmd_2528]
 RelativePath=CoreMangLib\cti\system\stringcomparer\StringComparerGetType\StringComparerGetType.cmd
 WorkingDir=CoreMangLib\cti\system\stringcomparer\StringComparerGetType
@@ -17702,6 +18835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringComparisonCurrentCulture.cmd_2529]
 RelativePath=CoreMangLib\cti\system\stringcomparison\StringComparisonCurrentCulture\StringComparisonCurrentCulture.cmd
 WorkingDir=CoreMangLib\cti\system\stringcomparison\StringComparisonCurrentCulture
@@ -17709,6 +18843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringComparisonCurrentCultureIgnoreCase.cmd_2530]
 RelativePath=CoreMangLib\cti\system\stringcomparison\StringComparisonCurrentCultureIgnoreCase\StringComparisonCurrentCultureIgnoreCase.cmd
 WorkingDir=CoreMangLib\cti\system\stringcomparison\StringComparisonCurrentCultureIgnoreCase
@@ -17716,6 +18851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringComparisonOrdinal.cmd_2531]
 RelativePath=CoreMangLib\cti\system\stringcomparison\StringComparisonOrdinal\StringComparisonOrdinal.cmd
 WorkingDir=CoreMangLib\cti\system\stringcomparison\StringComparisonOrdinal
@@ -17723,6 +18859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringComparisonOrdinalIgnoreCase.cmd_2532]
 RelativePath=CoreMangLib\cti\system\stringcomparison\StringComparisonOrdinalIgnoreCase\StringComparisonOrdinalIgnoreCase.cmd
 WorkingDir=CoreMangLib\cti\system\stringcomparison\StringComparisonOrdinalIgnoreCase
@@ -17730,6 +18867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [SZArrayHelperSetItem.cmd_2533]
 RelativePath=CoreMangLib\cti\system\szarrayhelper\SZArrayHelperSetItem\SZArrayHelperSetItem.cmd
 WorkingDir=CoreMangLib\cti\system\szarrayhelper\SZArrayHelperSetItem
@@ -17737,6 +18875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecoderCtor.cmd_2534]
 RelativePath=CoreMangLib\cti\system\text\decoder\DecoderCtor\DecoderCtor.cmd
 WorkingDir=CoreMangLib\cti\system\text\decoder\DecoderCtor
@@ -17744,6 +18883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DecoderReset.cmd_2535]
 RelativePath=CoreMangLib\cti\system\text\decoder\DecoderReset\DecoderReset.cmd
 WorkingDir=CoreMangLib\cti\system\text\decoder\DecoderReset
@@ -17751,6 +18891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncoderCtor.cmd_2536]
 RelativePath=CoreMangLib\cti\system\text\encoder\EncoderCtor\EncoderCtor.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoder\EncoderCtor
@@ -17758,6 +18899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingBigEndianUnicode.cmd_2537]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingBigEndianUnicode\EncodingBigEndianUnicode.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingBigEndianUnicode
@@ -17765,6 +18907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingClone.cmd_2538]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingClone\EncodingClone.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingClone
@@ -17772,6 +18915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingConvert1.cmd_2539]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingConvert1\EncodingConvert1.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingConvert1
@@ -17779,6 +18923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingConvert2.cmd_2540]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingConvert2\EncodingConvert2.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingConvert2
@@ -17786,6 +18931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingCtor1.cmd_2541]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingCtor1\EncodingCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingCtor1
@@ -17793,6 +18939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingEquals.cmd_2542]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingEquals\EncodingEquals.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingEquals
@@ -17800,6 +18947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetByteCount.cmd_2543]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetByteCount\EncodingGetByteCount.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetByteCount
@@ -17807,6 +18955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetByteCount1.cmd_2544]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetByteCount1\EncodingGetByteCount1.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetByteCount1
@@ -17814,6 +18963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetByteCount2.cmd_2545]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetByteCount2\EncodingGetByteCount2.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetByteCount2
@@ -17821,6 +18971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetByteCount3.cmd_2546]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetByteCount3\EncodingGetByteCount3.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetByteCount3
@@ -17828,6 +18979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetBytes1.cmd_2547]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetBytes1\EncodingGetBytes1.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetBytes1
@@ -17835,6 +18987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetBytes2.cmd_2548]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetBytes2\EncodingGetBytes2.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetBytes2
@@ -17842,6 +18995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetBytes3.cmd_2549]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetBytes3\EncodingGetBytes3.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetBytes3
@@ -17849,6 +19003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetBytes4.cmd_2550]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetBytes4\EncodingGetBytes4.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetBytes4
@@ -17856,6 +19011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetBytes5.cmd_2551]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetBytes5\EncodingGetBytes5.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetBytes5
@@ -17863,6 +19019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetCharCount.cmd_2552]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetCharCount\EncodingGetCharCount.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetCharCount
@@ -17870,6 +19027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetCharCount1.cmd_2553]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetCharCount1\EncodingGetCharCount1.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetCharCount1
@@ -17877,6 +19035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetCharCount2.cmd_2554]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetCharCount2\EncodingGetCharCount2.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetCharCount2
@@ -17884,6 +19043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetChars1.cmd_2555]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetChars1\EncodingGetChars1.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetChars1
@@ -17891,6 +19051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetChars2.cmd_2556]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetChars2\EncodingGetChars2.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetChars2
@@ -17898,6 +19059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetChars3.cmd_2557]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetChars3\EncodingGetChars3.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetChars3
@@ -17905,6 +19067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetDecoder.cmd_2558]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetDecoder\EncodingGetDecoder.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetDecoder
@@ -17912,6 +19075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetEncoder.cmd_2559]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetEncoder\EncodingGetEncoder.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetEncoder
@@ -17919,6 +19083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetEncoding2.cmd_2560]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetEncoding2\EncodingGetEncoding2.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetEncoding2
@@ -17926,6 +19091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetMaxByteCount.cmd_2561]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetMaxByteCount\EncodingGetMaxByteCount.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetMaxByteCount
@@ -17933,6 +19099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetMaxCharCount.cmd_2562]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetMaxCharCount\EncodingGetMaxCharCount.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetMaxCharCount
@@ -17940,6 +19107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetPreamble.cmd_2563]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetPreamble\EncodingGetPreamble.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetPreamble
@@ -17947,6 +19115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingGetString.cmd_2564]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingGetString\EncodingGetString.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingGetString
@@ -17954,6 +19123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingUnicode.cmd_2565]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingUnicode\EncodingUnicode.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingUnicode
@@ -17961,6 +19131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingUTF8.cmd_2566]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingUTF8\EncodingUTF8.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingUTF8
@@ -17968,6 +19139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EncodingWebName.cmd_2567]
 RelativePath=CoreMangLib\cti\system\text\encoding\EncodingWebName\EncodingWebName.cmd
 WorkingDir=CoreMangLib\cti\system\text\encoding\EncodingWebName
@@ -17975,6 +19147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend.cmd_2568]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend\StringBuilderAppend.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend
@@ -17982,6 +19155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend1.cmd_2569]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend1\StringBuilderAppend1.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend1
@@ -17989,6 +19163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend10.cmd_2570]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend10\StringBuilderAppend10.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend10
@@ -17996,6 +19171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend11.cmd_2571]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend11\StringBuilderAppend11.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend11
@@ -18003,6 +19179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend12.cmd_2572]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend12\StringBuilderAppend12.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend12
@@ -18010,6 +19187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend13.cmd_2573]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend13\StringBuilderAppend13.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend13
@@ -18017,6 +19195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend14.cmd_2574]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend14\StringBuilderAppend14.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend14
@@ -18024,6 +19203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend15.cmd_2575]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend15\StringBuilderAppend15.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend15
@@ -18031,6 +19211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend16.cmd_2576]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend16\StringBuilderAppend16.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend16
@@ -18038,6 +19219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend17.cmd_2577]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend17\StringBuilderAppend17.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend17
@@ -18045,6 +19227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend18.cmd_2578]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend18\StringBuilderAppend18.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend18
@@ -18052,6 +19235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend19.cmd_2579]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend19\StringBuilderAppend19.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend19
@@ -18059,6 +19243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend2.cmd_2580]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend2\StringBuilderAppend2.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend2
@@ -18066,6 +19251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend3.cmd_2581]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend3\StringBuilderAppend3.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend3
@@ -18073,6 +19259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend4.cmd_2582]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend4\StringBuilderAppend4.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend4
@@ -18080,6 +19267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend5.cmd_2583]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend5\StringBuilderAppend5.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend5
@@ -18087,6 +19275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend6.cmd_2584]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend6\StringBuilderAppend6.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend6
@@ -18094,6 +19283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend7.cmd_2585]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend7\StringBuilderAppend7.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend7
@@ -18101,6 +19291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend8.cmd_2586]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend8\StringBuilderAppend8.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend8
@@ -18108,6 +19299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderAppend9.cmd_2587]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend9\StringBuilderAppend9.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderAppend9
@@ -18115,6 +19307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderCapacity.cmd_2588]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderCapacity\StringBuilderCapacity.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderCapacity
@@ -18122,6 +19315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderCapacity_cti.cmd_2589]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderCapacity_cti\StringBuilderCapacity_cti.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderCapacity_cti
@@ -18129,6 +19323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderChars.cmd_2590]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderChars\StringBuilderChars.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderChars
@@ -18136,6 +19331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderctor1.cmd_2591]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor1\StringBuilderctor1.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor1
@@ -18143,6 +19339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderctor2.cmd_2592]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor2\StringBuilderctor2.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor2
@@ -18150,6 +19347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderctor3.cmd_2593]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor3\StringBuilderctor3.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor3
@@ -18157,6 +19355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderctor4.cmd_2594]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor4\StringBuilderctor4.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor4
@@ -18164,6 +19363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderctor5.cmd_2595]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor5\StringBuilderctor5.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor5
@@ -18171,6 +19371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderctor6.cmd_2596]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor6\StringBuilderctor6.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderctor6
@@ -18178,6 +19379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderInsert.cmd_2597]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderInsert\StringBuilderInsert.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderInsert
@@ -18185,6 +19387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderInsert3.cmd_2598]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderInsert3\StringBuilderInsert3.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderInsert3
@@ -18192,6 +19395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderInsert4.cmd_2599]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderInsert4\StringBuilderInsert4.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderInsert4
@@ -18199,6 +19403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderLength.cmd_2600]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderLength\StringBuilderLength.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderLength
@@ -18206,6 +19411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderLength_cti.cmd_2601]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderLength_cti\StringBuilderLength_cti.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderLength_cti
@@ -18213,6 +19419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderRemove.cmd_2602]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderRemove\StringBuilderRemove.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderRemove
@@ -18220,6 +19427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderReplace1.cmd_2603]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderReplace1\StringBuilderReplace1.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderReplace1
@@ -18227,6 +19435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderReplace2.cmd_2604]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderReplace2\StringBuilderReplace2.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderReplace2
@@ -18234,6 +19443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderReplace3.cmd_2605]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderReplace3\StringBuilderReplace3.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderReplace3
@@ -18241,6 +19451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderReplace4.cmd_2606]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderReplace4\StringBuilderReplace4.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderReplace4
@@ -18248,6 +19459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderToString1.cmd_2607]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderToString1\StringBuilderToString1.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderToString1
@@ -18255,6 +19467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StringBuilderToString2.cmd_2608]
 RelativePath=CoreMangLib\cti\system\text\stringbuilder\StringBuilderToString2\StringBuilderToString2.cmd
 WorkingDir=CoreMangLib\cti\system\text\stringbuilder\StringBuilderToString2
@@ -18262,6 +19475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingCtor1.cmd_2609]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingCtor1\UnicodeEncodingCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingCtor1
@@ -18269,6 +19483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingEquals.cmd_2610]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingEquals\UnicodeEncodingEquals.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingEquals
@@ -18276,6 +19491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetByteCount1.cmd_2611]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetByteCount1\UnicodeEncodingGetByteCount1.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetByteCount1
@@ -18283,6 +19499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetByteCount2.cmd_2612]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetByteCount2\UnicodeEncodingGetByteCount2.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetByteCount2
@@ -18290,6 +19507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetBytes2.cmd_2613]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetBytes2\UnicodeEncodingGetBytes2.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetBytes2
@@ -18297,6 +19515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetCharCount.cmd_2614]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetCharCount\UnicodeEncodingGetCharCount.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetCharCount
@@ -18304,6 +19523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetChars.cmd_2615]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetChars\UnicodeEncodingGetChars.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetChars
@@ -18311,6 +19531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetDecoder.cmd_2616]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetDecoder\UnicodeEncodingGetDecoder.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetDecoder
@@ -18318,6 +19539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetEncoder.cmd_2617]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetEncoder\UnicodeEncodingGetEncoder.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetEncoder
@@ -18325,6 +19547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetHashCode.cmd_2618]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetHashCode\UnicodeEncodingGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetHashCode
@@ -18332,6 +19555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetMaxByteCount.cmd_2619]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetMaxByteCount\UnicodeEncodingGetMaxByteCount.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetMaxByteCount
@@ -18339,6 +19563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetMaxCharCount.cmd_2620]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetMaxCharCount\UnicodeEncodingGetMaxCharCount.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetMaxCharCount
@@ -18346,6 +19571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetPreamble.cmd_2621]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetPreamble\UnicodeEncodingGetPreamble.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetPreamble
@@ -18353,6 +19579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UnicodeEncodingGetString.cmd_2622]
 RelativePath=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetString\UnicodeEncodingGetString.cmd
 WorkingDir=CoreMangLib\cti\system\text\unicodeencoding\UnicodeEncodingGetString
@@ -18360,6 +19587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingCtor.cmd_2623]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingCtor\UTF8EncodingCtor.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingCtor
@@ -18367,6 +19595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingCtor2.cmd_2624]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingCtor2\UTF8EncodingCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingCtor2
@@ -18374,6 +19603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingCtor3.cmd_2625]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingCtor3\UTF8EncodingCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingCtor3
@@ -18381,6 +19611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingEquals.cmd_2626]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingEquals\UTF8EncodingEquals.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingEquals
@@ -18388,6 +19619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetByteCount1.cmd_2627]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetByteCount1\UTF8EncodingGetByteCount1.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetByteCount1
@@ -18395,6 +19627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetByteCount2.cmd_2628]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetByteCount2\UTF8EncodingGetByteCount2.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetByteCount2
@@ -18402,6 +19635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetBytes1.cmd_2629]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetBytes1\UTF8EncodingGetBytes1.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetBytes1
@@ -18409,6 +19643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetBytes2.cmd_2630]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetBytes2\UTF8EncodingGetBytes2.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetBytes2
@@ -18416,6 +19651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetCharCount.cmd_2631]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetCharCount\UTF8EncodingGetCharCount.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetCharCount
@@ -18423,6 +19659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetChars.cmd_2632]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetChars\UTF8EncodingGetChars.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetChars
@@ -18430,6 +19667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetDecoder.cmd_2633]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetDecoder\UTF8EncodingGetDecoder.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetDecoder
@@ -18437,6 +19675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetEncoder.cmd_2634]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetEncoder\UTF8EncodingGetEncoder.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetEncoder
@@ -18444,6 +19683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetHashCode.cmd_2635]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetHashCode\UTF8EncodingGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetHashCode
@@ -18451,6 +19691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetMaxByteCount.cmd_2636]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetMaxByteCount\UTF8EncodingGetMaxByteCount.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetMaxByteCount
@@ -18458,6 +19699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetMaxCharCount.cmd_2637]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetMaxCharCount\UTF8EncodingGetMaxCharCount.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetMaxCharCount
@@ -18465,6 +19707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetPreamble.cmd_2638]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetPreamble\UTF8EncodingGetPreamble.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetPreamble
@@ -18472,6 +19715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UTF8EncodingGetString.cmd_2639]
 RelativePath=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetString\UTF8EncodingGetString.cmd
 WorkingDir=CoreMangLib\cti\system\text\utf8encoding\UTF8EncodingGetString
@@ -18479,6 +19723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AutoResetEventCtor.cmd_2640]
 RelativePath=CoreMangLib\cti\system\threading\autoresetevent\AutoResetEventCtor\AutoResetEventCtor.cmd
 WorkingDir=CoreMangLib\cti\system\threading\autoresetevent\AutoResetEventCtor
@@ -18486,6 +19731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AutoResetEventReSet.cmd_2641]
 RelativePath=CoreMangLib\cti\system\threading\autoresetevent\AutoResetEventReSet\AutoResetEventReSet.cmd
 WorkingDir=CoreMangLib\cti\system\threading\autoresetevent\AutoResetEventReSet
@@ -18493,6 +19739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AutoResetEventSet.cmd_2642]
 RelativePath=CoreMangLib\cti\system\threading\autoresetevent\AutoResetEventSet\AutoResetEventSet.cmd
 WorkingDir=CoreMangLib\cti\system\threading\autoresetevent\AutoResetEventSet
@@ -18500,6 +19747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedAdd1.cmd_2643]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedAdd1\InterlockedAdd1.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedAdd1
@@ -18507,6 +19755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedAdd2.cmd_2644]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedAdd2\InterlockedAdd2.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedAdd2
@@ -18514,6 +19763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedCompareExchange1.cmd_2645]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedCompareExchange1\InterlockedCompareExchange1.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedCompareExchange1
@@ -18521,6 +19771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedCompareExchange5.cmd_2646]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedCompareExchange5\InterlockedCompareExchange5.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedCompareExchange5
@@ -18528,6 +19779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedCompareExchange6.cmd_2647]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedCompareExchange6\InterlockedCompareExchange6.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedCompareExchange6
@@ -18535,6 +19787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedCompareExchange7.cmd_2648]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedCompareExchange7\InterlockedCompareExchange7.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedCompareExchange7
@@ -18542,6 +19795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedDecrement1.cmd_2649]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedDecrement1\InterlockedDecrement1.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedDecrement1
@@ -18549,6 +19803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedDecrement2.cmd_2650]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedDecrement2\InterlockedDecrement2.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedDecrement2
@@ -18556,6 +19811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedExchange1.cmd_2651]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedExchange1\InterlockedExchange1.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedExchange1
@@ -18563,6 +19819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedExchange5.cmd_2652]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedExchange5\InterlockedExchange5.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedExchange5
@@ -18570,6 +19827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedExchange6.cmd_2653]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedExchange6\InterlockedExchange6.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedExchange6
@@ -18577,6 +19835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedExchange7.cmd_2654]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedExchange7\InterlockedExchange7.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedExchange7
@@ -18584,6 +19843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedIncrement1.cmd_2655]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedIncrement1\InterlockedIncrement1.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedIncrement1
@@ -18591,6 +19851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockedIncrement2.cmd_2656]
 RelativePath=CoreMangLib\cti\system\threading\interlocked\InterlockedIncrement2\InterlockedIncrement2.cmd
 WorkingDir=CoreMangLib\cti\system\threading\interlocked\InterlockedIncrement2
@@ -18598,6 +19859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ManualResetEventCtor.cmd_2657]
 RelativePath=CoreMangLib\cti\system\threading\manualresetevent\ManualResetEventCtor\ManualResetEventCtor.cmd
 WorkingDir=CoreMangLib\cti\system\threading\manualresetevent\ManualResetEventCtor
@@ -18605,6 +19867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeOutInfinite.cmd_2658]
 RelativePath=CoreMangLib\cti\system\threading\timeout\TimeOutInfinite\TimeOutInfinite.cmd
 WorkingDir=CoreMangLib\cti\system\threading\timeout\TimeOutInfinite
@@ -18612,6 +19875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [WaitHandleCtor.cmd_2659]
 RelativePath=CoreMangLib\cti\system\threading\waithandle\WaitHandleCtor\WaitHandleCtor.cmd
 WorkingDir=CoreMangLib\cti\system\threading\waithandle\WaitHandleCtor
@@ -18619,6 +19883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [WaitHandleDispose1.cmd_2660]
 RelativePath=CoreMangLib\cti\system\threading\waithandle\WaitHandleDispose1\WaitHandleDispose1.cmd
 WorkingDir=CoreMangLib\cti\system\threading\waithandle\WaitHandleDispose1
@@ -18626,6 +19891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [WaitHandleDispose3.cmd_2661]
 RelativePath=CoreMangLib\cti\system\threading\waithandle\WaitHandleDispose3\WaitHandleDispose3.cmd
 WorkingDir=CoreMangLib\cti\system\threading\waithandle\WaitHandleDispose3
@@ -18633,6 +19899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeoutExceptionCtor1.cmd_2662]
 RelativePath=CoreMangLib\cti\system\timeoutexception\TimeoutExceptionCtor1\TimeoutExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\timeoutexception\TimeoutExceptionCtor1
@@ -18640,6 +19907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeoutExceptionCtor2.cmd_2663]
 RelativePath=CoreMangLib\cti\system\timeoutexception\TimeoutExceptionCtor2\TimeoutExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\timeoutexception\TimeoutExceptionCtor2
@@ -18647,6 +19915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeoutExceptionCtor3.cmd_2664]
 RelativePath=CoreMangLib\cti\system\timeoutexception\TimeoutExceptionCtor3\TimeoutExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\timeoutexception\TimeoutExceptionCtor3
@@ -18654,6 +19923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanAdd.cmd_2665]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanAdd\TimeSpanAdd.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanAdd
@@ -18661,6 +19931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanCompare1.cmd_2666]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanCompare1\TimeSpanCompare1.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanCompare1
@@ -18668,6 +19939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanCompareTo2.cmd_2667]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanCompareTo2\TimeSpanCompareTo2.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanCompareTo2
@@ -18675,6 +19947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanCtor1.cmd_2668]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanCtor1\TimeSpanCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanCtor1
@@ -18682,6 +19955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanCtor2.cmd_2669]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanCtor2\TimeSpanCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanCtor2
@@ -18689,6 +19963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanCtor3.cmd_2670]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanCtor3\TimeSpanCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanCtor3
@@ -18696,6 +19971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanCtor4.cmd_2671]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanCtor4\TimeSpanCtor4.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanCtor4
@@ -18703,6 +19979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanDuration.cmd_2672]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanDuration\TimeSpanDuration.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanDuration
@@ -18710,6 +19987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanEquals1.cmd_2673]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanEquals1\TimeSpanEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanEquals1
@@ -18717,6 +19995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanEquals2.cmd_2674]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanEquals2\TimeSpanEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanEquals2
@@ -18724,6 +20003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanEquals3.cmd_2675]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanEquals3\TimeSpanEquals3.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanEquals3
@@ -18731,6 +20011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanFromTicks.cmd_2676]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanFromTicks\TimeSpanFromTicks.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanFromTicks
@@ -18738,6 +20019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanGetHashCode.cmd_2677]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanGetHashCode\TimeSpanGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanGetHashCode
@@ -18745,6 +20027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanMaxValue.cmd_2678]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanMaxValue\TimeSpanMaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanMaxValue
@@ -18752,6 +20035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanMinValue.cmd_2679]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanMinValue\TimeSpanMinValue.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanMinValue
@@ -18759,6 +20043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanNegate.cmd_2680]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanNegate\TimeSpanNegate.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanNegate
@@ -18766,6 +20051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanTicks.cmd_2681]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanTicks\TimeSpanTicks.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanTicks
@@ -18773,6 +20059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanTicksPerDay.cmd_2682]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanTicksPerDay\TimeSpanTicksPerDay.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanTicksPerDay
@@ -18780,6 +20067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanTicksPerHour.cmd_2683]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanTicksPerHour\TimeSpanTicksPerHour.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanTicksPerHour
@@ -18787,6 +20075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanTicksPerMinute.cmd_2684]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanTicksPerMinute\TimeSpanTicksPerMinute.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanTicksPerMinute
@@ -18794,6 +20083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanTicksPerSecond.cmd_2685]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanTicksPerSecond\TimeSpanTicksPerSecond.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanTicksPerSecond
@@ -18801,6 +20091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanToString_str.cmd_2686]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanToString_str\TimeSpanToString_str.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanToString_str
@@ -18808,6 +20099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanTotalDays.cmd_2687]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanTotalDays\TimeSpanTotalDays.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanTotalDays
@@ -18815,6 +20107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanTotalHours.cmd_2688]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanTotalHours\TimeSpanTotalHours.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanTotalHours
@@ -18822,6 +20115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanTotalMilliseconds.cmd_2689]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanTotalMilliseconds\TimeSpanTotalMilliseconds.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanTotalMilliseconds
@@ -18829,6 +20123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanTotalMinutes.cmd_2690]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanTotalMinutes\TimeSpanTotalMinutes.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanTotalMinutes
@@ -18836,6 +20131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanTotalSeconds.cmd_2691]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanTotalSeconds\TimeSpanTotalSeconds.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanTotalSeconds
@@ -18843,6 +20139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TimeSpanZero.cmd_2692]
 RelativePath=CoreMangLib\cti\system\timespan\TimeSpanZero\TimeSpanZero.cmd
 WorkingDir=CoreMangLib\cti\system\timespan\TimeSpanZero
@@ -18850,6 +20147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeEquals1.cmd_2693]
 RelativePath=CoreMangLib\cti\system\type\TypeEquals1\TypeEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeEquals1
@@ -18857,6 +20155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeEquals2.cmd_2694]
 RelativePath=CoreMangLib\cti\system\type\TypeEquals2\TypeEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeEquals2
@@ -18864,6 +20163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeGetArrayRank.cmd_2695]
 RelativePath=CoreMangLib\cti\system\type\TypeGetArrayRank\TypeGetArrayRank.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeGetArrayRank
@@ -18871,6 +20171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeGetElementType.cmd_2696]
 RelativePath=CoreMangLib\cti\system\type\TypeGetElementType\TypeGetElementType.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeGetElementType
@@ -18878,6 +20179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeGetGenericTypeDefinition.cmd_2697]
 RelativePath=CoreMangLib\cti\system\type\TypeGetGenericTypeDefinition\TypeGetGenericTypeDefinition.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeGetGenericTypeDefinition
@@ -18885,6 +20187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeGetHashCode.cmd_2698]
 RelativePath=CoreMangLib\cti\system\type\TypeGetHashCode\TypeGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeGetHashCode
@@ -18892,6 +20195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeGetType1.cmd_2699]
 RelativePath=CoreMangLib\cti\system\type\TypeGetType1\TypeGetType1.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeGetType1
@@ -18899,6 +20203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeGetType2.cmd_2700]
 RelativePath=CoreMangLib\cti\system\type\TypeGetType2\TypeGetType2.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeGetType2
@@ -18906,6 +20211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeGetTypeFromHandle.cmd_2701]
 RelativePath=CoreMangLib\cti\system\type\TypeGetTypeFromHandle\TypeGetTypeFromHandle.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeGetTypeFromHandle
@@ -18913,6 +20219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeHasElementTypeImpl.cmd_2702]
 RelativePath=CoreMangLib\cti\system\type\TypeHasElementTypeImpl\TypeHasElementTypeImpl.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeHasElementTypeImpl
@@ -18920,6 +20227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeIsByRefImpl.cmd_2703]
 RelativePath=CoreMangLib\cti\system\type\TypeIsByRefImpl\TypeIsByRefImpl.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeIsByRefImpl
@@ -18927,6 +20235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeIsPointerImpl.cmd_2704]
 RelativePath=CoreMangLib\cti\system\type\TypeIsPointerImpl\TypeIsPointerImpl.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeIsPointerImpl
@@ -18934,6 +20243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeMakeArrayType1.cmd_2705]
 RelativePath=CoreMangLib\cti\system\type\TypeMakeArrayType1\TypeMakeArrayType1.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeMakeArrayType1
@@ -18941,6 +20251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeMakeArrayType2.cmd_2706]
 RelativePath=CoreMangLib\cti\system\type\TypeMakeArrayType2\TypeMakeArrayType2.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeMakeArrayType2
@@ -18948,6 +20259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeMakeByRefType.cmd_2707]
 RelativePath=CoreMangLib\cti\system\type\TypeMakeByRefType\TypeMakeByRefType.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeMakeByRefType
@@ -18955,6 +20267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeMakePointerType.cmd_2708]
 RelativePath=CoreMangLib\cti\system\type\TypeMakePointerType\TypeMakePointerType.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeMakePointerType
@@ -18962,6 +20275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeToString.cmd_2709]
 RelativePath=CoreMangLib\cti\system\type\TypeToString\TypeToString.cmd
 WorkingDir=CoreMangLib\cti\system\type\TypeToString
@@ -18969,6 +20283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeBoolean.cmd_2710]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeBoolean\TypeCodeBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeBoolean
@@ -18976,6 +20291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeByte.cmd_2711]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeByte\TypeCodeByte.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeByte
@@ -18983,6 +20299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeChar.cmd_2712]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeChar\TypeCodeChar.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeChar
@@ -18990,6 +20307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeDateTime.cmd_2713]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeDateTime\TypeCodeDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeDateTime
@@ -18997,6 +20315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeDecimal.cmd_2714]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeDecimal\TypeCodeDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeDecimal
@@ -19004,6 +20323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeDouble.cmd_2715]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeDouble\TypeCodeDouble.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeDouble
@@ -19011,6 +20331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeEmpty.cmd_2716]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeEmpty\TypeCodeEmpty.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeEmpty
@@ -19018,6 +20339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeInt16.cmd_2717]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeInt16\TypeCodeInt16.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeInt16
@@ -19025,6 +20347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeInt32.cmd_2718]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeInt32\TypeCodeInt32.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeInt32
@@ -19032,6 +20355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeInt64.cmd_2719]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeInt64\TypeCodeInt64.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeInt64
@@ -19039,6 +20363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeObject.cmd_2720]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeObject\TypeCodeObject.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeObject
@@ -19046,6 +20371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeSByte.cmd_2721]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeSByte\TypeCodeSByte.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeSByte
@@ -19053,6 +20379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeSingle.cmd_2722]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeSingle\TypeCodeSingle.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeSingle
@@ -19060,6 +20387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeString.cmd_2723]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeString\TypeCodeString.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeString
@@ -19067,6 +20395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeUInt16.cmd_2724]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeUInt16\TypeCodeUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeUInt16
@@ -19074,6 +20403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeUInt32.cmd_2725]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeUInt32\TypeCodeUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeUInt32
@@ -19081,6 +20411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeCodeUInt64.cmd_2726]
 RelativePath=CoreMangLib\cti\system\typecode\TypeCodeUInt64\TypeCodeUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\typecode\TypeCodeUInt64
@@ -19088,6 +20419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeLoadExceptionCtor1.cmd_2727]
 RelativePath=CoreMangLib\cti\system\typeloadexception\TypeLoadExceptionCtor1\TypeLoadExceptionCtor1.cmd
 WorkingDir=CoreMangLib\cti\system\typeloadexception\TypeLoadExceptionCtor1
@@ -19095,6 +20427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeLoadExceptionCtor2.cmd_2728]
 RelativePath=CoreMangLib\cti\system\typeloadexception\TypeLoadExceptionCtor2\TypeLoadExceptionCtor2.cmd
 WorkingDir=CoreMangLib\cti\system\typeloadexception\TypeLoadExceptionCtor2
@@ -19102,6 +20435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeLoadExceptionCtor3.cmd_2729]
 RelativePath=CoreMangLib\cti\system\typeloadexception\TypeLoadExceptionCtor3\TypeLoadExceptionCtor3.cmd
 WorkingDir=CoreMangLib\cti\system\typeloadexception\TypeLoadExceptionCtor3
@@ -19109,6 +20443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TypeLoadExceptionMessage.cmd_2730]
 RelativePath=CoreMangLib\cti\system\typeloadexception\TypeLoadExceptionMessage\TypeLoadExceptionMessage.cmd
 WorkingDir=CoreMangLib\cti\system\typeloadexception\TypeLoadExceptionMessage
@@ -19116,6 +20451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16CompareTo1.cmd_2731]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16CompareTo1\UInt16CompareTo1.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16CompareTo1
@@ -19123,6 +20459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16Equals1.cmd_2732]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16Equals1\UInt16Equals1.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16Equals1
@@ -19130,6 +20467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16Equals2.cmd_2733]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16Equals2\UInt16Equals2.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16Equals2
@@ -19137,6 +20475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToBoolean.cmd_2734]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToBoolean\UInt16IConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToBoolean
@@ -19144,6 +20483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToByte.cmd_2735]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToByte\UInt16IConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToByte
@@ -19151,6 +20491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToChar.cmd_2736]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToChar\UInt16IConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToChar
@@ -19158,6 +20499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToDateTime.cmd_2737]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToDateTime\UInt16IConvertibleToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToDateTime
@@ -19165,6 +20507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToDecimal.cmd_2738]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToDecimal\UInt16IConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToDecimal
@@ -19172,6 +20515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToDouble.cmd_2739]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToDouble\UInt16IConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToDouble
@@ -19179,6 +20523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToInt16.cmd_2740]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToInt16\UInt16IConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToInt16
@@ -19186,6 +20531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToInt32.cmd_2741]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToInt32\UInt16IConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToInt32
@@ -19193,6 +20539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToInt64.cmd_2742]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToInt64\UInt16IConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToInt64
@@ -19200,6 +20547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToSByte.cmd_2743]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToSByte\UInt16IConvertibleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToSByte
@@ -19207,6 +20555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToSingle.cmd_2744]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToSingle\UInt16IConvertibleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToSingle
@@ -19214,6 +20563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToType.cmd_2745]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToType\UInt16IConvertibleToType.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToType
@@ -19221,6 +20571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToUInt16.cmd_2746]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToUInt16\UInt16IConvertibleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToUInt16
@@ -19228,6 +20579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToUInt32.cmd_2747]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToUInt32\UInt16IConvertibleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToUInt32
@@ -19235,6 +20587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16IConvertibleToUInt64.cmd_2748]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16IConvertibleToUInt64\UInt16IConvertibleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16IConvertibleToUInt64
@@ -19242,6 +20595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16Parse1.cmd_2749]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16Parse1\UInt16Parse1.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16Parse1
@@ -19249,6 +20603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16Parse2.cmd_2750]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16Parse2\UInt16Parse2.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16Parse2
@@ -19256,6 +20611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16Parse3.cmd_2751]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16Parse3\UInt16Parse3.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16Parse3
@@ -19263,6 +20619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16ToString3.cmd_2752]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16ToString3\UInt16ToString3.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16ToString3
@@ -19270,6 +20627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16ToString4.cmd_2753]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16ToString4\UInt16ToString4.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16ToString4
@@ -19277,6 +20635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt16TryParse.cmd_2754]
 RelativePath=CoreMangLib\cti\system\uint16\UInt16TryParse\UInt16TryParse.cmd
 WorkingDir=CoreMangLib\cti\system\uint16\UInt16TryParse
@@ -19284,6 +20643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32CompareTo2.cmd_2755]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32CompareTo2\UInt32CompareTo2.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32CompareTo2
@@ -19291,6 +20651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32Equals1.cmd_2756]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32Equals1\UInt32Equals1.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32Equals1
@@ -19298,6 +20659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32Equals2.cmd_2757]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32Equals2\UInt32Equals2.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32Equals2
@@ -19305,6 +20667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32GetHashCode.cmd_2758]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32GetHashCode\UInt32GetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32GetHashCode
@@ -19312,6 +20675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToBoolean.cmd_2759]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToBoolean\UInt32IConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToBoolean
@@ -19319,6 +20683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToByte.cmd_2760]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToByte\UInt32IConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToByte
@@ -19326,6 +20691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToChar.cmd_2761]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToChar\UInt32IConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToChar
@@ -19333,6 +20699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToDecimal.cmd_2762]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToDecimal\UInt32IConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToDecimal
@@ -19340,6 +20707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToDouble.cmd_2763]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToDouble\UInt32IConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToDouble
@@ -19347,6 +20715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToInt16.cmd_2764]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToInt16\UInt32IConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToInt16
@@ -19354,6 +20723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToInt32.cmd_2765]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToInt32\UInt32IConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToInt32
@@ -19361,6 +20731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToInt64.cmd_2766]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToInt64\UInt32IConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToInt64
@@ -19368,6 +20739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToSByte.cmd_2767]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToSByte\UInt32IConvertibleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToSByte
@@ -19375,6 +20747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToSingle.cmd_2768]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToSingle\UInt32IConvertibleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToSingle
@@ -19382,6 +20755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToType.cmd_2769]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToType\UInt32IConvertibleToType.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToType
@@ -19389,6 +20763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToUInt16.cmd_2770]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToUInt16\UInt32IConvertibleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToUInt16
@@ -19396,6 +20771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToUInt32.cmd_2771]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToUInt32\UInt32IConvertibleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToUInt32
@@ -19403,6 +20779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32IConvertibleToUInt64.cmd_2772]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32IConvertibleToUInt64\UInt32IConvertibleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32IConvertibleToUInt64
@@ -19410,6 +20787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32MaxValue.cmd_2773]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32MaxValue\UInt32MaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32MaxValue
@@ -19417,6 +20795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32MinValue.cmd_2774]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32MinValue\UInt32MinValue.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32MinValue
@@ -19424,6 +20803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32Parse1.cmd_2775]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32Parse1\UInt32Parse1.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32Parse1
@@ -19431,6 +20811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32Parse2.cmd_2776]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32Parse2\UInt32Parse2.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32Parse2
@@ -19438,6 +20819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32Parse3.cmd_2777]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32Parse3\UInt32Parse3.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32Parse3
@@ -19445,6 +20827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32ToString2.cmd_2778]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32ToString2\UInt32ToString2.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32ToString2
@@ -19452,6 +20835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt32TryParse.cmd_2779]
 RelativePath=CoreMangLib\cti\system\uint32\UInt32TryParse\UInt32TryParse.cmd
 WorkingDir=CoreMangLib\cti\system\uint32\UInt32TryParse
@@ -19459,6 +20843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64GetHashCode.cmd_2780]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64GetHashCode\UInt64GetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64GetHashCode
@@ -19466,6 +20851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToBoolean.cmd_2781]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToBoolean\UInt64IConvertibleToBoolean.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToBoolean
@@ -19473,6 +20859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToByte.cmd_2782]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToByte\UInt64IConvertibleToByte.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToByte
@@ -19480,6 +20867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToChar.cmd_2783]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToChar\UInt64IConvertibleToChar.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToChar
@@ -19487,6 +20875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToDateTime.cmd_2784]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToDateTime\UInt64IConvertibleToDateTime.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToDateTime
@@ -19494,6 +20883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToDecimal.cmd_2785]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToDecimal\UInt64IConvertibleToDecimal.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToDecimal
@@ -19501,6 +20891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToDouble.cmd_2786]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToDouble\UInt64IConvertibleToDouble.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToDouble
@@ -19508,6 +20899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToInt16.cmd_2787]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToInt16\UInt64IConvertibleToInt16.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToInt16
@@ -19515,6 +20907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToInt32.cmd_2788]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToInt32\UInt64IConvertibleToInt32.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToInt32
@@ -19522,6 +20915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToInt64.cmd_2789]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToInt64\UInt64IConvertibleToInt64.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToInt64
@@ -19529,6 +20923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToSByte.cmd_2790]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToSByte\UInt64IConvertibleToSByte.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToSByte
@@ -19536,6 +20931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToSingle.cmd_2791]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToSingle\UInt64IConvertibleToSingle.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToSingle
@@ -19543,6 +20939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToType.cmd_2792]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToType\UInt64IConvertibleToType.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToType
@@ -19550,6 +20947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToUInt16.cmd_2793]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToUInt16\UInt64IConvertibleToUInt16.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToUInt16
@@ -19557,6 +20955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToUInt32.cmd_2794]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToUInt32\UInt64IConvertibleToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToUInt32
@@ -19564,6 +20963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64IConvertibleToUInt64.cmd_2795]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64IConvertibleToUInt64\UInt64IConvertibleToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64IConvertibleToUInt64
@@ -19571,6 +20971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64MaxValue.cmd_2796]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64MaxValue\UInt64MaxValue.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64MaxValue
@@ -19578,6 +20979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64MinValue.cmd_2797]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64MinValue\UInt64MinValue.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64MinValue
@@ -19585,6 +20987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64Parse1.cmd_2798]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64Parse1\UInt64Parse1.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64Parse1
@@ -19592,6 +20995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64Parse2.cmd_2799]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64Parse2\UInt64Parse2.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64Parse2
@@ -19599,6 +21003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64Parse3.cmd_2800]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64Parse3\UInt64Parse3.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64Parse3
@@ -19606,6 +21011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64ToString2.cmd_2801]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64ToString2\UInt64ToString2.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64ToString2
@@ -19613,6 +21019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UInt64TryParse.cmd_2802]
 RelativePath=CoreMangLib\cti\system\uint64\UInt64TryParse\UInt64TryParse.cmd
 WorkingDir=CoreMangLib\cti\system\uint64\UInt64TryParse
@@ -19620,6 +21027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UIntPtrCtor_UInt32.cmd_2803]
 RelativePath=CoreMangLib\cti\system\uintptr\UIntPtrCtor_UInt32\UIntPtrCtor_UInt32.cmd
 WorkingDir=CoreMangLib\cti\system\uintptr\UIntPtrCtor_UInt32
@@ -19627,6 +21035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UIntPtrCtor_UInt64.cmd_2804]
 RelativePath=CoreMangLib\cti\system\uintptr\UIntPtrCtor_UInt64\UIntPtrCtor_UInt64.cmd
 WorkingDir=CoreMangLib\cti\system\uintptr\UIntPtrCtor_UInt64
@@ -19634,6 +21043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UIntPtrCtor_VoidPtr.cmd_2805]
 RelativePath=CoreMangLib\cti\system\uintptr\UIntPtrCtor_VoidPtr\UIntPtrCtor_VoidPtr.cmd
 WorkingDir=CoreMangLib\cti\system\uintptr\UIntPtrCtor_VoidPtr
@@ -19641,6 +21051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UIntPtrEquals.cmd_2806]
 RelativePath=CoreMangLib\cti\system\uintptr\UIntPtrEquals\UIntPtrEquals.cmd
 WorkingDir=CoreMangLib\cti\system\uintptr\UIntPtrEquals
@@ -19648,6 +21059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UIntPtrGetHashCode.cmd_2807]
 RelativePath=CoreMangLib\cti\system\uintptr\UIntPtrGetHashCode\UIntPtrGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\uintptr\UIntPtrGetHashCode
@@ -19655,6 +21067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UIntPtrSize.cmd_2808]
 RelativePath=CoreMangLib\cti\system\uintptr\UIntPtrSize\UIntPtrSize.cmd
 WorkingDir=CoreMangLib\cti\system\uintptr\UIntPtrSize
@@ -19662,6 +21075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UIntPtrToPointer.cmd_2809]
 RelativePath=CoreMangLib\cti\system\uintptr\UIntPtrToPointer\UIntPtrToPointer.cmd
 WorkingDir=CoreMangLib\cti\system\uintptr\UIntPtrToPointer
@@ -19669,6 +21083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UIntPtrToString.cmd_2810]
 RelativePath=CoreMangLib\cti\system\uintptr\UIntPtrToString\UIntPtrToString.cmd
 WorkingDir=CoreMangLib\cti\system\uintptr\UIntPtrToString
@@ -19676,6 +21091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UIntPtrToUInt32.cmd_2811]
 RelativePath=CoreMangLib\cti\system\uintptr\UIntPtrToUInt32\UIntPtrToUInt32.cmd
 WorkingDir=CoreMangLib\cti\system\uintptr\UIntPtrToUInt32
@@ -19683,6 +21099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UIntPtrToUInt64.cmd_2812]
 RelativePath=CoreMangLib\cti\system\uintptr\UIntPtrToUInt64\UIntPtrToUInt64.cmd
 WorkingDir=CoreMangLib\cti\system\uintptr\UIntPtrToUInt64
@@ -19690,6 +21107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [UIntPtrZero.cmd_2813]
 RelativePath=CoreMangLib\cti\system\uintptr\UIntPtrZero\UIntPtrZero.cmd
 WorkingDir=CoreMangLib\cti\system\uintptr\UIntPtrZero
@@ -19697,6 +21115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ValueTypeEquals.cmd_2814]
 RelativePath=CoreMangLib\cti\system\valuetype\ValueTypeEquals\ValueTypeEquals.cmd
 WorkingDir=CoreMangLib\cti\system\valuetype\ValueTypeEquals
@@ -19704,6 +21123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ValueTypeEquals2.cmd_2815]
 RelativePath=CoreMangLib\cti\system\valuetype\ValueTypeEquals2\ValueTypeEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\valuetype\ValueTypeEquals2
@@ -19711,6 +21131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [VersionBuild.cmd_2816]
 RelativePath=CoreMangLib\cti\system\version\VersionBuild\VersionBuild.cmd
 WorkingDir=CoreMangLib\cti\system\version\VersionBuild
@@ -19718,6 +21139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [VersionCompareTo2.cmd_2817]
 RelativePath=CoreMangLib\cti\system\version\VersionCompareTo2\VersionCompareTo2.cmd
 WorkingDir=CoreMangLib\cti\system\version\VersionCompareTo2
@@ -19725,6 +21147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [VersionCtor4.cmd_2818]
 RelativePath=CoreMangLib\cti\system\version\VersionCtor4\VersionCtor4.cmd
 WorkingDir=CoreMangLib\cti\system\version\VersionCtor4
@@ -19732,6 +21155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [VersionEquals1.cmd_2819]
 RelativePath=CoreMangLib\cti\system\version\VersionEquals1\VersionEquals1.cmd
 WorkingDir=CoreMangLib\cti\system\version\VersionEquals1
@@ -19739,6 +21163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [VersionEquals2.cmd_2820]
 RelativePath=CoreMangLib\cti\system\version\VersionEquals2\VersionEquals2.cmd
 WorkingDir=CoreMangLib\cti\system\version\VersionEquals2
@@ -19746,6 +21171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [VersionGetHashCode.cmd_2821]
 RelativePath=CoreMangLib\cti\system\version\VersionGetHashCode\VersionGetHashCode.cmd
 WorkingDir=CoreMangLib\cti\system\version\VersionGetHashCode
@@ -19753,6 +21179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [VersionMajor.cmd_2822]
 RelativePath=CoreMangLib\cti\system\version\VersionMajor\VersionMajor.cmd
 WorkingDir=CoreMangLib\cti\system\version\VersionMajor
@@ -19760,6 +21187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [VersionRevision.cmd_2823]
 RelativePath=CoreMangLib\cti\system\version\VersionRevision\VersionRevision.cmd
 WorkingDir=CoreMangLib\cti\system\version\VersionRevision
@@ -19767,6 +21195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [VersionToString1.cmd_2824]
 RelativePath=CoreMangLib\cti\system\version\VersionToString1\VersionToString1.cmd
 WorkingDir=CoreMangLib\cti\system\version\VersionToString1
@@ -19774,6 +21203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [VersionToString2.cmd_2825]
 RelativePath=CoreMangLib\cti\system\version\VersionToString2\VersionToString2.cmd
 WorkingDir=CoreMangLib\cti\system\version\VersionToString2
@@ -19781,6 +21211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [WeakReferenceCtor1_PSC.cmd_2826]
 RelativePath=CoreMangLib\cti\system\weakreference\WeakReferenceCtor1_PSC\WeakReferenceCtor1_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\weakreference\WeakReferenceCtor1_PSC
@@ -19788,6 +21219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [WeakReferenceCtor2b_PSC.cmd_2827]
 RelativePath=CoreMangLib\cti\system\weakreference\WeakReferenceCtor2b_PSC\WeakReferenceCtor2b_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\weakreference\WeakReferenceCtor2b_PSC
@@ -19795,6 +21227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [WeakReferenceCtor2_PSC.cmd_2828]
 RelativePath=CoreMangLib\cti\system\weakreference\WeakReferenceCtor2_PSC\WeakReferenceCtor2_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\weakreference\WeakReferenceCtor2_PSC
@@ -19802,6 +21235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [WeakReferenceIsAliveb_PSC.cmd_2829]
 RelativePath=CoreMangLib\cti\system\weakreference\WeakReferenceIsAliveb_PSC\WeakReferenceIsAliveb_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\weakreference\WeakReferenceIsAliveb_PSC
@@ -19809,6 +21243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [WeakReferenceIsAlive_PSC.cmd_2830]
 RelativePath=CoreMangLib\cti\system\weakreference\WeakReferenceIsAlive_PSC\WeakReferenceIsAlive_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\weakreference\WeakReferenceIsAlive_PSC
@@ -19816,6 +21251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [WeakReferenceTargetb_PSC.cmd_2831]
 RelativePath=CoreMangLib\cti\system\weakreference\WeakReferenceTargetb_PSC\WeakReferenceTargetb_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\weakreference\WeakReferenceTargetb_PSC
@@ -19823,6 +21259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [WeakReferenceTrackResurrection_cti_PSC.cmd_2832]
 RelativePath=CoreMangLib\cti\system\weakreference\WeakReferenceTrackResurrection_cti_PSC\WeakReferenceTrackResurrection_cti_PSC.cmd
 WorkingDir=CoreMangLib\cti\system\weakreference\WeakReferenceTrackResurrection_cti_PSC
@@ -19830,6 +21267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ASURT_99893.cmd_2833]
 RelativePath=CoreMangLib\system\buffer\ASURT_99893\ASURT_99893.cmd
 WorkingDir=CoreMangLib\system\buffer\ASURT_99893
@@ -19837,6 +21275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Regression_Dev10_609271.cmd_2834]
 RelativePath=CoreMangLib\system\collections\generic\hashset\Regression_Dev10_609271\Regression_Dev10_609271.cmd
 WorkingDir=CoreMangLib\system\collections\generic\hashset\Regression_Dev10_609271
@@ -19844,6 +21283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Regression_Dev10_624201.cmd_2835]
 RelativePath=CoreMangLib\system\collections\generic\hashset\Regression_Dev10_624201\Regression_Dev10_624201.cmd
 WorkingDir=CoreMangLib\system\collections\generic\hashset\Regression_Dev10_624201
@@ -19851,13 +21291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
-[Co7510ParseExact_formatarray.cmd_2836]
-RelativePath=CoreMangLib\system\datetime\Co7510ParseExact_formatarray\Co7510ParseExact_formatarray.cmd
-WorkingDir=CoreMangLib\system\datetime\Co7510ParseExact_formatarray
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
+
 [NegativeGenerics.cmd_2837]
 RelativePath=CoreMangLib\system\delegate\generics\NegativeGenerics\NegativeGenerics.cmd
 WorkingDir=CoreMangLib\system\delegate\generics\NegativeGenerics
@@ -19865,6 +21299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [NG_Standard.cmd_2838]
 RelativePath=CoreMangLib\system\delegate\generics\NG_Standard\NG_Standard.cmd
 WorkingDir=CoreMangLib\system\delegate\generics\NG_Standard
@@ -19872,13 +21307,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [ClosedStatic.cmd_2839]
 RelativePath=CoreMangLib\system\delegate\miscellaneous\ClosedStatic\ClosedStatic.cmd
 WorkingDir=CoreMangLib\system\delegate\miscellaneous\ClosedStatic
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Co6010DelegateEqualsTwo.cmd_2840]
 RelativePath=CoreMangLib\system\delegate\miscellaneous\Co6010DelegateEqualsTwo\Co6010DelegateEqualsTwo.cmd
 WorkingDir=CoreMangLib\system\delegate\miscellaneous\Co6010DelegateEqualsTwo
@@ -19886,6 +21323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Co6031GetHashCode.cmd_2841]
 RelativePath=CoreMangLib\system\delegate\miscellaneous\Co6031GetHashCode\Co6031GetHashCode.cmd
 WorkingDir=CoreMangLib\system\delegate\miscellaneous\Co6031GetHashCode
@@ -19893,6 +21331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DDB113347.cmd_2842]
 RelativePath=CoreMangLib\system\delegate\regressions\devdivbugs\113347\DDB113347\DDB113347.cmd
 WorkingDir=CoreMangLib\system\delegate\regressions\devdivbugs\113347\DDB113347
@@ -19900,13 +21339,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [OpenDelegate.cmd_2843]
 RelativePath=CoreMangLib\system\delegate\VSD\OpenDelegate\OpenDelegate.cmd
 WorkingDir=CoreMangLib\system\delegate\VSD\OpenDelegate
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Guid_Parsing.cmd_2844]
 RelativePath=CoreMangLib\system\guid\Guid_Parsing\Guid_Parsing.cmd
 WorkingDir=CoreMangLib\system\guid\Guid_Parsing
@@ -19914,6 +21355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [LazyTTF.cmd_2845]
 RelativePath=CoreMangLib\system\lazyt\LazyTTF\LazyTTF.cmd
 WorkingDir=CoreMangLib\system\lazyt\LazyTTF
@@ -19921,13 +21363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
-[Shift_Jis.cmd_2846]
-RelativePath=CoreMangLib\system\text\encoding\Shift_Jis\Shift_Jis.cmd
-WorkingDir=CoreMangLib\system\text\encoding\Shift_Jis
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
-HostStyle=0
+
 [Version_Parsing.cmd_2847]
 RelativePath=CoreMangLib\system\version\Version_Parsing\Version_Parsing.cmd
 WorkingDir=CoreMangLib\system\version\Version_Parsing
@@ -19935,4276 +21371,4879 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Finalizer.cmd_2848]
 RelativePath=Exceptions\Finalization\Finalizer\Finalizer.cmd
 WorkingDir=Exceptions\Finalization\Finalizer
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AddMemoryPressureTest.cmd_2849]
 RelativePath=GC\API\GC\AddMemoryPressureTest\AddMemoryPressureTest.cmd
 WorkingDir=GC\API\GC\AddMemoryPressureTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AddThresholdTest.cmd_2850]
 RelativePath=GC\API\GC\AddThresholdTest\AddThresholdTest.cmd
 WorkingDir=GC\API\GC\AddThresholdTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AddUsageTest.cmd_2851]
 RelativePath=GC\API\GC\AddUsageTest\AddUsageTest.cmd
 WorkingDir=GC\API\GC\AddUsageTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect.cmd_2852]
 RelativePath=GC\API\GC\Collect\Collect.cmd
 WorkingDir=GC\API\GC\Collect
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect0.cmd_2853]
 RelativePath=GC\API\GC\Collect0\Collect0.cmd
 WorkingDir=GC\API\GC\Collect0
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect1.cmd_2854]
 RelativePath=GC\API\GC\Collect1\Collect1.cmd
 WorkingDir=GC\API\GC\Collect1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CollectionCountTest.cmd_2855]
 RelativePath=GC\API\GC\CollectionCountTest\CollectionCountTest.cmd
 WorkingDir=GC\API\GC\CollectionCountTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect_Default_1.cmd_2856]
 RelativePath=GC\API\GC\Collect_Default_1\Collect_Default_1.cmd
 WorkingDir=GC\API\GC\Collect_Default_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect_Default_2.cmd_2857]
 RelativePath=GC\API\GC\Collect_Default_2\Collect_Default_2.cmd
 WorkingDir=GC\API\GC\Collect_Default_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect_Default_3.cmd_2858]
 RelativePath=GC\API\GC\Collect_Default_3\Collect_Default_3.cmd
 WorkingDir=GC\API\GC\Collect_Default_3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect_fail.cmd_2859]
 RelativePath=GC\API\GC\Collect_fail\Collect_fail.cmd
 WorkingDir=GC\API\GC\Collect_fail
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect_Forced_1.cmd_2860]
 RelativePath=GC\API\GC\Collect_Forced_1\Collect_Forced_1.cmd
 WorkingDir=GC\API\GC\Collect_Forced_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect_Forced_2.cmd_2861]
 RelativePath=GC\API\GC\Collect_Forced_2\Collect_Forced_2.cmd
 WorkingDir=GC\API\GC\Collect_Forced_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect_Forced_3.cmd_2862]
 RelativePath=GC\API\GC\Collect_Forced_3\Collect_Forced_3.cmd
 WorkingDir=GC\API\GC\Collect_Forced_3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect_neg.cmd_2863]
 RelativePath=GC\API\GC\Collect_neg\Collect_neg.cmd
 WorkingDir=GC\API\GC\Collect_neg
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect_Optimized_1.cmd_2864]
 RelativePath=GC\API\GC\Collect_Optimized_1\Collect_Optimized_1.cmd
 WorkingDir=GC\API\GC\Collect_Optimized_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect_Optimized_2.cmd_2865]
 RelativePath=GC\API\GC\Collect_Optimized_2\Collect_Optimized_2.cmd
 WorkingDir=GC\API\GC\Collect_Optimized_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Collect_Optimized_3.cmd_2866]
 RelativePath=GC\API\GC\Collect_Optimized_3\Collect_Optimized_3.cmd
 WorkingDir=GC\API\GC\Collect_Optimized_3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Finalize.cmd_2867]
 RelativePath=GC\API\GC\Finalize\Finalize.cmd
 WorkingDir=GC\API\GC\Finalize
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GetGeneration.cmd_2868]
 RelativePath=GC\API\GC\GetGeneration\GetGeneration.cmd
 WorkingDir=GC\API\GC\GetGeneration
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GetGeneration_box.cmd_2871]
 RelativePath=GC\API\GC\GetGeneration_box\GetGeneration_box.cmd
 WorkingDir=GC\API\GC\GetGeneration_box
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GetGeneration_fail.cmd_2872]
 RelativePath=GC\API\GC\GetGeneration_fail\GetGeneration_fail.cmd
 WorkingDir=GC\API\GC\GetGeneration_fail
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GetTotalMemory.cmd_2873]
 RelativePath=GC\API\GC\GetTotalMemory\GetTotalMemory.cmd
 WorkingDir=GC\API\GC\GetTotalMemory
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [KeepAlive.cmd_2874]
 RelativePath=GC\API\GC\KeepAlive\KeepAlive.cmd
 WorkingDir=GC\API\GC\KeepAlive
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [KeepAliveNull.cmd_2875]
 RelativePath=GC\API\GC\KeepAliveNull\KeepAliveNull.cmd
 WorkingDir=GC\API\GC\KeepAliveNull
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [KeepAliveRecur.cmd_2876]
 RelativePath=GC\API\GC\KeepAliveRecur\KeepAliveRecur.cmd
 WorkingDir=GC\API\GC\KeepAliveRecur
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MaxGeneration.cmd_2877]
 RelativePath=GC\API\GC\MaxGeneration\MaxGeneration.cmd
 WorkingDir=GC\API\GC\MaxGeneration
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RemoveMemoryPressureTest.cmd_2878]
 RelativePath=GC\API\GC\RemoveMemoryPressureTest\RemoveMemoryPressureTest.cmd
 WorkingDir=GC\API\GC\RemoveMemoryPressureTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RemoveUsageTest.cmd_2879]
 RelativePath=GC\API\GC\RemoveUsageTest\RemoveUsageTest.cmd
 WorkingDir=GC\API\GC\RemoveUsageTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ReRegisterForFinalize.cmd_2880]
 RelativePath=GC\API\GC\ReRegisterForFinalize\ReRegisterForFinalize.cmd
 WorkingDir=GC\API\GC\ReRegisterForFinalize
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ReRegisterForFinalize_null.cmd_2881]
 RelativePath=GC\API\GC\ReRegisterForFinalize_null\ReRegisterForFinalize_null.cmd
 WorkingDir=GC\API\GC\ReRegisterForFinalize_null
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [SuppressFinalize.cmd_2882]
 RelativePath=GC\API\GC\SuppressFinalize\SuppressFinalize.cmd
 WorkingDir=GC\API\GC\SuppressFinalize
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [SuppressFinalize_Null.cmd_2883]
 RelativePath=GC\API\GC\SuppressFinalize_Null\SuppressFinalize_Null.cmd
 WorkingDir=GC\API\GC\SuppressFinalize_Null
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TotalMemory.cmd_2884]
 RelativePath=GC\API\GC\TotalMemory\TotalMemory.cmd
 WorkingDir=GC\API\GC\TotalMemory
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TotalMemory2.cmd_2885]
 RelativePath=GC\API\GC\TotalMemory2\TotalMemory2.cmd
 WorkingDir=GC\API\GC\TotalMemory2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AddrOfPinnedObject.cmd_2886]
 RelativePath=GC\API\GCHandle\AddrOfPinnedObject\AddrOfPinnedObject.cmd
 WorkingDir=GC\API\GCHandle\AddrOfPinnedObject
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AddrOfPinnedObject_neg.cmd_2887]
 RelativePath=GC\API\GCHandle\AddrOfPinnedObject_neg\AddrOfPinnedObject_neg.cmd
 WorkingDir=GC\API\GCHandle\AddrOfPinnedObject_neg
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Alloc.cmd_2888]
 RelativePath=GC\API\GCHandle\Alloc\Alloc.cmd
 WorkingDir=GC\API\GCHandle\Alloc
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Alloc_neg.cmd_2889]
 RelativePath=GC\API\GCHandle\Alloc_neg\Alloc_neg.cmd
 WorkingDir=GC\API\GCHandle\Alloc_neg
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Alloc_neg2.cmd_2890]
 RelativePath=GC\API\GCHandle\Alloc_neg2\Alloc_neg2.cmd
 WorkingDir=GC\API\GCHandle\Alloc_neg2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Casting.cmd_2891]
 RelativePath=GC\API\GCHandle\Casting\Casting.cmd
 WorkingDir=GC\API\GCHandle\Casting
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Equality.cmd_2892]
 RelativePath=GC\API\GCHandle\Equality\Equality.cmd
 WorkingDir=GC\API\GCHandle\Equality
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Free.cmd_2893]
 RelativePath=GC\API\GCHandle\Free\Free.cmd
 WorkingDir=GC\API\GCHandle\Free
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Free_neg.cmd_2894]
 RelativePath=GC\API\GCHandle\Free_neg\Free_neg.cmd
 WorkingDir=GC\API\GCHandle\Free_neg
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HandleCopy.cmd_2895]
 RelativePath=GC\API\GCHandle\HandleCopy\HandleCopy.cmd
 WorkingDir=GC\API\GCHandle\HandleCopy
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [IsAllocated.cmd_2896]
 RelativePath=GC\API\GCHandle\IsAllocated\IsAllocated.cmd
 WorkingDir=GC\API\GCHandle\IsAllocated
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Normal.cmd_2897]
 RelativePath=GC\API\GCHandle\Normal\Normal.cmd
 WorkingDir=GC\API\GCHandle\Normal
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Pinned.cmd_2898]
 RelativePath=GC\API\GCHandle\Pinned\Pinned.cmd
 WorkingDir=GC\API\GCHandle\Pinned
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [PinObj_neg.cmd_2899]
 RelativePath=GC\API\GCHandle\PinObj_neg\PinObj_neg.cmd
 WorkingDir=GC\API\GCHandle\PinObj_neg
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Target.cmd_2900]
 RelativePath=GC\API\GCHandle\Target\Target.cmd
 WorkingDir=GC\API\GCHandle\Target
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Target_neg.cmd_2901]
 RelativePath=GC\API\GCHandle\Target_neg\Target_neg.cmd
 WorkingDir=GC\API\GCHandle\Target_neg
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ToFromIntPtr.cmd_2902]
 RelativePath=GC\API\GCHandle\ToFromIntPtr\ToFromIntPtr.cmd
 WorkingDir=GC\API\GCHandle\ToFromIntPtr
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Weak.cmd_2903]
 RelativePath=GC\API\GCHandle\Weak\Weak.cmd
 WorkingDir=GC\API\GCHandle\Weak
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Count.cmd_2904]
 RelativePath=GC\API\GCHandleCollector\Count\Count.cmd
 WorkingDir=GC\API\GCHandleCollector\Count
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CtorsAndProperties.cmd_2905]
 RelativePath=GC\API\GCHandleCollector\CtorsAndProperties\CtorsAndProperties.cmd
 WorkingDir=GC\API\GCHandleCollector\CtorsAndProperties
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NegTests.cmd_2906]
 RelativePath=GC\API\GCHandleCollector\NegTests\NegTests.cmd
 WorkingDir=GC\API\GCHandleCollector\NegTests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Usage.cmd_2907]
 RelativePath=GC\API\GCHandleCollector\Usage\Usage.cmd
 WorkingDir=GC\API\GCHandleCollector\Usage
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [InputValidation.cmd_2908]
 RelativePath=GC\API\GCSettings\InputValidation\InputValidation.cmd
 WorkingDir=GC\API\GCSettings\InputValidation
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Finalize.cmd_2909]
 RelativePath=GC\API\WeakReference\Finalize\Finalize.cmd
 WorkingDir=GC\API\WeakReference\Finalize
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Finalize2.cmd_2910]
 RelativePath=GC\API\WeakReference\Finalize2\Finalize2.cmd
 WorkingDir=GC\API\WeakReference\Finalize2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [IsAlive.cmd_2911]
 RelativePath=GC\API\WeakReference\IsAlive\IsAlive.cmd
 WorkingDir=GC\API\WeakReference\IsAlive
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [IsAlive_neg.cmd_2912]
 RelativePath=GC\API\WeakReference\IsAlive_neg\IsAlive_neg.cmd
 WorkingDir=GC\API\WeakReference\IsAlive_neg
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [multipleWRs.cmd_2913]
 RelativePath=GC\API\WeakReference\multipleWRs\multipleWRs.cmd
 WorkingDir=GC\API\WeakReference\multipleWRs
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [multipleWRs_1.cmd_2914]
 RelativePath=GC\API\WeakReference\multipleWRs_1\multipleWRs_1.cmd
 WorkingDir=GC\API\WeakReference\multipleWRs_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NullHandle.cmd_2915]
 RelativePath=GC\API\WeakReference\NullHandle\NullHandle.cmd
 WorkingDir=GC\API\WeakReference\NullHandle
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Target.cmd_2916]
 RelativePath=GC\API\WeakReference\Target\Target.cmd
 WorkingDir=GC\API\WeakReference\Target
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TrackResurrection.cmd_2917]
 RelativePath=GC\API\WeakReference\TrackResurrection\TrackResurrection.cmd
 WorkingDir=GC\API\WeakReference\TrackResurrection
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [delete_next_card_table.cmd_2919]
 RelativePath=GC\Coverage\delete_next_card_table\delete_next_card_table.cmd
 WorkingDir=GC\Coverage\delete_next_card_table
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
+
 [LargeObjectAlloc.cmd_2920]
 RelativePath=GC\Coverage\LargeObjectAlloc\LargeObjectAlloc.cmd
 WorkingDir=GC\Coverage\LargeObjectAlloc
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS;
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [LargeObjectAlloc2.cmd_2921]
 RelativePath=GC\Coverage\LargeObjectAlloc2\LargeObjectAlloc2.cmd
 WorkingDir=GC\Coverage\LargeObjectAlloc2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [concurrentspin2.cmd_2923]
 RelativePath=GC\Features\BackgroundGC\concurrentspin2\concurrentspin2.cmd
 WorkingDir=GC\Features\BackgroundGC\concurrentspin2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
+
 [finalizeio.cmd_2925]
 RelativePath=GC\Features\Finalizer\finalizeio\finalizeio\finalizeio.cmd
 WorkingDir=GC\Features\Finalizer\finalizeio\finalizeio
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [finalizearray.cmd_2926]
 RelativePath=GC\Features\Finalizer\finalizeother\finalizearray\finalizearray.cmd
 WorkingDir=GC\Features\Finalizer\finalizeother\finalizearray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [finalizearraysleep.cmd_2927]
 RelativePath=GC\Features\Finalizer\finalizeother\finalizearraysleep\finalizearraysleep.cmd
 WorkingDir=GC\Features\Finalizer\finalizeother\finalizearraysleep
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [finalizedest.cmd_2928]
 RelativePath=GC\Features\Finalizer\finalizeother\finalizedest\finalizedest.cmd
 WorkingDir=GC\Features\Finalizer\finalizeother\finalizedest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [finalizeexcep.cmd_2929]
 RelativePath=GC\Features\Finalizer\finalizeother\finalizeexcep\finalizeexcep.cmd
 WorkingDir=GC\Features\Finalizer\finalizeother\finalizeexcep
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [finalizeinherit.cmd_2930]
 RelativePath=GC\Features\Finalizer\finalizeother\finalizeinherit\finalizeinherit.cmd
 WorkingDir=GC\Features\Finalizer\finalizeother\finalizeinherit
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [finalizenested.cmd_2931]
 RelativePath=GC\Features\Finalizer\finalizeother\finalizenested\finalizenested.cmd
 WorkingDir=GC\Features\Finalizer\finalizeother\finalizenested
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [bestfit.cmd_2932]
 RelativePath=GC\Features\HeapExpansion\bestfit\bestfit.cmd
 WorkingDir=GC\Features\HeapExpansion\bestfit
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [bestfit-finalize.cmd_2933]
 RelativePath=GC\Features\HeapExpansion\bestfit-finalize\bestfit-finalize.cmd
 WorkingDir=GC\Features\HeapExpansion\bestfit-finalize
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [bestfit-threaded.cmd_2934]
 RelativePath=GC\Features\HeapExpansion\bestfit-threaded\bestfit-threaded.cmd
 WorkingDir=GC\Features\HeapExpansion\bestfit-threaded
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [bestfit_1.cmd_2935]
 RelativePath=GC\Features\HeapExpansion\bestfit_1\bestfit_1.cmd
 WorkingDir=GC\Features\HeapExpansion\bestfit_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [expandheap.cmd_2936]
 RelativePath=GC\Features\HeapExpansion\expandheap\expandheap.cmd
 WorkingDir=GC\Features\HeapExpansion\expandheap
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [Finalizer.cmd_2937]
 RelativePath=GC\Features\HeapExpansion\Finalizer\Finalizer.cmd
 WorkingDir=GC\Features\HeapExpansion\Finalizer
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Handles.cmd_2938]
 RelativePath=GC\Features\HeapExpansion\Handles\Handles.cmd
 WorkingDir=GC\Features\HeapExpansion\Handles
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [plug.cmd_2939]
 RelativePath=GC\Features\HeapExpansion\plug\plug.cmd
 WorkingDir=GC\Features\HeapExpansion\plug
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
+
 [pluggaps.cmd_2940]
 RelativePath=GC\Features\HeapExpansion\pluggaps\pluggaps.cmd
 WorkingDir=GC\Features\HeapExpansion\pluggaps
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [keepalivearray.cmd_2941]
 RelativePath=GC\Features\KeepAlive\keepaliveother\keepalivearray\keepalivearray.cmd
 WorkingDir=GC\Features\KeepAlive\keepaliveother\keepalivearray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [keepalivedirectedgraph.cmd_2942]
 RelativePath=GC\Features\KeepAlive\keepaliveother\keepalivedirectedgraph\keepalivedirectedgraph.cmd
 WorkingDir=GC\Features\KeepAlive\keepaliveother\keepalivedirectedgraph
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [keepalivefinalize.cmd_2943]
 RelativePath=GC\Features\KeepAlive\keepaliveother\keepalivefinalize\keepalivefinalize.cmd
 WorkingDir=GC\Features\KeepAlive\keepaliveother\keepalivefinalize
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [keepalivehandle.cmd_2944]
 RelativePath=GC\Features\KeepAlive\keepaliveother\keepalivehandle\keepalivehandle.cmd
 WorkingDir=GC\Features\KeepAlive\keepaliveother\keepalivehandle
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [keepalivescope.cmd_2945]
 RelativePath=GC\Features\KeepAlive\keepaliveother\keepalivescope\keepalivescope.cmd
 WorkingDir=GC\Features\KeepAlive\keepaliveother\keepalivescope
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [keepalivetry.cmd_2946]
 RelativePath=GC\Features\KeepAlive\keepaliveother\keepalivetry\keepalivetry.cmd
 WorkingDir=GC\Features\KeepAlive\keepaliveother\keepalivetry
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [keepalivetypes.cmd_2947]
 RelativePath=GC\Features\KeepAlive\keepaliveother\keepalivetypes\keepalivetypes.cmd
 WorkingDir=GC\Features\KeepAlive\keepaliveother\keepalivetypes
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [lohcompactapi.cmd_2948]
 RelativePath=GC\Features\LOHCompaction\lohcompactapi\lohcompactapi.cmd
 WorkingDir=GC\Features\LOHCompaction\lohcompactapi
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;UNSTABLE
+Categories=UNSTABLE;EXPECTED_PASS
 HostStyle=0
+
 [lohcompactapi2.cmd_2949]
 RelativePath=GC\Features\LOHCompaction\lohcompactapi2\lohcompactapi2.cmd
 WorkingDir=GC\Features\LOHCompaction\lohcompactapi2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
+
 [lohcompactapi_exceptions.cmd_2950]
 RelativePath=GC\Features\LOHCompaction\lohcompactapi_exceptions\lohcompactapi_exceptions.cmd
 WorkingDir=GC\Features\LOHCompaction\lohcompactapi_exceptions
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [lohcompactscenariorepro.cmd_2951]
 RelativePath=GC\Features\LOHCompaction\lohcompactscenariorepro\lohcompactscenariorepro.cmd
 WorkingDir=GC\Features\LOHCompaction\lohcompactscenariorepro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
+
 [lohcompact_stress.cmd_2952]
 RelativePath=GC\Features\LOHCompaction\lohcompact_stress\lohcompact_stress.cmd
 WorkingDir=GC\Features\LOHCompaction\lohcompact_stress
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [lohpin.cmd_2953]
 RelativePath=GC\Features\LOHCompaction\lohpin\lohpin.cmd
 WorkingDir=GC\Features\LOHCompaction\lohpin
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [eco1.cmd_2955]
 RelativePath=GC\Features\PartialCompaction\eco1\eco1.cmd
 WorkingDir=GC\Features\PartialCompaction\eco1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
+
 [partialcompactiontest.cmd_2956]
 RelativePath=GC\Features\PartialCompaction\partialcompactiontest\partialcompactiontest.cmd
 WorkingDir=GC\Features\PartialCompaction\partialcompactiontest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
+
 [partialcompactionwloh.cmd_2957]
 RelativePath=GC\Features\PartialCompaction\partialcompactionwloh\partialcompactionwloh.cmd
 WorkingDir=GC\Features\PartialCompaction\partialcompactionwloh
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
+
 [PinnedCollect.cmd_2958]
 RelativePath=GC\Features\Pinning\PinningOther\PinnedCollect\PinnedCollect.cmd
 WorkingDir=GC\Features\Pinning\PinningOther\PinnedCollect
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [PinnedHandle.cmd_2959]
 RelativePath=GC\Features\Pinning\PinningOther\PinnedHandle\PinnedHandle.cmd
 WorkingDir=GC\Features\Pinning\PinningOther\PinnedHandle
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [PinnedInt.cmd_2960]
 RelativePath=GC\Features\Pinning\PinningOther\PinnedInt\PinnedInt.cmd
 WorkingDir=GC\Features\Pinning\PinningOther\PinnedInt
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [PinnedMany.cmd_2961]
 RelativePath=GC\Features\Pinning\PinningOther\PinnedMany\PinnedMany.cmd
 WorkingDir=GC\Features\Pinning\PinningOther\PinnedMany
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [PinnedMultiple.cmd_2962]
 RelativePath=GC\Features\Pinning\PinningOther\PinnedMultiple\PinnedMultiple.cmd
 WorkingDir=GC\Features\Pinning\PinningOther\PinnedMultiple
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [PinnedObject.cmd_2963]
 RelativePath=GC\Features\Pinning\PinningOther\PinnedObject\PinnedObject.cmd
 WorkingDir=GC\Features\Pinning\PinningOther\PinnedObject
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sustainedlowlatency_race.cmd_2965]
 RelativePath=GC\Features\SustainedLowLatency\sustainedlowlatency_race\sustainedlowlatency_race.cmd
 WorkingDir=GC\Features\SustainedLowLatency\sustainedlowlatency_race
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
+
 [sustainedlowlatency_race_reverse.cmd_2966]
 RelativePath=GC\Features\SustainedLowLatency\sustainedlowlatency_race_reverse\sustainedlowlatency_race_reverse.cmd
 WorkingDir=GC\Features\SustainedLowLatency\sustainedlowlatency_race_reverse
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
+
 [largeexceptiontest.cmd_2968]
 RelativePath=GC\LargeMemory\Allocation\largeexceptiontest\largeexceptiontest.cmd
 WorkingDir=GC\LargeMemory\Allocation\largeexceptiontest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [gettotalmemory.cmd_2971]
 RelativePath=GC\LargeMemory\API\gc\gettotalmemory\gettotalmemory.cmd
 WorkingDir=GC\LargeMemory\API\gc\gettotalmemory
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [keepalive.cmd_2972]
 RelativePath=GC\LargeMemory\API\gc\keepalive\keepalive.cmd
 WorkingDir=GC\LargeMemory\API\gc\keepalive
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [suppressfinalize.cmd_2974]
 RelativePath=GC\LargeMemory\API\gc\suppressfinalize\suppressfinalize.cmd
 WorkingDir=GC\LargeMemory\API\gc\suppressfinalize
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [largearraytest.cmd_2975]
 RelativePath=GC\LargeMemory\Regressions\largearraytest\largearraytest.cmd
 WorkingDir=GC\LargeMemory\Regressions\largearraytest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [pressureoverflow.cmd_2976]
 RelativePath=GC\LargeMemory\Regressions\pressureoverflow\pressureoverflow.cmd
 WorkingDir=GC\LargeMemory\Regressions\pressureoverflow
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [149926.cmd_2978]
 RelativePath=GC\Regressions\v2.0-beta1\149926\149926\149926.cmd
 WorkingDir=GC\Regressions\v2.0-beta1\149926\149926
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS;LONG_RUNNING
+Categories=RT;Pri0;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [289745.cmd_2979]
 RelativePath=GC\Regressions\v2.0-beta1\289745\289745\289745.cmd
 WorkingDir=GC\Regressions\v2.0-beta1\289745\289745
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [302560.cmd_2980]
 RelativePath=GC\Regressions\v2.0-beta1\289745\302560\302560.cmd
 WorkingDir=GC\Regressions\v2.0-beta1\289745\302560
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [426480.cmd_2981]
 RelativePath=GC\Regressions\v2.0-beta2\426480\426480\426480.cmd
 WorkingDir=GC\Regressions\v2.0-beta2\426480\426480
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [445488.cmd_2982]
 RelativePath=GC\Regressions\v2.0-beta2\445488\445488\445488.cmd
 WorkingDir=GC\Regressions\v2.0-beta2\445488\445488
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [452950.cmd_2983]
 RelativePath=GC\Regressions\v2.0-beta2\452950\452950\452950.cmd
 WorkingDir=GC\Regressions\v2.0-beta2\452950\452950
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [460373.cmd_2984]
 RelativePath=GC\Regressions\v2.0-beta2\460373\460373\460373.cmd
 WorkingDir=GC\Regressions\v2.0-beta2\460373\460373
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [462651.cmd_2985]
 RelativePath=GC\Regressions\v2.0-beta2\462651\462651\462651.cmd
 WorkingDir=GC\Regressions\v2.0-beta2\462651\462651
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS;LONG_RUNNING
 HostStyle=0
+
 [471729.cmd_2986]
 RelativePath=GC\Regressions\v2.0-beta2\471729\471729\471729.cmd
 WorkingDir=GC\Regressions\v2.0-beta2\471729\471729
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [494226.cmd_2987]
 RelativePath=GC\Regressions\v2.0-rtm\494226\494226\494226.cmd
 WorkingDir=GC\Regressions\v2.0-rtm\494226\494226
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS;LONG_RUNNING
+Categories=RT;Pri0;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [544701.cmd_2988]
 RelativePath=GC\Regressions\v2.0-rtm\544701\544701\544701.cmd
 WorkingDir=GC\Regressions\v2.0-rtm\544701\544701
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [thdtree.cmd_2990]
 RelativePath=GC\Scenarios\BinTree\thdtree\thdtree.cmd
 WorkingDir=GC\Scenarios\BinTree\thdtree
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [thdtreegrowingobj.cmd_2991]
 RelativePath=GC\Scenarios\BinTree\thdtreegrowingobj\thdtreegrowingobj.cmd
 WorkingDir=GC\Scenarios\BinTree\thdtreegrowingobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [thdtreelivingobj.cmd_2992]
 RelativePath=GC\Scenarios\BinTree\thdtreelivingobj\thdtreelivingobj.cmd
 WorkingDir=GC\Scenarios\BinTree\thdtreelivingobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [arrcpy.cmd_2993]
 RelativePath=GC\Scenarios\Boxing\arrcpy\arrcpy.cmd
 WorkingDir=GC\Scenarios\Boxing\arrcpy
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [gcvariant.cmd_2994]
 RelativePath=GC\Scenarios\Boxing\gcvariant\gcvariant.cmd
 WorkingDir=GC\Scenarios\Boxing\gcvariant
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [gcvariant2.cmd_2995]
 RelativePath=GC\Scenarios\Boxing\gcvariant2\gcvariant2.cmd
 WorkingDir=GC\Scenarios\Boxing\gcvariant2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [gcvariant3.cmd_2996]
 RelativePath=GC\Scenarios\Boxing\gcvariant3\gcvariant3.cmd
 WorkingDir=GC\Scenarios\Boxing\gcvariant3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [gcvariant4.cmd_2997]
 RelativePath=GC\Scenarios\Boxing\gcvariant4\gcvariant4.cmd
 WorkingDir=GC\Scenarios\Boxing\gcvariant4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [simpvariant.cmd_2998]
 RelativePath=GC\Scenarios\Boxing\simpvariant\simpvariant.cmd
 WorkingDir=GC\Scenarios\Boxing\simpvariant
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vararystress.cmd_2999]
 RelativePath=GC\Scenarios\Boxing\vararystress\vararystress.cmd
 WorkingDir=GC\Scenarios\Boxing\vararystress
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [variantint.cmd_3000]
 RelativePath=GC\Scenarios\Boxing\variantint\variantint.cmd
 WorkingDir=GC\Scenarios\Boxing\variantint
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [variantlinklist.cmd_3001]
 RelativePath=GC\Scenarios\Boxing\variantlinklist\variantlinklist.cmd
 WorkingDir=GC\Scenarios\Boxing\variantlinklist
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dlbigleak.cmd_3002]
 RelativePath=GC\Scenarios\DoublinkList\dlbigleak\dlbigleak.cmd
 WorkingDir=GC\Scenarios\DoublinkList\dlbigleak
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dlbigleakthd.cmd_3003]
 RelativePath=GC\Scenarios\DoublinkList\dlbigleakthd\dlbigleakthd.cmd
 WorkingDir=GC\Scenarios\DoublinkList\dlbigleakthd
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dlbigleakthd_v2.cmd_3004]
 RelativePath=GC\Scenarios\DoublinkList\dlbigleakthd_v2\dlbigleakthd_v2.cmd
 WorkingDir=GC\Scenarios\DoublinkList\dlbigleakthd_v2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dlcollect.cmd_3005]
 RelativePath=GC\Scenarios\DoublinkList\dlcollect\dlcollect.cmd
 WorkingDir=GC\Scenarios\DoublinkList\dlcollect
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dlstack.cmd_3006]
 RelativePath=GC\Scenarios\DoublinkList\dlstack\dlstack.cmd
 WorkingDir=GC\Scenarios\DoublinkList\dlstack
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [doublinkgen.cmd_3007]
 RelativePath=GC\Scenarios\DoublinkList\doublinkgen\doublinkgen.cmd
 WorkingDir=GC\Scenarios\DoublinkList\doublinkgen
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [doublinknoleak2.cmd_3009]
 RelativePath=GC\Scenarios\DoublinkList\doublinknoleak2\doublinknoleak2.cmd
 WorkingDir=GC\Scenarios\DoublinkList\doublinknoleak2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [doublinkstay.cmd_3010]
 RelativePath=GC\Scenarios\DoublinkList\doublinkstay\doublinkstay.cmd
 WorkingDir=GC\Scenarios\DoublinkList\doublinkstay
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dynamo.cmd_3011]
 RelativePath=GC\Scenarios\Dynamo\dynamo\dynamo.cmd
 WorkingDir=GC\Scenarios\Dynamo\dynamo
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [FinalizeTimeout.cmd_3012]
 RelativePath=GC\Scenarios\FinalizeTimeout\FinalizeTimeout\FinalizeTimeout.cmd
 WorkingDir=GC\Scenarios\FinalizeTimeout\FinalizeTimeout
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_FAIL
+Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [finalnstruct.cmd_3013]
 RelativePath=GC\Scenarios\FinalNStruct\finalnstruct\finalnstruct.cmd
 WorkingDir=GC\Scenarios\FinalNStruct\finalnstruct
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [nstructresur.cmd_3014]
 RelativePath=GC\Scenarios\FinalNStruct\nstructresur\nstructresur.cmd
 WorkingDir=GC\Scenarios\FinalNStruct\nstructresur
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [nstructtun.cmd_3015]
 RelativePath=GC\Scenarios\FinalNStruct\nstructtun\nstructtun.cmd
 WorkingDir=GC\Scenarios\FinalNStruct\nstructtun
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [fragman.cmd_3016]
 RelativePath=GC\Scenarios\FragMan\fragman\fragman.cmd
 WorkingDir=GC\Scenarios\FragMan\fragman
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [gc_base1.cmd_3017]
 RelativePath=GC\Scenarios\GCBase1\gc_base1\gc_base1.cmd
 WorkingDir=GC\Scenarios\GCBase1\gc_base1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [gc_base1_1.cmd_3018]
 RelativePath=GC\Scenarios\GCBase1\gc_base1_1\gc_base1_1.cmd
 WorkingDir=GC\Scenarios\GCBase1\gc_base1_1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [gcbench.cmd_3019]
 RelativePath=GC\Scenarios\GCBench\gcbench\gcbench.cmd
 WorkingDir=GC\Scenarios\GCBench\gcbench
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator.cmd_3020]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator\GCSimulator.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_10.cmd_3021]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_10\GCSimulator_10.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_10
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_100.cmd_3022]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_100\GCSimulator_100.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_100
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_101.cmd_3023]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_101\GCSimulator_101.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_101
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_102.cmd_3024]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_102\GCSimulator_102.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_102
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_103.cmd_3025]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_103\GCSimulator_103.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_103
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_104.cmd_3026]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_104\GCSimulator_104.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_104
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_105.cmd_3027]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_105\GCSimulator_105.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_105
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_106.cmd_3028]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_106\GCSimulator_106.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_106
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_107.cmd_3029]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_107\GCSimulator_107.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_107
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_108.cmd_3030]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_108\GCSimulator_108.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_108
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_109.cmd_3031]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_109\GCSimulator_109.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_109
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_11.cmd_3032]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_11\GCSimulator_11.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_11
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_110.cmd_3033]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_110\GCSimulator_110.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_110
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_111.cmd_3034]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_111\GCSimulator_111.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_111
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_112.cmd_3035]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_112\GCSimulator_112.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_112
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_113.cmd_3036]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_113\GCSimulator_113.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_113
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_114.cmd_3037]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_114\GCSimulator_114.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_114
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_115.cmd_3038]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_115\GCSimulator_115.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_115
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_116.cmd_3039]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_116\GCSimulator_116.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_116
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_117.cmd_3040]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_117\GCSimulator_117.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_117
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_118.cmd_3041]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_118\GCSimulator_118.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_118
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_119.cmd_3042]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_119\GCSimulator_119.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_119
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_12.cmd_3043]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_12\GCSimulator_12.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_12
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_120.cmd_3044]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_120\GCSimulator_120.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_120
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_121.cmd_3045]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_121\GCSimulator_121.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_121
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_122.cmd_3046]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_122\GCSimulator_122.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_122
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_123.cmd_3047]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_123\GCSimulator_123.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_123
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_124.cmd_3048]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_124\GCSimulator_124.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_124
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_125.cmd_3049]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_125\GCSimulator_125.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_125
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_126.cmd_3050]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_126\GCSimulator_126.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_126
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_127.cmd_3051]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_127\GCSimulator_127.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_127
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_128.cmd_3052]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_128\GCSimulator_128.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_128
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_129.cmd_3053]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_129\GCSimulator_129.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_129
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_13.cmd_3054]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_13\GCSimulator_13.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_13
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_130.cmd_3055]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_130\GCSimulator_130.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_130
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_131.cmd_3056]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_131\GCSimulator_131.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_131
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_132.cmd_3057]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_132\GCSimulator_132.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_132
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_133.cmd_3058]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_133\GCSimulator_133.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_133
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_134.cmd_3059]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_134\GCSimulator_134.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_134
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_135.cmd_3060]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_135\GCSimulator_135.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_135
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_136.cmd_3061]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_136\GCSimulator_136.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_136
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_137.cmd_3062]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_137\GCSimulator_137.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_137
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_138.cmd_3063]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_138\GCSimulator_138.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_138
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_139.cmd_3064]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_139\GCSimulator_139.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_139
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_14.cmd_3065]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_14\GCSimulator_14.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_14
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_140.cmd_3066]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_140\GCSimulator_140.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_140
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_141.cmd_3067]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_141\GCSimulator_141.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_141
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_142.cmd_3068]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_142\GCSimulator_142.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_142
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_143.cmd_3069]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_143\GCSimulator_143.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_143
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_144.cmd_3070]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_144\GCSimulator_144.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_144
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_145.cmd_3071]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_145\GCSimulator_145.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_145
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_146.cmd_3072]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_146\GCSimulator_146.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_146
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_147.cmd_3073]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_147\GCSimulator_147.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_147
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_148.cmd_3074]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_148\GCSimulator_148.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_148
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_149.cmd_3075]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_149\GCSimulator_149.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_149
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_15.cmd_3076]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_15\GCSimulator_15.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_15
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_150.cmd_3077]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_150\GCSimulator_150.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_150
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_151.cmd_3078]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_151\GCSimulator_151.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_151
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_152.cmd_3079]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_152\GCSimulator_152.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_152
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_153.cmd_3080]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_153\GCSimulator_153.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_153
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_154.cmd_3081]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_154\GCSimulator_154.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_154
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_155.cmd_3082]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_155\GCSimulator_155.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_155
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_156.cmd_3083]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_156\GCSimulator_156.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_156
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_157.cmd_3084]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_157\GCSimulator_157.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_157
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_158.cmd_3085]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_158\GCSimulator_158.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_158
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_159.cmd_3086]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_159\GCSimulator_159.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_159
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_16.cmd_3087]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_16\GCSimulator_16.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_16
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_160.cmd_3088]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_160\GCSimulator_160.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_160
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_161.cmd_3089]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_161\GCSimulator_161.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_161
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_162.cmd_3090]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_162\GCSimulator_162.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_162
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_163.cmd_3091]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_163\GCSimulator_163.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_163
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_164.cmd_3092]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_164\GCSimulator_164.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_164
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_165.cmd_3093]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_165\GCSimulator_165.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_165
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_166.cmd_3094]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_166\GCSimulator_166.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_166
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_167.cmd_3095]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_167\GCSimulator_167.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_167
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_168.cmd_3096]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_168\GCSimulator_168.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_168
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_169.cmd_3097]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_169\GCSimulator_169.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_169
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_17.cmd_3098]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_17\GCSimulator_17.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_17
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_170.cmd_3099]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_170\GCSimulator_170.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_170
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_171.cmd_3100]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_171\GCSimulator_171.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_171
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_172.cmd_3101]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_172\GCSimulator_172.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_172
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_173.cmd_3102]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_173\GCSimulator_173.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_173
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_174.cmd_3103]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_174\GCSimulator_174.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_174
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_175.cmd_3104]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_175\GCSimulator_175.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_175
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_176.cmd_3105]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_176\GCSimulator_176.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_176
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_177.cmd_3106]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_177\GCSimulator_177.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_177
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_178.cmd_3107]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_178\GCSimulator_178.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_178
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_179.cmd_3108]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_179\GCSimulator_179.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_179
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_18.cmd_3109]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_18\GCSimulator_18.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_18
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_180.cmd_3110]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_180\GCSimulator_180.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_180
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_181.cmd_3111]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_181\GCSimulator_181.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_181
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_182.cmd_3112]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_182\GCSimulator_182.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_182
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_183.cmd_3113]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_183\GCSimulator_183.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_183
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_184.cmd_3114]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_184\GCSimulator_184.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_184
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_185.cmd_3115]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_185\GCSimulator_185.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_185
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_186.cmd_3116]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_186\GCSimulator_186.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_186
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_187.cmd_3117]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_187\GCSimulator_187.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_187
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_188.cmd_3118]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_188\GCSimulator_188.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_188
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_189.cmd_3119]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_189\GCSimulator_189.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_189
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_19.cmd_3120]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_19\GCSimulator_19.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_19
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_190.cmd_3121]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_190\GCSimulator_190.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_190
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_191.cmd_3122]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_191\GCSimulator_191.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_191
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_192.cmd_3123]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_192\GCSimulator_192.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_192
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_193.cmd_3124]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_193\GCSimulator_193.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_193
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_194.cmd_3125]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_194\GCSimulator_194.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_194
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_195.cmd_3126]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_195\GCSimulator_195.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_195
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_196.cmd_3127]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_196\GCSimulator_196.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_196
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_197.cmd_3128]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_197\GCSimulator_197.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_197
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_198.cmd_3129]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_198\GCSimulator_198.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_198
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_199.cmd_3130]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_199\GCSimulator_199.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_199
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_2.cmd_3131]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_2\GCSimulator_2.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_20.cmd_3132]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_20\GCSimulator_20.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_20
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_200.cmd_3133]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_200\GCSimulator_200.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_200
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_201.cmd_3134]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_201\GCSimulator_201.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_201
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_202.cmd_3135]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_202\GCSimulator_202.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_202
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_203.cmd_3136]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_203\GCSimulator_203.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_203
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_204.cmd_3137]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_204\GCSimulator_204.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_204
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_205.cmd_3138]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_205\GCSimulator_205.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_205
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_206.cmd_3139]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_206\GCSimulator_206.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_206
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_207.cmd_3140]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_207\GCSimulator_207.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_207
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_208.cmd_3141]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_208\GCSimulator_208.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_208
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_209.cmd_3142]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_209\GCSimulator_209.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_209
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_21.cmd_3143]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_21\GCSimulator_21.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_21
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_210.cmd_3144]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_210\GCSimulator_210.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_210
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_211.cmd_3145]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_211\GCSimulator_211.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_211
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_212.cmd_3146]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_212\GCSimulator_212.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_212
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_213.cmd_3147]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_213\GCSimulator_213.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_213
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_214.cmd_3148]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_214\GCSimulator_214.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_214
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_215.cmd_3149]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_215\GCSimulator_215.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_215
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_216.cmd_3150]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_216\GCSimulator_216.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_216
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_217.cmd_3151]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_217\GCSimulator_217.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_217
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_218.cmd_3152]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_218\GCSimulator_218.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_218
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_219.cmd_3153]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_219\GCSimulator_219.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_219
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_22.cmd_3154]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_22\GCSimulator_22.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_22
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_220.cmd_3155]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_220\GCSimulator_220.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_220
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_221.cmd_3156]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_221\GCSimulator_221.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_221
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_222.cmd_3157]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_222\GCSimulator_222.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_222
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_223.cmd_3158]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_223\GCSimulator_223.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_223
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_224.cmd_3159]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_224\GCSimulator_224.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_224
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_225.cmd_3160]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_225\GCSimulator_225.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_225
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_226.cmd_3161]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_226\GCSimulator_226.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_226
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_227.cmd_3162]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_227\GCSimulator_227.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_227
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_228.cmd_3163]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_228\GCSimulator_228.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_228
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_229.cmd_3164]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_229\GCSimulator_229.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_229
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_23.cmd_3165]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_23\GCSimulator_23.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_23
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_230.cmd_3166]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_230\GCSimulator_230.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_230
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_231.cmd_3167]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_231\GCSimulator_231.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_231
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_232.cmd_3168]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_232\GCSimulator_232.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_232
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_233.cmd_3169]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_233\GCSimulator_233.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_233
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_234.cmd_3170]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_234\GCSimulator_234.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_234
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_235.cmd_3171]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_235\GCSimulator_235.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_235
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_236.cmd_3172]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_236\GCSimulator_236.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_236
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_237.cmd_3173]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_237\GCSimulator_237.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_237
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_238.cmd_3174]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_238\GCSimulator_238.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_238
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_239.cmd_3175]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_239\GCSimulator_239.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_239
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_24.cmd_3176]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_24\GCSimulator_24.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_24
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_240.cmd_3177]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_240\GCSimulator_240.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_240
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_241.cmd_3178]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_241\GCSimulator_241.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_241
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_242.cmd_3179]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_242\GCSimulator_242.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_242
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_243.cmd_3180]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_243\GCSimulator_243.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_243
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_244.cmd_3181]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_244\GCSimulator_244.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_244
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_245.cmd_3182]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_245\GCSimulator_245.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_245
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_246.cmd_3183]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_246\GCSimulator_246.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_246
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_247.cmd_3184]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_247\GCSimulator_247.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_247
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_248.cmd_3185]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_248\GCSimulator_248.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_248
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_249.cmd_3186]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_249\GCSimulator_249.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_249
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_25.cmd_3187]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_25\GCSimulator_25.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_25
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_250.cmd_3188]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_250\GCSimulator_250.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_250
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_251.cmd_3189]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_251\GCSimulator_251.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_251
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_252.cmd_3190]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_252\GCSimulator_252.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_252
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_253.cmd_3191]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_253\GCSimulator_253.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_253
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_254.cmd_3192]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_254\GCSimulator_254.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_254
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_255.cmd_3193]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_255\GCSimulator_255.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_255
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_256.cmd_3194]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_256\GCSimulator_256.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_256
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_257.cmd_3195]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_257\GCSimulator_257.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_257
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_258.cmd_3196]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_258\GCSimulator_258.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_258
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_259.cmd_3197]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_259\GCSimulator_259.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_259
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_26.cmd_3198]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_26\GCSimulator_26.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_26
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_260.cmd_3199]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_260\GCSimulator_260.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_260
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_261.cmd_3200]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_261\GCSimulator_261.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_261
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_262.cmd_3201]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_262\GCSimulator_262.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_262
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_263.cmd_3202]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_263\GCSimulator_263.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_263
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_264.cmd_3203]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_264\GCSimulator_264.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_264
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_265.cmd_3204]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_265\GCSimulator_265.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_265
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_266.cmd_3205]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_266\GCSimulator_266.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_266
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_267.cmd_3206]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_267\GCSimulator_267.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_267
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_268.cmd_3207]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_268\GCSimulator_268.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_268
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_269.cmd_3208]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_269\GCSimulator_269.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_269
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_27.cmd_3209]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_27\GCSimulator_27.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_27
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_270.cmd_3210]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_270\GCSimulator_270.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_270
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_271.cmd_3211]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_271\GCSimulator_271.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_271
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_272.cmd_3212]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_272\GCSimulator_272.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_272
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_273.cmd_3213]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_273\GCSimulator_273.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_273
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_274.cmd_3214]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_274\GCSimulator_274.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_274
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_275.cmd_3215]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_275\GCSimulator_275.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_275
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_276.cmd_3216]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_276\GCSimulator_276.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_276
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_277.cmd_3217]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_277\GCSimulator_277.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_277
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_278.cmd_3218]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_278\GCSimulator_278.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_278
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_279.cmd_3219]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_279\GCSimulator_279.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_279
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_28.cmd_3220]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_28\GCSimulator_28.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_28
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_280.cmd_3221]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_280\GCSimulator_280.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_280
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_281.cmd_3222]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_281\GCSimulator_281.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_281
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_282.cmd_3223]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_282\GCSimulator_282.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_282
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_283.cmd_3224]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_283\GCSimulator_283.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_283
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_284.cmd_3225]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_284\GCSimulator_284.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_284
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_285.cmd_3226]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_285\GCSimulator_285.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_285
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_286.cmd_3227]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_286\GCSimulator_286.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_286
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_287.cmd_3228]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_287\GCSimulator_287.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_287
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_288.cmd_3229]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_288\GCSimulator_288.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_288
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_289.cmd_3230]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_289\GCSimulator_289.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_289
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_29.cmd_3231]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_29\GCSimulator_29.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_29
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_290.cmd_3232]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_290\GCSimulator_290.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_290
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_291.cmd_3233]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_291\GCSimulator_291.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_291
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_292.cmd_3234]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_292\GCSimulator_292.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_292
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_293.cmd_3235]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_293\GCSimulator_293.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_293
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_294.cmd_3236]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_294\GCSimulator_294.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_294
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_295.cmd_3237]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_295\GCSimulator_295.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_295
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_296.cmd_3238]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_296\GCSimulator_296.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_296
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_297.cmd_3239]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_297\GCSimulator_297.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_297
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_298.cmd_3240]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_298\GCSimulator_298.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_298
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_299.cmd_3241]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_299\GCSimulator_299.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_299
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_3.cmd_3242]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_3\GCSimulator_3.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_30.cmd_3243]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_30\GCSimulator_30.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_30
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_300.cmd_3244]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_300\GCSimulator_300.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_300
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_301.cmd_3245]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_301\GCSimulator_301.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_301
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_302.cmd_3246]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_302\GCSimulator_302.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_302
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_303.cmd_3247]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_303\GCSimulator_303.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_303
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_304.cmd_3248]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_304\GCSimulator_304.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_304
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_305.cmd_3249]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_305\GCSimulator_305.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_305
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_306.cmd_3250]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_306\GCSimulator_306.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_306
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_307.cmd_3251]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_307\GCSimulator_307.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_307
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_308.cmd_3252]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_308\GCSimulator_308.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_308
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_309.cmd_3253]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_309\GCSimulator_309.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_309
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_31.cmd_3254]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_31\GCSimulator_31.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_31
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_310.cmd_3255]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_310\GCSimulator_310.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_310
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_311.cmd_3256]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_311\GCSimulator_311.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_311
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_312.cmd_3257]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_312\GCSimulator_312.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_312
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_313.cmd_3258]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_313\GCSimulator_313.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_313
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_314.cmd_3259]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_314\GCSimulator_314.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_314
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_315.cmd_3260]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_315\GCSimulator_315.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_315
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_316.cmd_3261]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_316\GCSimulator_316.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_316
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_317.cmd_3262]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_317\GCSimulator_317.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_317
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_318.cmd_3263]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_318\GCSimulator_318.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_318
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_319.cmd_3264]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_319\GCSimulator_319.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_319
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_32.cmd_3265]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_32\GCSimulator_32.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_32
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_320.cmd_3266]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_320\GCSimulator_320.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_320
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_321.cmd_3267]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_321\GCSimulator_321.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_321
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_322.cmd_3268]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_322\GCSimulator_322.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_322
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_323.cmd_3269]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_323\GCSimulator_323.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_323
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_324.cmd_3270]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_324\GCSimulator_324.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_324
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_325.cmd_3271]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_325\GCSimulator_325.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_325
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_326.cmd_3272]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_326\GCSimulator_326.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_326
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_327.cmd_3273]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_327\GCSimulator_327.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_327
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_328.cmd_3274]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_328\GCSimulator_328.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_328
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_329.cmd_3275]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_329\GCSimulator_329.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_329
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_33.cmd_3276]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_33\GCSimulator_33.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_33
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_330.cmd_3277]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_330\GCSimulator_330.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_330
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_331.cmd_3278]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_331\GCSimulator_331.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_331
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_332.cmd_3279]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_332\GCSimulator_332.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_332
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_333.cmd_3280]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_333\GCSimulator_333.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_333
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_334.cmd_3281]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_334\GCSimulator_334.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_334
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_335.cmd_3282]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_335\GCSimulator_335.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_335
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_336.cmd_3283]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_336\GCSimulator_336.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_336
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_337.cmd_3284]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_337\GCSimulator_337.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_337
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_338.cmd_3285]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_338\GCSimulator_338.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_338
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_339.cmd_3286]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_339\GCSimulator_339.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_339
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_34.cmd_3287]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_34\GCSimulator_34.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_34
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_340.cmd_3288]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_340\GCSimulator_340.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_340
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_341.cmd_3289]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_341\GCSimulator_341.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_341
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_342.cmd_3290]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_342\GCSimulator_342.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_342
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_343.cmd_3291]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_343\GCSimulator_343.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_343
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_344.cmd_3292]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_344\GCSimulator_344.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_344
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_345.cmd_3293]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_345\GCSimulator_345.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_345
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_346.cmd_3294]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_346\GCSimulator_346.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_346
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_347.cmd_3295]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_347\GCSimulator_347.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_347
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_348.cmd_3296]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_348\GCSimulator_348.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_348
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_349.cmd_3297]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_349\GCSimulator_349.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_349
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_35.cmd_3298]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_35\GCSimulator_35.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_35
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_350.cmd_3299]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_350\GCSimulator_350.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_350
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_351.cmd_3300]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_351\GCSimulator_351.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_351
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_352.cmd_3301]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_352\GCSimulator_352.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_352
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_353.cmd_3302]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_353\GCSimulator_353.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_353
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_354.cmd_3303]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_354\GCSimulator_354.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_354
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_355.cmd_3304]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_355\GCSimulator_355.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_355
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_356.cmd_3305]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_356\GCSimulator_356.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_356
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_357.cmd_3306]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_357\GCSimulator_357.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_357
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_358.cmd_3307]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_358\GCSimulator_358.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_358
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_359.cmd_3308]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_359\GCSimulator_359.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_359
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_36.cmd_3309]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_36\GCSimulator_36.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_36
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_360.cmd_3310]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_360\GCSimulator_360.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_360
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_361.cmd_3311]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_361\GCSimulator_361.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_361
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_362.cmd_3312]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_362\GCSimulator_362.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_362
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_363.cmd_3313]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_363\GCSimulator_363.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_363
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_364.cmd_3314]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_364\GCSimulator_364.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_364
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_365.cmd_3315]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_365\GCSimulator_365.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_365
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_366.cmd_3316]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_366\GCSimulator_366.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_366
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_367.cmd_3317]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_367\GCSimulator_367.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_367
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_368.cmd_3318]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_368\GCSimulator_368.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_368
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_369.cmd_3319]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_369\GCSimulator_369.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_369
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_37.cmd_3320]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_37\GCSimulator_37.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_37
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_370.cmd_3321]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_370\GCSimulator_370.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_370
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_371.cmd_3322]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_371\GCSimulator_371.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_371
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_372.cmd_3323]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_372\GCSimulator_372.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_372
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_373.cmd_3324]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_373\GCSimulator_373.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_373
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_374.cmd_3325]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_374\GCSimulator_374.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_374
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_375.cmd_3326]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_375\GCSimulator_375.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_375
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_376.cmd_3327]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_376\GCSimulator_376.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_376
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_377.cmd_3328]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_377\GCSimulator_377.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_377
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_378.cmd_3329]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_378\GCSimulator_378.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_378
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_379.cmd_3330]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_379\GCSimulator_379.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_379
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_38.cmd_3331]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_38\GCSimulator_38.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_38
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_380.cmd_3332]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_380\GCSimulator_380.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_380
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_381.cmd_3333]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_381\GCSimulator_381.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_381
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_382.cmd_3334]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_382\GCSimulator_382.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_382
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_383.cmd_3335]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_383\GCSimulator_383.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_383
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_384.cmd_3336]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_384\GCSimulator_384.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_384
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_385.cmd_3337]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_385\GCSimulator_385.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_385
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_386.cmd_3338]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_386\GCSimulator_386.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_386
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_387.cmd_3339]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_387\GCSimulator_387.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_387
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_388.cmd_3340]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_388\GCSimulator_388.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_388
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_389.cmd_3341]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_389\GCSimulator_389.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_389
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_39.cmd_3342]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_39\GCSimulator_39.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_39
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_390.cmd_3343]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_390\GCSimulator_390.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_390
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_391.cmd_3344]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_391\GCSimulator_391.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_391
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_392.cmd_3345]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_392\GCSimulator_392.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_392
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_393.cmd_3346]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_393\GCSimulator_393.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_393
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_394.cmd_3347]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_394\GCSimulator_394.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_394
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_395.cmd_3348]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_395\GCSimulator_395.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_395
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_396.cmd_3349]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_396\GCSimulator_396.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_396
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_397.cmd_3350]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_397\GCSimulator_397.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_397
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_398.cmd_3351]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_398\GCSimulator_398.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_398
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_399.cmd_3352]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_399\GCSimulator_399.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_399
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_4.cmd_3353]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_4\GCSimulator_4.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_40.cmd_3354]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_40\GCSimulator_40.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_40
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_400.cmd_3355]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_400\GCSimulator_400.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_400
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_401.cmd_3356]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_401\GCSimulator_401.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_401
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_402.cmd_3357]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_402\GCSimulator_402.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_402
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_403.cmd_3358]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_403\GCSimulator_403.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_403
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_404.cmd_3359]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_404\GCSimulator_404.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_404
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_405.cmd_3360]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_405\GCSimulator_405.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_405
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_406.cmd_3361]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_406\GCSimulator_406.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_406
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_407.cmd_3362]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_407\GCSimulator_407.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_407
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_408.cmd_3363]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_408\GCSimulator_408.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_408
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_409.cmd_3364]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_409\GCSimulator_409.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_409
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_41.cmd_3365]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_41\GCSimulator_41.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_41
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_410.cmd_3366]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_410\GCSimulator_410.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_410
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_411.cmd_3367]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_411\GCSimulator_411.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_411
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_412.cmd_3368]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_412\GCSimulator_412.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_412
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_413.cmd_3369]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_413\GCSimulator_413.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_413
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_414.cmd_3370]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_414\GCSimulator_414.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_414
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_415.cmd_3371]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_415\GCSimulator_415.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_415
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_416.cmd_3372]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_416\GCSimulator_416.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_416
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_417.cmd_3373]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_417\GCSimulator_417.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_417
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_418.cmd_3374]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_418\GCSimulator_418.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_418
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_419.cmd_3375]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_419\GCSimulator_419.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_419
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_42.cmd_3376]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_42\GCSimulator_42.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_42
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_420.cmd_3377]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_420\GCSimulator_420.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_420
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_421.cmd_3378]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_421\GCSimulator_421.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_421
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_422.cmd_3379]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_422\GCSimulator_422.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_422
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_423.cmd_3380]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_423\GCSimulator_423.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_423
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_424.cmd_3381]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_424\GCSimulator_424.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_424
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_425.cmd_3382]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_425\GCSimulator_425.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_425
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_426.cmd_3383]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_426\GCSimulator_426.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_426
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_427.cmd_3384]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_427\GCSimulator_427.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_427
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_428.cmd_3385]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_428\GCSimulator_428.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_428
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_429.cmd_3386]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_429\GCSimulator_429.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_429
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_43.cmd_3387]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_43\GCSimulator_43.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_43
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_430.cmd_3388]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_430\GCSimulator_430.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_430
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_431.cmd_3389]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_431\GCSimulator_431.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_431
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_432.cmd_3390]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_432\GCSimulator_432.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_432
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_44.cmd_3391]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_44\GCSimulator_44.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_44
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_45.cmd_3392]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_45\GCSimulator_45.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_45
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_46.cmd_3393]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_46\GCSimulator_46.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_46
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_47.cmd_3394]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_47\GCSimulator_47.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_47
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_48.cmd_3395]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_48\GCSimulator_48.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_48
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_49.cmd_3396]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_49\GCSimulator_49.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_49
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_5.cmd_3397]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_5\GCSimulator_5.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_50.cmd_3398]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_50\GCSimulator_50.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_50
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_51.cmd_3399]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_51\GCSimulator_51.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_51
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_52.cmd_3400]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_52\GCSimulator_52.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_52
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_53.cmd_3401]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_53\GCSimulator_53.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_53
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_54.cmd_3402]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_54\GCSimulator_54.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_54
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_55.cmd_3403]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_55\GCSimulator_55.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_55
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_56.cmd_3404]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_56\GCSimulator_56.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_56
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_57.cmd_3405]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_57\GCSimulator_57.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_57
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_58.cmd_3406]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_58\GCSimulator_58.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_58
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_59.cmd_3407]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_59\GCSimulator_59.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_59
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_6.cmd_3408]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_6\GCSimulator_6.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_6
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_60.cmd_3409]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_60\GCSimulator_60.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_60
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_61.cmd_3410]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_61\GCSimulator_61.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_61
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_62.cmd_3411]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_62\GCSimulator_62.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_62
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_63.cmd_3412]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_63\GCSimulator_63.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_63
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_64.cmd_3413]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_64\GCSimulator_64.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_64
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_65.cmd_3414]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_65\GCSimulator_65.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_65
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_66.cmd_3415]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_66\GCSimulator_66.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_66
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_67.cmd_3416]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_67\GCSimulator_67.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_67
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_68.cmd_3417]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_68\GCSimulator_68.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_68
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_69.cmd_3418]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_69\GCSimulator_69.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_69
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_7.cmd_3419]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_7\GCSimulator_7.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_7
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_70.cmd_3420]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_70\GCSimulator_70.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_70
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_71.cmd_3421]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_71\GCSimulator_71.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_71
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_72.cmd_3422]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_72\GCSimulator_72.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_72
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_73.cmd_3423]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_73\GCSimulator_73.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_73
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_74.cmd_3424]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_74\GCSimulator_74.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_74
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_75.cmd_3425]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_75\GCSimulator_75.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_75
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_76.cmd_3426]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_76\GCSimulator_76.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_76
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_77.cmd_3427]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_77\GCSimulator_77.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_77
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_78.cmd_3428]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_78\GCSimulator_78.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_78
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_79.cmd_3429]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_79\GCSimulator_79.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_79
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_8.cmd_3430]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_8\GCSimulator_8.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_8
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_80.cmd_3431]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_80\GCSimulator_80.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_80
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
-HostStyle=0
-[GCSimulator_81.cmd_3432]
-RelativePath=GC\Scenarios\GCSimulator\GCSimulator_81\GCSimulator_81.cmd
-WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_81
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_FAIL
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_82.cmd_3433]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_82\GCSimulator_82.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_82
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_83.cmd_3434]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_83\GCSimulator_83.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_83
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_84.cmd_3435]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_84\GCSimulator_84.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_84
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_85.cmd_3436]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_85\GCSimulator_85.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_85
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_86.cmd_3437]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_86\GCSimulator_86.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_86
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_87.cmd_3438]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_87\GCSimulator_87.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_87
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_88.cmd_3439]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_88\GCSimulator_88.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_88
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_89.cmd_3440]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_89\GCSimulator_89.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_89
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_9.cmd_3441]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_9\GCSimulator_9.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_9
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_90.cmd_3442]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_90\GCSimulator_90.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_90
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_91.cmd_3443]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_91\GCSimulator_91.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_91
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_92.cmd_3444]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_92\GCSimulator_92.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_92
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_93.cmd_3445]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_93\GCSimulator_93.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_93
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_94.cmd_3446]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_94\GCSimulator_94.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_94
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_95.cmd_3447]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_95\GCSimulator_95.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_95
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_96.cmd_3448]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_96\GCSimulator_96.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_96
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_97.cmd_3449]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_97\GCSimulator_97.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_97
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_98.cmd_3450]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_98\GCSimulator_98.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_98
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GCSimulator_99.cmd_3451]
 RelativePath=GC\Scenarios\GCSimulator\GCSimulator_99\GCSimulator_99.cmd
 WorkingDir=GC\Scenarios\GCSimulator\GCSimulator_99
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [gcstress.cmd_3452]
 RelativePath=GC\Scenarios\GCStress\gcstress\gcstress.cmd
 WorkingDir=GC\Scenarios\GCStress\gcstress
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;UNSTABLE
+Categories=UNSTABLE;EXPECTED_PASS
 HostStyle=0
+
 [leakgen.cmd_3453]
 RelativePath=GC\Scenarios\LeakGen\leakgen\leakgen.cmd
 WorkingDir=GC\Scenarios\LeakGen\leakgen
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [leakgenthrd.cmd_3454]
 RelativePath=GC\Scenarios\LeakGen\leakgenthrd\leakgenthrd.cmd
 WorkingDir=GC\Scenarios\LeakGen\leakgenthrd
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [leakwheel.cmd_3455]
 RelativePath=GC\Scenarios\LeakWheel\leakwheel\leakwheel.cmd
 WorkingDir=GC\Scenarios\LeakWheel\leakwheel
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [minleakgen.cmd_3456]
 RelativePath=GC\Scenarios\MinLeakGen\minleakgen\minleakgen.cmd
 WorkingDir=GC\Scenarios\MinLeakGen\minleakgen
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ndpin.cmd_3458]
 RelativePath=GC\Scenarios\NDPin\ndpin\ndpin.cmd
 WorkingDir=GC\Scenarios\NDPin\ndpin
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ndpinfinal.cmd_3459]
 RelativePath=GC\Scenarios\NDPin\ndpinfinal\ndpinfinal.cmd
 WorkingDir=GC\Scenarios\NDPin\ndpinfinal
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [rancollect.cmd_3460]
 RelativePath=GC\Scenarios\RanCollect\rancollect\rancollect.cmd
 WorkingDir=GC\Scenarios\RanCollect\rancollect
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [reflectobj.cmd_3461]
 RelativePath=GC\Scenarios\ReflectObj\reflectobj\reflectobj.cmd
 WorkingDir=GC\Scenarios\ReflectObj\reflectobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;UNSTABLE
+Categories=UNSTABLE;EXPECTED_PASS
 HostStyle=0
+
 [continue.cmd_3462]
 RelativePath=GC\Scenarios\Resurrection\continue\continue.cmd
 WorkingDir=GC\Scenarios\Resurrection\continue
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [rootmem.cmd_3463]
 RelativePath=GC\Scenarios\Rootmem\rootmem\rootmem.cmd
 WorkingDir=GC\Scenarios\Rootmem\rootmem
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [gc.cmd_3464]
 RelativePath=GC\Scenarios\Samples\gc\gc.cmd
 WorkingDir=GC\Scenarios\Samples\gc
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [servermodel.cmd_3465]
 RelativePath=GC\Scenarios\ServerModel\servermodel\servermodel.cmd
 WorkingDir=GC\Scenarios\ServerModel\servermodel
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [singlinkgen.cmd_3466]
 RelativePath=GC\Scenarios\SingLinkList\singlinkgen\singlinkgen.cmd
 WorkingDir=GC\Scenarios\SingLinkList\singlinkgen
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [singlinkstay.cmd_3467]
 RelativePath=GC\Scenarios\SingLinkList\singlinkstay\singlinkstay.cmd
 WorkingDir=GC\Scenarios\SingLinkList\singlinkstay
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [stringcreator.cmd_3468]
 RelativePath=GC\Scenarios\StringCreator\stringcreator\stringcreator.cmd
 WorkingDir=GC\Scenarios\StringCreator\stringcreator
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [thdchaos.cmd_3469]
 RelativePath=GC\Scenarios\THDChaos\thdchaos\thdchaos.cmd
 WorkingDir=GC\Scenarios\THDChaos\thdchaos
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [thdlist.cmd_3470]
 RelativePath=GC\Scenarios\THDList\thdlist\thdlist.cmd
 WorkingDir=GC\Scenarios\THDList\thdlist
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [weakreffinal.cmd_3471]
 RelativePath=GC\Scenarios\WeakReference\weakreffinal\weakreffinal.cmd
 WorkingDir=GC\Scenarios\WeakReference\weakreffinal
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ReliabilityFramework.cmd_3472]
 RelativePath=GC\Stress\Framework\ReliabilityFramework\ReliabilityFramework.cmd
 WorkingDir=GC\Stress\Framework\ReliabilityFramework
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [csgen.1.cmd_3473]
 RelativePath=hosting\stress\testset1\csgen.1\csgen.1.cmd
 WorkingDir=hosting\stress\testset1\csgen.1
@@ -24212,6 +26251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [csgen.2.cmd_3474]
 RelativePath=hosting\stress\testset1\csgen.2\csgen.2.cmd
 WorkingDir=hosting\stress\testset1\csgen.2
@@ -24219,13 +26259,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [simple1.cmd_3475]
 RelativePath=hosting\stress\testset1\simple1\simple1.cmd
 WorkingDir=hosting\stress\testset1\simple1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MarshalBoolArrayTest.cmd_3476]
 RelativePath=Interop\ArrayMarshalling\BoolArray\MarshalBoolArrayTest\MarshalBoolArrayTest.cmd
 WorkingDir=Interop\ArrayMarshalling\BoolArray\MarshalBoolArrayTest
@@ -24233,6 +26275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [MarshalArrayByValTest.cmd_3477]
 RelativePath=Interop\ArrayMarshalling\ByValArray\MarshalArrayByValTest\MarshalArrayByValTest.cmd
 WorkingDir=Interop\ArrayMarshalling\ByValArray\MarshalArrayByValTest
@@ -24240,195 +26283,223 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [FuncPtrAsDelegateParam.cmd_3479]
 RelativePath=Interop\FuncPtrAsDelegateParam\FuncPtrAsDelegateParam\FuncPtrAsDelegateParam.cmd
 WorkingDir=Interop\FuncPtrAsDelegateParam\FuncPtrAsDelegateParam
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Castable.cmd_3480]
 RelativePath=Interop\ICastable\Castable\Castable.cmd
 WorkingDir=Interop\ICastable\Castable
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS;UNWIND
+Categories=RT;Pri0;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [CopyByteArray.cmd_3481]
 RelativePath=Interop\MarshalAPI\Copy\CopyByteArray\CopyByteArray.cmd
 WorkingDir=Interop\MarshalAPI\Copy\CopyByteArray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CopyCharArray.cmd_3482]
 RelativePath=Interop\MarshalAPI\Copy\CopyCharArray\CopyCharArray.cmd
 WorkingDir=Interop\MarshalAPI\Copy\CopyCharArray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CopyDoubleArray.cmd_3483]
 RelativePath=Interop\MarshalAPI\Copy\CopyDoubleArray\CopyDoubleArray.cmd
 WorkingDir=Interop\MarshalAPI\Copy\CopyDoubleArray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CopyInt16Array.cmd_3484]
 RelativePath=Interop\MarshalAPI\Copy\CopyInt16Array\CopyInt16Array.cmd
 WorkingDir=Interop\MarshalAPI\Copy\CopyInt16Array
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CopyInt32Array.cmd_3485]
 RelativePath=Interop\MarshalAPI\Copy\CopyInt32Array\CopyInt32Array.cmd
 WorkingDir=Interop\MarshalAPI\Copy\CopyInt32Array
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CopyInt64Array.cmd_3486]
 RelativePath=Interop\MarshalAPI\Copy\CopyInt64Array\CopyInt64Array.cmd
 WorkingDir=Interop\MarshalAPI\Copy\CopyInt64Array
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CopyIntPtrArray.cmd_3487]
 RelativePath=Interop\MarshalAPI\Copy\CopyIntPtrArray\CopyIntPtrArray.cmd
 WorkingDir=Interop\MarshalAPI\Copy\CopyIntPtrArray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CopySingleArray.cmd_3488]
 RelativePath=Interop\MarshalAPI\Copy\CopySingleArray\CopySingleArray.cmd
 WorkingDir=Interop\MarshalAPI\Copy\CopySingleArray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [FunctionPtrTest.cmd_3489]
 RelativePath=Interop\MarshalAPI\FunctionPointer\FunctionPtrTest\FunctionPtrTest.cmd
 WorkingDir=Interop\MarshalAPI\FunctionPointer\FunctionPtrTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GetExceptionForHR.cmd_3490]
 RelativePath=Interop\MarshalAPI\GetExceptionForHR\GetExceptionForHR\GetExceptionForHR.cmd
 WorkingDir=Interop\MarshalAPI\GetExceptionForHR\GetExceptionForHR
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GetNativeVariantForObject.cmd_3491]
 RelativePath=Interop\MarshalAPI\GetNativeVariantForObject\GetNativeVariantForObject\GetNativeVariantForObject.cmd
 WorkingDir=Interop\MarshalAPI\GetNativeVariantForObject\GetNativeVariantForObject
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GetObjectForNativeVariant.cmd_3492]
 RelativePath=Interop\MarshalAPI\GetObjectForNativeVariant\GetObjectForNativeVariant\GetObjectForNativeVariant.cmd
 WorkingDir=Interop\MarshalAPI\GetObjectForNativeVariant\GetObjectForNativeVariant
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GetObjectsForNativeVariants.cmd_3493]
 RelativePath=Interop\MarshalAPI\GetObjectsForNativeVariants\GetObjectsForNativeVariants\GetObjectsForNativeVariants.cmd
 WorkingDir=Interop\MarshalAPI\GetObjectsForNativeVariants\GetObjectsForNativeVariants
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [IUnknownTest.cmd_3494]
 RelativePath=Interop\MarshalAPI\IUnknown\IUnknownTest\IUnknownTest.cmd
 WorkingDir=Interop\MarshalAPI\IUnknown\IUnknownTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AutoLayoutStructure.cmd_3495]
 RelativePath=Interop\MarshalAPI\Miscellaneous\AutoLayoutStructure\AutoLayoutStructure.cmd
 WorkingDir=Interop\MarshalAPI\Miscellaneous\AutoLayoutStructure
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MarshalClassTests.cmd_3496]
 RelativePath=Interop\MarshalAPI\Miscellaneous\MarshalClassTests\MarshalClassTests.cmd
 WorkingDir=Interop\MarshalAPI\Miscellaneous\MarshalClassTests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [OffsetOf.cmd_3497]
 RelativePath=Interop\MarshalAPI\OffsetOf\OffsetOf\OffsetOf.cmd
 WorkingDir=Interop\MarshalAPI\OffsetOf\OffsetOf
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ReadWriteByte.cmd_3498]
 RelativePath=Interop\MarshalAPI\ReadWrite\ReadWriteByte\ReadWriteByte.cmd
 WorkingDir=Interop\MarshalAPI\ReadWrite\ReadWriteByte
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ReadWriteInt16.cmd_3499]
 RelativePath=Interop\MarshalAPI\ReadWrite\ReadWriteInt16\ReadWriteInt16.cmd
 WorkingDir=Interop\MarshalAPI\ReadWrite\ReadWriteInt16
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ReadWriteInt32.cmd_3500]
 RelativePath=Interop\MarshalAPI\ReadWrite\ReadWriteInt32\ReadWriteInt32.cmd
 WorkingDir=Interop\MarshalAPI\ReadWrite\ReadWriteInt32
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ReadWriteInt64.cmd_3501]
 RelativePath=Interop\MarshalAPI\ReadWrite\ReadWriteInt64\ReadWriteInt64.cmd
 WorkingDir=Interop\MarshalAPI\ReadWrite\ReadWriteInt64
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ReadWriteIntPtr.cmd_3502]
 RelativePath=Interop\MarshalAPI\ReadWrite\ReadWriteIntPtr\ReadWriteIntPtr.cmd
 WorkingDir=Interop\MarshalAPI\ReadWrite\ReadWriteIntPtr
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [StringMarshalingTest.cmd_3503]
 RelativePath=Interop\MarshalAPI\String\StringMarshalingTest\StringMarshalingTest.cmd
 WorkingDir=Interop\MarshalAPI\String\StringMarshalingTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [UnsafeAddrOfPinnedArrayElement.cmd_3504]
 RelativePath=Interop\MarshalAPI\UnsafeAddrOfPinnedArrayElement\UnsafeAddrOfPinnedArrayElement\UnsafeAddrOfPinnedArrayElement.cmd
 WorkingDir=Interop\MarshalAPI\UnsafeAddrOfPinnedArrayElement\UnsafeAddrOfPinnedArrayElement
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NativeCallableTest.cmd_3505]
 RelativePath=Interop\NativeCallable\NativeCallableTest\NativeCallableTest.cmd
 WorkingDir=Interop\NativeCallable\NativeCallableTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BoolTest.cmd_3506]
 RelativePath=Interop\PrimitiveMarshalling\Bool\BoolTest\BoolTest.cmd
 WorkingDir=Interop\PrimitiveMarshalling\Bool\BoolTest
@@ -24436,13 +26507,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [EnumTest.cmd_3507]
 RelativePath=Interop\PrimitiveMarshalling\EnumMarshalling\EnumTest\EnumTest.cmd
 WorkingDir=Interop\PrimitiveMarshalling\EnumMarshalling\EnumTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [PInvokeUIntPtrTest.cmd_3508]
 RelativePath=Interop\PrimitiveMarshalling\UIntPtr\PInvokeUIntPtrTest\PInvokeUIntPtrTest.cmd
 WorkingDir=Interop\PrimitiveMarshalling\UIntPtr\PInvokeUIntPtrTest
@@ -24450,62 +26523,71 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [RefCharArrayTest.cmd_3509]
 RelativePath=Interop\RefCharArray\RefCharArrayTest\RefCharArrayTest.cmd
 WorkingDir=Interop\RefCharArray\RefCharArrayTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RefIntTest.cmd_3510]
 RelativePath=Interop\RefInt\RefIntTest\RefIntTest.cmd
 WorkingDir=Interop\RefInt\RefIntTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [SimpleStruct.cmd_3511]
 RelativePath=Interop\SimpleStruct\SimpleStruct\SimpleStruct.cmd
 WorkingDir=Interop\SimpleStruct\SimpleStruct
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [LPSTRTest.cmd_3512]
 RelativePath=Interop\StringMarshalling\LPSTR\LPSTRTest\LPSTRTest.cmd
 WorkingDir=Interop\StringMarshalling\LPSTR\LPSTRTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [LPTSTRTest.cmd_3513]
 RelativePath=Interop\StringMarshalling\LPTSTR\LPTSTRTest\LPTSTRTest.cmd
 WorkingDir=Interop\StringMarshalling\LPTSTR\LPTSTRTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [UTF8Test.cmd_3514]
 RelativePath=Interop\StringMarshalling\UTF8\UTF8Test\UTF8Test.cmd
 WorkingDir=Interop\StringMarshalling\UTF8\UTF8Test
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MarshalStructAsLayoutExp.cmd_3515]
 RelativePath=Interop\StructMarshalling\PInvoke\MarshalStructAsLayoutExp\MarshalStructAsLayoutExp.cmd
 WorkingDir=Interop\StructMarshalling\PInvoke\MarshalStructAsLayoutExp
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MarshalStructAsLayoutSeq.cmd_3516]
 RelativePath=Interop\StructMarshalling\PInvoke\MarshalStructAsLayoutSeq\MarshalStructAsLayoutSeq.cmd
 WorkingDir=Interop\StructMarshalling\PInvoke\MarshalStructAsLayoutSeq
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Not-Int32.cmd_3517]
 RelativePath=JIT\BBT\Scenario4\Not-Int32\Not-Int32.cmd
 WorkingDir=JIT\BBT\Scenario4\Not-Int32
@@ -24513,6 +26595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Add1.cmd_3518]
 RelativePath=JIT\CodeGenBringUpTests\Add1\Add1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Add1
@@ -24520,6 +26603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [addref.cmd_3519]
 RelativePath=JIT\CodeGenBringUpTests\addref\addref.cmd
 WorkingDir=JIT\CodeGenBringUpTests\addref
@@ -24527,6 +26611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [And1.cmd_3520]
 RelativePath=JIT\CodeGenBringUpTests\And1\And1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\And1
@@ -24534,6 +26619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [AndRef.cmd_3521]
 RelativePath=JIT\CodeGenBringUpTests\AndRef\AndRef.cmd
 WorkingDir=JIT\CodeGenBringUpTests\AndRef
@@ -24541,6 +26627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Args4.cmd_3522]
 RelativePath=JIT\CodeGenBringUpTests\Args4\Args4.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Args4
@@ -24548,6 +26635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Args5.cmd_3523]
 RelativePath=JIT\CodeGenBringUpTests\Args5\Args5.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Args5
@@ -24555,6 +26643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [AsgAdd1.cmd_3524]
 RelativePath=JIT\CodeGenBringUpTests\AsgAdd1\AsgAdd1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\AsgAdd1
@@ -24562,6 +26651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [AsgAnd1.cmd_3525]
 RelativePath=JIT\CodeGenBringUpTests\AsgAnd1\AsgAnd1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\AsgAnd1
@@ -24569,6 +26659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [AsgOr1.cmd_3526]
 RelativePath=JIT\CodeGenBringUpTests\AsgOr1\AsgOr1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\AsgOr1
@@ -24576,6 +26667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [AsgSub1.cmd_3527]
 RelativePath=JIT\CodeGenBringUpTests\AsgSub1\AsgSub1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\AsgSub1
@@ -24583,6 +26675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [AsgXor1.cmd_3528]
 RelativePath=JIT\CodeGenBringUpTests\AsgXor1\AsgXor1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\AsgXor1
@@ -24590,6 +26683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [BinaryRMW.cmd_3529]
 RelativePath=JIT\CodeGenBringUpTests\BinaryRMW\BinaryRMW.cmd
 WorkingDir=JIT\CodeGenBringUpTests\BinaryRMW
@@ -24597,6 +26691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Call1.cmd_3530]
 RelativePath=JIT\CodeGenBringUpTests\Call1\Call1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Call1
@@ -24604,6 +26699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CnsBool.cmd_3531]
 RelativePath=JIT\CodeGenBringUpTests\CnsBool\CnsBool.cmd
 WorkingDir=JIT\CodeGenBringUpTests\CnsBool
@@ -24611,6 +26707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CnsLng1.cmd_3532]
 RelativePath=JIT\CodeGenBringUpTests\CnsLng1\CnsLng1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\CnsLng1
@@ -24618,6 +26715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblAdd.cmd_3533]
 RelativePath=JIT\CodeGenBringUpTests\DblAdd\DblAdd.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblAdd
@@ -24625,6 +26723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblAddConst.cmd_3534]
 RelativePath=JIT\CodeGenBringUpTests\DblAddConst\DblAddConst.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblAddConst
@@ -24632,6 +26731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblArea.cmd_3535]
 RelativePath=JIT\CodeGenBringUpTests\DblArea\DblArea.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblArea
@@ -24639,6 +26739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblArray.cmd_3536]
 RelativePath=JIT\CodeGenBringUpTests\DblArray\DblArray.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblArray
@@ -24646,6 +26747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblAvg2.cmd_3537]
 RelativePath=JIT\CodeGenBringUpTests\DblAvg2\DblAvg2.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblAvg2
@@ -24653,6 +26755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblAvg6.cmd_3538]
 RelativePath=JIT\CodeGenBringUpTests\DblAvg6\DblAvg6.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblAvg6
@@ -24660,6 +26763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblCall1.cmd_3539]
 RelativePath=JIT\CodeGenBringUpTests\DblCall1\DblCall1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblCall1
@@ -24667,6 +26771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblCall2.cmd_3540]
 RelativePath=JIT\CodeGenBringUpTests\DblCall2\DblCall2.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblCall2
@@ -24674,6 +26779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblDist.cmd_3541]
 RelativePath=JIT\CodeGenBringUpTests\DblDist\DblDist.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblDist
@@ -24681,6 +26787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblDiv.cmd_3542]
 RelativePath=JIT\CodeGenBringUpTests\DblDiv\DblDiv.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblDiv
@@ -24688,6 +26795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblDivConst.cmd_3543]
 RelativePath=JIT\CodeGenBringUpTests\DblDivConst\DblDivConst.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblDivConst
@@ -24695,6 +26803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblFillArray.cmd_3544]
 RelativePath=JIT\CodeGenBringUpTests\DblFillArray\DblFillArray.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblFillArray
@@ -24702,6 +26811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblMul.cmd_3545]
 RelativePath=JIT\CodeGenBringUpTests\DblMul\DblMul.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblMul
@@ -24709,6 +26819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblMulConst.cmd_3546]
 RelativePath=JIT\CodeGenBringUpTests\DblMulConst\DblMulConst.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblMulConst
@@ -24716,6 +26827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblNeg.cmd_3547]
 RelativePath=JIT\CodeGenBringUpTests\DblNeg\DblNeg.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblNeg
@@ -24723,6 +26835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblRem.cmd_3548]
 RelativePath=JIT\CodeGenBringUpTests\DblRem\DblRem.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblRem
@@ -24730,6 +26843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblRoots.cmd_3549]
 RelativePath=JIT\CodeGenBringUpTests\DblRoots\DblRoots.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblRoots
@@ -24737,6 +26851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblSub.cmd_3550]
 RelativePath=JIT\CodeGenBringUpTests\DblSub\DblSub.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblSub
@@ -24744,6 +26859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblSubConst.cmd_3551]
 RelativePath=JIT\CodeGenBringUpTests\DblSubConst\DblSubConst.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblSubConst
@@ -24751,6 +26867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DblVar.cmd_3552]
 RelativePath=JIT\CodeGenBringUpTests\DblVar\DblVar.cmd
 WorkingDir=JIT\CodeGenBringUpTests\DblVar
@@ -24758,6 +26875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [div1.cmd_3553]
 RelativePath=JIT\CodeGenBringUpTests\div1\div1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\div1
@@ -24765,6 +26883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [div2.cmd_3554]
 RelativePath=JIT\CodeGenBringUpTests\div2\div2.cmd
 WorkingDir=JIT\CodeGenBringUpTests\div2
@@ -24772,6 +26891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [divref.cmd_3555]
 RelativePath=JIT\CodeGenBringUpTests\divref\divref.cmd
 WorkingDir=JIT\CodeGenBringUpTests\divref
@@ -24779,6 +26899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Eq1.cmd_3556]
 RelativePath=JIT\CodeGenBringUpTests\Eq1\Eq1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Eq1
@@ -24786,6 +26907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FactorialRec.cmd_3557]
 RelativePath=JIT\CodeGenBringUpTests\FactorialRec\FactorialRec.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FactorialRec
@@ -24793,6 +26915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FibLoop.cmd_3558]
 RelativePath=JIT\CodeGenBringUpTests\FibLoop\FibLoop.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FibLoop
@@ -24800,6 +26923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FiboRec.cmd_3559]
 RelativePath=JIT\CodeGenBringUpTests\FiboRec\FiboRec.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FiboRec
@@ -24807,6 +26931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPAdd.cmd_3560]
 RelativePath=JIT\CodeGenBringUpTests\FPAdd\FPAdd.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPAdd
@@ -24814,6 +26939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPAddConst.cmd_3561]
 RelativePath=JIT\CodeGenBringUpTests\FPAddConst\FPAddConst.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPAddConst
@@ -24821,6 +26947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPArea.cmd_3562]
 RelativePath=JIT\CodeGenBringUpTests\FPArea\FPArea.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPArea
@@ -24828,6 +26955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPArray.cmd_3563]
 RelativePath=JIT\CodeGenBringUpTests\FPArray\FPArray.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPArray
@@ -24835,6 +26963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPAvg2.cmd_3564]
 RelativePath=JIT\CodeGenBringUpTests\FPAvg2\FPAvg2.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPAvg2
@@ -24842,6 +26971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPAvg6.cmd_3565]
 RelativePath=JIT\CodeGenBringUpTests\FPAvg6\FPAvg6.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPAvg6
@@ -24849,6 +26979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPCall1.cmd_3566]
 RelativePath=JIT\CodeGenBringUpTests\FPCall1\FPCall1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPCall1
@@ -24856,6 +26987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPCall2.cmd_3567]
 RelativePath=JIT\CodeGenBringUpTests\FPCall2\FPCall2.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPCall2
@@ -24863,6 +26995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPConvDbl2Lng.cmd_3568]
 RelativePath=JIT\CodeGenBringUpTests\FPConvDbl2Lng\FPConvDbl2Lng.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPConvDbl2Lng
@@ -24870,6 +27003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPConvF2F.cmd_3569]
 RelativePath=JIT\CodeGenBringUpTests\FPConvF2F\FPConvF2F.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPConvF2F
@@ -24877,6 +27011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPConvF2I.cmd_3570]
 RelativePath=JIT\CodeGenBringUpTests\FPConvF2I\FPConvF2I.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPConvF2I
@@ -24884,6 +27019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPConvF2Lng.cmd_3571]
 RelativePath=JIT\CodeGenBringUpTests\FPConvF2Lng\FPConvF2Lng.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPConvF2Lng
@@ -24891,6 +27027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPConvI2F.cmd_3572]
 RelativePath=JIT\CodeGenBringUpTests\FPConvI2F\FPConvI2F.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPConvI2F
@@ -24898,6 +27035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPDist.cmd_3573]
 RelativePath=JIT\CodeGenBringUpTests\FPDist\FPDist.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPDist
@@ -24905,6 +27043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPDiv.cmd_3574]
 RelativePath=JIT\CodeGenBringUpTests\FPDiv\FPDiv.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPDiv
@@ -24912,6 +27051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPDivConst.cmd_3575]
 RelativePath=JIT\CodeGenBringUpTests\FPDivConst\FPDivConst.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPDivConst
@@ -24919,6 +27059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPError.cmd_3576]
 RelativePath=JIT\CodeGenBringUpTests\FPError\FPError.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPError
@@ -24926,6 +27067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPFillArray.cmd_3577]
 RelativePath=JIT\CodeGenBringUpTests\FPFillArray\FPFillArray.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPFillArray
@@ -24933,6 +27075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPMath.cmd_3578]
 RelativePath=JIT\CodeGenBringUpTests\FPMath\FPMath.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPMath
@@ -24940,6 +27083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPMul.cmd_3579]
 RelativePath=JIT\CodeGenBringUpTests\FPMul\FPMul.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPMul
@@ -24947,6 +27091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPMulConst.cmd_3580]
 RelativePath=JIT\CodeGenBringUpTests\FPMulConst\FPMulConst.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPMulConst
@@ -24954,6 +27099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPNeg.cmd_3581]
 RelativePath=JIT\CodeGenBringUpTests\FPNeg\FPNeg.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPNeg
@@ -24961,6 +27107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPRem.cmd_3582]
 RelativePath=JIT\CodeGenBringUpTests\FPRem\FPRem.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPRem
@@ -24968,6 +27115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPRoots.cmd_3583]
 RelativePath=JIT\CodeGenBringUpTests\FPRoots\FPRoots.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPRoots
@@ -24975,6 +27123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPSmall.cmd_3584]
 RelativePath=JIT\CodeGenBringUpTests\FPSmall\FPSmall.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPSmall
@@ -24982,6 +27131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPSub.cmd_3585]
 RelativePath=JIT\CodeGenBringUpTests\FPSub\FPSub.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPSub
@@ -24989,6 +27139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPSubConst.cmd_3586]
 RelativePath=JIT\CodeGenBringUpTests\FPSubConst\FPSubConst.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPSubConst
@@ -24996,6 +27147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPVar.cmd_3587]
 RelativePath=JIT\CodeGenBringUpTests\FPVar\FPVar.cmd
 WorkingDir=JIT\CodeGenBringUpTests\FPVar
@@ -25003,6 +27155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Gcd.cmd_3588]
 RelativePath=JIT\CodeGenBringUpTests\Gcd\Gcd.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Gcd
@@ -25010,6 +27163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Ge1.cmd_3589]
 RelativePath=JIT\CodeGenBringUpTests\Ge1\Ge1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Ge1
@@ -25017,6 +27171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Gt1.cmd_3590]
 RelativePath=JIT\CodeGenBringUpTests\Gt1\Gt1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Gt1
@@ -25024,6 +27179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Ind1.cmd_3591]
 RelativePath=JIT\CodeGenBringUpTests\Ind1\Ind1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Ind1
@@ -25031,6 +27187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [InitObj.cmd_3592]
 RelativePath=JIT\CodeGenBringUpTests\InitObj\InitObj.cmd
 WorkingDir=JIT\CodeGenBringUpTests\InitObj
@@ -25038,6 +27195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [InstanceCalls.cmd_3593]
 RelativePath=JIT\CodeGenBringUpTests\InstanceCalls\InstanceCalls.cmd
 WorkingDir=JIT\CodeGenBringUpTests\InstanceCalls
@@ -25045,6 +27203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [IntArraySum.cmd_3594]
 RelativePath=JIT\CodeGenBringUpTests\IntArraySum\IntArraySum.cmd
 WorkingDir=JIT\CodeGenBringUpTests\IntArraySum
@@ -25052,6 +27211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [IntConv.cmd_3595]
 RelativePath=JIT\CodeGenBringUpTests\IntConv\IntConv.cmd
 WorkingDir=JIT\CodeGenBringUpTests\IntConv
@@ -25059,6 +27219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Jmp1.cmd_3596]
 RelativePath=JIT\CodeGenBringUpTests\Jmp1\Jmp1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Jmp1
@@ -25066,6 +27227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrue1.cmd_3597]
 RelativePath=JIT\CodeGenBringUpTests\JTrue1\JTrue1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrue1
@@ -25073,6 +27235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueEqDbl.cmd_3598]
 RelativePath=JIT\CodeGenBringUpTests\JTrueEqDbl\JTrueEqDbl.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueEqDbl
@@ -25080,6 +27243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueEqFP.cmd_3599]
 RelativePath=JIT\CodeGenBringUpTests\JTrueEqFP\JTrueEqFP.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueEqFP
@@ -25087,6 +27251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueEqInt1.cmd_3600]
 RelativePath=JIT\CodeGenBringUpTests\JTrueEqInt1\JTrueEqInt1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueEqInt1
@@ -25094,6 +27259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueGeDbl.cmd_3601]
 RelativePath=JIT\CodeGenBringUpTests\JTrueGeDbl\JTrueGeDbl.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueGeDbl
@@ -25101,6 +27267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueGeFP.cmd_3602]
 RelativePath=JIT\CodeGenBringUpTests\JTrueGeFP\JTrueGeFP.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueGeFP
@@ -25108,6 +27275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueGeInt1.cmd_3603]
 RelativePath=JIT\CodeGenBringUpTests\JTrueGeInt1\JTrueGeInt1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueGeInt1
@@ -25115,6 +27283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueGtDbl.cmd_3604]
 RelativePath=JIT\CodeGenBringUpTests\JTrueGtDbl\JTrueGtDbl.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueGtDbl
@@ -25122,6 +27291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueGtFP.cmd_3605]
 RelativePath=JIT\CodeGenBringUpTests\JTrueGtFP\JTrueGtFP.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueGtFP
@@ -25129,6 +27299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueGtInt1.cmd_3606]
 RelativePath=JIT\CodeGenBringUpTests\JTrueGtInt1\JTrueGtInt1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueGtInt1
@@ -25136,6 +27307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueLeDbl.cmd_3607]
 RelativePath=JIT\CodeGenBringUpTests\JTrueLeDbl\JTrueLeDbl.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueLeDbl
@@ -25143,6 +27315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueLeFP.cmd_3608]
 RelativePath=JIT\CodeGenBringUpTests\JTrueLeFP\JTrueLeFP.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueLeFP
@@ -25150,6 +27323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueLeInt1.cmd_3609]
 RelativePath=JIT\CodeGenBringUpTests\JTrueLeInt1\JTrueLeInt1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueLeInt1
@@ -25157,6 +27331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueLtDbl.cmd_3610]
 RelativePath=JIT\CodeGenBringUpTests\JTrueLtDbl\JTrueLtDbl.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueLtDbl
@@ -25164,6 +27339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueLtFP.cmd_3611]
 RelativePath=JIT\CodeGenBringUpTests\JTrueLtFP\JTrueLtFP.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueLtFP
@@ -25171,6 +27347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueLtInt1.cmd_3612]
 RelativePath=JIT\CodeGenBringUpTests\JTrueLtInt1\JTrueLtInt1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueLtInt1
@@ -25178,6 +27355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueNeDbl.cmd_3613]
 RelativePath=JIT\CodeGenBringUpTests\JTrueNeDbl\JTrueNeDbl.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueNeDbl
@@ -25185,6 +27363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueNeFP.cmd_3614]
 RelativePath=JIT\CodeGenBringUpTests\JTrueNeFP\JTrueNeFP.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueNeFP
@@ -25192,6 +27371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JTrueNeInt1.cmd_3615]
 RelativePath=JIT\CodeGenBringUpTests\JTrueNeInt1\JTrueNeInt1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\JTrueNeInt1
@@ -25199,6 +27379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Le1.cmd_3616]
 RelativePath=JIT\CodeGenBringUpTests\Le1\Le1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Le1
@@ -25206,6 +27387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [LeftShift.cmd_3617]
 RelativePath=JIT\CodeGenBringUpTests\LeftShift\LeftShift.cmd
 WorkingDir=JIT\CodeGenBringUpTests\LeftShift
@@ -25213,6 +27395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [LngConv.cmd_3618]
 RelativePath=JIT\CodeGenBringUpTests\LngConv\LngConv.cmd
 WorkingDir=JIT\CodeGenBringUpTests\LngConv
@@ -25220,6 +27403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Localloc.cmd_3619]
 RelativePath=JIT\CodeGenBringUpTests\Localloc\Localloc.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Localloc
@@ -25227,6 +27411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [LocallocLarge.cmd_3620]
 RelativePath=JIT\CodeGenBringUpTests\LocallocLarge\LocallocLarge.cmd
 WorkingDir=JIT\CodeGenBringUpTests\LocallocLarge
@@ -25234,6 +27419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [LongArgsAndReturn.cmd_3621]
 RelativePath=JIT\CodeGenBringUpTests\LongArgsAndReturn\LongArgsAndReturn.cmd
 WorkingDir=JIT\CodeGenBringUpTests\LongArgsAndReturn
@@ -25241,6 +27427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Lt1.cmd_3622]
 RelativePath=JIT\CodeGenBringUpTests\Lt1\Lt1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Lt1
@@ -25248,6 +27435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mul1.cmd_3623]
 RelativePath=JIT\CodeGenBringUpTests\mul1\mul1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\mul1
@@ -25255,6 +27443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mul2.cmd_3624]
 RelativePath=JIT\CodeGenBringUpTests\mul2\mul2.cmd
 WorkingDir=JIT\CodeGenBringUpTests\mul2
@@ -25262,6 +27451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mul3.cmd_3625]
 RelativePath=JIT\CodeGenBringUpTests\mul3\mul3.cmd
 WorkingDir=JIT\CodeGenBringUpTests\mul3
@@ -25269,6 +27459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mul4.cmd_3626]
 RelativePath=JIT\CodeGenBringUpTests\mul4\mul4.cmd
 WorkingDir=JIT\CodeGenBringUpTests\mul4
@@ -25276,6 +27467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Ne1.cmd_3627]
 RelativePath=JIT\CodeGenBringUpTests\Ne1\Ne1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Ne1
@@ -25283,6 +27475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [NegRMW.cmd_3628]
 RelativePath=JIT\CodeGenBringUpTests\NegRMW\NegRMW.cmd
 WorkingDir=JIT\CodeGenBringUpTests\NegRMW
@@ -25290,6 +27483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [NestedCall.cmd_3629]
 RelativePath=JIT\CodeGenBringUpTests\NestedCall\NestedCall.cmd
 WorkingDir=JIT\CodeGenBringUpTests\NestedCall
@@ -25297,6 +27491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [NotAndNeg.cmd_3630]
 RelativePath=JIT\CodeGenBringUpTests\NotAndNeg\NotAndNeg.cmd
 WorkingDir=JIT\CodeGenBringUpTests\NotAndNeg
@@ -25304,6 +27499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [NotRMW.cmd_3631]
 RelativePath=JIT\CodeGenBringUpTests\NotRMW\NotRMW.cmd
 WorkingDir=JIT\CodeGenBringUpTests\NotRMW
@@ -25311,6 +27507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ObjAlloc.cmd_3632]
 RelativePath=JIT\CodeGenBringUpTests\ObjAlloc\ObjAlloc.cmd
 WorkingDir=JIT\CodeGenBringUpTests\ObjAlloc
@@ -25318,6 +27515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [OpMembersOfStructLocal.cmd_3633]
 RelativePath=JIT\CodeGenBringUpTests\OpMembersOfStructLocal\OpMembersOfStructLocal.cmd
 WorkingDir=JIT\CodeGenBringUpTests\OpMembersOfStructLocal
@@ -25325,6 +27523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Or1.cmd_3634]
 RelativePath=JIT\CodeGenBringUpTests\Or1\Or1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Or1
@@ -25332,6 +27531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [OrRef.cmd_3635]
 RelativePath=JIT\CodeGenBringUpTests\OrRef\OrRef.cmd
 WorkingDir=JIT\CodeGenBringUpTests\OrRef
@@ -25339,6 +27539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [RecursiveTailCall.cmd_3636]
 RelativePath=JIT\CodeGenBringUpTests\RecursiveTailCall\RecursiveTailCall.cmd
 WorkingDir=JIT\CodeGenBringUpTests\RecursiveTailCall
@@ -25346,6 +27547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rem1.cmd_3637]
 RelativePath=JIT\CodeGenBringUpTests\rem1\rem1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\rem1
@@ -25353,6 +27555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [RightShiftRef.cmd_3638]
 RelativePath=JIT\CodeGenBringUpTests\RightShiftRef\RightShiftRef.cmd
 WorkingDir=JIT\CodeGenBringUpTests\RightShiftRef
@@ -25360,6 +27563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Rotate.cmd_3639]
 RelativePath=JIT\CodeGenBringUpTests\Rotate\Rotate.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Rotate
@@ -25367,6 +27571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [StaticCalls.cmd_3640]
 RelativePath=JIT\CodeGenBringUpTests\StaticCalls\StaticCalls.cmd
 WorkingDir=JIT\CodeGenBringUpTests\StaticCalls
@@ -25374,6 +27579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [StaticValueField.cmd_3641]
 RelativePath=JIT\CodeGenBringUpTests\StaticValueField\StaticValueField.cmd
 WorkingDir=JIT\CodeGenBringUpTests\StaticValueField
@@ -25381,13 +27587,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct16args.cmd_3642]
 RelativePath=JIT\CodeGenBringUpTests\struct16args\struct16args.cmd
 WorkingDir=JIT\CodeGenBringUpTests\struct16args
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [StructFldAddr.cmd_3643]
 RelativePath=JIT\CodeGenBringUpTests\StructFldAddr\StructFldAddr.cmd
 WorkingDir=JIT\CodeGenBringUpTests\StructFldAddr
@@ -25395,6 +27603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [StructInstMethod.cmd_3644]
 RelativePath=JIT\CodeGenBringUpTests\StructInstMethod\StructInstMethod.cmd
 WorkingDir=JIT\CodeGenBringUpTests\StructInstMethod
@@ -25402,6 +27611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Sub1.cmd_3645]
 RelativePath=JIT\CodeGenBringUpTests\Sub1\Sub1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Sub1
@@ -25409,6 +27619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SubRef.cmd_3646]
 RelativePath=JIT\CodeGenBringUpTests\SubRef\SubRef.cmd
 WorkingDir=JIT\CodeGenBringUpTests\SubRef
@@ -25416,6 +27627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Swap.cmd_3647]
 RelativePath=JIT\CodeGenBringUpTests\Swap\Swap.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Swap
@@ -25423,6 +27635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Switch.cmd_3648]
 RelativePath=JIT\CodeGenBringUpTests\Switch\Switch.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Switch
@@ -25430,6 +27643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Unbox.cmd_3649]
 RelativePath=JIT\CodeGenBringUpTests\Unbox\Unbox.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Unbox
@@ -25437,6 +27651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Xor1.cmd_3650]
 RelativePath=JIT\CodeGenBringUpTests\Xor1\Xor1.cmd
 WorkingDir=JIT\CodeGenBringUpTests\Xor1
@@ -25444,6 +27659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [XorRef.cmd_3651]
 RelativePath=JIT\CodeGenBringUpTests\XorRef\XorRef.cmd
 WorkingDir=JIT\CodeGenBringUpTests\XorRef
@@ -25451,6 +27667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_Arrayscomplex3.cmd_3652]
 RelativePath=JIT\Directed\array-il\_Arrayscomplex3\_Arrayscomplex3.cmd
 WorkingDir=JIT\Directed\array-il\_Arrayscomplex3
@@ -25458,6 +27675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_Arrayssimple3.cmd_3653]
 RelativePath=JIT\Directed\array-il\_Arrayssimple3\_Arrayssimple3.cmd
 WorkingDir=JIT\Directed\array-il\_Arrayssimple3
@@ -25465,6 +27683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Complex1.cmd_3654]
 RelativePath=JIT\Directed\Arrays\Complex1\Complex1.cmd
 WorkingDir=JIT\Directed\Arrays\Complex1
@@ -25472,6 +27691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Complex2.cmd_3655]
 RelativePath=JIT\Directed\Arrays\Complex2\Complex2.cmd
 WorkingDir=JIT\Directed\Arrays\Complex2
@@ -25479,6 +27699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Simple1.cmd_3656]
 RelativePath=JIT\Directed\Arrays\Simple1\Simple1.cmd
 WorkingDir=JIT\Directed\Arrays\Simple1
@@ -25486,6 +27707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Simple2.cmd_3657]
 RelativePath=JIT\Directed\Arrays\Simple2\Simple2.cmd
 WorkingDir=JIT\Directed\Arrays\Simple2
@@ -25493,6 +27715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Generic_Test_CSharp_Base_1.cmd_3658]
 RelativePath=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Base_1\Generic_Test_CSharp_Base_1.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Base_1
@@ -25500,6 +27723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Generic_Test_CSharp_Base_2.cmd_3659]
 RelativePath=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Base_2\Generic_Test_CSharp_Base_2.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Base_2
@@ -25507,6 +27731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Generic_Test_CSharp_Base_3.cmd_3660]
 RelativePath=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Base_3\Generic_Test_CSharp_Base_3.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Base_3
@@ -25514,6 +27739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Generic_Test_CSharp_Base_4.cmd_3661]
 RelativePath=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Base_4\Generic_Test_CSharp_Base_4.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Base_4
@@ -25521,6 +27747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Generic_Test_CSharp_Base_6.cmd_3662]
 RelativePath=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Base_6\Generic_Test_CSharp_Base_6.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Base_6
@@ -25528,6 +27755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Generic_Test_CSharp_Peer_1.cmd_3663]
 RelativePath=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Peer_1\Generic_Test_CSharp_Peer_1.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Peer_1
@@ -25535,6 +27763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Generic_Test_CSharp_Peer_2.cmd_3664]
 RelativePath=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Peer_2\Generic_Test_CSharp_Peer_2.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Peer_2
@@ -25542,6 +27771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Generic_Test_CSharp_Peer_3.cmd_3665]
 RelativePath=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Peer_3\Generic_Test_CSharp_Peer_3.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Peer_3
@@ -25549,6 +27779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Generic_Test_CSharp_Peer_4.cmd_3666]
 RelativePath=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Peer_4\Generic_Test_CSharp_Peer_4.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Peer_4
@@ -25556,6 +27787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Generic_Test_CSharp_Peer_6.cmd_3667]
 RelativePath=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Peer_6\Generic_Test_CSharp_Peer_6.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Generic_Test_CSharp_Peer_6
@@ -25563,6 +27795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Test_CSharp_Base_1.cmd_3668]
 RelativePath=JIT\Directed\CheckedCtor\Test_CSharp_Base_1\Test_CSharp_Base_1.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Test_CSharp_Base_1
@@ -25570,6 +27803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Test_CSharp_Base_2.cmd_3669]
 RelativePath=JIT\Directed\CheckedCtor\Test_CSharp_Base_2\Test_CSharp_Base_2.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Test_CSharp_Base_2
@@ -25577,6 +27811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Test_CSharp_Base_3.cmd_3670]
 RelativePath=JIT\Directed\CheckedCtor\Test_CSharp_Base_3\Test_CSharp_Base_3.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Test_CSharp_Base_3
@@ -25584,6 +27819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Test_CSharp_Base_4.cmd_3671]
 RelativePath=JIT\Directed\CheckedCtor\Test_CSharp_Base_4\Test_CSharp_Base_4.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Test_CSharp_Base_4
@@ -25591,6 +27827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Test_CSharp_Peer_1.cmd_3672]
 RelativePath=JIT\Directed\CheckedCtor\Test_CSharp_Peer_1\Test_CSharp_Peer_1.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Test_CSharp_Peer_1
@@ -25598,6 +27835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Test_CSharp_Peer_2.cmd_3673]
 RelativePath=JIT\Directed\CheckedCtor\Test_CSharp_Peer_2\Test_CSharp_Peer_2.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Test_CSharp_Peer_2
@@ -25605,6 +27843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Test_CSharp_Peer_3.cmd_3674]
 RelativePath=JIT\Directed\CheckedCtor\Test_CSharp_Peer_3\Test_CSharp_Peer_3.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Test_CSharp_Peer_3
@@ -25612,6 +27851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Test_CSharp_Peer_4.cmd_3675]
 RelativePath=JIT\Directed\CheckedCtor\Test_CSharp_Peer_4\Test_CSharp_Peer_4.cmd
 WorkingDir=JIT\Directed\CheckedCtor\Test_CSharp_Peer_4
@@ -25619,6 +27859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_And_Op_cs_d.cmd_3676]
 RelativePath=JIT\Directed\cmov\Bool_And_Op_cs_d\Bool_And_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Bool_And_Op_cs_d
@@ -25626,6 +27867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_And_Op_cs_do.cmd_3677]
 RelativePath=JIT\Directed\cmov\Bool_And_Op_cs_do\Bool_And_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Bool_And_Op_cs_do
@@ -25633,6 +27875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_And_Op_cs_r.cmd_3678]
 RelativePath=JIT\Directed\cmov\Bool_And_Op_cs_r\Bool_And_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Bool_And_Op_cs_r
@@ -25640,6 +27883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_And_Op_cs_ro.cmd_3679]
 RelativePath=JIT\Directed\cmov\Bool_And_Op_cs_ro\Bool_And_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Bool_And_Op_cs_ro
@@ -25647,6 +27891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_No_Op_cs_d.cmd_3680]
 RelativePath=JIT\Directed\cmov\Bool_No_Op_cs_d\Bool_No_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Bool_No_Op_cs_d
@@ -25654,6 +27899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_No_Op_cs_do.cmd_3681]
 RelativePath=JIT\Directed\cmov\Bool_No_Op_cs_do\Bool_No_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Bool_No_Op_cs_do
@@ -25661,6 +27907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_No_Op_cs_r.cmd_3682]
 RelativePath=JIT\Directed\cmov\Bool_No_Op_cs_r\Bool_No_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Bool_No_Op_cs_r
@@ -25668,6 +27915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_No_Op_cs_ro.cmd_3683]
 RelativePath=JIT\Directed\cmov\Bool_No_Op_cs_ro\Bool_No_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Bool_No_Op_cs_ro
@@ -25675,6 +27923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_Or_Op_cs_d.cmd_3684]
 RelativePath=JIT\Directed\cmov\Bool_Or_Op_cs_d\Bool_Or_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Bool_Or_Op_cs_d
@@ -25682,6 +27931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_Or_Op_cs_do.cmd_3685]
 RelativePath=JIT\Directed\cmov\Bool_Or_Op_cs_do\Bool_Or_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Bool_Or_Op_cs_do
@@ -25689,6 +27939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_Or_Op_cs_r.cmd_3686]
 RelativePath=JIT\Directed\cmov\Bool_Or_Op_cs_r\Bool_Or_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Bool_Or_Op_cs_r
@@ -25696,6 +27947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_Or_Op_cs_ro.cmd_3687]
 RelativePath=JIT\Directed\cmov\Bool_Or_Op_cs_ro\Bool_Or_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Bool_Or_Op_cs_ro
@@ -25703,6 +27955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_Xor_Op_cs_d.cmd_3688]
 RelativePath=JIT\Directed\cmov\Bool_Xor_Op_cs_d\Bool_Xor_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Bool_Xor_Op_cs_d
@@ -25710,6 +27963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_Xor_Op_cs_do.cmd_3689]
 RelativePath=JIT\Directed\cmov\Bool_Xor_Op_cs_do\Bool_Xor_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Bool_Xor_Op_cs_do
@@ -25717,6 +27971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_Xor_Op_cs_r.cmd_3690]
 RelativePath=JIT\Directed\cmov\Bool_Xor_Op_cs_r\Bool_Xor_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Bool_Xor_Op_cs_r
@@ -25724,6 +27979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bool_Xor_Op_cs_ro.cmd_3691]
 RelativePath=JIT\Directed\cmov\Bool_Xor_Op_cs_ro\Bool_Xor_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Bool_Xor_Op_cs_ro
@@ -25731,6 +27987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_And_Op_cs_d.cmd_3692]
 RelativePath=JIT\Directed\cmov\Double_And_Op_cs_d\Double_And_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Double_And_Op_cs_d
@@ -25738,6 +27995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_And_Op_cs_do.cmd_3693]
 RelativePath=JIT\Directed\cmov\Double_And_Op_cs_do\Double_And_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Double_And_Op_cs_do
@@ -25745,6 +28003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_And_Op_cs_r.cmd_3694]
 RelativePath=JIT\Directed\cmov\Double_And_Op_cs_r\Double_And_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Double_And_Op_cs_r
@@ -25752,6 +28011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_And_Op_cs_ro.cmd_3695]
 RelativePath=JIT\Directed\cmov\Double_And_Op_cs_ro\Double_And_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Double_And_Op_cs_ro
@@ -25759,6 +28019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_No_Op_cs_d.cmd_3696]
 RelativePath=JIT\Directed\cmov\Double_No_Op_cs_d\Double_No_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Double_No_Op_cs_d
@@ -25766,6 +28027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_No_Op_cs_do.cmd_3697]
 RelativePath=JIT\Directed\cmov\Double_No_Op_cs_do\Double_No_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Double_No_Op_cs_do
@@ -25773,6 +28035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_No_Op_cs_r.cmd_3698]
 RelativePath=JIT\Directed\cmov\Double_No_Op_cs_r\Double_No_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Double_No_Op_cs_r
@@ -25780,6 +28043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_No_Op_cs_ro.cmd_3699]
 RelativePath=JIT\Directed\cmov\Double_No_Op_cs_ro\Double_No_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Double_No_Op_cs_ro
@@ -25787,6 +28051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_Or_Op_cs_d.cmd_3700]
 RelativePath=JIT\Directed\cmov\Double_Or_Op_cs_d\Double_Or_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Double_Or_Op_cs_d
@@ -25794,6 +28059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_Or_Op_cs_do.cmd_3701]
 RelativePath=JIT\Directed\cmov\Double_Or_Op_cs_do\Double_Or_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Double_Or_Op_cs_do
@@ -25801,6 +28067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_Or_Op_cs_r.cmd_3702]
 RelativePath=JIT\Directed\cmov\Double_Or_Op_cs_r\Double_Or_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Double_Or_Op_cs_r
@@ -25808,6 +28075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_Or_Op_cs_ro.cmd_3703]
 RelativePath=JIT\Directed\cmov\Double_Or_Op_cs_ro\Double_Or_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Double_Or_Op_cs_ro
@@ -25815,6 +28083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_Xor_Op_cs_d.cmd_3704]
 RelativePath=JIT\Directed\cmov\Double_Xor_Op_cs_d\Double_Xor_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Double_Xor_Op_cs_d
@@ -25822,6 +28091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_Xor_Op_cs_do.cmd_3705]
 RelativePath=JIT\Directed\cmov\Double_Xor_Op_cs_do\Double_Xor_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Double_Xor_Op_cs_do
@@ -25829,6 +28099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_Xor_Op_cs_r.cmd_3706]
 RelativePath=JIT\Directed\cmov\Double_Xor_Op_cs_r\Double_Xor_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Double_Xor_Op_cs_r
@@ -25836,6 +28107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Double_Xor_Op_cs_ro.cmd_3707]
 RelativePath=JIT\Directed\cmov\Double_Xor_Op_cs_ro\Double_Xor_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Double_Xor_Op_cs_ro
@@ -25843,6 +28115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_And_Op_cs_d.cmd_3708]
 RelativePath=JIT\Directed\cmov\Float_And_Op_cs_d\Float_And_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Float_And_Op_cs_d
@@ -25850,6 +28123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_And_Op_cs_do.cmd_3709]
 RelativePath=JIT\Directed\cmov\Float_And_Op_cs_do\Float_And_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Float_And_Op_cs_do
@@ -25857,6 +28131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_And_Op_cs_r.cmd_3710]
 RelativePath=JIT\Directed\cmov\Float_And_Op_cs_r\Float_And_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Float_And_Op_cs_r
@@ -25864,6 +28139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_And_Op_cs_ro.cmd_3711]
 RelativePath=JIT\Directed\cmov\Float_And_Op_cs_ro\Float_And_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Float_And_Op_cs_ro
@@ -25871,6 +28147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_No_Op_cs_d.cmd_3712]
 RelativePath=JIT\Directed\cmov\Float_No_Op_cs_d\Float_No_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Float_No_Op_cs_d
@@ -25878,6 +28155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_No_Op_cs_do.cmd_3713]
 RelativePath=JIT\Directed\cmov\Float_No_Op_cs_do\Float_No_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Float_No_Op_cs_do
@@ -25885,6 +28163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_No_Op_cs_r.cmd_3714]
 RelativePath=JIT\Directed\cmov\Float_No_Op_cs_r\Float_No_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Float_No_Op_cs_r
@@ -25892,6 +28171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_No_Op_cs_ro.cmd_3715]
 RelativePath=JIT\Directed\cmov\Float_No_Op_cs_ro\Float_No_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Float_No_Op_cs_ro
@@ -25899,6 +28179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_Or_Op_cs_d.cmd_3716]
 RelativePath=JIT\Directed\cmov\Float_Or_Op_cs_d\Float_Or_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Float_Or_Op_cs_d
@@ -25906,6 +28187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_Or_Op_cs_do.cmd_3717]
 RelativePath=JIT\Directed\cmov\Float_Or_Op_cs_do\Float_Or_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Float_Or_Op_cs_do
@@ -25913,6 +28195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_Or_Op_cs_r.cmd_3718]
 RelativePath=JIT\Directed\cmov\Float_Or_Op_cs_r\Float_Or_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Float_Or_Op_cs_r
@@ -25920,6 +28203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_Or_Op_cs_ro.cmd_3719]
 RelativePath=JIT\Directed\cmov\Float_Or_Op_cs_ro\Float_Or_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Float_Or_Op_cs_ro
@@ -25927,6 +28211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_Xor_Op_cs_d.cmd_3720]
 RelativePath=JIT\Directed\cmov\Float_Xor_Op_cs_d\Float_Xor_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Float_Xor_Op_cs_d
@@ -25934,6 +28219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_Xor_Op_cs_do.cmd_3721]
 RelativePath=JIT\Directed\cmov\Float_Xor_Op_cs_do\Float_Xor_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Float_Xor_Op_cs_do
@@ -25941,6 +28227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_Xor_Op_cs_r.cmd_3722]
 RelativePath=JIT\Directed\cmov\Float_Xor_Op_cs_r\Float_Xor_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Float_Xor_Op_cs_r
@@ -25948,6 +28235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Float_Xor_Op_cs_ro.cmd_3723]
 RelativePath=JIT\Directed\cmov\Float_Xor_Op_cs_ro\Float_Xor_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Float_Xor_Op_cs_ro
@@ -25955,6 +28243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_And_Op_cs_d.cmd_3724]
 RelativePath=JIT\Directed\cmov\Int_And_Op_cs_d\Int_And_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Int_And_Op_cs_d
@@ -25962,6 +28251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_And_Op_cs_do.cmd_3725]
 RelativePath=JIT\Directed\cmov\Int_And_Op_cs_do\Int_And_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Int_And_Op_cs_do
@@ -25969,6 +28259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_And_Op_cs_r.cmd_3726]
 RelativePath=JIT\Directed\cmov\Int_And_Op_cs_r\Int_And_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Int_And_Op_cs_r
@@ -25976,6 +28267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_And_Op_cs_ro.cmd_3727]
 RelativePath=JIT\Directed\cmov\Int_And_Op_cs_ro\Int_And_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Int_And_Op_cs_ro
@@ -25983,6 +28275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_No_Op_cs_d.cmd_3728]
 RelativePath=JIT\Directed\cmov\Int_No_Op_cs_d\Int_No_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Int_No_Op_cs_d
@@ -25990,6 +28283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_No_Op_cs_do.cmd_3729]
 RelativePath=JIT\Directed\cmov\Int_No_Op_cs_do\Int_No_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Int_No_Op_cs_do
@@ -25997,6 +28291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_No_Op_cs_r.cmd_3730]
 RelativePath=JIT\Directed\cmov\Int_No_Op_cs_r\Int_No_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Int_No_Op_cs_r
@@ -26004,6 +28299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_No_Op_cs_ro.cmd_3731]
 RelativePath=JIT\Directed\cmov\Int_No_Op_cs_ro\Int_No_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Int_No_Op_cs_ro
@@ -26011,6 +28307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_Or_Op_cs_d.cmd_3732]
 RelativePath=JIT\Directed\cmov\Int_Or_Op_cs_d\Int_Or_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Int_Or_Op_cs_d
@@ -26018,6 +28315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_Or_Op_cs_do.cmd_3733]
 RelativePath=JIT\Directed\cmov\Int_Or_Op_cs_do\Int_Or_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Int_Or_Op_cs_do
@@ -26025,6 +28323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_Or_Op_cs_r.cmd_3734]
 RelativePath=JIT\Directed\cmov\Int_Or_Op_cs_r\Int_Or_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Int_Or_Op_cs_r
@@ -26032,6 +28331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_Or_Op_cs_ro.cmd_3735]
 RelativePath=JIT\Directed\cmov\Int_Or_Op_cs_ro\Int_Or_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Int_Or_Op_cs_ro
@@ -26039,6 +28339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_Xor_Op_cs_d.cmd_3736]
 RelativePath=JIT\Directed\cmov\Int_Xor_Op_cs_d\Int_Xor_Op_cs_d.cmd
 WorkingDir=JIT\Directed\cmov\Int_Xor_Op_cs_d
@@ -26046,6 +28347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_Xor_Op_cs_do.cmd_3737]
 RelativePath=JIT\Directed\cmov\Int_Xor_Op_cs_do\Int_Xor_Op_cs_do.cmd
 WorkingDir=JIT\Directed\cmov\Int_Xor_Op_cs_do
@@ -26053,6 +28355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_Xor_Op_cs_r.cmd_3738]
 RelativePath=JIT\Directed\cmov\Int_Xor_Op_cs_r\Int_Xor_Op_cs_r.cmd
 WorkingDir=JIT\Directed\cmov\Int_Xor_Op_cs_r
@@ -26060,6 +28363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Int_Xor_Op_cs_ro.cmd_3739]
 RelativePath=JIT\Directed\cmov\Int_Xor_Op_cs_ro\Int_Xor_Op_cs_ro.cmd
 WorkingDir=JIT\Directed\cmov\Int_Xor_Op_cs_ro
@@ -26067,6 +28371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FPZero.cmd_3740]
 RelativePath=JIT\Directed\Convert\FPZero\FPZero.cmd
 WorkingDir=JIT\Directed\Convert\FPZero
@@ -26074,6 +28379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [implicitConv.cmd_3741]
 RelativePath=JIT\Directed\Convert\implicitConv\implicitConv.cmd
 WorkingDir=JIT\Directed\Convert\implicitConv
@@ -26081,6 +28387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [minopts_convu1.cmd_3742]
 RelativePath=JIT\Directed\Convert\minopts_convu1\minopts_convu1.cmd
 WorkingDir=JIT\Directed\Convert\minopts_convu1
@@ -26088,6 +28395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FilterToHandler.cmd_3743]
 RelativePath=JIT\Directed\coverage\compiler\FilterToHandler\FilterToHandler.cmd
 WorkingDir=JIT\Directed\coverage\compiler\FilterToHandler
@@ -26095,6 +28403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xaddmuly_cs_d.cmd_3744]
 RelativePath=JIT\Directed\coverage\flowgraph\xaddmuly_cs_d\xaddmuly_cs_d.cmd
 WorkingDir=JIT\Directed\coverage\flowgraph\xaddmuly_cs_d
@@ -26102,6 +28411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [xaddmuly_cs_do.cmd_3745]
 RelativePath=JIT\Directed\coverage\flowgraph\xaddmuly_cs_do\xaddmuly_cs_do.cmd
 WorkingDir=JIT\Directed\coverage\flowgraph\xaddmuly_cs_do
@@ -26109,6 +28419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [xaddmuly_cs_r.cmd_3746]
 RelativePath=JIT\Directed\coverage\flowgraph\xaddmuly_cs_r\xaddmuly_cs_r.cmd
 WorkingDir=JIT\Directed\coverage\flowgraph\xaddmuly_cs_r
@@ -26116,6 +28427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [xaddmuly_cs_ro.cmd_3747]
 RelativePath=JIT\Directed\coverage\flowgraph\xaddmuly_cs_ro\xaddmuly_cs_ro.cmd
 WorkingDir=JIT\Directed\coverage\flowgraph\xaddmuly_cs_ro
@@ -26123,6 +28435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [badendfinally.cmd_3748]
 RelativePath=JIT\Directed\coverage\importer\badendfinally\badendfinally.cmd
 WorkingDir=JIT\Directed\coverage\importer\badendfinally
@@ -26130,6 +28443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [badtailcall.cmd_3749]
 RelativePath=JIT\Directed\coverage\importer\badtailcall\badtailcall.cmd
 WorkingDir=JIT\Directed\coverage\importer\badtailcall
@@ -26137,6 +28451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [byrefsubbyref1.cmd_3750]
 RelativePath=JIT\Directed\coverage\importer\byrefsubbyref1\byrefsubbyref1.cmd
 WorkingDir=JIT\Directed\coverage\importer\byrefsubbyref1
@@ -26144,6 +28459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [calli2.cmd_3751]
 RelativePath=JIT\Directed\coverage\importer\calli2\calli2.cmd
 WorkingDir=JIT\Directed\coverage\importer\calli2
@@ -26151,6 +28467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ceeillegal.cmd_3752]
 RelativePath=JIT\Directed\coverage\importer\ceeillegal\ceeillegal.cmd
 WorkingDir=JIT\Directed\coverage\importer\ceeillegal
@@ -26158,6 +28475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [badendfinally_il_d.cmd_3753]
 RelativePath=JIT\Directed\coverage\importer\Desktop\badendfinally_il_d\badendfinally_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\badendfinally_il_d
@@ -26165,6 +28483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badendfinally_il_r.cmd_3754]
 RelativePath=JIT\Directed\coverage\importer\Desktop\badendfinally_il_r\badendfinally_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\badendfinally_il_r
@@ -26172,20 +28491,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badldsfld_il_d.cmd_3755]
 RelativePath=JIT\Directed\coverage\importer\Desktop\badldsfld_il_d\badldsfld_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\badldsfld_il_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [badldsfld_il_r.cmd_3756]
 RelativePath=JIT\Directed\coverage\importer\Desktop\badldsfld_il_r\badldsfld_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\badldsfld_il_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [badtailcall_il_d.cmd_3757]
 RelativePath=JIT\Directed\coverage\importer\Desktop\badtailcall_il_d\badtailcall_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\badtailcall_il_d
@@ -26193,6 +28515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badtailcall_il_r.cmd_3758]
 RelativePath=JIT\Directed\coverage\importer\Desktop\badtailcall_il_r\badtailcall_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\badtailcall_il_r
@@ -26200,6 +28523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [byrefsubbyref1_il_d.cmd_3761]
 RelativePath=JIT\Directed\coverage\importer\Desktop\byrefsubbyref1_il_d\byrefsubbyref1_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\byrefsubbyref1_il_d
@@ -26207,6 +28531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [byrefsubbyref1_il_r.cmd_3762]
 RelativePath=JIT\Directed\coverage\importer\Desktop\byrefsubbyref1_il_r\byrefsubbyref1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\byrefsubbyref1_il_r
@@ -26214,6 +28539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [calli2_il_d.cmd_3763]
 RelativePath=JIT\Directed\coverage\importer\Desktop\calli2_il_d\calli2_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\calli2_il_d
@@ -26221,6 +28547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [calli2_il_r.cmd_3764]
 RelativePath=JIT\Directed\coverage\importer\Desktop\calli2_il_r\calli2_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\calli2_il_r
@@ -26228,6 +28555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ceeillegal_il_d.cmd_3765]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ceeillegal_il_d\ceeillegal_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ceeillegal_il_d
@@ -26235,6 +28563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ceeillegal_il_r.cmd_3766]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ceeillegal_il_r\ceeillegal_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ceeillegal_il_r
@@ -26242,6 +28571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldelemnullarr2_il_d.cmd_3769]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ldelemnullarr2_il_d\ldelemnullarr2_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ldelemnullarr2_il_d
@@ -26249,6 +28579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldelemnullarr2_il_r.cmd_3770]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ldelemnullarr2_il_r\ldelemnullarr2_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ldelemnullarr2_il_r
@@ -26256,6 +28587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldfldr4_il_d.cmd_3771]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ldfldr4_il_d\ldfldr4_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ldfldr4_il_d
@@ -26263,6 +28595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldfldr4_il_r.cmd_3772]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ldfldr4_il_r\ldfldr4_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ldfldr4_il_r
@@ -26270,6 +28603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldfldstatic1_il_d.cmd_3773]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ldfldstatic1_il_d\ldfldstatic1_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ldfldstatic1_il_d
@@ -26277,6 +28611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldfldstatic1_il_r.cmd_3774]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ldfldstatic1_il_r\ldfldstatic1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ldfldstatic1_il_r
@@ -26284,6 +28619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldfldunboxedvt_il_d.cmd_3775]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ldfldunboxedvt_il_d\ldfldunboxedvt_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ldfldunboxedvt_il_d
@@ -26291,6 +28627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldfldunboxedvt_il_r.cmd_3776]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ldfldunboxedvt_il_r\ldfldunboxedvt_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ldfldunboxedvt_il_r
@@ -26298,6 +28635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldvirtftnsideeffect_il_d.cmd_3777]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ldvirtftnsideeffect_il_d\ldvirtftnsideeffect_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ldvirtftnsideeffect_il_d
@@ -26305,6 +28643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldvirtftnsideeffect_il_r.cmd_3778]
 RelativePath=JIT\Directed\coverage\importer\Desktop\ldvirtftnsideeffect_il_r\ldvirtftnsideeffect_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\ldvirtftnsideeffect_il_r
@@ -26312,6 +28651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nullsdarr_il_d.cmd_3781]
 RelativePath=JIT\Directed\coverage\importer\Desktop\nullsdarr_il_d\nullsdarr_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\nullsdarr_il_d
@@ -26319,6 +28659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nullsdarr_il_r.cmd_3782]
 RelativePath=JIT\Directed\coverage\importer\Desktop\nullsdarr_il_r\nullsdarr_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\nullsdarr_il_r
@@ -26326,6 +28667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [refanytype1_il_d.cmd_3783]
 RelativePath=JIT\Directed\coverage\importer\Desktop\refanytype1_il_d\refanytype1_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\refanytype1_il_d
@@ -26333,6 +28675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [refanytype1_il_r.cmd_3784]
 RelativePath=JIT\Directed\coverage\importer\Desktop\refanytype1_il_r\refanytype1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\refanytype1_il_r
@@ -26340,6 +28683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stfldstatic1_il_d.cmd_3785]
 RelativePath=JIT\Directed\coverage\importer\Desktop\stfldstatic1_il_d\stfldstatic1_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\stfldstatic1_il_d
@@ -26347,6 +28691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stfldstatic1_il_r.cmd_3786]
 RelativePath=JIT\Directed\coverage\importer\Desktop\stfldstatic1_il_r\stfldstatic1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\stfldstatic1_il_r
@@ -26354,6 +28699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [subovfun1_il_d.cmd_3787]
 RelativePath=JIT\Directed\coverage\importer\Desktop\subovfun1_il_d\subovfun1_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\subovfun1_il_d
@@ -26361,6 +28707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [subovfun1_il_r.cmd_3788]
 RelativePath=JIT\Directed\coverage\importer\Desktop\subovfun1_il_r\subovfun1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\subovfun1_il_r
@@ -26368,6 +28715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [volatilldind_il_d.cmd_3789]
 RelativePath=JIT\Directed\coverage\importer\Desktop\volatilldind_il_d\volatilldind_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\volatilldind_il_d
@@ -26375,6 +28723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [volatilldind_il_r.cmd_3790]
 RelativePath=JIT\Directed\coverage\importer\Desktop\volatilldind_il_r\volatilldind_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\volatilldind_il_r
@@ -26382,6 +28731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [volatilstind_il_d.cmd_3791]
 RelativePath=JIT\Directed\coverage\importer\Desktop\volatilstind_il_d\volatilstind_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\volatilstind_il_d
@@ -26389,6 +28739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [volatilstind_il_r.cmd_3792]
 RelativePath=JIT\Directed\coverage\importer\Desktop\volatilstind_il_r\volatilstind_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\Desktop\volatilstind_il_r
@@ -26396,6 +28747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldelemnullarr2.cmd_3793]
 RelativePath=JIT\Directed\coverage\importer\ldelemnullarr2\ldelemnullarr2.cmd
 WorkingDir=JIT\Directed\coverage\importer\ldelemnullarr2
@@ -26403,6 +28755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldfldstatic1_il_r.cmd_3794]
 RelativePath=JIT\Directed\coverage\importer\ldfldstatic1_il_r\ldfldstatic1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\ldfldstatic1_il_r
@@ -26410,6 +28763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldfldunboxedvt.cmd_3795]
 RelativePath=JIT\Directed\coverage\importer\ldfldunboxedvt\ldfldunboxedvt.cmd
 WorkingDir=JIT\Directed\coverage\importer\ldfldunboxedvt
@@ -26417,6 +28771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldvirtftnsideeffect.cmd_3796]
 RelativePath=JIT\Directed\coverage\importer\ldvirtftnsideeffect\ldvirtftnsideeffect.cmd
 WorkingDir=JIT\Directed\coverage\importer\ldvirtftnsideeffect
@@ -26424,6 +28779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [nullsdarr.cmd_3797]
 RelativePath=JIT\Directed\coverage\importer\nullsdarr\nullsdarr.cmd
 WorkingDir=JIT\Directed\coverage\importer\nullsdarr
@@ -26431,6 +28787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [refanytype1.cmd_3798]
 RelativePath=JIT\Directed\coverage\importer\refanytype1\refanytype1.cmd
 WorkingDir=JIT\Directed\coverage\importer\refanytype1
@@ -26438,6 +28795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stfldstatic1_il_d.cmd_3799]
 RelativePath=JIT\Directed\coverage\importer\stfldstatic1_il_d\stfldstatic1_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\stfldstatic1_il_d
@@ -26445,6 +28803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stfldstatic1_il_r.cmd_3800]
 RelativePath=JIT\Directed\coverage\importer\stfldstatic1_il_r\stfldstatic1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\stfldstatic1_il_r
@@ -26452,6 +28811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [subovfun1_il_d.cmd_3801]
 RelativePath=JIT\Directed\coverage\importer\subovfun1_il_d\subovfun1_il_d.cmd
 WorkingDir=JIT\Directed\coverage\importer\subovfun1_il_d
@@ -26459,6 +28819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [subovfun1_il_r.cmd_3802]
 RelativePath=JIT\Directed\coverage\importer\subovfun1_il_r\subovfun1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\importer\subovfun1_il_r
@@ -26466,6 +28827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [volatilldind.cmd_3803]
 RelativePath=JIT\Directed\coverage\importer\volatilldind\volatilldind.cmd
 WorkingDir=JIT\Directed\coverage\importer\volatilldind
@@ -26473,6 +28835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [volatilstind.cmd_3804]
 RelativePath=JIT\Directed\coverage\importer\volatilstind\volatilstind.cmd
 WorkingDir=JIT\Directed\coverage\importer\volatilstind
@@ -26480,6 +28843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [33objref_cs_d.cmd_3805]
 RelativePath=JIT\Directed\coverage\oldtests\33objref_cs_d\33objref_cs_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\33objref_cs_d
@@ -26487,6 +28851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [33objref_cs_do.cmd_3806]
 RelativePath=JIT\Directed\coverage\oldtests\33objref_cs_do\33objref_cs_do.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\33objref_cs_do
@@ -26494,6 +28859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [33objref_cs_r.cmd_3807]
 RelativePath=JIT\Directed\coverage\oldtests\33objref_cs_r\33objref_cs_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\33objref_cs_r
@@ -26501,6 +28867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [33objref_cs_ro.cmd_3808]
 RelativePath=JIT\Directed\coverage\oldtests\33objref_cs_ro\33objref_cs_ro.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\33objref_cs_ro
@@ -26508,6 +28875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arrgetlen_il_d.cmd_3809]
 RelativePath=JIT\Directed\coverage\oldtests\arrgetlen_il_d\arrgetlen_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\arrgetlen_il_d
@@ -26515,6 +28883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arrgetlen_il_r.cmd_3810]
 RelativePath=JIT\Directed\coverage\oldtests\arrgetlen_il_r\arrgetlen_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\arrgetlen_il_r
@@ -26522,6 +28891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [callipinvoke.cmd_3811]
 RelativePath=JIT\Directed\coverage\oldtests\callipinvoke\callipinvoke.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\callipinvoke
@@ -26529,6 +28899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cse1_cs_d.cmd_3812]
 RelativePath=JIT\Directed\coverage\oldtests\cse1_cs_d\cse1_cs_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\cse1_cs_d
@@ -26536,6 +28907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cse1_cs_do.cmd_3813]
 RelativePath=JIT\Directed\coverage\oldtests\cse1_cs_do\cse1_cs_do.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\cse1_cs_do
@@ -26543,6 +28915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cse1_cs_r.cmd_3814]
 RelativePath=JIT\Directed\coverage\oldtests\cse1_cs_r\cse1_cs_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\cse1_cs_r
@@ -26550,6 +28923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cse1_cs_ro.cmd_3815]
 RelativePath=JIT\Directed\coverage\oldtests\cse1_cs_ro\cse1_cs_ro.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\cse1_cs_ro
@@ -26557,6 +28931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cse2_cs_d.cmd_3816]
 RelativePath=JIT\Directed\coverage\oldtests\cse2_cs_d\cse2_cs_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\cse2_cs_d
@@ -26564,6 +28939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cse2_cs_do.cmd_3817]
 RelativePath=JIT\Directed\coverage\oldtests\cse2_cs_do\cse2_cs_do.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\cse2_cs_do
@@ -26571,6 +28947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cse2_cs_r.cmd_3818]
 RelativePath=JIT\Directed\coverage\oldtests\cse2_cs_r\cse2_cs_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\cse2_cs_r
@@ -26578,6 +28955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cse2_cs_ro.cmd_3819]
 RelativePath=JIT\Directed\coverage\oldtests\cse2_cs_ro\cse2_cs_ro.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\cse2_cs_ro
@@ -26585,6 +28963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [callipinvoke_il_d.cmd_3820]
 RelativePath=JIT\Directed\coverage\oldtests\Desktop\callipinvoke_il_d\callipinvoke_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\Desktop\callipinvoke_il_d
@@ -26592,6 +28971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [callipinvoke_il_r.cmd_3821]
 RelativePath=JIT\Directed\coverage\oldtests\Desktop\callipinvoke_il_r\callipinvoke_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\Desktop\callipinvoke_il_r
@@ -26599,6 +28979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldadd_cs_d.cmd_3822]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldadd_cs_d\lclfldadd_cs_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldadd_cs_d
@@ -26606,6 +28987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldadd_cs_do.cmd_3823]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldadd_cs_do\lclfldadd_cs_do.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldadd_cs_do
@@ -26613,6 +28995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldadd_cs_r.cmd_3824]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldadd_cs_r\lclfldadd_cs_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldadd_cs_r
@@ -26620,6 +29003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldadd_cs_ro.cmd_3825]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldadd_cs_ro\lclfldadd_cs_ro.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldadd_cs_ro
@@ -26627,6 +29011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclflddiv_cs_d.cmd_3826]
 RelativePath=JIT\Directed\coverage\oldtests\lclflddiv_cs_d\lclflddiv_cs_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclflddiv_cs_d
@@ -26634,6 +29019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclflddiv_cs_do.cmd_3827]
 RelativePath=JIT\Directed\coverage\oldtests\lclflddiv_cs_do\lclflddiv_cs_do.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclflddiv_cs_do
@@ -26641,6 +29027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclflddiv_cs_r.cmd_3828]
 RelativePath=JIT\Directed\coverage\oldtests\lclflddiv_cs_r\lclflddiv_cs_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclflddiv_cs_r
@@ -26648,6 +29035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclflddiv_cs_ro.cmd_3829]
 RelativePath=JIT\Directed\coverage\oldtests\lclflddiv_cs_ro\lclflddiv_cs_ro.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclflddiv_cs_ro
@@ -26655,6 +29043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldmul_cs_d.cmd_3830]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldmul_cs_d\lclfldmul_cs_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldmul_cs_d
@@ -26662,6 +29051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldmul_cs_do.cmd_3831]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldmul_cs_do\lclfldmul_cs_do.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldmul_cs_do
@@ -26669,6 +29059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldmul_cs_r.cmd_3832]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldmul_cs_r\lclfldmul_cs_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldmul_cs_r
@@ -26676,6 +29067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldmul_cs_ro.cmd_3833]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldmul_cs_ro\lclfldmul_cs_ro.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldmul_cs_ro
@@ -26683,6 +29075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldrem_cs_d.cmd_3834]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldrem_cs_d\lclfldrem_cs_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldrem_cs_d
@@ -26690,6 +29083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldrem_cs_do.cmd_3835]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldrem_cs_do\lclfldrem_cs_do.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldrem_cs_do
@@ -26697,6 +29091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldrem_cs_r.cmd_3836]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldrem_cs_r\lclfldrem_cs_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldrem_cs_r
@@ -26704,6 +29099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldrem_cs_ro.cmd_3837]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldrem_cs_ro\lclfldrem_cs_ro.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldrem_cs_ro
@@ -26711,6 +29107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldsub_cs_d.cmd_3838]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldsub_cs_d\lclfldsub_cs_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldsub_cs_d
@@ -26718,6 +29115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldsub_cs_do.cmd_3839]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldsub_cs_do\lclfldsub_cs_do.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldsub_cs_do
@@ -26725,6 +29123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldsub_cs_r.cmd_3840]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldsub_cs_r\lclfldsub_cs_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldsub_cs_r
@@ -26732,6 +29131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lclfldsub_cs_ro.cmd_3841]
 RelativePath=JIT\Directed\coverage\oldtests\lclfldsub_cs_ro\lclfldsub_cs_ro.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lclfldsub_cs_ro
@@ -26739,6 +29139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lcliimpl_il_d.cmd_3842]
 RelativePath=JIT\Directed\coverage\oldtests\lcliimpl_il_d\lcliimpl_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lcliimpl_il_d
@@ -26746,6 +29147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lcliimpl_il_r.cmd_3843]
 RelativePath=JIT\Directed\coverage\oldtests\lcliimpl_il_r\lcliimpl_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\lcliimpl_il_r
@@ -26753,6 +29155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldfldstatic_il_d.cmd_3844]
 RelativePath=JIT\Directed\coverage\oldtests\ldfldstatic_il_d\ldfldstatic_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ldfldstatic_il_d
@@ -26760,6 +29163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldfldstatic_il_r.cmd_3845]
 RelativePath=JIT\Directed\coverage\oldtests\ldfldstatic_il_r\ldfldstatic_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ldfldstatic_il_r
@@ -26767,6 +29171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldsshrstsfld_il_d.cmd_3846]
 RelativePath=JIT\Directed\coverage\oldtests\ldsshrstsfld_il_d\ldsshrstsfld_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ldsshrstsfld_il_d
@@ -26774,6 +29179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldsshrstsfld_il_r.cmd_3847]
 RelativePath=JIT\Directed\coverage\oldtests\ldsshrstsfld_il_r\ldsshrstsfld_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ldsshrstsfld_il_r
@@ -26781,6 +29187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldvirtftncalli_il_d.cmd_3848]
 RelativePath=JIT\Directed\coverage\oldtests\ldvirtftncalli_il_d\ldvirtftncalli_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ldvirtftncalli_il_d
@@ -26788,6 +29195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldvirtftncalli_il_r.cmd_3849]
 RelativePath=JIT\Directed\coverage\oldtests\ldvirtftncalli_il_r\ldvirtftncalli_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ldvirtftncalli_il_r
@@ -26795,6 +29203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ovfldiv1_il_d.cmd_3850]
 RelativePath=JIT\Directed\coverage\oldtests\ovfldiv1_il_d\ovfldiv1_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ovfldiv1_il_d
@@ -26802,6 +29211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ovfldiv1_il_r.cmd_3851]
 RelativePath=JIT\Directed\coverage\oldtests\ovfldiv1_il_r\ovfldiv1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ovfldiv1_il_r
@@ -26809,6 +29219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ovfldiv2_il_d.cmd_3852]
 RelativePath=JIT\Directed\coverage\oldtests\ovfldiv2_il_d\ovfldiv2_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ovfldiv2_il_d
@@ -26816,6 +29227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ovfldiv2_il_r.cmd_3853]
 RelativePath=JIT\Directed\coverage\oldtests\ovfldiv2_il_r\ovfldiv2_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ovfldiv2_il_r
@@ -26823,6 +29235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ovflrem1_il_d.cmd_3854]
 RelativePath=JIT\Directed\coverage\oldtests\ovflrem1_il_d\ovflrem1_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ovflrem1_il_d
@@ -26830,6 +29243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ovflrem1_il_r.cmd_3855]
 RelativePath=JIT\Directed\coverage\oldtests\ovflrem1_il_r\ovflrem1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ovflrem1_il_r
@@ -26837,6 +29251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ovflrem2_il_d.cmd_3856]
 RelativePath=JIT\Directed\coverage\oldtests\ovflrem2_il_d\ovflrem2_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ovflrem2_il_d
@@ -26844,6 +29259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ovflrem2_il_r.cmd_3857]
 RelativePath=JIT\Directed\coverage\oldtests\ovflrem2_il_r\ovflrem2_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\ovflrem2_il_r
@@ -26851,6 +29267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stfldstatic1_il_d.cmd_3858]
 RelativePath=JIT\Directed\coverage\oldtests\stfldstatic1_il_d\stfldstatic1_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\stfldstatic1_il_d
@@ -26858,6 +29275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stfldstatic1_il_r.cmd_3859]
 RelativePath=JIT\Directed\coverage\oldtests\stfldstatic1_il_r\stfldstatic1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\stfldstatic1_il_r
@@ -26865,6 +29283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stfldstatic2_il_d.cmd_3860]
 RelativePath=JIT\Directed\coverage\oldtests\stfldstatic2_il_d\stfldstatic2_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\stfldstatic2_il_d
@@ -26872,6 +29291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stfldstatic2_il_r.cmd_3861]
 RelativePath=JIT\Directed\coverage\oldtests\stfldstatic2_il_r\stfldstatic2_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\stfldstatic2_il_r
@@ -26879,6 +29299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [subbyref_il_d.cmd_3862]
 RelativePath=JIT\Directed\coverage\oldtests\subbyref_il_d\subbyref_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\subbyref_il_d
@@ -26886,6 +29307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [subbyref_il_r.cmd_3863]
 RelativePath=JIT\Directed\coverage\oldtests\subbyref_il_r\subbyref_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\subbyref_il_r
@@ -26893,6 +29315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [switchdefaultonly1_il_d.cmd_3864]
 RelativePath=JIT\Directed\coverage\oldtests\switchdefaultonly1_il_d\switchdefaultonly1_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\switchdefaultonly1_il_d
@@ -26900,6 +29323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [switchdefaultonly1_il_r.cmd_3865]
 RelativePath=JIT\Directed\coverage\oldtests\switchdefaultonly1_il_r\switchdefaultonly1_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\switchdefaultonly1_il_r
@@ -26907,6 +29331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [switchdefaultonly2_il_d.cmd_3866]
 RelativePath=JIT\Directed\coverage\oldtests\switchdefaultonly2_il_d\switchdefaultonly2_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\switchdefaultonly2_il_d
@@ -26914,6 +29339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [switchdefaultonly2_il_r.cmd_3867]
 RelativePath=JIT\Directed\coverage\oldtests\switchdefaultonly2_il_r\switchdefaultonly2_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\switchdefaultonly2_il_r
@@ -26921,6 +29347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [switchdefaultonly3_il_d.cmd_3868]
 RelativePath=JIT\Directed\coverage\oldtests\switchdefaultonly3_il_d\switchdefaultonly3_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\switchdefaultonly3_il_d
@@ -26928,6 +29355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [switchdefaultonly3_il_r.cmd_3869]
 RelativePath=JIT\Directed\coverage\oldtests\switchdefaultonly3_il_r\switchdefaultonly3_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\switchdefaultonly3_il_r
@@ -26935,6 +29363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [tlstest_il_d.cmd_3870]
 RelativePath=JIT\Directed\coverage\oldtests\tlstest_il_d\tlstest_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\tlstest_il_d
@@ -26942,6 +29371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tlstest_il_r.cmd_3871]
 RelativePath=JIT\Directed\coverage\oldtests\tlstest_il_r\tlstest_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\tlstest_il_r
@@ -26949,6 +29379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trashreg_il_d.cmd_3872]
 RelativePath=JIT\Directed\coverage\oldtests\trashreg_il_d\trashreg_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\trashreg_il_d
@@ -26956,6 +29387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [trashreg_il_r.cmd_3873]
 RelativePath=JIT\Directed\coverage\oldtests\trashreg_il_r\trashreg_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\trashreg_il_r
@@ -26963,6 +29395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [volatilecpobj_il_d.cmd_3874]
 RelativePath=JIT\Directed\coverage\oldtests\volatilecpobj_il_d\volatilecpobj_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\volatilecpobj_il_d
@@ -26970,6 +29403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [volatilecpobj_il_r.cmd_3875]
 RelativePath=JIT\Directed\coverage\oldtests\volatilecpobj_il_r\volatilecpobj_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\volatilecpobj_il_r
@@ -26977,6 +29411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [zeroinit_il_d.cmd_3876]
 RelativePath=JIT\Directed\coverage\oldtests\zeroinit_il_d\zeroinit_il_d.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\zeroinit_il_d
@@ -26984,6 +29419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [zeroinit_il_r.cmd_3877]
 RelativePath=JIT\Directed\coverage\oldtests\zeroinit_il_r\zeroinit_il_r.cmd
 WorkingDir=JIT\Directed\coverage\oldtests\zeroinit_il_r
@@ -26991,6 +29427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [excepobj.cmd_3878]
 RelativePath=JIT\Directed\ExcepFilters\excepobj\excepobj\excepobj.cmd
 WorkingDir=JIT\Directed\ExcepFilters\excepobj\excepobj
@@ -26998,6 +29435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [fault.cmd_3879]
 RelativePath=JIT\Directed\ExcepFilters\fault\fault\fault.cmd
 WorkingDir=JIT\Directed\ExcepFilters\fault\fault
@@ -27005,6 +29443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mixed.cmd_3880]
 RelativePath=JIT\Directed\ExcepFilters\mixed\mixed\mixed.cmd
 WorkingDir=JIT\Directed\ExcepFilters\mixed\mixed
@@ -27012,6 +29451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [mixed3.cmd_3881]
 RelativePath=JIT\Directed\ExcepFilters\mixed3\mixed3\mixed3.cmd
 WorkingDir=JIT\Directed\ExcepFilters\mixed3\mixed3
@@ -27019,6 +29459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CallOrder.cmd_3882]
 RelativePath=JIT\Directed\FaultHandlers\CallOrder\CallOrder\CallOrder.cmd
 WorkingDir=JIT\Directed\FaultHandlers\CallOrder\CallOrder
@@ -27026,6 +29467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Nesting.cmd_3883]
 RelativePath=JIT\Directed\FaultHandlers\Nesting\Nesting\Nesting.cmd
 WorkingDir=JIT\Directed\FaultHandlers\Nesting\Nesting
@@ -27033,6 +29475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Simple.cmd_3884]
 RelativePath=JIT\Directed\FaultHandlers\Simple\Simple\Simple.cmd
 WorkingDir=JIT\Directed\FaultHandlers\Simple\Simple
@@ -27040,6 +29483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [AttributeConflict.cmd_3885]
 RelativePath=JIT\Directed\forceinlining\AttributeConflict\AttributeConflict.cmd
 WorkingDir=JIT\Directed\forceinlining\AttributeConflict
@@ -27047,6 +29491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [LargeNumberOfArgs.cmd_3886]
 RelativePath=JIT\Directed\forceinlining\LargeNumberOfArgs\LargeNumberOfArgs.cmd
 WorkingDir=JIT\Directed\forceinlining\LargeNumberOfArgs
@@ -27054,6 +29499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [NegativeCases.cmd_3887]
 RelativePath=JIT\Directed\forceinlining\NegativeCases\NegativeCases.cmd
 WorkingDir=JIT\Directed\forceinlining\NegativeCases
@@ -27061,6 +29507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [NoMetaData.cmd_3888]
 RelativePath=JIT\Directed\forceinlining\NoMetaData\NoMetaData.cmd
 WorkingDir=JIT\Directed\forceinlining\NoMetaData
@@ -27068,6 +29515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [PositiveCases.cmd_3889]
 RelativePath=JIT\Directed\forceinlining\PositiveCases\PositiveCases.cmd
 WorkingDir=JIT\Directed\forceinlining\PositiveCases
@@ -27075,6 +29523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Recursion.cmd_3890]
 RelativePath=JIT\Directed\forceinlining\Recursion\Recursion.cmd
 WorkingDir=JIT\Directed\forceinlining\Recursion
@@ -27082,6 +29531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [gettypetypeofmatrix.cmd_3891]
 RelativePath=JIT\Directed\gettypetypeof\gettypetypeofmatrix\gettypetypeofmatrix.cmd
 WorkingDir=JIT\Directed\gettypetypeof\gettypetypeofmatrix
@@ -27089,6 +29539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [leave1.cmd_3892]
 RelativePath=JIT\Directed\IL\leave\leave1\leave1.cmd
 WorkingDir=JIT\Directed\IL\leave\leave1
@@ -27096,6 +29547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [MutualRecur-TailCall.cmd_3893]
 RelativePath=JIT\Directed\IL\mutualrecur-tailcall\MutualRecur-TailCall\MutualRecur-TailCall.cmd
 WorkingDir=JIT\Directed\IL\mutualrecur-tailcall\MutualRecur-TailCall
@@ -27103,6 +29555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [PInvokeTail.cmd_3894]
 RelativePath=JIT\Directed\IL\PInvokeTail\PInvokeTail\PInvokeTail.cmd
 WorkingDir=JIT\Directed\IL\PInvokeTail\PInvokeTail
@@ -27110,6 +29563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [TailWinApi.cmd_3895]
 RelativePath=JIT\Directed\IL\PInvokeTail\TailWinApi\TailWinApi.cmd
 WorkingDir=JIT\Directed\IL\PInvokeTail\TailWinApi
@@ -27117,6 +29571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Rethrow1.cmd_3896]
 RelativePath=JIT\Directed\IL\rethrow\Rethrow1\Rethrow1.cmd
 WorkingDir=JIT\Directed\IL\rethrow\Rethrow1
@@ -27124,6 +29579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Rethrow2.cmd_3897]
 RelativePath=JIT\Directed\IL\rethrow\Rethrow2\Rethrow2.cmd
 WorkingDir=JIT\Directed\IL\rethrow\Rethrow2
@@ -27131,6 +29587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jitTailcall1.cmd_3898]
 RelativePath=JIT\Directed\IL\Tailcall\jitTailcall1\jitTailcall1.cmd
 WorkingDir=JIT\Directed\IL\Tailcall\jitTailcall1
@@ -27138,6 +29595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JitTailcall2.cmd_3899]
 RelativePath=JIT\Directed\IL\Tailcall\JitTailcall2\JitTailcall2.cmd
 WorkingDir=JIT\Directed\IL\Tailcall\JitTailcall2
@@ -27145,6 +29603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cmpxchg.cmd_3900]
 RelativePath=JIT\Directed\intrinsic\interlocked\cmpxchg\cmpxchg.cmd
 WorkingDir=JIT\Directed\intrinsic\interlocked\cmpxchg
@@ -27152,6 +29611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cse_cmpxchg.cmd_3901]
 RelativePath=JIT\Directed\intrinsic\interlocked\cse_cmpxchg\cse_cmpxchg.cmd
 WorkingDir=JIT\Directed\intrinsic\interlocked\cse_cmpxchg
@@ -27159,6 +29619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [IntrinsicTest_Overflow.cmd_3902]
 RelativePath=JIT\Directed\intrinsic\interlocked\IntrinsicTest_Overflow\IntrinsicTest_Overflow.cmd
 WorkingDir=JIT\Directed\intrinsic\interlocked\IntrinsicTest_Overflow
@@ -27166,6 +29627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [nullchecksuppress.cmd_3903]
 RelativePath=JIT\Directed\intrinsic\interlocked\nullchecksuppress\nullchecksuppress.cmd
 WorkingDir=JIT\Directed\intrinsic\interlocked\nullchecksuppress
@@ -27173,6 +29635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [regalloc1.cmd_3904]
 RelativePath=JIT\Directed\intrinsic\interlocked\regalloc1\regalloc1.cmd
 WorkingDir=JIT\Directed\intrinsic\interlocked\regalloc1
@@ -27180,6 +29643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [regalloc2.cmd_3905]
 RelativePath=JIT\Directed\intrinsic\interlocked\regalloc2\regalloc2.cmd
 WorkingDir=JIT\Directed\intrinsic\interlocked\regalloc2
@@ -27187,6 +29651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow0_cs_d.cmd_3910]
 RelativePath=JIT\Directed\intrinsic\pow\pow0_cs_d\pow0_cs_d.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow0_cs_d
@@ -27194,6 +29659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow0_cs_do.cmd_3911]
 RelativePath=JIT\Directed\intrinsic\pow\pow0_cs_do\pow0_cs_do.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow0_cs_do
@@ -27201,6 +29667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow0_cs_r.cmd_3912]
 RelativePath=JIT\Directed\intrinsic\pow\pow0_cs_r\pow0_cs_r.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow0_cs_r
@@ -27208,6 +29675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow0_cs_ro.cmd_3913]
 RelativePath=JIT\Directed\intrinsic\pow\pow0_cs_ro\pow0_cs_ro.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow0_cs_ro
@@ -27215,6 +29683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow1.cmd_3914]
 RelativePath=JIT\Directed\intrinsic\pow\pow1\pow1.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow1
@@ -27222,6 +29691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow2_cs_d.cmd_3915]
 RelativePath=JIT\Directed\intrinsic\pow\pow2_cs_d\pow2_cs_d.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow2_cs_d
@@ -27229,6 +29699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow2_cs_do.cmd_3916]
 RelativePath=JIT\Directed\intrinsic\pow\pow2_cs_do\pow2_cs_do.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow2_cs_do
@@ -27236,6 +29707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow2_cs_r.cmd_3917]
 RelativePath=JIT\Directed\intrinsic\pow\pow2_cs_r\pow2_cs_r.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow2_cs_r
@@ -27243,6 +29715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow2_cs_ro.cmd_3918]
 RelativePath=JIT\Directed\intrinsic\pow\pow2_cs_ro\pow2_cs_ro.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow2_cs_ro
@@ -27250,6 +29723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow3_cs_d.cmd_3919]
 RelativePath=JIT\Directed\intrinsic\pow\pow3_cs_d\pow3_cs_d.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow3_cs_d
@@ -27257,6 +29731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow3_cs_do.cmd_3920]
 RelativePath=JIT\Directed\intrinsic\pow\pow3_cs_do\pow3_cs_do.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow3_cs_do
@@ -27264,6 +29739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow3_cs_r.cmd_3921]
 RelativePath=JIT\Directed\intrinsic\pow\pow3_cs_r\pow3_cs_r.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow3_cs_r
@@ -27271,6 +29747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pow3_cs_ro.cmd_3922]
 RelativePath=JIT\Directed\intrinsic\pow\pow3_cs_ro\pow3_cs_ro.cmd
 WorkingDir=JIT\Directed\intrinsic\pow\pow3_cs_ro
@@ -27278,6 +29755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [catch1_d.cmd_3923]
 RelativePath=JIT\Directed\leave\catch1_d\catch1_d.cmd
 WorkingDir=JIT\Directed\leave\catch1_d
@@ -27285,6 +29763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [catch1_r.cmd_3924]
 RelativePath=JIT\Directed\leave\catch1_r\catch1_r.cmd
 WorkingDir=JIT\Directed\leave\catch1_r
@@ -27292,6 +29771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [catch2_d.cmd_3925]
 RelativePath=JIT\Directed\leave\catch2_d\catch2_d.cmd
 WorkingDir=JIT\Directed\leave\catch2_d
@@ -27299,6 +29779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [catch2_r.cmd_3926]
 RelativePath=JIT\Directed\leave\catch2_r\catch2_r.cmd
 WorkingDir=JIT\Directed\leave\catch2_r
@@ -27306,6 +29787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [catch3_d.cmd_3927]
 RelativePath=JIT\Directed\leave\catch3_d\catch3_d.cmd
 WorkingDir=JIT\Directed\leave\catch3_d
@@ -27313,6 +29795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [catch3_r.cmd_3928]
 RelativePath=JIT\Directed\leave\catch3_r\catch3_r.cmd
 WorkingDir=JIT\Directed\leave\catch3_r
@@ -27320,6 +29803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [filter1_d.cmd_3929]
 RelativePath=JIT\Directed\leave\filter1_d\filter1_d.cmd
 WorkingDir=JIT\Directed\leave\filter1_d
@@ -27327,6 +29811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [filter1_r.cmd_3930]
 RelativePath=JIT\Directed\leave\filter1_r\filter1_r.cmd
 WorkingDir=JIT\Directed\leave\filter1_r
@@ -27334,6 +29819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [filter2_d.cmd_3931]
 RelativePath=JIT\Directed\leave\filter2_d\filter2_d.cmd
 WorkingDir=JIT\Directed\leave\filter2_d
@@ -27341,6 +29827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [filter2_r.cmd_3932]
 RelativePath=JIT\Directed\leave\filter2_r\filter2_r.cmd
 WorkingDir=JIT\Directed\leave\filter2_r
@@ -27348,6 +29835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [filter3_d.cmd_3933]
 RelativePath=JIT\Directed\leave\filter3_d\filter3_d.cmd
 WorkingDir=JIT\Directed\leave\filter3_d
@@ -27355,6 +29843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [filter3_r.cmd_3934]
 RelativePath=JIT\Directed\leave\filter3_r\filter3_r.cmd
 WorkingDir=JIT\Directed\leave\filter3_r
@@ -27362,6 +29851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [try1_d.cmd_3935]
 RelativePath=JIT\Directed\leave\try1_d\try1_d.cmd
 WorkingDir=JIT\Directed\leave\try1_d
@@ -27369,6 +29859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [try1_r.cmd_3936]
 RelativePath=JIT\Directed\leave\try1_r\try1_r.cmd
 WorkingDir=JIT\Directed\leave\try1_r
@@ -27376,6 +29867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [try2_d.cmd_3937]
 RelativePath=JIT\Directed\leave\try2_d\try2_d.cmd
 WorkingDir=JIT\Directed\leave\try2_d
@@ -27383,6 +29875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [try2_r.cmd_3938]
 RelativePath=JIT\Directed\leave\try2_r\try2_r.cmd
 WorkingDir=JIT\Directed\leave\try2_r
@@ -27390,6 +29883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [try3_d.cmd_3939]
 RelativePath=JIT\Directed\leave\try3_d\try3_d.cmd
 WorkingDir=JIT\Directed\leave\try3_d
@@ -27397,6 +29891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [try3_r.cmd_3940]
 RelativePath=JIT\Directed\leave\try3_r\try3_r.cmd
 WorkingDir=JIT\Directed\leave\try3_r
@@ -27404,6 +29899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lifetime1.cmd_3941]
 RelativePath=JIT\Directed\lifetime\lifetime1\lifetime1.cmd
 WorkingDir=JIT\Directed\lifetime\lifetime1
@@ -27411,13 +29907,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lifetime2.cmd_3942]
 RelativePath=JIT\Directed\lifetime\lifetime2\lifetime2.cmd
 WorkingDir=JIT\Directed\lifetime\lifetime2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [localloc3_cs_d.cmd_3943]
 RelativePath=JIT\Directed\localloc\localloc3_cs_d\localloc3_cs_d.cmd
 WorkingDir=JIT\Directed\localloc\localloc3_cs_d
@@ -27425,6 +29923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [localloc3_cs_do.cmd_3944]
 RelativePath=JIT\Directed\localloc\localloc3_cs_do\localloc3_cs_do.cmd
 WorkingDir=JIT\Directed\localloc\localloc3_cs_do
@@ -27432,6 +29931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [localloc3_cs_r.cmd_3945]
 RelativePath=JIT\Directed\localloc\localloc3_cs_r\localloc3_cs_r.cmd
 WorkingDir=JIT\Directed\localloc\localloc3_cs_r
@@ -27439,6 +29939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [localloc3_cs_ro.cmd_3946]
 RelativePath=JIT\Directed\localloc\localloc3_cs_ro\localloc3_cs_ro.cmd
 WorkingDir=JIT\Directed\localloc\localloc3_cs_ro
@@ -27446,6 +29947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [funcptrtest.cmd_3947]
 RelativePath=JIT\Directed\Misc\function_pointer\funcptrtest\funcptrtest.cmd
 WorkingDir=JIT\Directed\Misc\function_pointer\funcptrtest
@@ -27453,13 +29955,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [MutualThdRecur-fptr.cmd_3948]
 RelativePath=JIT\Directed\Misc\function_pointer\MutualThdRecur-fptr\MutualThdRecur-fptr.cmd
 WorkingDir=JIT\Directed\Misc\function_pointer\MutualThdRecur-fptr
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [gettypetypeofmatrix.cmd_3949]
 RelativePath=JIT\Directed\Misc\gettype\gettypetypeofmatrix\gettypetypeofmatrix.cmd
 WorkingDir=JIT\Directed\Misc\gettype\gettypetypeofmatrix
@@ -27467,6 +29971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BadRegArgs.cmd_3950]
 RelativePath=JIT\Directed\Misc\SIDEEFFECTS\BadRegArgs\BadRegArgs.cmd
 WorkingDir=JIT\Directed\Misc\SIDEEFFECTS\BadRegArgs
@@ -27474,6 +29979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SideEffects.cmd_3951]
 RelativePath=JIT\Directed\Misc\SIDEEFFECTS\SideEffects\SideEffects.cmd
 WorkingDir=JIT\Directed\Misc\SIDEEFFECTS\SideEffects
@@ -27481,6 +29987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [newarr.cmd_3952]
 RelativePath=JIT\Directed\newarr\newarr\newarr.cmd
 WorkingDir=JIT\Directed\newarr\newarr
@@ -27488,6 +29995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [boxunboxenum_d.cmd_3953]
 RelativePath=JIT\Directed\nullabletypes\boxunboxenum_d\boxunboxenum_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\boxunboxenum_d
@@ -27495,6 +30003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [boxunboxenum_do.cmd_3954]
 RelativePath=JIT\Directed\nullabletypes\boxunboxenum_do\boxunboxenum_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\boxunboxenum_do
@@ -27502,6 +30011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [boxunboxenum_r.cmd_3955]
 RelativePath=JIT\Directed\nullabletypes\boxunboxenum_r\boxunboxenum_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\boxunboxenum_r
@@ -27509,6 +30019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [boxunboxenum_ro.cmd_3956]
 RelativePath=JIT\Directed\nullabletypes\boxunboxenum_ro\boxunboxenum_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\boxunboxenum_ro
@@ -27516,6 +30027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [boxunboxinterface_d.cmd_3957]
 RelativePath=JIT\Directed\nullabletypes\boxunboxinterface_d\boxunboxinterface_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\boxunboxinterface_d
@@ -27523,6 +30035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [boxunboxinterface_do.cmd_3958]
 RelativePath=JIT\Directed\nullabletypes\boxunboxinterface_do\boxunboxinterface_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\boxunboxinterface_do
@@ -27530,6 +30043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [boxunboxinterface_r.cmd_3959]
 RelativePath=JIT\Directed\nullabletypes\boxunboxinterface_r\boxunboxinterface_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\boxunboxinterface_r
@@ -27537,6 +30051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [boxunboxinterface_ro.cmd_3960]
 RelativePath=JIT\Directed\nullabletypes\boxunboxinterface_ro\boxunboxinterface_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\boxunboxinterface_ro
@@ -27544,6 +30059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassenum_d.cmd_3961]
 RelativePath=JIT\Directed\nullabletypes\castclassenum_d\castclassenum_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassenum_d
@@ -27551,6 +30067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassenum_do.cmd_3962]
 RelativePath=JIT\Directed\nullabletypes\castclassenum_do\castclassenum_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassenum_do
@@ -27558,6 +30075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassenum_r.cmd_3963]
 RelativePath=JIT\Directed\nullabletypes\castclassenum_r\castclassenum_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassenum_r
@@ -27565,6 +30083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassenum_ro.cmd_3964]
 RelativePath=JIT\Directed\nullabletypes\castclassenum_ro\castclassenum_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassenum_ro
@@ -27572,6 +30091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassinterface_d.cmd_3965]
 RelativePath=JIT\Directed\nullabletypes\castclassinterface_d\castclassinterface_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassinterface_d
@@ -27579,6 +30099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassinterface_do.cmd_3966]
 RelativePath=JIT\Directed\nullabletypes\castclassinterface_do\castclassinterface_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassinterface_do
@@ -27586,6 +30107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassinterface_r.cmd_3967]
 RelativePath=JIT\Directed\nullabletypes\castclassinterface_r\castclassinterface_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassinterface_r
@@ -27593,6 +30115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassinterface_ro.cmd_3968]
 RelativePath=JIT\Directed\nullabletypes\castclassinterface_ro\castclassinterface_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassinterface_ro
@@ -27600,6 +30123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassvaluetype_d.cmd_3969]
 RelativePath=JIT\Directed\nullabletypes\castclassvaluetype_d\castclassvaluetype_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassvaluetype_d
@@ -27607,6 +30131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassvaluetype_do.cmd_3970]
 RelativePath=JIT\Directed\nullabletypes\castclassvaluetype_do\castclassvaluetype_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassvaluetype_do
@@ -27614,6 +30139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassvaluetype_r.cmd_3971]
 RelativePath=JIT\Directed\nullabletypes\castclassvaluetype_r\castclassvaluetype_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassvaluetype_r
@@ -27621,6 +30147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclassvaluetype_ro.cmd_3972]
 RelativePath=JIT\Directed\nullabletypes\castclassvaluetype_ro\castclassvaluetype_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\castclassvaluetype_ro
@@ -27628,6 +30155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [constructor_d.cmd_3973]
 RelativePath=JIT\Directed\nullabletypes\constructor_d\constructor_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\constructor_d
@@ -27635,6 +30163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [constructor_do.cmd_3974]
 RelativePath=JIT\Directed\nullabletypes\constructor_do\constructor_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\constructor_do
@@ -27642,6 +30171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [constructor_r.cmd_3975]
 RelativePath=JIT\Directed\nullabletypes\constructor_r\constructor_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\constructor_r
@@ -27649,6 +30179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [constructor_ro.cmd_3976]
 RelativePath=JIT\Directed\nullabletypes\constructor_ro\constructor_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\constructor_ro
@@ -27656,6 +30187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [boxunboxvaluetype_do.cmd_3977]
 RelativePath=JIT\Directed\nullabletypes\Desktop\boxunboxvaluetype_do\boxunboxvaluetype_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\Desktop\boxunboxvaluetype_do
@@ -27663,6 +30195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [boxunboxvaluetype_r.cmd_3978]
 RelativePath=JIT\Directed\nullabletypes\Desktop\boxunboxvaluetype_r\boxunboxvaluetype_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\Desktop\boxunboxvaluetype_r
@@ -27670,6 +30203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [boxunboxvaluetype_ro.cmd_3979]
 RelativePath=JIT\Directed\nullabletypes\Desktop\boxunboxvaluetype_ro\boxunboxvaluetype_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\Desktop\boxunboxvaluetype_ro
@@ -27677,6 +30211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nullcomparaison_d.cmd_3980]
 RelativePath=JIT\Directed\nullabletypes\Desktop\nullcomparaison_d\nullcomparaison_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\Desktop\nullcomparaison_d
@@ -27684,6 +30219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nullcomparaison_do.cmd_3981]
 RelativePath=JIT\Directed\nullabletypes\Desktop\nullcomparaison_do\nullcomparaison_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\Desktop\nullcomparaison_do
@@ -27691,6 +30227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nullcomparaison_r.cmd_3982]
 RelativePath=JIT\Directed\nullabletypes\Desktop\nullcomparaison_r\nullcomparaison_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\Desktop\nullcomparaison_r
@@ -27698,6 +30235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nullcomparaison_ro.cmd_3983]
 RelativePath=JIT\Directed\nullabletypes\Desktop\nullcomparaison_ro\nullcomparaison_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\Desktop\nullcomparaison_ro
@@ -27705,6 +30243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hashcode_d.cmd_3984]
 RelativePath=JIT\Directed\nullabletypes\hashcode_d\hashcode_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\hashcode_d
@@ -27712,6 +30251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hashcode_do.cmd_3985]
 RelativePath=JIT\Directed\nullabletypes\hashcode_do\hashcode_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\hashcode_do
@@ -27719,6 +30259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hashcode_r.cmd_3986]
 RelativePath=JIT\Directed\nullabletypes\hashcode_r\hashcode_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\hashcode_r
@@ -27726,6 +30267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hashcode_ro.cmd_3987]
 RelativePath=JIT\Directed\nullabletypes\hashcode_ro\hashcode_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\hashcode_ro
@@ -27733,6 +30275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hasvalue_d.cmd_3988]
 RelativePath=JIT\Directed\nullabletypes\hasvalue_d\hasvalue_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\hasvalue_d
@@ -27740,6 +30283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hasvalue_do.cmd_3989]
 RelativePath=JIT\Directed\nullabletypes\hasvalue_do\hasvalue_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\hasvalue_do
@@ -27747,6 +30291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hasvalue_r.cmd_3990]
 RelativePath=JIT\Directed\nullabletypes\hasvalue_r\hasvalue_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\hasvalue_r
@@ -27754,6 +30299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hasvalue_ro.cmd_3991]
 RelativePath=JIT\Directed\nullabletypes\hasvalue_ro\hasvalue_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\hasvalue_ro
@@ -27761,6 +30307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [invocation_d.cmd_3992]
 RelativePath=JIT\Directed\nullabletypes\invocation_d\invocation_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\invocation_d
@@ -27768,6 +30315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [invocation_do.cmd_3993]
 RelativePath=JIT\Directed\nullabletypes\invocation_do\invocation_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\invocation_do
@@ -27775,6 +30323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [invocation_r.cmd_3994]
 RelativePath=JIT\Directed\nullabletypes\invocation_r\invocation_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\invocation_r
@@ -27782,6 +30331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [invocation_ro.cmd_3995]
 RelativePath=JIT\Directed\nullabletypes\invocation_ro\invocation_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\invocation_ro
@@ -27789,6 +30339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinst2_d.cmd_3996]
 RelativePath=JIT\Directed\nullabletypes\isinst2_d\isinst2_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinst2_d
@@ -27796,6 +30347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinst2_do.cmd_3997]
 RelativePath=JIT\Directed\nullabletypes\isinst2_do\isinst2_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinst2_do
@@ -27803,6 +30355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinst2_r.cmd_3998]
 RelativePath=JIT\Directed\nullabletypes\isinst2_r\isinst2_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinst2_r
@@ -27810,6 +30363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinst2_ro.cmd_3999]
 RelativePath=JIT\Directed\nullabletypes\isinst2_ro\isinst2_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinst2_ro
@@ -27817,6 +30371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstboxed_d.cmd_4000]
 RelativePath=JIT\Directed\nullabletypes\isinstboxed_d\isinstboxed_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstboxed_d
@@ -27824,6 +30379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstboxed_do.cmd_4001]
 RelativePath=JIT\Directed\nullabletypes\isinstboxed_do\isinstboxed_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstboxed_do
@@ -27831,6 +30387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstboxed_r.cmd_4002]
 RelativePath=JIT\Directed\nullabletypes\isinstboxed_r\isinstboxed_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstboxed_r
@@ -27838,6 +30395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstboxed_ro.cmd_4003]
 RelativePath=JIT\Directed\nullabletypes\isinstboxed_ro\isinstboxed_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstboxed_ro
@@ -27845,6 +30403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstenum_d.cmd_4004]
 RelativePath=JIT\Directed\nullabletypes\isinstenum_d\isinstenum_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstenum_d
@@ -27852,6 +30411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstenum_do.cmd_4005]
 RelativePath=JIT\Directed\nullabletypes\isinstenum_do\isinstenum_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstenum_do
@@ -27859,6 +30419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstenum_r.cmd_4006]
 RelativePath=JIT\Directed\nullabletypes\isinstenum_r\isinstenum_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstenum_r
@@ -27866,6 +30427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstenum_ro.cmd_4007]
 RelativePath=JIT\Directed\nullabletypes\isinstenum_ro\isinstenum_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstenum_ro
@@ -27873,6 +30435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstgenerics_d.cmd_4008]
 RelativePath=JIT\Directed\nullabletypes\isinstgenerics_d\isinstgenerics_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstgenerics_d
@@ -27880,6 +30443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstgenerics_do.cmd_4009]
 RelativePath=JIT\Directed\nullabletypes\isinstgenerics_do\isinstgenerics_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstgenerics_do
@@ -27887,6 +30451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstgenerics_r.cmd_4010]
 RelativePath=JIT\Directed\nullabletypes\isinstgenerics_r\isinstgenerics_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstgenerics_r
@@ -27894,6 +30459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstgenerics_ro.cmd_4011]
 RelativePath=JIT\Directed\nullabletypes\isinstgenerics_ro\isinstgenerics_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstgenerics_ro
@@ -27901,6 +30467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstinterface_d.cmd_4012]
 RelativePath=JIT\Directed\nullabletypes\isinstinterface_d\isinstinterface_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstinterface_d
@@ -27908,6 +30475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstinterface_do.cmd_4013]
 RelativePath=JIT\Directed\nullabletypes\isinstinterface_do\isinstinterface_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstinterface_do
@@ -27915,6 +30483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstinterface_r.cmd_4014]
 RelativePath=JIT\Directed\nullabletypes\isinstinterface_r\isinstinterface_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstinterface_r
@@ -27922,6 +30491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstinterface_ro.cmd_4015]
 RelativePath=JIT\Directed\nullabletypes\isinstinterface_ro\isinstinterface_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstinterface_ro
@@ -27929,6 +30499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstvaluetype_d.cmd_4016]
 RelativePath=JIT\Directed\nullabletypes\isinstvaluetype_d\isinstvaluetype_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstvaluetype_d
@@ -27936,6 +30507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstvaluetype_do.cmd_4017]
 RelativePath=JIT\Directed\nullabletypes\isinstvaluetype_do\isinstvaluetype_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstvaluetype_do
@@ -27943,6 +30515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstvaluetype_r.cmd_4018]
 RelativePath=JIT\Directed\nullabletypes\isinstvaluetype_r\isinstvaluetype_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstvaluetype_r
@@ -27950,6 +30523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinstvaluetype_ro.cmd_4019]
 RelativePath=JIT\Directed\nullabletypes\isinstvaluetype_ro\isinstvaluetype_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinstvaluetype_ro
@@ -27957,6 +30531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinst_d.cmd_4020]
 RelativePath=JIT\Directed\nullabletypes\isinst_d\isinst_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinst_d
@@ -27964,6 +30539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinst_do.cmd_4021]
 RelativePath=JIT\Directed\nullabletypes\isinst_do\isinst_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinst_do
@@ -27971,6 +30547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinst_r.cmd_4022]
 RelativePath=JIT\Directed\nullabletypes\isinst_r\isinst_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinst_r
@@ -27978,6 +30555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinst_ro.cmd_4023]
 RelativePath=JIT\Directed\nullabletypes\isinst_ro\isinst_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\isinst_ro
@@ -27985,6 +30563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tostring_d.cmd_4024]
 RelativePath=JIT\Directed\nullabletypes\tostring_d\tostring_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\tostring_d
@@ -27992,6 +30571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tostring_do.cmd_4025]
 RelativePath=JIT\Directed\nullabletypes\tostring_do\tostring_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\tostring_do
@@ -27999,6 +30579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tostring_r.cmd_4026]
 RelativePath=JIT\Directed\nullabletypes\tostring_r\tostring_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\tostring_r
@@ -28006,6 +30587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tostring_ro.cmd_4027]
 RelativePath=JIT\Directed\nullabletypes\tostring_ro\tostring_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\tostring_ro
@@ -28013,6 +30595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unboxnullable_d.cmd_4028]
 RelativePath=JIT\Directed\nullabletypes\unboxnullable_d\unboxnullable_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\unboxnullable_d
@@ -28020,6 +30603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unboxnullable_do.cmd_4029]
 RelativePath=JIT\Directed\nullabletypes\unboxnullable_do\unboxnullable_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\unboxnullable_do
@@ -28027,6 +30611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unboxnullable_r.cmd_4030]
 RelativePath=JIT\Directed\nullabletypes\unboxnullable_r\unboxnullable_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\unboxnullable_r
@@ -28034,6 +30619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unboxnullable_ro.cmd_4031]
 RelativePath=JIT\Directed\nullabletypes\unboxnullable_ro\unboxnullable_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\unboxnullable_ro
@@ -28041,6 +30627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [value_d.cmd_4032]
 RelativePath=JIT\Directed\nullabletypes\value_d\value_d.cmd
 WorkingDir=JIT\Directed\nullabletypes\value_d
@@ -28048,6 +30635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [value_do.cmd_4033]
 RelativePath=JIT\Directed\nullabletypes\value_do\value_do.cmd
 WorkingDir=JIT\Directed\nullabletypes\value_do
@@ -28055,6 +30643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [value_r.cmd_4034]
 RelativePath=JIT\Directed\nullabletypes\value_r\value_r.cmd
 WorkingDir=JIT\Directed\nullabletypes\value_r
@@ -28062,6 +30651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [value_ro.cmd_4035]
 RelativePath=JIT\Directed\nullabletypes\value_ro\value_ro.cmd
 WorkingDir=JIT\Directed\nullabletypes\value_ro
@@ -28069,6 +30659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ccse_cs_d.cmd_4036]
 RelativePath=JIT\Directed\perffix\commutativecse\ccse_cs_d\ccse_cs_d.cmd
 WorkingDir=JIT\Directed\perffix\commutativecse\ccse_cs_d
@@ -28076,6 +30667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ccse_cs_do.cmd_4037]
 RelativePath=JIT\Directed\perffix\commutativecse\ccse_cs_do\ccse_cs_do.cmd
 WorkingDir=JIT\Directed\perffix\commutativecse\ccse_cs_do
@@ -28083,6 +30675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ccse_cs_r.cmd_4038]
 RelativePath=JIT\Directed\perffix\commutativecse\ccse_cs_r\ccse_cs_r.cmd
 WorkingDir=JIT\Directed\perffix\commutativecse\ccse_cs_r
@@ -28090,6 +30683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ccse_cs_ro.cmd_4039]
 RelativePath=JIT\Directed\perffix\commutativecse\ccse_cs_ro\ccse_cs_ro.cmd
 WorkingDir=JIT\Directed\perffix\commutativecse\ccse_cs_ro
@@ -28097,6 +30691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callconv1_cs_d.cmd_4040]
 RelativePath=JIT\Directed\perffix\primitivevt\callconv1_cs_d\callconv1_cs_d.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\callconv1_cs_d
@@ -28104,6 +30699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callconv1_cs_do.cmd_4041]
 RelativePath=JIT\Directed\perffix\primitivevt\callconv1_cs_do\callconv1_cs_do.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\callconv1_cs_do
@@ -28111,6 +30707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callconv1_cs_r.cmd_4042]
 RelativePath=JIT\Directed\perffix\primitivevt\callconv1_cs_r\callconv1_cs_r.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\callconv1_cs_r
@@ -28118,6 +30715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callconv1_cs_ro.cmd_4043]
 RelativePath=JIT\Directed\perffix\primitivevt\callconv1_cs_ro\callconv1_cs_ro.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\callconv1_cs_ro
@@ -28125,6 +30723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callconv2_cs_d.cmd_4044]
 RelativePath=JIT\Directed\perffix\primitivevt\callconv2_cs_d\callconv2_cs_d.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\callconv2_cs_d
@@ -28132,6 +30731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callconv2_cs_do.cmd_4045]
 RelativePath=JIT\Directed\perffix\primitivevt\callconv2_cs_do\callconv2_cs_do.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\callconv2_cs_do
@@ -28139,6 +30739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callconv2_cs_r.cmd_4046]
 RelativePath=JIT\Directed\perffix\primitivevt\callconv2_cs_r\callconv2_cs_r.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\callconv2_cs_r
@@ -28146,6 +30747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callconv2_cs_ro.cmd_4047]
 RelativePath=JIT\Directed\perffix\primitivevt\callconv2_cs_ro\callconv2_cs_ro.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\callconv2_cs_ro
@@ -28153,6 +30755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callconv3_il_d.cmd_4048]
 RelativePath=JIT\Directed\perffix\primitivevt\callconv3_il_d\callconv3_il_d.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\callconv3_il_d
@@ -28160,6 +30763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callconv3_il_r.cmd_4049]
 RelativePath=JIT\Directed\perffix\primitivevt\callconv3_il_r\callconv3_il_r.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\callconv3_il_r
@@ -28167,6 +30771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [identity3_il_d.cmd_4050]
 RelativePath=JIT\Directed\perffix\primitivevt\identity3_il_d\identity3_il_d.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\identity3_il_d
@@ -28174,6 +30779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [identity3_il_r.cmd_4051]
 RelativePath=JIT\Directed\perffix\primitivevt\identity3_il_r\identity3_il_r.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\identity3_il_r
@@ -28181,6 +30787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed1_cs_d.cmd_4052]
 RelativePath=JIT\Directed\perffix\primitivevt\mixed1_cs_d\mixed1_cs_d.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\mixed1_cs_d
@@ -28188,6 +30795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed1_cs_do.cmd_4053]
 RelativePath=JIT\Directed\perffix\primitivevt\mixed1_cs_do\mixed1_cs_do.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\mixed1_cs_do
@@ -28195,6 +30803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed1_cs_r.cmd_4054]
 RelativePath=JIT\Directed\perffix\primitivevt\mixed1_cs_r\mixed1_cs_r.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\mixed1_cs_r
@@ -28202,6 +30811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed1_cs_ro.cmd_4055]
 RelativePath=JIT\Directed\perffix\primitivevt\mixed1_cs_ro\mixed1_cs_ro.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\mixed1_cs_ro
@@ -28209,6 +30819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed2_cs_d.cmd_4056]
 RelativePath=JIT\Directed\perffix\primitivevt\mixed2_cs_d\mixed2_cs_d.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\mixed2_cs_d
@@ -28216,6 +30827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed2_cs_do.cmd_4057]
 RelativePath=JIT\Directed\perffix\primitivevt\mixed2_cs_do\mixed2_cs_do.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\mixed2_cs_do
@@ -28223,6 +30835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed2_cs_r.cmd_4058]
 RelativePath=JIT\Directed\perffix\primitivevt\mixed2_cs_r\mixed2_cs_r.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\mixed2_cs_r
@@ -28230,6 +30843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed2_cs_ro.cmd_4059]
 RelativePath=JIT\Directed\perffix\primitivevt\mixed2_cs_ro\mixed2_cs_ro.cmd
 WorkingDir=JIT\Directed\perffix\primitivevt\mixed2_cs_ro
@@ -28237,13 +30851,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [object-pin.cmd_4060]
 RelativePath=JIT\Directed\pinning\object-pin\object-pin\object-pin.cmd
 WorkingDir=JIT\Directed\pinning\object-pin\object-pin
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [calli_excep.cmd_4061]
 RelativePath=JIT\Directed\pinvoke\calli_excep\calli_excep.cmd
 WorkingDir=JIT\Directed\pinvoke\calli_excep
@@ -28251,6 +30867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [jump.cmd_4062]
 RelativePath=JIT\Directed\pinvoke\jump\jump.cmd
 WorkingDir=JIT\Directed\pinvoke\jump
@@ -28258,6 +30875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [sin.cmd_4064]
 RelativePath=JIT\Directed\pinvoke\sin\sin.cmd
 WorkingDir=JIT\Directed\pinvoke\sin
@@ -28265,6 +30883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sysinfo_cs.cmd_4065]
 RelativePath=JIT\Directed\pinvoke\sysinfo_cs\sysinfo_cs.cmd
 WorkingDir=JIT\Directed\pinvoke\sysinfo_cs
@@ -28272,6 +30891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sysinfo_il.cmd_4066]
 RelativePath=JIT\Directed\pinvoke\sysinfo_il\sysinfo_il.cmd
 WorkingDir=JIT\Directed\pinvoke\sysinfo_il
@@ -28279,6 +30899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [tail.cmd_4067]
 RelativePath=JIT\Directed\pinvoke\tail\tail.cmd
 WorkingDir=JIT\Directed\pinvoke\tail
@@ -28286,447 +30907,511 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callconv1_cs_d.cmd_4068]
 RelativePath=JIT\Directed\PREFIX\PrimitiveVT\callconv1_cs_d\callconv1_cs_d.cmd
 WorkingDir=JIT\Directed\PREFIX\PrimitiveVT\callconv1_cs_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [callconv1_cs_do.cmd_4069]
 RelativePath=JIT\Directed\PREFIX\PrimitiveVT\callconv1_cs_do\callconv1_cs_do.cmd
 WorkingDir=JIT\Directed\PREFIX\PrimitiveVT\callconv1_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [callconv1_cs_r.cmd_4070]
 RelativePath=JIT\Directed\PREFIX\PrimitiveVT\callconv1_cs_r\callconv1_cs_r.cmd
 WorkingDir=JIT\Directed\PREFIX\PrimitiveVT\callconv1_cs_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [callconv1_cs_ro.cmd_4071]
 RelativePath=JIT\Directed\PREFIX\PrimitiveVT\callconv1_cs_ro\callconv1_cs_ro.cmd
 WorkingDir=JIT\Directed\PREFIX\PrimitiveVT\callconv1_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [callconv2_cs_d.cmd_4072]
 RelativePath=JIT\Directed\PREFIX\PrimitiveVT\callconv2_cs_d\callconv2_cs_d.cmd
 WorkingDir=JIT\Directed\PREFIX\PrimitiveVT\callconv2_cs_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [callconv2_cs_do.cmd_4073]
 RelativePath=JIT\Directed\PREFIX\PrimitiveVT\callconv2_cs_do\callconv2_cs_do.cmd
 WorkingDir=JIT\Directed\PREFIX\PrimitiveVT\callconv2_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [callconv2_cs_r.cmd_4074]
 RelativePath=JIT\Directed\PREFIX\PrimitiveVT\callconv2_cs_r\callconv2_cs_r.cmd
 WorkingDir=JIT\Directed\PREFIX\PrimitiveVT\callconv2_cs_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [callconv2_cs_ro.cmd_4075]
 RelativePath=JIT\Directed\PREFIX\PrimitiveVT\callconv2_cs_ro\callconv2_cs_ro.cmd
 WorkingDir=JIT\Directed\PREFIX\PrimitiveVT\callconv2_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [add.cmd_4076]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\add\add.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\add
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [array_tests.cmd_4078]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\array_tests\array_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\array_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Box_Unbox.cmd_4079]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\Box_Unbox\Box_Unbox.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\Box_Unbox
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [cpblk.cmd_4080]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\cpblk\cpblk.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\cpblk
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [cpobj.cmd_4081]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\cpobj\cpobj.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\cpobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [add.cmd_4082]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\Desktop\add\add.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\Desktop\add
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [fielda_tests.cmd_4083]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\fielda_tests\fielda_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\fielda_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [field_tests.cmd_4084]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\field_tests\field_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\field_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [initblk.cmd_4085]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\initblk\initblk.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\initblk
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [initobj.cmd_4086]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\initobj\initobj.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\initobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldind_stind.cmd_4087]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\ldind_stind\ldind_stind.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\ldind_stind
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldloca.cmd_4088]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\ldloca\ldloca.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\ldloca
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldobj.cmd_4089]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\ldobj\ldobj.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\ldobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [localloc.cmd_4090]
 RelativePath=JIT\Directed\PREFIX\unaligned\1\localloc\localloc.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\1\localloc
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [add.cmd_4091]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\add\add.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\add
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [array_tests.cmd_4093]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\array_tests\array_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\array_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Box_Unbox.cmd_4094]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\Box_Unbox\Box_Unbox.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\Box_Unbox
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [cpblk.cmd_4095]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\cpblk\cpblk.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\cpblk
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [cpobj.cmd_4096]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\cpobj\cpobj.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\cpobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [fielda_tests.cmd_4097]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\fielda_tests\fielda_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\fielda_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [field_tests.cmd_4098]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\field_tests\field_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\field_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [initblk.cmd_4099]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\initblk\initblk.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\initblk
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [initobj.cmd_4100]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\initobj\initobj.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\initobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldind_stind.cmd_4101]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\ldind_stind\ldind_stind.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\ldind_stind
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldloca.cmd_4102]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\ldloca\ldloca.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\ldloca
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldobj.cmd_4103]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\ldobj\ldobj.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\ldobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [localloc.cmd_4104]
 RelativePath=JIT\Directed\PREFIX\unaligned\2\localloc\localloc.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\2\localloc
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [add.cmd_4105]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\add\add.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\add
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [array_tests.cmd_4107]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\array_tests\array_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\array_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Box_Unbox.cmd_4108]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\Box_Unbox\Box_Unbox.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\Box_Unbox
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [cpblk.cmd_4109]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\cpblk\cpblk.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\cpblk
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [cpobj.cmd_4110]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\cpobj\cpobj.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\cpobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [add.cmd_4111]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\Desktop\add\add.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\Desktop\add
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [fielda_tests.cmd_4112]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\fielda_tests\fielda_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\fielda_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [field_tests.cmd_4113]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\field_tests\field_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\field_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [initblk.cmd_4114]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\initblk\initblk.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\initblk
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [initobj.cmd_4115]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\initobj\initobj.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\initobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldind_stind.cmd_4116]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\ldind_stind\ldind_stind.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\ldind_stind
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldloca.cmd_4117]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\ldloca\ldloca.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\ldloca
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldobj.cmd_4118]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\ldobj\ldobj.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\ldobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [localloc.cmd_4119]
 RelativePath=JIT\Directed\PREFIX\unaligned\4\localloc\localloc.cmd
 WorkingDir=JIT\Directed\PREFIX\unaligned\4\localloc
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [add.cmd_4120]
 RelativePath=JIT\Directed\PREFIX\volatile\1\add\add.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\add
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [array_tests.cmd_4122]
 RelativePath=JIT\Directed\PREFIX\volatile\1\array_tests\array_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\array_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Box_Unbox.cmd_4123]
 RelativePath=JIT\Directed\PREFIX\volatile\1\Box_Unbox\Box_Unbox.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\Box_Unbox
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [cpblk.cmd_4124]
 RelativePath=JIT\Directed\PREFIX\volatile\1\cpblk\cpblk.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\cpblk
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [cpobj.cmd_4125]
 RelativePath=JIT\Directed\PREFIX\volatile\1\cpobj\cpobj.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\cpobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [add.cmd_4126]
 RelativePath=JIT\Directed\PREFIX\volatile\1\Desktop\add\add.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\Desktop\add
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [fielda_tests.cmd_4127]
 RelativePath=JIT\Directed\PREFIX\volatile\1\fielda_tests\fielda_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\fielda_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [field_tests.cmd_4128]
 RelativePath=JIT\Directed\PREFIX\volatile\1\field_tests\field_tests.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\field_tests
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [initblk.cmd_4129]
 RelativePath=JIT\Directed\PREFIX\volatile\1\initblk\initblk.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\initblk
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [initobj.cmd_4130]
 RelativePath=JIT\Directed\PREFIX\volatile\1\initobj\initobj.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\initobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldind_stind.cmd_4131]
 RelativePath=JIT\Directed\PREFIX\volatile\1\ldind_stind\ldind_stind.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\ldind_stind
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldloca.cmd_4132]
 RelativePath=JIT\Directed\PREFIX\volatile\1\ldloca\ldloca.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\ldloca
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ldobj.cmd_4133]
 RelativePath=JIT\Directed\PREFIX\volatile\1\ldobj\ldobj.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\ldobj
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [localloc.cmd_4134]
 RelativePath=JIT\Directed\PREFIX\volatile\1\localloc\localloc.cmd
 WorkingDir=JIT\Directed\PREFIX\volatile\1\localloc
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [byref2iu_il_d.cmd_4135]
 RelativePath=JIT\Directed\refbyref\byref2iu_il_d\byref2iu_il_d.cmd
 WorkingDir=JIT\Directed\refbyref\byref2iu_il_d
@@ -28734,6 +31419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [byref2iu_il_r.cmd_4136]
 RelativePath=JIT\Directed\refbyref\byref2iu_il_r\byref2iu_il_r.cmd
 WorkingDir=JIT\Directed\refbyref\byref2iu_il_r
@@ -28741,6 +31427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [byrefconvert_il_d.cmd_4137]
 RelativePath=JIT\Directed\refbyref\byrefconvert_il_d\byrefconvert_il_d.cmd
 WorkingDir=JIT\Directed\refbyref\byrefconvert_il_d
@@ -28748,6 +31435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [byrefconvert_il_r.cmd_4138]
 RelativePath=JIT\Directed\refbyref\byrefconvert_il_r\byrefconvert_il_r.cmd
 WorkingDir=JIT\Directed\refbyref\byrefconvert_il_r
@@ -28755,6 +31443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ref2byref_il_d.cmd_4139]
 RelativePath=JIT\Directed\refbyref\ref2byref_il_d\ref2byref_il_d.cmd
 WorkingDir=JIT\Directed\refbyref\ref2byref_il_d
@@ -28762,6 +31451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ref2byref_il_r.cmd_4140]
 RelativePath=JIT\Directed\refbyref\ref2byref_il_r\ref2byref_il_r.cmd
 WorkingDir=JIT\Directed\refbyref\ref2byref_il_r
@@ -28769,6 +31459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ref2iu_il_d.cmd_4141]
 RelativePath=JIT\Directed\refbyref\ref2iu_il_d\ref2iu_il_d.cmd
 WorkingDir=JIT\Directed\refbyref\ref2iu_il_d
@@ -28776,6 +31467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ref2iu_il_r.cmd_4142]
 RelativePath=JIT\Directed\refbyref\ref2iu_il_r\ref2iu_il_r.cmd
 WorkingDir=JIT\Directed\refbyref\ref2iu_il_r
@@ -28783,6 +31475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [refpinned2iu_il_d.cmd_4143]
 RelativePath=JIT\Directed\refbyref\refpinned2iu_il_d\refpinned2iu_il_d.cmd
 WorkingDir=JIT\Directed\refbyref\refpinned2iu_il_d
@@ -28790,6 +31483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [refpinned2iu_il_r.cmd_4144]
 RelativePath=JIT\Directed\refbyref\refpinned2iu_il_r\refpinned2iu_il_r.cmd
 WorkingDir=JIT\Directed\refbyref\refpinned2iu_il_r
@@ -28797,6 +31491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [gcref1.cmd_4146]
 RelativePath=JIT\Directed\RVAInit\gcref1\gcref1.cmd
 WorkingDir=JIT\Directed\RVAInit\gcref1
@@ -28804,6 +31499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [gcref2.cmd_4147]
 RelativePath=JIT\Directed\RVAInit\gcref2\gcref2.cmd
 WorkingDir=JIT\Directed\RVAInit\gcref2
@@ -28811,6 +31507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nested.cmd_4148]
 RelativePath=JIT\Directed\RVAInit\nested\nested.cmd
 WorkingDir=JIT\Directed\RVAInit\nested
@@ -28818,6 +31515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [oddsize.cmd_4149]
 RelativePath=JIT\Directed\RVAInit\oddsize\oddsize.cmd
 WorkingDir=JIT\Directed\RVAInit\oddsize
@@ -28825,6 +31523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [simple.cmd_4151]
 RelativePath=JIT\Directed\RVAInit\simple\simple.cmd
 WorkingDir=JIT\Directed\RVAInit\simple
@@ -28832,6 +31531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [int16_cs_d.cmd_4157]
 RelativePath=JIT\Directed\shift\int16_cs_d\int16_cs_d.cmd
 WorkingDir=JIT\Directed\shift\int16_cs_d
@@ -28839,6 +31539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int16_cs_do.cmd_4158]
 RelativePath=JIT\Directed\shift\int16_cs_do\int16_cs_do.cmd
 WorkingDir=JIT\Directed\shift\int16_cs_do
@@ -28846,6 +31547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int16_cs_r.cmd_4159]
 RelativePath=JIT\Directed\shift\int16_cs_r\int16_cs_r.cmd
 WorkingDir=JIT\Directed\shift\int16_cs_r
@@ -28853,6 +31555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int16_cs_ro.cmd_4160]
 RelativePath=JIT\Directed\shift\int16_cs_ro\int16_cs_ro.cmd
 WorkingDir=JIT\Directed\shift\int16_cs_ro
@@ -28860,6 +31563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int16_d.cmd_4161]
 RelativePath=JIT\Directed\shift\int16_d\int16_d.cmd
 WorkingDir=JIT\Directed\shift\int16_d
@@ -28867,6 +31571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int16_do.cmd_4162]
 RelativePath=JIT\Directed\shift\int16_do\int16_do.cmd
 WorkingDir=JIT\Directed\shift\int16_do
@@ -28874,6 +31579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int16_r.cmd_4163]
 RelativePath=JIT\Directed\shift\int16_r\int16_r.cmd
 WorkingDir=JIT\Directed\shift\int16_r
@@ -28881,6 +31587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int16_ro.cmd_4164]
 RelativePath=JIT\Directed\shift\int16_ro\int16_ro.cmd
 WorkingDir=JIT\Directed\shift\int16_ro
@@ -28888,6 +31595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int32_cs_d.cmd_4165]
 RelativePath=JIT\Directed\shift\int32_cs_d\int32_cs_d.cmd
 WorkingDir=JIT\Directed\shift\int32_cs_d
@@ -28895,6 +31603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int32_cs_do.cmd_4166]
 RelativePath=JIT\Directed\shift\int32_cs_do\int32_cs_do.cmd
 WorkingDir=JIT\Directed\shift\int32_cs_do
@@ -28902,6 +31611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int32_cs_r.cmd_4167]
 RelativePath=JIT\Directed\shift\int32_cs_r\int32_cs_r.cmd
 WorkingDir=JIT\Directed\shift\int32_cs_r
@@ -28909,6 +31619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int32_cs_ro.cmd_4168]
 RelativePath=JIT\Directed\shift\int32_cs_ro\int32_cs_ro.cmd
 WorkingDir=JIT\Directed\shift\int32_cs_ro
@@ -28916,6 +31627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int32_d.cmd_4169]
 RelativePath=JIT\Directed\shift\int32_d\int32_d.cmd
 WorkingDir=JIT\Directed\shift\int32_d
@@ -28923,6 +31635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int32_do.cmd_4170]
 RelativePath=JIT\Directed\shift\int32_do\int32_do.cmd
 WorkingDir=JIT\Directed\shift\int32_do
@@ -28930,6 +31643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int32_r.cmd_4171]
 RelativePath=JIT\Directed\shift\int32_r\int32_r.cmd
 WorkingDir=JIT\Directed\shift\int32_r
@@ -28937,6 +31651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int32_ro.cmd_4172]
 RelativePath=JIT\Directed\shift\int32_ro\int32_ro.cmd
 WorkingDir=JIT\Directed\shift\int32_ro
@@ -28944,6 +31659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int64_d.cmd_4173]
 RelativePath=JIT\Directed\shift\int64_d\int64_d.cmd
 WorkingDir=JIT\Directed\shift\int64_d
@@ -28951,6 +31667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int64_do.cmd_4174]
 RelativePath=JIT\Directed\shift\int64_do\int64_do.cmd
 WorkingDir=JIT\Directed\shift\int64_do
@@ -28958,6 +31675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int64_r.cmd_4175]
 RelativePath=JIT\Directed\shift\int64_r\int64_r.cmd
 WorkingDir=JIT\Directed\shift\int64_r
@@ -28965,6 +31683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int64_ro.cmd_4176]
 RelativePath=JIT\Directed\shift\int64_ro\int64_ro.cmd
 WorkingDir=JIT\Directed\shift\int64_ro
@@ -28972,6 +31691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int8_il_d.cmd_4177]
 RelativePath=JIT\Directed\shift\int8_il_d\int8_il_d.cmd
 WorkingDir=JIT\Directed\shift\int8_il_d
@@ -28979,6 +31699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int8_il_r.cmd_4178]
 RelativePath=JIT\Directed\shift\int8_il_r\int8_il_r.cmd
 WorkingDir=JIT\Directed\shift\int8_il_r
@@ -28986,6 +31707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [nativeint_il_d.cmd_4179]
 RelativePath=JIT\Directed\shift\nativeint_il_d\nativeint_il_d.cmd
 WorkingDir=JIT\Directed\shift\nativeint_il_d
@@ -28993,6 +31715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [nativeint_il_r.cmd_4180]
 RelativePath=JIT\Directed\shift\nativeint_il_r\nativeint_il_r.cmd
 WorkingDir=JIT\Directed\shift\nativeint_il_r
@@ -29000,6 +31723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [nativeuint_il_d.cmd_4181]
 RelativePath=JIT\Directed\shift\nativeuint_il_d\nativeuint_il_d.cmd
 WorkingDir=JIT\Directed\shift\nativeuint_il_d
@@ -29007,6 +31731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [nativeuint_il_r.cmd_4182]
 RelativePath=JIT\Directed\shift\nativeuint_il_r\nativeuint_il_r.cmd
 WorkingDir=JIT\Directed\shift\nativeuint_il_r
@@ -29014,6 +31739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint16_cs_d.cmd_4183]
 RelativePath=JIT\Directed\shift\uint16_cs_d\uint16_cs_d.cmd
 WorkingDir=JIT\Directed\shift\uint16_cs_d
@@ -29021,6 +31747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint16_cs_do.cmd_4184]
 RelativePath=JIT\Directed\shift\uint16_cs_do\uint16_cs_do.cmd
 WorkingDir=JIT\Directed\shift\uint16_cs_do
@@ -29028,6 +31755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint16_cs_r.cmd_4185]
 RelativePath=JIT\Directed\shift\uint16_cs_r\uint16_cs_r.cmd
 WorkingDir=JIT\Directed\shift\uint16_cs_r
@@ -29035,6 +31763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint16_cs_ro.cmd_4186]
 RelativePath=JIT\Directed\shift\uint16_cs_ro\uint16_cs_ro.cmd
 WorkingDir=JIT\Directed\shift\uint16_cs_ro
@@ -29042,6 +31771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint16_d.cmd_4187]
 RelativePath=JIT\Directed\shift\uint16_d\uint16_d.cmd
 WorkingDir=JIT\Directed\shift\uint16_d
@@ -29049,6 +31779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint16_do.cmd_4188]
 RelativePath=JIT\Directed\shift\uint16_do\uint16_do.cmd
 WorkingDir=JIT\Directed\shift\uint16_do
@@ -29056,6 +31787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint16_r.cmd_4189]
 RelativePath=JIT\Directed\shift\uint16_r\uint16_r.cmd
 WorkingDir=JIT\Directed\shift\uint16_r
@@ -29063,6 +31795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint16_ro.cmd_4190]
 RelativePath=JIT\Directed\shift\uint16_ro\uint16_ro.cmd
 WorkingDir=JIT\Directed\shift\uint16_ro
@@ -29070,6 +31803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint32_cs_d.cmd_4191]
 RelativePath=JIT\Directed\shift\uint32_cs_d\uint32_cs_d.cmd
 WorkingDir=JIT\Directed\shift\uint32_cs_d
@@ -29077,6 +31811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint32_cs_do.cmd_4192]
 RelativePath=JIT\Directed\shift\uint32_cs_do\uint32_cs_do.cmd
 WorkingDir=JIT\Directed\shift\uint32_cs_do
@@ -29084,6 +31819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint32_cs_r.cmd_4193]
 RelativePath=JIT\Directed\shift\uint32_cs_r\uint32_cs_r.cmd
 WorkingDir=JIT\Directed\shift\uint32_cs_r
@@ -29091,6 +31827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint32_cs_ro.cmd_4194]
 RelativePath=JIT\Directed\shift\uint32_cs_ro\uint32_cs_ro.cmd
 WorkingDir=JIT\Directed\shift\uint32_cs_ro
@@ -29098,6 +31835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint32_d.cmd_4195]
 RelativePath=JIT\Directed\shift\uint32_d\uint32_d.cmd
 WorkingDir=JIT\Directed\shift\uint32_d
@@ -29105,6 +31843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint32_do.cmd_4196]
 RelativePath=JIT\Directed\shift\uint32_do\uint32_do.cmd
 WorkingDir=JIT\Directed\shift\uint32_do
@@ -29112,6 +31851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint32_r.cmd_4197]
 RelativePath=JIT\Directed\shift\uint32_r\uint32_r.cmd
 WorkingDir=JIT\Directed\shift\uint32_r
@@ -29119,6 +31859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint32_ro.cmd_4198]
 RelativePath=JIT\Directed\shift\uint32_ro\uint32_ro.cmd
 WorkingDir=JIT\Directed\shift\uint32_ro
@@ -29126,6 +31867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint64_d.cmd_4199]
 RelativePath=JIT\Directed\shift\uint64_d\uint64_d.cmd
 WorkingDir=JIT\Directed\shift\uint64_d
@@ -29133,6 +31875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint64_do.cmd_4200]
 RelativePath=JIT\Directed\shift\uint64_do\uint64_do.cmd
 WorkingDir=JIT\Directed\shift\uint64_do
@@ -29140,6 +31883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint64_r.cmd_4201]
 RelativePath=JIT\Directed\shift\uint64_r\uint64_r.cmd
 WorkingDir=JIT\Directed\shift\uint64_r
@@ -29147,6 +31891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint64_ro.cmd_4202]
 RelativePath=JIT\Directed\shift\uint64_ro\uint64_ro.cmd
 WorkingDir=JIT\Directed\shift\uint64_ro
@@ -29154,6 +31899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint8_cs_d.cmd_4203]
 RelativePath=JIT\Directed\shift\uint8_cs_d\uint8_cs_d.cmd
 WorkingDir=JIT\Directed\shift\uint8_cs_d
@@ -29161,6 +31907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint8_cs_do.cmd_4204]
 RelativePath=JIT\Directed\shift\uint8_cs_do\uint8_cs_do.cmd
 WorkingDir=JIT\Directed\shift\uint8_cs_do
@@ -29168,6 +31915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint8_cs_r.cmd_4205]
 RelativePath=JIT\Directed\shift\uint8_cs_r\uint8_cs_r.cmd
 WorkingDir=JIT\Directed\shift\uint8_cs_r
@@ -29175,6 +31923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint8_cs_ro.cmd_4206]
 RelativePath=JIT\Directed\shift\uint8_cs_ro\uint8_cs_ro.cmd
 WorkingDir=JIT\Directed\shift\uint8_cs_ro
@@ -29182,6 +31931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint8_d.cmd_4207]
 RelativePath=JIT\Directed\shift\uint8_d\uint8_d.cmd
 WorkingDir=JIT\Directed\shift\uint8_d
@@ -29189,6 +31939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint8_do.cmd_4208]
 RelativePath=JIT\Directed\shift\uint8_do\uint8_do.cmd
 WorkingDir=JIT\Directed\shift\uint8_do
@@ -29196,6 +31947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint8_r.cmd_4209]
 RelativePath=JIT\Directed\shift\uint8_r\uint8_r.cmd
 WorkingDir=JIT\Directed\shift\uint8_r
@@ -29203,6 +31955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint8_ro.cmd_4210]
 RelativePath=JIT\Directed\shift\uint8_ro\uint8_ro.cmd
 WorkingDir=JIT\Directed\shift\uint8_ro
@@ -29210,6 +31963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess1_cs_d.cmd_4211]
 RelativePath=JIT\Directed\StrAccess\straccess1_cs_d\straccess1_cs_d.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess1_cs_d
@@ -29217,6 +31971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess1_cs_do.cmd_4212]
 RelativePath=JIT\Directed\StrAccess\straccess1_cs_do\straccess1_cs_do.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess1_cs_do
@@ -29224,6 +31979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess1_cs_r.cmd_4213]
 RelativePath=JIT\Directed\StrAccess\straccess1_cs_r\straccess1_cs_r.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess1_cs_r
@@ -29231,6 +31987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess1_cs_ro.cmd_4214]
 RelativePath=JIT\Directed\StrAccess\straccess1_cs_ro\straccess1_cs_ro.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess1_cs_ro
@@ -29238,6 +31995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess2_cs_d.cmd_4215]
 RelativePath=JIT\Directed\StrAccess\straccess2_cs_d\straccess2_cs_d.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess2_cs_d
@@ -29245,6 +32003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess2_cs_do.cmd_4216]
 RelativePath=JIT\Directed\StrAccess\straccess2_cs_do\straccess2_cs_do.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess2_cs_do
@@ -29252,6 +32011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess2_cs_r.cmd_4217]
 RelativePath=JIT\Directed\StrAccess\straccess2_cs_r\straccess2_cs_r.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess2_cs_r
@@ -29259,6 +32019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess2_cs_ro.cmd_4218]
 RelativePath=JIT\Directed\StrAccess\straccess2_cs_ro\straccess2_cs_ro.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess2_cs_ro
@@ -29266,6 +32027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess3_cs_d.cmd_4219]
 RelativePath=JIT\Directed\StrAccess\straccess3_cs_d\straccess3_cs_d.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess3_cs_d
@@ -29273,6 +32035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess3_cs_do.cmd_4220]
 RelativePath=JIT\Directed\StrAccess\straccess3_cs_do\straccess3_cs_do.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess3_cs_do
@@ -29280,6 +32043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess3_cs_r.cmd_4221]
 RelativePath=JIT\Directed\StrAccess\straccess3_cs_r\straccess3_cs_r.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess3_cs_r
@@ -29287,6 +32051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess3_cs_ro.cmd_4222]
 RelativePath=JIT\Directed\StrAccess\straccess3_cs_ro\straccess3_cs_ro.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess3_cs_ro
@@ -29294,6 +32059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [straccess4.cmd_4223]
 RelativePath=JIT\Directed\StrAccess\straccess4\straccess4.cmd
 WorkingDir=JIT\Directed\StrAccess\straccess4
@@ -29301,13 +32067,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [StructABI.cmd_4224]
 RelativePath=JIT\Directed\StructABI\StructABI\StructABI.cmd
 WorkingDir=JIT\Directed\StructABI\StructABI
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;NATIVE_INTEROP;NEED_TRIAGE
+Categories=Pri0;JIT;NEED_TRIAGE;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [SP1.cmd_4225]
 RelativePath=JIT\Directed\StructPromote\SP1\SP1.cmd
 WorkingDir=JIT\Directed\StructPromote\SP1
@@ -29315,6 +32083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SP1a.cmd_4226]
 RelativePath=JIT\Directed\StructPromote\SP1a\SP1a.cmd
 WorkingDir=JIT\Directed\StructPromote\SP1a
@@ -29322,6 +32091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SP1a2.cmd_4227]
 RelativePath=JIT\Directed\StructPromote\SP1a2\SP1a2.cmd
 WorkingDir=JIT\Directed\StructPromote\SP1a2
@@ -29329,6 +32099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SP1b.cmd_4228]
 RelativePath=JIT\Directed\StructPromote\SP1b\SP1b.cmd
 WorkingDir=JIT\Directed\StructPromote\SP1b
@@ -29336,6 +32107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SP1c.cmd_4229]
 RelativePath=JIT\Directed\StructPromote\SP1c\SP1c.cmd
 WorkingDir=JIT\Directed\StructPromote\SP1c
@@ -29343,6 +32115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SP1d.cmd_4230]
 RelativePath=JIT\Directed\StructPromote\SP1d\SP1d.cmd
 WorkingDir=JIT\Directed\StructPromote\SP1d
@@ -29350,6 +32123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SP2.cmd_4231]
 RelativePath=JIT\Directed\StructPromote\SP2\SP2.cmd
 WorkingDir=JIT\Directed\StructPromote\SP2
@@ -29357,6 +32131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SP2a.cmd_4232]
 RelativePath=JIT\Directed\StructPromote\SP2a\SP2a.cmd
 WorkingDir=JIT\Directed\StructPromote\SP2a
@@ -29364,6 +32139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SP2b.cmd_4233]
 RelativePath=JIT\Directed\StructPromote\SP2b\SP2b.cmd
 WorkingDir=JIT\Directed\StructPromote\SP2b
@@ -29371,6 +32147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SP2c.cmd_4234]
 RelativePath=JIT\Directed\StructPromote\SP2c\SP2c.cmd
 WorkingDir=JIT\Directed\StructPromote\SP2c
@@ -29378,6 +32155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SpAddr.cmd_4235]
 RelativePath=JIT\Directed\StructPromote\SpAddr\SpAddr.cmd
 WorkingDir=JIT\Directed\StructPromote\SpAddr
@@ -29385,6 +32163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SpAddrAT.cmd_4236]
 RelativePath=JIT\Directed\StructPromote\SpAddrAT\SpAddrAT.cmd
 WorkingDir=JIT\Directed\StructPromote\SpAddrAT
@@ -29392,6 +32171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [tailcall.cmd_4237]
 RelativePath=JIT\Directed\tailcall\tailcall\tailcall.cmd
 WorkingDir=JIT\Directed\tailcall\tailcall
@@ -29399,6 +32179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [fault.cmd_4238]
 RelativePath=JIT\Directed\throwbox\fault\fault.cmd
 WorkingDir=JIT\Directed\throwbox\fault
@@ -29406,6 +32187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [filter.cmd_4239]
 RelativePath=JIT\Directed\throwbox\filter\filter.cmd
 WorkingDir=JIT\Directed\throwbox\filter
@@ -29413,6 +32195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [finally.cmd_4240]
 RelativePath=JIT\Directed\throwbox\finally\finally.cmd
 WorkingDir=JIT\Directed\throwbox\finally
@@ -29420,6 +32203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [rethrow.cmd_4241]
 RelativePath=JIT\Directed\throwbox\rethrow\rethrow.cmd
 WorkingDir=JIT\Directed\throwbox\rethrow
@@ -29427,6 +32211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [TypedReference.cmd_4244]
 RelativePath=JIT\Directed\TypedReference\TypedReference\TypedReference.cmd
 WorkingDir=JIT\Directed\TypedReference\TypedReference
@@ -29434,6 +32219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Dev10_846218.cmd_4245]
 RelativePath=JIT\Directed\UnrollLoop\Dev10_846218\Dev10_846218.cmd
 WorkingDir=JIT\Directed\UnrollLoop\Dev10_846218
@@ -29441,6 +32227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loop1_cs_d.cmd_4246]
 RelativePath=JIT\Directed\UnrollLoop\loop1_cs_d\loop1_cs_d.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop1_cs_d
@@ -29448,6 +32235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loop1_cs_do.cmd_4247]
 RelativePath=JIT\Directed\UnrollLoop\loop1_cs_do\loop1_cs_do.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop1_cs_do
@@ -29455,6 +32243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loop1_cs_r.cmd_4248]
 RelativePath=JIT\Directed\UnrollLoop\loop1_cs_r\loop1_cs_r.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop1_cs_r
@@ -29462,6 +32251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loop1_cs_ro.cmd_4249]
 RelativePath=JIT\Directed\UnrollLoop\loop1_cs_ro\loop1_cs_ro.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop1_cs_ro
@@ -29469,6 +32259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loop2_cs_d.cmd_4250]
 RelativePath=JIT\Directed\UnrollLoop\loop2_cs_d\loop2_cs_d.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop2_cs_d
@@ -29476,13 +32267,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loop2_cs_do.cmd_4251]
 RelativePath=JIT\Directed\UnrollLoop\loop2_cs_do\loop2_cs_do.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop2_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;UNSTABLE
+Categories=Pri0;UNSTABLE;EXPECTED_PASS
 HostStyle=0
+
 [loop2_cs_r.cmd_4252]
 RelativePath=JIT\Directed\UnrollLoop\loop2_cs_r\loop2_cs_r.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop2_cs_r
@@ -29490,13 +32283,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loop2_cs_ro.cmd_4253]
 RelativePath=JIT\Directed\UnrollLoop\loop2_cs_ro\loop2_cs_ro.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop2_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;UNSTABLE
+Categories=Pri0;UNSTABLE;EXPECTED_PASS
 HostStyle=0
+
 [loop3_il_d.cmd_4254]
 RelativePath=JIT\Directed\UnrollLoop\loop3_il_d\loop3_il_d.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop3_il_d
@@ -29504,6 +32299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loop3_il_r.cmd_4255]
 RelativePath=JIT\Directed\UnrollLoop\loop3_il_r\loop3_il_r.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop3_il_r
@@ -29511,6 +32307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loop4_cs_d.cmd_4256]
 RelativePath=JIT\Directed\UnrollLoop\loop4_cs_d\loop4_cs_d.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop4_cs_d
@@ -29518,6 +32315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loop4_cs_do.cmd_4257]
 RelativePath=JIT\Directed\UnrollLoop\loop4_cs_do\loop4_cs_do.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop4_cs_do
@@ -29525,6 +32323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loop4_cs_r.cmd_4258]
 RelativePath=JIT\Directed\UnrollLoop\loop4_cs_r\loop4_cs_r.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop4_cs_r
@@ -29532,6 +32331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loop4_cs_ro.cmd_4259]
 RelativePath=JIT\Directed\UnrollLoop\loop4_cs_ro\loop4_cs_ro.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop4_cs_ro
@@ -29539,6 +32339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loop6_cs_d.cmd_4260]
 RelativePath=JIT\Directed\UnrollLoop\loop6_cs_d\loop6_cs_d.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop6_cs_d
@@ -29546,6 +32347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loop6_cs_do.cmd_4261]
 RelativePath=JIT\Directed\UnrollLoop\loop6_cs_do\loop6_cs_do.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop6_cs_do
@@ -29553,6 +32355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loop6_cs_r.cmd_4262]
 RelativePath=JIT\Directed\UnrollLoop\loop6_cs_r\loop6_cs_r.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop6_cs_r
@@ -29560,6 +32363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loop6_cs_ro.cmd_4263]
 RelativePath=JIT\Directed\UnrollLoop\loop6_cs_ro\loop6_cs_ro.cmd
 WorkingDir=JIT\Directed\UnrollLoop\loop6_cs_ro
@@ -29567,6 +32371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Dev10_863995.cmd_4264]
 RelativePath=JIT\Directed\zeroinit\Dev10_863995\Dev10_863995.cmd
 WorkingDir=JIT\Directed\zeroinit\Dev10_863995
@@ -29574,6 +32379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [init_byte.cmd_4265]
 RelativePath=JIT\Directed\zeroinit\init_byte\init_byte.cmd
 WorkingDir=JIT\Directed\zeroinit\init_byte
@@ -29581,6 +32387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [init_int32.cmd_4266]
 RelativePath=JIT\Directed\zeroinit\init_int32\init_int32.cmd
 WorkingDir=JIT\Directed\zeroinit\init_int32
@@ -29588,6 +32395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [init_int64.cmd_4267]
 RelativePath=JIT\Directed\zeroinit\init_int64\init_int64.cmd
 WorkingDir=JIT\Directed\zeroinit\init_int64
@@ -29595,6 +32403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [init_struct.cmd_4268]
 RelativePath=JIT\Directed\zeroinit\init_struct\init_struct.cmd
 WorkingDir=JIT\Directed\zeroinit\init_struct
@@ -29602,6 +32411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [init_uint32.cmd_4269]
 RelativePath=JIT\Directed\zeroinit\init_uint32\init_uint32.cmd
 WorkingDir=JIT\Directed\zeroinit\init_uint32
@@ -29609,6 +32419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [init_uint64.cmd_4270]
 RelativePath=JIT\Directed\zeroinit\init_uint64\init_uint64.cmd
 WorkingDir=JIT\Directed\zeroinit\init_uint64
@@ -29616,6 +32427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [tail.cmd_4271]
 RelativePath=JIT\Directed\zeroinit\tail\tail.cmd
 WorkingDir=JIT\Directed\zeroinit\tail
@@ -29623,6 +32435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class01.cmd_4272]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\class01\class01.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\class01
@@ -29630,6 +32443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class01_instance.cmd_4273]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\class01_instance\class01_instance.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\class01_instance
@@ -29637,6 +32451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class01_static.cmd_4274]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\class01_static\class01_static.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\class01_static
@@ -29644,6 +32459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class02.cmd_4275]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\class02\class02.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\class02
@@ -29651,6 +32467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class03.cmd_4276]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\class03\class03.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\class03
@@ -29658,6 +32475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class04.cmd_4277]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\class04\class04.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\class04
@@ -29665,6 +32483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class05.cmd_4278]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\class05\class05.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\class05
@@ -29672,6 +32491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class06.cmd_4279]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\class06\class06.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\class06
@@ -29679,6 +32499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class07.cmd_4280]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\class07\class07.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\class07
@@ -29686,6 +32507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struc01.cmd_4281]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\struc01\struc01.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\struc01
@@ -29693,6 +32515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Struct01.cmd_4282]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\Struct01\Struct01.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\Struct01
@@ -29700,6 +32523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Struct01_instance.cmd_4283]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\Struct01_instance\Struct01_instance.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\Struct01_instance
@@ -29707,6 +32531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct01_static.cmd_4284]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct01_static\struct01_static.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct01_static
@@ -29714,6 +32539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct02.cmd_4285]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct02\struct02.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct02
@@ -29721,6 +32547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct03.cmd_4286]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct03\struct03.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct03
@@ -29728,6 +32555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct04.cmd_4287]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct04\struct04.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct04
@@ -29735,6 +32563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct05.cmd_4288]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct05\struct05.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct05
@@ -29742,6 +32571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct06.cmd_4289]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct06\struct06.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct06
@@ -29749,6 +32579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct07.cmd_4290]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct07\struct07.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\Jagged\struct07
@@ -29756,6 +32587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class01.cmd_4291]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\MultiDim\class01\class01.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\MultiDim\class01
@@ -29763,6 +32595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class01_instance.cmd_4292]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\MultiDim\class01_instance\class01_instance.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\MultiDim\class01_instance
@@ -29770,6 +32603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class01_static.cmd_4293]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\MultiDim\class01_static\class01_static.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\MultiDim\class01_static
@@ -29777,6 +32611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct01.cmd_4294]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\MultiDim\struct01\struct01.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\MultiDim\struct01
@@ -29784,6 +32619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct01_instance.cmd_4295]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\MultiDim\struct01_instance\struct01_instance.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\MultiDim\struct01_instance
@@ -29791,6 +32627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct01_static.cmd_4296]
 RelativePath=JIT\Generics\Arrays\ConstructedTypes\MultiDim\struct01_static\struct01_static.cmd
 WorkingDir=JIT\Generics\Arrays\ConstructedTypes\MultiDim\struct01_static
@@ -29798,6 +32635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class01.cmd_4297]
 RelativePath=JIT\Generics\Arrays\TypeParameters\Jagged\class01\class01.cmd
 WorkingDir=JIT\Generics\Arrays\TypeParameters\Jagged\class01
@@ -29805,6 +32643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct01.cmd_4298]
 RelativePath=JIT\Generics\Arrays\TypeParameters\Jagged\struct01\struct01.cmd
 WorkingDir=JIT\Generics\Arrays\TypeParameters\Jagged\struct01
@@ -29812,6 +32651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class01.cmd_4299]
 RelativePath=JIT\Generics\Arrays\TypeParameters\MultiDim\class01\class01.cmd
 WorkingDir=JIT\Generics\Arrays\TypeParameters\MultiDim\class01
@@ -29819,6 +32659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct01.cmd_4300]
 RelativePath=JIT\Generics\Arrays\TypeParameters\MultiDim\struct01\struct01.cmd
 WorkingDir=JIT\Generics\Arrays\TypeParameters\MultiDim\struct01
@@ -29826,6 +32667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class1_cs_d.cmd_4301]
 RelativePath=JIT\Generics\ConstrainedCall\class1_cs_d\class1_cs_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class1_cs_d
@@ -29833,6 +32675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class1_cs_do.cmd_4302]
 RelativePath=JIT\Generics\ConstrainedCall\class1_cs_do\class1_cs_do.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class1_cs_do
@@ -29840,6 +32683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class1_cs_r.cmd_4303]
 RelativePath=JIT\Generics\ConstrainedCall\class1_cs_r\class1_cs_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class1_cs_r
@@ -29847,6 +32691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class1_cs_ro.cmd_4304]
 RelativePath=JIT\Generics\ConstrainedCall\class1_cs_ro\class1_cs_ro.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class1_cs_ro
@@ -29854,6 +32699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class1_il_d.cmd_4305]
 RelativePath=JIT\Generics\ConstrainedCall\class1_il_d\class1_il_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class1_il_d
@@ -29861,6 +32707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [class1_il_r.cmd_4306]
 RelativePath=JIT\Generics\ConstrainedCall\class1_il_r\class1_il_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class1_il_r
@@ -29868,6 +32715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [class2_cs_d.cmd_4307]
 RelativePath=JIT\Generics\ConstrainedCall\class2_cs_d\class2_cs_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class2_cs_d
@@ -29875,6 +32723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class2_cs_do.cmd_4308]
 RelativePath=JIT\Generics\ConstrainedCall\class2_cs_do\class2_cs_do.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class2_cs_do
@@ -29882,6 +32731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class2_cs_r.cmd_4309]
 RelativePath=JIT\Generics\ConstrainedCall\class2_cs_r\class2_cs_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class2_cs_r
@@ -29889,6 +32739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class2_cs_ro.cmd_4310]
 RelativePath=JIT\Generics\ConstrainedCall\class2_cs_ro\class2_cs_ro.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class2_cs_ro
@@ -29896,6 +32747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class2_il_d.cmd_4311]
 RelativePath=JIT\Generics\ConstrainedCall\class2_il_d\class2_il_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class2_il_d
@@ -29903,6 +32755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [class2_il_r.cmd_4312]
 RelativePath=JIT\Generics\ConstrainedCall\class2_il_r\class2_il_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\class2_il_r
@@ -29910,6 +32763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [vt1_cs_d.cmd_4313]
 RelativePath=JIT\Generics\ConstrainedCall\vt1_cs_d\vt1_cs_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt1_cs_d
@@ -29917,6 +32771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt1_cs_do.cmd_4314]
 RelativePath=JIT\Generics\ConstrainedCall\vt1_cs_do\vt1_cs_do.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt1_cs_do
@@ -29924,6 +32779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt1_cs_r.cmd_4315]
 RelativePath=JIT\Generics\ConstrainedCall\vt1_cs_r\vt1_cs_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt1_cs_r
@@ -29931,6 +32787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt1_cs_ro.cmd_4316]
 RelativePath=JIT\Generics\ConstrainedCall\vt1_cs_ro\vt1_cs_ro.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt1_cs_ro
@@ -29938,6 +32795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt1_il_d.cmd_4317]
 RelativePath=JIT\Generics\ConstrainedCall\vt1_il_d\vt1_il_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt1_il_d
@@ -29945,6 +32803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt1_il_r.cmd_4318]
 RelativePath=JIT\Generics\ConstrainedCall\vt1_il_r\vt1_il_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt1_il_r
@@ -29952,6 +32811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt2_cs_d.cmd_4319]
 RelativePath=JIT\Generics\ConstrainedCall\vt2_cs_d\vt2_cs_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt2_cs_d
@@ -29959,6 +32819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt2_cs_do.cmd_4320]
 RelativePath=JIT\Generics\ConstrainedCall\vt2_cs_do\vt2_cs_do.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt2_cs_do
@@ -29966,6 +32827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt2_cs_r.cmd_4321]
 RelativePath=JIT\Generics\ConstrainedCall\vt2_cs_r\vt2_cs_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt2_cs_r
@@ -29973,6 +32835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt2_cs_ro.cmd_4322]
 RelativePath=JIT\Generics\ConstrainedCall\vt2_cs_ro\vt2_cs_ro.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt2_cs_ro
@@ -29980,6 +32843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt2_il_d.cmd_4323]
 RelativePath=JIT\Generics\ConstrainedCall\vt2_il_d\vt2_il_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt2_il_d
@@ -29987,6 +32851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt2_il_r.cmd_4324]
 RelativePath=JIT\Generics\ConstrainedCall\vt2_il_r\vt2_il_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt2_il_r
@@ -29994,6 +32859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt3_cs_d.cmd_4325]
 RelativePath=JIT\Generics\ConstrainedCall\vt3_cs_d\vt3_cs_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt3_cs_d
@@ -30001,6 +32867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt3_cs_do.cmd_4326]
 RelativePath=JIT\Generics\ConstrainedCall\vt3_cs_do\vt3_cs_do.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt3_cs_do
@@ -30008,6 +32875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt3_cs_r.cmd_4327]
 RelativePath=JIT\Generics\ConstrainedCall\vt3_cs_r\vt3_cs_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt3_cs_r
@@ -30015,6 +32883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt3_cs_ro.cmd_4328]
 RelativePath=JIT\Generics\ConstrainedCall\vt3_cs_ro\vt3_cs_ro.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt3_cs_ro
@@ -30022,6 +32891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt3_il_d.cmd_4329]
 RelativePath=JIT\Generics\ConstrainedCall\vt3_il_d\vt3_il_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt3_il_d
@@ -30029,6 +32899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt3_il_r.cmd_4330]
 RelativePath=JIT\Generics\ConstrainedCall\vt3_il_r\vt3_il_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt3_il_r
@@ -30036,6 +32907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt4_cs_d.cmd_4331]
 RelativePath=JIT\Generics\ConstrainedCall\vt4_cs_d\vt4_cs_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt4_cs_d
@@ -30043,6 +32915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt4_cs_do.cmd_4332]
 RelativePath=JIT\Generics\ConstrainedCall\vt4_cs_do\vt4_cs_do.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt4_cs_do
@@ -30050,6 +32923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt4_cs_r.cmd_4333]
 RelativePath=JIT\Generics\ConstrainedCall\vt4_cs_r\vt4_cs_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt4_cs_r
@@ -30057,6 +32931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt4_cs_ro.cmd_4334]
 RelativePath=JIT\Generics\ConstrainedCall\vt4_cs_ro\vt4_cs_ro.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt4_cs_ro
@@ -30064,6 +32939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vt4_il_d.cmd_4335]
 RelativePath=JIT\Generics\ConstrainedCall\vt4_il_d\vt4_il_d.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt4_il_d
@@ -30071,6 +32947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [vt4_il_r.cmd_4336]
 RelativePath=JIT\Generics\ConstrainedCall\vt4_il_r\vt4_il_r.cmd
 WorkingDir=JIT\Generics\ConstrainedCall\vt4_il_r
@@ -30078,6 +32955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call_instance01.cmd_4337]
 RelativePath=JIT\Generics\Constraints\call_instance01\call_instance01.cmd
 WorkingDir=JIT\Generics\Constraints\call_instance01
@@ -30085,6 +32963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Call_instance01_d.cmd_4338]
 RelativePath=JIT\Generics\Constraints\Call_instance01_d\Call_instance01_d.cmd
 WorkingDir=JIT\Generics\Constraints\Call_instance01_d
@@ -30092,6 +32971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Call_instance01_do.cmd_4339]
 RelativePath=JIT\Generics\Constraints\Call_instance01_do\Call_instance01_do.cmd
 WorkingDir=JIT\Generics\Constraints\Call_instance01_do
@@ -30099,6 +32979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Call_instance01_r.cmd_4340]
 RelativePath=JIT\Generics\Constraints\Call_instance01_r\Call_instance01_r.cmd
 WorkingDir=JIT\Generics\Constraints\Call_instance01_r
@@ -30106,6 +32987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Call_instance01_ro.cmd_4341]
 RelativePath=JIT\Generics\Constraints\Call_instance01_ro\Call_instance01_ro.cmd
 WorkingDir=JIT\Generics\Constraints\Call_instance01_ro
@@ -30113,6 +32995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [call_static01.cmd_4342]
 RelativePath=JIT\Generics\Constraints\call_static01\call_static01.cmd
 WorkingDir=JIT\Generics\Constraints\call_static01
@@ -30120,6 +33003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convert_instance01.cmd_4343]
 RelativePath=JIT\Generics\Constraints\convert_instance01\convert_instance01.cmd
 WorkingDir=JIT\Generics\Constraints\convert_instance01
@@ -30127,6 +33011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convert_static01.cmd_4344]
 RelativePath=JIT\Generics\Constraints\convert_static01\convert_static01.cmd
 WorkingDir=JIT\Generics\Constraints\convert_static01
@@ -30134,6 +33019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [transitive_instance01.cmd_4345]
 RelativePath=JIT\Generics\Constraints\transitive_instance01\transitive_instance01.cmd
 WorkingDir=JIT\Generics\Constraints\transitive_instance01
@@ -30141,6 +33027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [transitive_static01.cmd_4346]
 RelativePath=JIT\Generics\Constraints\transitive_static01\transitive_static01.cmd
 WorkingDir=JIT\Generics\Constraints\transitive_static01
@@ -30148,6 +33035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [box_unbox01.cmd_4347]
 RelativePath=JIT\Generics\Conversions\Boxing\box_unbox01\box_unbox01.cmd
 WorkingDir=JIT\Generics\Conversions\Boxing\box_unbox01
@@ -30155,6 +33043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [gentogen01.cmd_4348]
 RelativePath=JIT\Generics\Conversions\Reference\gentogen01\gentogen01.cmd
 WorkingDir=JIT\Generics\Conversions\Reference\gentogen01
@@ -30162,6 +33051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [gentogen02.cmd_4349]
 RelativePath=JIT\Generics\Conversions\Reference\gentogen02\gentogen02.cmd
 WorkingDir=JIT\Generics\Conversions\Reference\gentogen02
@@ -30169,6 +33059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [gentogen03.cmd_4350]
 RelativePath=JIT\Generics\Conversions\Reference\gentogen03\gentogen03.cmd
 WorkingDir=JIT\Generics\Conversions\Reference\gentogen03
@@ -30176,6 +33067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [gentonongen01.cmd_4351]
 RelativePath=JIT\Generics\Conversions\Reference\gentonongen01\gentonongen01.cmd
 WorkingDir=JIT\Generics\Conversions\Reference\gentonongen01
@@ -30183,6 +33075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [gentonongen02.cmd_4352]
 RelativePath=JIT\Generics\Conversions\Reference\gentonongen02\gentonongen02.cmd
 WorkingDir=JIT\Generics\Conversions\Reference\gentonongen02
@@ -30190,6 +33083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [gentonongen03.cmd_4353]
 RelativePath=JIT\Generics\Conversions\Reference\gentonongen03\gentonongen03.cmd
 WorkingDir=JIT\Generics\Conversions\Reference\gentonongen03
@@ -30197,6 +33091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [nongentogen01.cmd_4354]
 RelativePath=JIT\Generics\Conversions\Reference\nongentogen01\nongentogen01.cmd
 WorkingDir=JIT\Generics\Conversions\Reference\nongentogen01
@@ -30204,6 +33099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [nongentogen02.cmd_4355]
 RelativePath=JIT\Generics\Conversions\Reference\nongentogen02\nongentogen02.cmd
 WorkingDir=JIT\Generics\Conversions\Reference\nongentogen02
@@ -30211,6 +33107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [nongentogen03.cmd_4356]
 RelativePath=JIT\Generics\Conversions\Reference\nongentogen03\nongentogen03.cmd
 WorkingDir=JIT\Generics\Conversions\Reference\nongentogen03
@@ -30218,6 +33115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [chaos55915408cs.cmd_4357]
 RelativePath=JIT\Generics\Coverage\chaos55915408cs\chaos55915408cs.cmd
 WorkingDir=JIT\Generics\Coverage\chaos55915408cs
@@ -30225,6 +33123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [chaos55915408cs_o.cmd_4358]
 RelativePath=JIT\Generics\Coverage\chaos55915408cs_o\chaos55915408cs_o.cmd
 WorkingDir=JIT\Generics\Coverage\chaos55915408cs_o
@@ -30232,6 +33131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [chaos56200037cs.cmd_4359]
 RelativePath=JIT\Generics\Coverage\chaos56200037cs\chaos56200037cs.cmd
 WorkingDir=JIT\Generics\Coverage\chaos56200037cs
@@ -30239,6 +33139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [chaos56200037cs_o.cmd_4360]
 RelativePath=JIT\Generics\Coverage\chaos56200037cs_o\chaos56200037cs_o.cmd
 WorkingDir=JIT\Generics\Coverage\chaos56200037cs_o
@@ -30246,6 +33147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [chaos65204782cs.cmd_4361]
 RelativePath=JIT\Generics\Coverage\chaos65204782cs\chaos65204782cs.cmd
 WorkingDir=JIT\Generics\Coverage\chaos65204782cs
@@ -30253,6 +33155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [chaos65204782cs_o.cmd_4362]
 RelativePath=JIT\Generics\Coverage\chaos65204782cs_o\chaos65204782cs_o.cmd
 WorkingDir=JIT\Generics\Coverage\chaos65204782cs_o
@@ -30260,6 +33163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [general_class_instance01.cmd_4363]
 RelativePath=JIT\Generics\Exceptions\general_class_instance01\general_class_instance01.cmd
 WorkingDir=JIT\Generics\Exceptions\general_class_instance01
@@ -30267,6 +33171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [general_class_static01.cmd_4364]
 RelativePath=JIT\Generics\Exceptions\general_class_static01\general_class_static01.cmd
 WorkingDir=JIT\Generics\Exceptions\general_class_static01
@@ -30274,6 +33179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [general_struct_instance01.cmd_4365]
 RelativePath=JIT\Generics\Exceptions\general_struct_instance01\general_struct_instance01.cmd
 WorkingDir=JIT\Generics\Exceptions\general_struct_instance01
@@ -30281,6 +33187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [general_struct_static01.cmd_4366]
 RelativePath=JIT\Generics\Exceptions\general_struct_static01\general_struct_static01.cmd
 WorkingDir=JIT\Generics\Exceptions\general_struct_static01
@@ -30288,6 +33195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [specific_class_instance01.cmd_4367]
 RelativePath=JIT\Generics\Exceptions\specific_class_instance01\specific_class_instance01.cmd
 WorkingDir=JIT\Generics\Exceptions\specific_class_instance01
@@ -30295,6 +33203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [specific_class_instance02.cmd_4368]
 RelativePath=JIT\Generics\Exceptions\specific_class_instance02\specific_class_instance02.cmd
 WorkingDir=JIT\Generics\Exceptions\specific_class_instance02
@@ -30302,6 +33211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [specific_class_static01.cmd_4369]
 RelativePath=JIT\Generics\Exceptions\specific_class_static01\specific_class_static01.cmd
 WorkingDir=JIT\Generics\Exceptions\specific_class_static01
@@ -30309,6 +33219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [specific_class_static02.cmd_4370]
 RelativePath=JIT\Generics\Exceptions\specific_class_static02\specific_class_static02.cmd
 WorkingDir=JIT\Generics\Exceptions\specific_class_static02
@@ -30316,6 +33227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [specific_struct_instance01.cmd_4371]
 RelativePath=JIT\Generics\Exceptions\specific_struct_instance01\specific_struct_instance01.cmd
 WorkingDir=JIT\Generics\Exceptions\specific_struct_instance01
@@ -30323,6 +33235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [specific_struct_instance02.cmd_4372]
 RelativePath=JIT\Generics\Exceptions\specific_struct_instance02\specific_struct_instance02.cmd
 WorkingDir=JIT\Generics\Exceptions\specific_struct_instance02
@@ -30330,6 +33243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [specific_struct_static01.cmd_4373]
 RelativePath=JIT\Generics\Exceptions\specific_struct_static01\specific_struct_static01.cmd
 WorkingDir=JIT\Generics\Exceptions\specific_struct_static01
@@ -30337,6 +33251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [specific_struct_static02.cmd_4374]
 RelativePath=JIT\Generics\Exceptions\specific_struct_static02\specific_struct_static02.cmd
 WorkingDir=JIT\Generics\Exceptions\specific_struct_static02
@@ -30344,6 +33259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [getclassfrommethodparam.cmd_4375]
 RelativePath=JIT\Generics\Fields\getclassfrommethodparam\getclassfrommethodparam.cmd
 WorkingDir=JIT\Generics\Fields\getclassfrommethodparam
@@ -30351,6 +33267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [instance_assignment_class01.cmd_4376]
 RelativePath=JIT\Generics\Fields\instance_assignment_class01\instance_assignment_class01.cmd
 WorkingDir=JIT\Generics\Fields\instance_assignment_class01
@@ -30358,6 +33275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_assignment_struct01.cmd_4377]
 RelativePath=JIT\Generics\Fields\instance_assignment_struct01\instance_assignment_struct01.cmd
 WorkingDir=JIT\Generics\Fields\instance_assignment_struct01
@@ -30365,6 +33283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_equalnull_class01.cmd_4378]
 RelativePath=JIT\Generics\Fields\instance_equalnull_class01\instance_equalnull_class01.cmd
 WorkingDir=JIT\Generics\Fields\instance_equalnull_class01
@@ -30372,6 +33291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_equalnull_struct01.cmd_4379]
 RelativePath=JIT\Generics\Fields\instance_equalnull_struct01\instance_equalnull_struct01.cmd
 WorkingDir=JIT\Generics\Fields\instance_equalnull_struct01
@@ -30379,6 +33299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_passing_class01.cmd_4380]
 RelativePath=JIT\Generics\Fields\instance_passing_class01\instance_passing_class01.cmd
 WorkingDir=JIT\Generics\Fields\instance_passing_class01
@@ -30386,6 +33307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_passing_struct01.cmd_4381]
 RelativePath=JIT\Generics\Fields\instance_passing_struct01\instance_passing_struct01.cmd
 WorkingDir=JIT\Generics\Fields\instance_passing_struct01
@@ -30393,6 +33315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_assignment_class01.cmd_4382]
 RelativePath=JIT\Generics\Fields\static_assignment_class01\static_assignment_class01.cmd
 WorkingDir=JIT\Generics\Fields\static_assignment_class01
@@ -30400,6 +33323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_assignment_struct01.cmd_4383]
 RelativePath=JIT\Generics\Fields\static_assignment_struct01\static_assignment_struct01.cmd
 WorkingDir=JIT\Generics\Fields\static_assignment_struct01
@@ -30407,6 +33331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_equalnull_class01.cmd_4384]
 RelativePath=JIT\Generics\Fields\static_equalnull_class01\static_equalnull_class01.cmd
 WorkingDir=JIT\Generics\Fields\static_equalnull_class01
@@ -30414,6 +33339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_equalnull_struct01.cmd_4385]
 RelativePath=JIT\Generics\Fields\static_equalnull_struct01\static_equalnull_struct01.cmd
 WorkingDir=JIT\Generics\Fields\static_equalnull_struct01
@@ -30421,6 +33347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_passing_class01.cmd_4386]
 RelativePath=JIT\Generics\Fields\static_passing_class01\static_passing_class01.cmd
 WorkingDir=JIT\Generics\Fields\static_passing_class01
@@ -30428,6 +33355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_passing_struct01.cmd_4387]
 RelativePath=JIT\Generics\Fields\static_passing_struct01\static_passing_struct01.cmd
 WorkingDir=JIT\Generics\Fields\static_passing_struct01
@@ -30435,6 +33363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [baseclass01.cmd_4388]
 RelativePath=JIT\Generics\Instantiation\Classes\baseclass01\baseclass01.cmd
 WorkingDir=JIT\Generics\Instantiation\Classes\baseclass01
@@ -30442,6 +33371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [baseclass02.cmd_4389]
 RelativePath=JIT\Generics\Instantiation\Classes\baseclass02\baseclass02.cmd
 WorkingDir=JIT\Generics\Instantiation\Classes\baseclass02
@@ -30449,6 +33379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [baseclass03.cmd_4390]
 RelativePath=JIT\Generics\Instantiation\Classes\baseclass03\baseclass03.cmd
 WorkingDir=JIT\Generics\Instantiation\Classes\baseclass03
@@ -30456,6 +33387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [baseclass04.cmd_4391]
 RelativePath=JIT\Generics\Instantiation\Classes\baseclass04\baseclass04.cmd
 WorkingDir=JIT\Generics\Instantiation\Classes\baseclass04
@@ -30463,6 +33395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [baseclass05.cmd_4392]
 RelativePath=JIT\Generics\Instantiation\Classes\baseclass05\baseclass05.cmd
 WorkingDir=JIT\Generics\Instantiation\Classes\baseclass05
@@ -30470,6 +33403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class01.cmd_4393]
 RelativePath=JIT\Generics\Instantiation\Classes\class01\class01.cmd
 WorkingDir=JIT\Generics\Instantiation\Classes\class01
@@ -30477,6 +33411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class02.cmd_4394]
 RelativePath=JIT\Generics\Instantiation\Classes\class02\class02.cmd
 WorkingDir=JIT\Generics\Instantiation\Classes\class02
@@ -30484,6 +33419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class03.cmd_4395]
 RelativePath=JIT\Generics\Instantiation\Classes\class03\class03.cmd
 WorkingDir=JIT\Generics\Instantiation\Classes\class03
@@ -30491,6 +33427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Delegate001.cmd_4396]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate001\Delegate001.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate001
@@ -30498,6 +33435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate002.cmd_4397]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate002\Delegate002.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate002
@@ -30505,6 +33443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate003.cmd_4398]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate003\Delegate003.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate003
@@ -30512,6 +33451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate004.cmd_4399]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate004\Delegate004.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate004
@@ -30519,6 +33459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate005.cmd_4400]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate005\Delegate005.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate005
@@ -30526,6 +33467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate006.cmd_4401]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate006\Delegate006.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate006
@@ -30533,6 +33475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate007.cmd_4402]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate007\Delegate007.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate007
@@ -30540,6 +33483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate008.cmd_4403]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate008\Delegate008.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate008
@@ -30547,6 +33491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate009.cmd_4404]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate009\Delegate009.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate009
@@ -30554,6 +33499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate010.cmd_4405]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate010\Delegate010.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate010
@@ -30561,6 +33507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate011.cmd_4406]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate011\Delegate011.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate011
@@ -30568,6 +33515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate012.cmd_4407]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate012\Delegate012.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate012
@@ -30575,6 +33523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate013.cmd_4408]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate013\Delegate013.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate013
@@ -30582,6 +33531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate014.cmd_4409]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate014\Delegate014.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate014
@@ -30589,6 +33539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate015.cmd_4410]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate015\Delegate015.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate015
@@ -30596,6 +33547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate016.cmd_4411]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate016\Delegate016.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate016
@@ -30603,6 +33555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate017.cmd_4412]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate017\Delegate017.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate017
@@ -30610,6 +33563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate018.cmd_4413]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate018\Delegate018.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate018
@@ -30617,6 +33571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate019.cmd_4414]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate019\Delegate019.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate019
@@ -30624,6 +33579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate020.cmd_4415]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate020\Delegate020.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate020
@@ -30631,6 +33587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate021.cmd_4416]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate021\Delegate021.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate021
@@ -30638,6 +33595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate022.cmd_4417]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate022\Delegate022.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate022
@@ -30645,6 +33603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate023.cmd_4418]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate023\Delegate023.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate023
@@ -30652,6 +33611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate024.cmd_4419]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate024\Delegate024.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate024
@@ -30659,6 +33619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate025.cmd_4420]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate025\Delegate025.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate025
@@ -30666,6 +33627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate026.cmd_4421]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate026\Delegate026.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate026
@@ -30673,6 +33635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate027.cmd_4422]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate027\Delegate027.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate027
@@ -30680,6 +33643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate028.cmd_4423]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate028\Delegate028.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate028
@@ -30687,6 +33651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate029.cmd_4424]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate029\Delegate029.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate029
@@ -30694,6 +33659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate030.cmd_4425]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate030\Delegate030.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate030
@@ -30701,6 +33667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate031.cmd_4426]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate031\Delegate031.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate031
@@ -30708,6 +33675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Delegate032.cmd_4427]
 RelativePath=JIT\Generics\Instantiation\delegates\Delegate032\Delegate032.cmd
 WorkingDir=JIT\Generics\Instantiation\delegates\Delegate032
@@ -30715,6 +33683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [class01.cmd_4428]
 RelativePath=JIT\Generics\Instantiation\Interfaces\class01\class01.cmd
 WorkingDir=JIT\Generics\Instantiation\Interfaces\class01
@@ -30722,6 +33691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class02.cmd_4429]
 RelativePath=JIT\Generics\Instantiation\Interfaces\class02\class02.cmd
 WorkingDir=JIT\Generics\Instantiation\Interfaces\class02
@@ -30729,6 +33699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class03.cmd_4430]
 RelativePath=JIT\Generics\Instantiation\Interfaces\class03\class03.cmd
 WorkingDir=JIT\Generics\Instantiation\Interfaces\class03
@@ -30736,6 +33707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class04.cmd_4431]
 RelativePath=JIT\Generics\Instantiation\Interfaces\class04\class04.cmd
 WorkingDir=JIT\Generics\Instantiation\Interfaces\class04
@@ -30743,6 +33715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class05.cmd_4432]
 RelativePath=JIT\Generics\Instantiation\Interfaces\class05\class05.cmd
 WorkingDir=JIT\Generics\Instantiation\Interfaces\class05
@@ -30750,6 +33723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct01.cmd_4433]
 RelativePath=JIT\Generics\Instantiation\Interfaces\struct01\struct01.cmd
 WorkingDir=JIT\Generics\Instantiation\Interfaces\struct01
@@ -30757,6 +33731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct02.cmd_4434]
 RelativePath=JIT\Generics\Instantiation\Interfaces\struct02\struct02.cmd
 WorkingDir=JIT\Generics\Instantiation\Interfaces\struct02
@@ -30764,6 +33739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct03.cmd_4435]
 RelativePath=JIT\Generics\Instantiation\Interfaces\struct03\struct03.cmd
 WorkingDir=JIT\Generics\Instantiation\Interfaces\struct03
@@ -30771,6 +33747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct04.cmd_4436]
 RelativePath=JIT\Generics\Instantiation\Interfaces\struct04\struct04.cmd
 WorkingDir=JIT\Generics\Instantiation\Interfaces\struct04
@@ -30778,6 +33755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct05.cmd_4437]
 RelativePath=JIT\Generics\Instantiation\Interfaces\struct05\struct05.cmd
 WorkingDir=JIT\Generics\Instantiation\Interfaces\struct05
@@ -30785,6 +33763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct01.cmd_4438]
 RelativePath=JIT\Generics\Instantiation\Structs\struct01\struct01.cmd
 WorkingDir=JIT\Generics\Instantiation\Structs\struct01
@@ -30792,6 +33771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct02.cmd_4439]
 RelativePath=JIT\Generics\Instantiation\Structs\struct02\struct02.cmd
 WorkingDir=JIT\Generics\Instantiation\Structs\struct02
@@ -30799,6 +33779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct03.cmd_4440]
 RelativePath=JIT\Generics\Instantiation\Structs\struct03\struct03.cmd
 WorkingDir=JIT\Generics\Instantiation\Structs\struct03
@@ -30806,6 +33787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_assignment_class01.cmd_4441]
 RelativePath=JIT\Generics\Locals\instance_assignment_class01\instance_assignment_class01.cmd
 WorkingDir=JIT\Generics\Locals\instance_assignment_class01
@@ -30813,6 +33795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_assignment_struct01.cmd_4442]
 RelativePath=JIT\Generics\Locals\instance_assignment_struct01\instance_assignment_struct01.cmd
 WorkingDir=JIT\Generics\Locals\instance_assignment_struct01
@@ -30820,6 +33803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_equalnull_class01.cmd_4443]
 RelativePath=JIT\Generics\Locals\instance_equalnull_class01\instance_equalnull_class01.cmd
 WorkingDir=JIT\Generics\Locals\instance_equalnull_class01
@@ -30827,6 +33811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_equalnull_struct01.cmd_4444]
 RelativePath=JIT\Generics\Locals\instance_equalnull_struct01\instance_equalnull_struct01.cmd
 WorkingDir=JIT\Generics\Locals\instance_equalnull_struct01
@@ -30834,6 +33819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_passing_class01.cmd_4445]
 RelativePath=JIT\Generics\Locals\instance_passing_class01\instance_passing_class01.cmd
 WorkingDir=JIT\Generics\Locals\instance_passing_class01
@@ -30841,6 +33827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_passing_struct01.cmd_4446]
 RelativePath=JIT\Generics\Locals\instance_passing_struct01\instance_passing_struct01.cmd
 WorkingDir=JIT\Generics\Locals\instance_passing_struct01
@@ -30848,6 +33835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_assignment_class01.cmd_4447]
 RelativePath=JIT\Generics\Locals\static_assignment_class01\static_assignment_class01.cmd
 WorkingDir=JIT\Generics\Locals\static_assignment_class01
@@ -30855,6 +33843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_assignment_struct01.cmd_4448]
 RelativePath=JIT\Generics\Locals\static_assignment_struct01\static_assignment_struct01.cmd
 WorkingDir=JIT\Generics\Locals\static_assignment_struct01
@@ -30862,6 +33851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_equalnull_class01.cmd_4449]
 RelativePath=JIT\Generics\Locals\static_equalnull_class01\static_equalnull_class01.cmd
 WorkingDir=JIT\Generics\Locals\static_equalnull_class01
@@ -30869,6 +33859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_equalnull_struct01.cmd_4450]
 RelativePath=JIT\Generics\Locals\static_equalnull_struct01\static_equalnull_struct01.cmd
 WorkingDir=JIT\Generics\Locals\static_equalnull_struct01
@@ -30876,6 +33867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_passing_class01.cmd_4451]
 RelativePath=JIT\Generics\Locals\static_passing_class01\static_passing_class01.cmd
 WorkingDir=JIT\Generics\Locals\static_passing_class01
@@ -30883,6 +33875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_passing_struct01.cmd_4452]
 RelativePath=JIT\Generics\Locals\static_passing_struct01\static_passing_struct01.cmd
 WorkingDir=JIT\Generics\Locals\static_passing_struct01
@@ -30890,6 +33883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class_instance01.cmd_4453]
 RelativePath=JIT\Generics\MemberAccess\class_instance01\class_instance01.cmd
 WorkingDir=JIT\Generics\MemberAccess\class_instance01
@@ -30897,6 +33891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class_static01.cmd_4454]
 RelativePath=JIT\Generics\MemberAccess\class_static01\class_static01.cmd
 WorkingDir=JIT\Generics\MemberAccess\class_static01
@@ -30904,6 +33899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [interface_class01.cmd_4455]
 RelativePath=JIT\Generics\MemberAccess\interface_class01\interface_class01.cmd
 WorkingDir=JIT\Generics\MemberAccess\interface_class01
@@ -30911,6 +33907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [interface_class02.cmd_4456]
 RelativePath=JIT\Generics\MemberAccess\interface_class02\interface_class02.cmd
 WorkingDir=JIT\Generics\MemberAccess\interface_class02
@@ -30918,6 +33915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [interface_struct01.cmd_4457]
 RelativePath=JIT\Generics\MemberAccess\interface_struct01\interface_struct01.cmd
 WorkingDir=JIT\Generics\MemberAccess\interface_struct01
@@ -30925,6 +33923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [interface_struct02.cmd_4458]
 RelativePath=JIT\Generics\MemberAccess\interface_struct02\interface_struct02.cmd
 WorkingDir=JIT\Generics\MemberAccess\interface_struct02
@@ -30932,6 +33931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct_instance01.cmd_4459]
 RelativePath=JIT\Generics\MemberAccess\struct_instance01\struct_instance01.cmd
 WorkingDir=JIT\Generics\MemberAccess\struct_instance01
@@ -30939,6 +33939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct_static01.cmd_4460]
 RelativePath=JIT\Generics\MemberAccess\struct_static01\struct_static01.cmd
 WorkingDir=JIT\Generics\MemberAccess\struct_static01
@@ -30946,6 +33947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_assignment_class01.cmd_4461]
 RelativePath=JIT\Generics\Parameters\instance_assignment_class01\instance_assignment_class01.cmd
 WorkingDir=JIT\Generics\Parameters\instance_assignment_class01
@@ -30953,6 +33955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_assignment_struct01.cmd_4462]
 RelativePath=JIT\Generics\Parameters\instance_assignment_struct01\instance_assignment_struct01.cmd
 WorkingDir=JIT\Generics\Parameters\instance_assignment_struct01
@@ -30960,6 +33963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_equalnull_class01.cmd_4463]
 RelativePath=JIT\Generics\Parameters\instance_equalnull_class01\instance_equalnull_class01.cmd
 WorkingDir=JIT\Generics\Parameters\instance_equalnull_class01
@@ -30967,6 +33971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_equalnull_struct01.cmd_4464]
 RelativePath=JIT\Generics\Parameters\instance_equalnull_struct01\instance_equalnull_struct01.cmd
 WorkingDir=JIT\Generics\Parameters\instance_equalnull_struct01
@@ -30974,6 +33979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_passing_class01.cmd_4465]
 RelativePath=JIT\Generics\Parameters\instance_passing_class01\instance_passing_class01.cmd
 WorkingDir=JIT\Generics\Parameters\instance_passing_class01
@@ -30981,6 +33987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance_passing_struct01.cmd_4466]
 RelativePath=JIT\Generics\Parameters\instance_passing_struct01\instance_passing_struct01.cmd
 WorkingDir=JIT\Generics\Parameters\instance_passing_struct01
@@ -30988,6 +33995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_assignment_class01.cmd_4467]
 RelativePath=JIT\Generics\Parameters\static_assignment_class01\static_assignment_class01.cmd
 WorkingDir=JIT\Generics\Parameters\static_assignment_class01
@@ -30995,6 +34003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_assignment_struct01.cmd_4468]
 RelativePath=JIT\Generics\Parameters\static_assignment_struct01\static_assignment_struct01.cmd
 WorkingDir=JIT\Generics\Parameters\static_assignment_struct01
@@ -31002,6 +34011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_equalnull_class01.cmd_4469]
 RelativePath=JIT\Generics\Parameters\static_equalnull_class01\static_equalnull_class01.cmd
 WorkingDir=JIT\Generics\Parameters\static_equalnull_class01
@@ -31009,6 +34019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_equalnull_struct01.cmd_4470]
 RelativePath=JIT\Generics\Parameters\static_equalnull_struct01\static_equalnull_struct01.cmd
 WorkingDir=JIT\Generics\Parameters\static_equalnull_struct01
@@ -31016,6 +34027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_passing_class01.cmd_4471]
 RelativePath=JIT\Generics\Parameters\static_passing_class01\static_passing_class01.cmd
 WorkingDir=JIT\Generics\Parameters\static_passing_class01
@@ -31023,6 +34035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static_passing_struct01.cmd_4472]
 RelativePath=JIT\Generics\Parameters\static_passing_struct01\static_passing_struct01.cmd
 WorkingDir=JIT\Generics\Parameters\static_passing_struct01
@@ -31030,6 +34043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [instance01.cmd_4473]
 RelativePath=JIT\Generics\pinvoke\instance01\instance01.cmd
 WorkingDir=JIT\Generics\pinvoke\instance01
@@ -31037,6 +34051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [instance02.cmd_4474]
 RelativePath=JIT\Generics\pinvoke\instance02\instance02.cmd
 WorkingDir=JIT\Generics\pinvoke\instance02
@@ -31044,6 +34059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [instance03.cmd_4475]
 RelativePath=JIT\Generics\pinvoke\instance03\instance03.cmd
 WorkingDir=JIT\Generics\pinvoke\instance03
@@ -31051,6 +34067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [static01.cmd_4476]
 RelativePath=JIT\Generics\pinvoke\static01\static01.cmd
 WorkingDir=JIT\Generics\pinvoke\static01
@@ -31058,6 +34075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [static02.cmd_4477]
 RelativePath=JIT\Generics\pinvoke\static02\static02.cmd
 WorkingDir=JIT\Generics\pinvoke\static02
@@ -31065,6 +34083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ddb148379.cmd_4478]
 RelativePath=JIT\Generics\regression\DDB148379\ddb148379\ddb148379.cmd
 WorkingDir=JIT\Generics\regression\DDB148379\ddb148379
@@ -31072,6 +34091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class01.cmd_4479]
 RelativePath=JIT\Generics\Typeof\class01\class01.cmd
 WorkingDir=JIT\Generics\Typeof\class01
@@ -31079,6 +34099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class02.cmd_4480]
 RelativePath=JIT\Generics\Typeof\class02\class02.cmd
 WorkingDir=JIT\Generics\Typeof\class02
@@ -31086,6 +34107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [class03.cmd_4481]
 RelativePath=JIT\Generics\Typeof\class03\class03.cmd
 WorkingDir=JIT\Generics\Typeof\class03
@@ -31093,6 +34115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [dynamicTypes.cmd_4482]
 RelativePath=JIT\Generics\Typeof\dynamicTypes\dynamicTypes.cmd
 WorkingDir=JIT\Generics\Typeof\dynamicTypes
@@ -31100,6 +34123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [objectBoxing.cmd_4483]
 RelativePath=JIT\Generics\Typeof\objectBoxing\objectBoxing.cmd
 WorkingDir=JIT\Generics\Typeof\objectBoxing
@@ -31107,6 +34131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [refTypesdynamic.cmd_4484]
 RelativePath=JIT\Generics\Typeof\refTypesdynamic\refTypesdynamic.cmd
 WorkingDir=JIT\Generics\Typeof\refTypesdynamic
@@ -31114,6 +34139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct01.cmd_4485]
 RelativePath=JIT\Generics\Typeof\struct01\struct01.cmd
 WorkingDir=JIT\Generics\Typeof\struct01
@@ -31121,6 +34147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct02.cmd_4486]
 RelativePath=JIT\Generics\Typeof\struct02\struct02.cmd
 WorkingDir=JIT\Generics\Typeof\struct02
@@ -31128,6 +34155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct03.cmd_4487]
 RelativePath=JIT\Generics\Typeof\struct03\struct03.cmd
 WorkingDir=JIT\Generics\Typeof\struct03
@@ -31135,6 +34163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [valueTypeBoxing.cmd_4488]
 RelativePath=JIT\Generics\Typeof\valueTypeBoxing\valueTypeBoxing.cmd
 WorkingDir=JIT\Generics\Typeof\valueTypeBoxing
@@ -31142,6 +34171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [default_class01.cmd_4489]
 RelativePath=JIT\Generics\TypeParameters\default_class01\default_class01.cmd
 WorkingDir=JIT\Generics\TypeParameters\default_class01
@@ -31149,6 +34179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [default_struct01.cmd_4490]
 RelativePath=JIT\Generics\TypeParameters\default_struct01\default_struct01.cmd
 WorkingDir=JIT\Generics\TypeParameters\default_struct01
@@ -31156,6 +34187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [add.cmd_4491]
 RelativePath=JIT\IL_Conformance\Old\Base\add\add.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\add
@@ -31163,6 +34195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [add_ovf.cmd_4492]
 RelativePath=JIT\IL_Conformance\Old\Base\add_ovf\add_ovf.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\add_ovf
@@ -31170,6 +34203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [and.cmd_4493]
 RelativePath=JIT\IL_Conformance\Old\Base\and\and.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\and
@@ -31177,6 +34211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [beq.cmd_4494]
 RelativePath=JIT\IL_Conformance\Old\Base\beq\beq.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\beq
@@ -31184,6 +34219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [beq_s.cmd_4495]
 RelativePath=JIT\IL_Conformance\Old\Base\beq_s\beq_s.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\beq_s
@@ -31191,6 +34227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bge.cmd_4496]
 RelativePath=JIT\IL_Conformance\Old\Base\bge\bge.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\bge
@@ -31198,6 +34235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bge_s.cmd_4497]
 RelativePath=JIT\IL_Conformance\Old\Base\bge_s\bge_s.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\bge_s
@@ -31205,6 +34243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bgt.cmd_4498]
 RelativePath=JIT\IL_Conformance\Old\Base\bgt\bgt.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\bgt
@@ -31212,6 +34251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bgt_s.cmd_4499]
 RelativePath=JIT\IL_Conformance\Old\Base\bgt_s\bgt_s.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\bgt_s
@@ -31219,6 +34259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ble.cmd_4500]
 RelativePath=JIT\IL_Conformance\Old\Base\ble\ble.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ble
@@ -31226,6 +34267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ble_s.cmd_4501]
 RelativePath=JIT\IL_Conformance\Old\Base\ble_s\ble_s.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ble_s
@@ -31233,6 +34275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [blt.cmd_4502]
 RelativePath=JIT\IL_Conformance\Old\Base\blt\blt.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\blt
@@ -31240,6 +34283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [blt_s.cmd_4503]
 RelativePath=JIT\IL_Conformance\Old\Base\blt_s\blt_s.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\blt_s
@@ -31247,6 +34291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bne.cmd_4504]
 RelativePath=JIT\IL_Conformance\Old\Base\bne\bne.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\bne
@@ -31254,6 +34299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bne_s.cmd_4505]
 RelativePath=JIT\IL_Conformance\Old\Base\bne_s\bne_s.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\bne_s
@@ -31261,6 +34307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [br.cmd_4506]
 RelativePath=JIT\IL_Conformance\Old\Base\br\br.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\br
@@ -31268,6 +34315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [brfalse.cmd_4507]
 RelativePath=JIT\IL_Conformance\Old\Base\brfalse\brfalse.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\brfalse
@@ -31275,6 +34323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [brfalse_s.cmd_4508]
 RelativePath=JIT\IL_Conformance\Old\Base\brfalse_s\brfalse_s.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\brfalse_s
@@ -31282,6 +34331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [brtrue.cmd_4509]
 RelativePath=JIT\IL_Conformance\Old\Base\brtrue\brtrue.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\brtrue
@@ -31289,6 +34339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [brtrue_s.cmd_4510]
 RelativePath=JIT\IL_Conformance\Old\Base\brtrue_s\brtrue_s.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\brtrue_s
@@ -31296,6 +34347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [br_s.cmd_4511]
 RelativePath=JIT\IL_Conformance\Old\Base\br_s\br_s.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\br_s
@@ -31303,6 +34355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call.cmd_4512]
 RelativePath=JIT\IL_Conformance\Old\Base\call\call.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\call
@@ -31310,6 +34363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ceq.cmd_4513]
 RelativePath=JIT\IL_Conformance\Old\Base\ceq\ceq.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ceq
@@ -31317,6 +34371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cgt.cmd_4514]
 RelativePath=JIT\IL_Conformance\Old\Base\cgt\cgt.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\cgt
@@ -31324,6 +34379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ckfinite.cmd_4515]
 RelativePath=JIT\IL_Conformance\Old\Base\ckfinite\ckfinite.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ckfinite
@@ -31331,6 +34387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [clt.cmd_4516]
 RelativePath=JIT\IL_Conformance\Old\Base\clt\clt.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\clt
@@ -31338,6 +34395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv.cmd_4517]
 RelativePath=JIT\IL_Conformance\Old\Base\conv\conv.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\conv
@@ -31345,6 +34403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf.cmd_4518]
 RelativePath=JIT\IL_Conformance\Old\Base\conv_ovf\conv_ovf.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\conv_ovf
@@ -31352,6 +34411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cpblk.cmd_4519]
 RelativePath=JIT\IL_Conformance\Old\Base\cpblk\cpblk.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\cpblk
@@ -31359,6 +34419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [div.cmd_4520]
 RelativePath=JIT\IL_Conformance\Old\Base\div\div.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\div
@@ -31366,6 +34427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dup.cmd_4521]
 RelativePath=JIT\IL_Conformance\Old\Base\dup\dup.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\dup
@@ -31373,6 +34435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [initblk.cmd_4522]
 RelativePath=JIT\IL_Conformance\Old\Base\initblk\initblk.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\initblk
@@ -31380,6 +34443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [jmp.cmd_4523]
 RelativePath=JIT\IL_Conformance\Old\Base\jmp\jmp.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\jmp
@@ -31387,6 +34451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldargs_stargs.cmd_4524]
 RelativePath=JIT\IL_Conformance\Old\Base\ldargs_stargs\ldargs_stargs.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ldargs_stargs
@@ -31394,6 +34459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_n.cmd_4525]
 RelativePath=JIT\IL_Conformance\Old\Base\ldarg_n\ldarg_n.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ldarg_n
@@ -31401,6 +34467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_starg.cmd_4526]
 RelativePath=JIT\IL_Conformance\Old\Base\ldarg_starg\ldarg_starg.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ldarg_starg
@@ -31408,6 +34475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldc.cmd_4527]
 RelativePath=JIT\IL_Conformance\Old\Base\ldc\ldc.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ldc
@@ -31415,6 +34483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldc_i4_n.cmd_4528]
 RelativePath=JIT\IL_Conformance\Old\Base\ldc_i4_n\ldc_i4_n.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ldc_i4_n
@@ -31422,6 +34491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldftn_calli.cmd_4529]
 RelativePath=JIT\IL_Conformance\Old\Base\ldftn_calli\ldftn_calli.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ldftn_calli
@@ -31429,6 +34499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_stind.cmd_4530]
 RelativePath=JIT\IL_Conformance\Old\Base\ldind_stind\ldind_stind.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ldind_stind
@@ -31436,6 +34507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloca.cmd_4531]
 RelativePath=JIT\IL_Conformance\Old\Base\ldloca\ldloca.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ldloca
@@ -31443,6 +34515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_stloc.cmd_4532]
 RelativePath=JIT\IL_Conformance\Old\Base\ldloc_stloc\ldloc_stloc.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ldloc_stloc
@@ -31450,6 +34523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldnull.cmd_4533]
 RelativePath=JIT\IL_Conformance\Old\Base\ldnull\ldnull.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ldnull
@@ -31457,6 +34531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul.cmd_4534]
 RelativePath=JIT\IL_Conformance\Old\Base\mul\mul.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\mul
@@ -31464,6 +34539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_ovf.cmd_4535]
 RelativePath=JIT\IL_Conformance\Old\Base\mul_ovf\mul_ovf.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\mul_ovf
@@ -31471,6 +34547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [neg.cmd_4536]
 RelativePath=JIT\IL_Conformance\Old\Base\neg\neg.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\neg
@@ -31478,6 +34555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nop.cmd_4537]
 RelativePath=JIT\IL_Conformance\Old\Base\nop\nop.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\nop
@@ -31485,6 +34563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [not.cmd_4538]
 RelativePath=JIT\IL_Conformance\Old\Base\not\not.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\not
@@ -31492,6 +34571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [or.cmd_4539]
 RelativePath=JIT\IL_Conformance\Old\Base\or\or.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\or
@@ -31499,6 +34579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [pop.cmd_4540]
 RelativePath=JIT\IL_Conformance\Old\Base\pop\pop.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\pop
@@ -31506,6 +34587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rem.cmd_4541]
 RelativePath=JIT\IL_Conformance\Old\Base\rem\rem.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\rem
@@ -31513,6 +34595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ret.cmd_4542]
 RelativePath=JIT\IL_Conformance\Old\Base\ret\ret.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\ret
@@ -31520,6 +34603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [shl.cmd_4543]
 RelativePath=JIT\IL_Conformance\Old\Base\shl\shl.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\shl
@@ -31527,6 +34611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [shr.cmd_4544]
 RelativePath=JIT\IL_Conformance\Old\Base\shr\shr.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\shr
@@ -31534,6 +34619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub.cmd_4545]
 RelativePath=JIT\IL_Conformance\Old\Base\sub\sub.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\sub
@@ -31541,6 +34627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_ovf.cmd_4546]
 RelativePath=JIT\IL_Conformance\Old\Base\sub_ovf\sub_ovf.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\sub_ovf
@@ -31548,6 +34635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [switch.cmd_4547]
 RelativePath=JIT\IL_Conformance\Old\Base\switch\switch.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\switch
@@ -31555,6 +34643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tailcall.cmd_4548]
 RelativePath=JIT\IL_Conformance\Old\Base\tailcall\tailcall.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\tailcall
@@ -31562,6 +34651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unaligned.cmd_4549]
 RelativePath=JIT\IL_Conformance\Old\Base\unaligned\unaligned.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\unaligned
@@ -31569,6 +34659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [volatile.cmd_4550]
 RelativePath=JIT\IL_Conformance\Old\Base\volatile\volatile.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\volatile
@@ -31576,6 +34667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xor.cmd_4551]
 RelativePath=JIT\IL_Conformance\Old\Base\xor\xor.cmd
 WorkingDir=JIT\IL_Conformance\Old\Base\xor
@@ -31583,6 +34675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_i.cmd_4552]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_i\add_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_i
@@ -31590,6 +34683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_I4.cmd_4553]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_I4\add_I4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_I4
@@ -31597,6 +34691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_i8.cmd_4554]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_i8\add_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_i8
@@ -31604,6 +34699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_ovf_i1.cmd_4555]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_i1\add_ovf_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_i1
@@ -31611,6 +34707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_ovf_i2.cmd_4556]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_i2\add_ovf_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_i2
@@ -31618,6 +34715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_ovf_i4.cmd_4557]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_i4\add_ovf_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_i4
@@ -31625,6 +34723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_ovf_i8.cmd_4558]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_i8\add_ovf_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_i8
@@ -31632,6 +34731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_ovf_u1.cmd_4559]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_u1\add_ovf_u1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_u1
@@ -31639,6 +34739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_ovf_u2.cmd_4560]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_u2\add_ovf_u2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_u2
@@ -31646,6 +34747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_ovf_u4.cmd_4561]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_u4\add_ovf_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_u4
@@ -31653,6 +34755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_ovf_u8.cmd_4562]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_u8\add_ovf_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_ovf_u8
@@ -31660,6 +34763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_r4.cmd_4563]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_r4\add_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_r4
@@ -31667,6 +34771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [add_r8.cmd_4564]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\add_r8\add_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\add_r8
@@ -31674,6 +34779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [and_u4.cmd_4565]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\and_u4\and_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\and_u4
@@ -31681,6 +34787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [and_u8.cmd_4566]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\and_u8\and_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\and_u8
@@ -31688,6 +34795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [beq_i.cmd_4567]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\beq_i\beq_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\beq_i
@@ -31695,6 +34803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [beq_i4.cmd_4568]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\beq_i4\beq_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\beq_i4
@@ -31702,6 +34811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [beq_i8.cmd_4569]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\beq_i8\beq_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\beq_i8
@@ -31709,6 +34819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [beq_r4.cmd_4570]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\beq_r4\beq_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\beq_r4
@@ -31716,6 +34827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [beq_r8.cmd_4571]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\beq_r8\beq_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\beq_r8
@@ -31723,6 +34835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bge_i4.cmd_4572]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bge_i4\bge_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bge_i4
@@ -31730,6 +34843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bge_i8.cmd_4573]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bge_i8\bge_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bge_i8
@@ -31737,6 +34851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bge_r4.cmd_4574]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bge_r4\bge_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bge_r4
@@ -31744,6 +34859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bge_r8.cmd_4575]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bge_r8\bge_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bge_r8
@@ -31751,6 +34867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bge_u.cmd_4576]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bge_u\bge_u.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bge_u
@@ -31758,6 +34875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bge_un_i4.cmd_4577]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bge_un_i4\bge_un_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bge_un_i4
@@ -31765,6 +34883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bge_un_i8.cmd_4578]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bge_un_i8\bge_un_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bge_un_i8
@@ -31772,6 +34891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bge_un_r4.cmd_4579]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bge_un_r4\bge_un_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bge_un_r4
@@ -31779,6 +34899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bge_un_r8.cmd_4580]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bge_un_r8\bge_un_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bge_un_r8
@@ -31786,6 +34907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bgt_i4.cmd_4581]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bgt_i4\bgt_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bgt_i4
@@ -31793,6 +34915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bgt_i8.cmd_4582]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bgt_i8\bgt_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bgt_i8
@@ -31800,6 +34923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bgt_r4.cmd_4583]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bgt_r4\bgt_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bgt_r4
@@ -31807,6 +34931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bgt_r8.cmd_4584]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bgt_r8\bgt_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bgt_r8
@@ -31814,6 +34939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bgt_u.cmd_4585]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bgt_u\bgt_u.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bgt_u
@@ -31821,6 +34947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bgt_u4.cmd_4586]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bgt_u4\bgt_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bgt_u4
@@ -31828,6 +34955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bgt_u8.cmd_4587]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bgt_u8\bgt_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bgt_u8
@@ -31835,6 +34963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bgt_un_r4.cmd_4588]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bgt_un_r4\bgt_un_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bgt_un_r4
@@ -31842,6 +34971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bgt_un_r8.cmd_4589]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bgt_un_r8\bgt_un_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bgt_un_r8
@@ -31849,6 +34979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ble_i4.cmd_4590]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ble_i4\ble_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ble_i4
@@ -31856,6 +34987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ble_i8.cmd_4591]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ble_i8\ble_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ble_i8
@@ -31863,6 +34995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ble_r4.cmd_4592]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ble_r4\ble_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ble_r4
@@ -31870,6 +35003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ble_r8.cmd_4593]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ble_r8\ble_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ble_r8
@@ -31877,6 +35011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ble_u.cmd_4594]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ble_u\ble_u.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ble_u
@@ -31884,6 +35019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ble_u4.cmd_4595]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ble_u4\ble_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ble_u4
@@ -31891,6 +35027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ble_u8.cmd_4596]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ble_u8\ble_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ble_u8
@@ -31898,6 +35035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ble_un_r4.cmd_4597]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ble_un_r4\ble_un_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ble_un_r4
@@ -31905,6 +35043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ble_un_r8.cmd_4598]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ble_un_r8\ble_un_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ble_un_r8
@@ -31912,6 +35051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [blt_i4.cmd_4599]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\blt_i4\blt_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\blt_i4
@@ -31919,6 +35059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [blt_i8.cmd_4600]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\blt_i8\blt_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\blt_i8
@@ -31926,6 +35067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [blt_r4.cmd_4601]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\blt_r4\blt_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\blt_r4
@@ -31933,6 +35075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [blt_r8.cmd_4602]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\blt_r8\blt_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\blt_r8
@@ -31940,6 +35083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [blt_u.cmd_4603]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\blt_u\blt_u.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\blt_u
@@ -31947,6 +35091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [blt_u4.cmd_4604]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\blt_u4\blt_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\blt_u4
@@ -31954,6 +35099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [blt_u8.cmd_4605]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\blt_u8\blt_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\blt_u8
@@ -31961,6 +35107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [blt_un_r4.cmd_4606]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\blt_un_r4\blt_un_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\blt_un_r4
@@ -31968,6 +35115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [blt_un_r8.cmd_4607]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\blt_un_r8\blt_un_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\blt_un_r8
@@ -31975,6 +35123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bne_u.cmd_4608]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bne_u\bne_u.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bne_u
@@ -31982,6 +35131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bne_u4.cmd_4609]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bne_u4\bne_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bne_u4
@@ -31989,6 +35139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bne_u8.cmd_4610]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bne_u8\bne_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bne_u8
@@ -31996,6 +35147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bne_un_r4.cmd_4611]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bne_un_r4\bne_un_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bne_un_r4
@@ -32003,6 +35155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bne_un_r8.cmd_4612]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\bne_un_r8\bne_un_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\bne_un_r8
@@ -32010,6 +35163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [br.cmd_4613]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\br\br.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\br
@@ -32017,6 +35171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [brfalse.cmd_4614]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\brfalse\brfalse.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\brfalse
@@ -32024,6 +35179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [brtrue.cmd_4615]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\brtrue\brtrue.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\brtrue
@@ -32031,6 +35187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call.cmd_4616]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\call\call.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\call
@@ -32038,6 +35195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ceq_i.cmd_4617]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ceq_i\ceq_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ceq_i
@@ -32045,6 +35203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ceq_i4.cmd_4618]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ceq_i4\ceq_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ceq_i4
@@ -32052,6 +35211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ceq_i8.cmd_4619]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ceq_i8\ceq_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ceq_i8
@@ -32059,6 +35219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ceq_r4.cmd_4620]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ceq_r4\ceq_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ceq_r4
@@ -32066,6 +35227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ceq_r8.cmd_4621]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ceq_r8\ceq_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ceq_r8
@@ -32073,6 +35235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cgt_i4.cmd_4622]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\cgt_i4\cgt_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\cgt_i4
@@ -32080,6 +35243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cgt_i8.cmd_4623]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\cgt_i8\cgt_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\cgt_i8
@@ -32087,6 +35251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cgt_r4.cmd_4624]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\cgt_r4\cgt_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\cgt_r4
@@ -32094,6 +35259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cgt_r8.cmd_4625]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\cgt_r8\cgt_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\cgt_r8
@@ -32101,6 +35267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cgt_u.cmd_4626]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\cgt_u\cgt_u.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\cgt_u
@@ -32108,6 +35275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cgt_u4.cmd_4627]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\cgt_u4\cgt_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\cgt_u4
@@ -32115,6 +35283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cgt_u8.cmd_4628]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\cgt_u8\cgt_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\cgt_u8
@@ -32122,6 +35291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cgt_un_r4.cmd_4629]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\cgt_un_r4\cgt_un_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\cgt_un_r4
@@ -32129,6 +35299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cgt_un_r8.cmd_4630]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\cgt_un_r8\cgt_un_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\cgt_un_r8
@@ -32136,6 +35307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ckfinite_r4.cmd_4631]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ckfinite_r4\ckfinite_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ckfinite_r4
@@ -32143,6 +35315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ckfinite_r8.cmd_4632]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ckfinite_r8\ckfinite_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ckfinite_r8
@@ -32150,6 +35323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [clt_i4.cmd_4633]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\clt_i4\clt_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\clt_i4
@@ -32157,6 +35331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [clt_i8.cmd_4634]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\clt_i8\clt_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\clt_i8
@@ -32164,6 +35339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [clt_r4.cmd_4635]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\clt_r4\clt_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\clt_r4
@@ -32171,6 +35347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [clt_r8.cmd_4636]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\clt_r8\clt_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\clt_r8
@@ -32178,6 +35355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [clt_u.cmd_4637]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\clt_u\clt_u.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\clt_u
@@ -32185,6 +35363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [clt_u4.cmd_4638]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\clt_u4\clt_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\clt_u4
@@ -32192,6 +35371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [clt_u8.cmd_4639]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\clt_u8\clt_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\clt_u8
@@ -32199,6 +35379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [clt_un_r4.cmd_4640]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\clt_un_r4\clt_un_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\clt_un_r4
@@ -32206,6 +35387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [clt_un_r8.cmd_4641]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\clt_un_r8\clt_un_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\clt_un_r8
@@ -32213,6 +35395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Conv_I4.cmd_4642]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\Conv_I4\Conv_I4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\Conv_I4
@@ -32220,6 +35403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Conv_I8.cmd_4643]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\Conv_I8\Conv_I8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\Conv_I8
@@ -32227,6 +35411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_i1_un.cmd_4644]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i1_un\conv_ovf_i1_un.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i1_un
@@ -32234,6 +35419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_i4_i1.cmd_4645]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i4_i1\conv_ovf_i4_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i4_i1
@@ -32241,6 +35427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_i4_i2.cmd_4646]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i4_i2\conv_ovf_i4_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i4_i2
@@ -32248,6 +35435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_i4_u4.cmd_4647]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i4_u4\conv_ovf_i4_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i4_u4
@@ -32255,6 +35443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_i8_i4.cmd_4648]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i8_i4\conv_ovf_i8_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i8_i4
@@ -32262,6 +35451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_i8_u8.cmd_4649]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i8_u8\conv_ovf_i8_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_i8_u8
@@ -32269,6 +35459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_r8_i.cmd_4650]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_r8_i\conv_ovf_r8_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_r8_i
@@ -32276,6 +35467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_r8_i4.cmd_4651]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_r8_i4\conv_ovf_r8_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_r8_i4
@@ -32283,6 +35475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_r8_i8.cmd_4652]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_r8_i8\conv_ovf_r8_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_r8_i8
@@ -32290,6 +35483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_u4_i.cmd_4653]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u4_i\conv_ovf_u4_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u4_i
@@ -32297,6 +35491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_u4_i4.cmd_4654]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u4_i4\conv_ovf_u4_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u4_i4
@@ -32304,6 +35499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_u4_u1.cmd_4655]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u4_u1\conv_ovf_u4_u1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u4_u1
@@ -32311,6 +35507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_u4_u2.cmd_4656]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u4_u2\conv_ovf_u4_u2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u4_u2
@@ -32318,6 +35515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_u8_i8.cmd_4657]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u8_i8\conv_ovf_u8_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u8_i8
@@ -32325,6 +35523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_u8_u4.cmd_4658]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u8_u4\conv_ovf_u8_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\conv_ovf_u8_u4
@@ -32332,6 +35531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Conv_R4.cmd_4659]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\Conv_R4\Conv_R4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\Conv_R4
@@ -32339,6 +35539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cpblk.cmd_4660]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\cpblk\cpblk.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\cpblk
@@ -32346,6 +35547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [c_br.cmd_4661]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\c_br\c_br.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\c_br
@@ -32353,6 +35555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [c_brfalse.cmd_4662]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\c_brfalse\c_brfalse.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\c_brfalse
@@ -32360,6 +35563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [c_brtrue.cmd_4663]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\c_brtrue\c_brtrue.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\c_brtrue
@@ -32367,6 +35571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [c_call.cmd_4664]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\c_call\c_call.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\c_call
@@ -32374,6 +35579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [c_cpblk.cmd_4665]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\c_cpblk\c_cpblk.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\c_cpblk
@@ -32381,6 +35587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [c_initblk.cmd_4666]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\c_initblk\c_initblk.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\c_initblk
@@ -32388,6 +35595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [c_ldvirtftn.cmd_4667]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\c_ldvirtftn\c_ldvirtftn.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\c_ldvirtftn
@@ -32395,6 +35603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [c_localloc.cmd_4668]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\c_localloc\c_localloc.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\c_localloc
@@ -32402,6 +35611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [c_nop.cmd_4669]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\c_nop\c_nop.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\c_nop
@@ -32409,6 +35619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [c_ret.cmd_4670]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\c_ret\c_ret.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\c_ret
@@ -32416,6 +35627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [c_switch.cmd_4671]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\c_switch\c_switch.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\c_switch
@@ -32423,6 +35635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [div_i4.cmd_4672]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\div_i4\div_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\div_i4
@@ -32430,6 +35643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [div_i8.cmd_4673]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\div_i8\div_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\div_i8
@@ -32437,6 +35651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [div_r4.cmd_4674]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\div_r4\div_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\div_r4
@@ -32444,6 +35659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [div_r8.cmd_4675]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\div_r8\div_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\div_r8
@@ -32451,6 +35667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [div_u4.cmd_4676]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\div_u4\div_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\div_u4
@@ -32458,6 +35675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [div_u8.cmd_4677]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\div_u8\div_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\div_u8
@@ -32465,6 +35683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dup4.cmd_4678]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\dup4\dup4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\dup4
@@ -32472,6 +35691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dup8.cmd_4679]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\dup8\dup8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\dup8
@@ -32479,6 +35699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dupi.cmd_4680]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\dupi\dupi.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\dupi
@@ -32486,6 +35707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [initblk.cmd_4681]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\initblk\initblk.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\initblk
@@ -32493,6 +35715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarga_i.cmd_4682]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarga_i\ldarga_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarga_i
@@ -32500,6 +35723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarga_i4.cmd_4683]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarga_i4\ldarga_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarga_i4
@@ -32507,6 +35731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarga_i8.cmd_4684]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarga_i8\ldarga_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarga_i8
@@ -32514,6 +35739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarga_r4.cmd_4685]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarga_r4\ldarga_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarga_r4
@@ -32521,6 +35747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarga_r8.cmd_4686]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarga_r8\ldarga_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarga_r8
@@ -32528,6 +35755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarga_ref.cmd_4687]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarga_ref\ldarga_ref.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarga_ref
@@ -32535,6 +35763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_i.cmd_4688]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarg_i\ldarg_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarg_i
@@ -32542,6 +35771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_i4.cmd_4689]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarg_i4\ldarg_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarg_i4
@@ -32549,6 +35779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_i8.cmd_4690]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarg_i8\ldarg_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarg_i8
@@ -32556,6 +35787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_r4.cmd_4691]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarg_r4\ldarg_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarg_r4
@@ -32563,6 +35795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_r8.cmd_4692]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarg_r8\ldarg_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarg_r8
@@ -32570,6 +35803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_ref.cmd_4693]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldarg_ref\ldarg_ref.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldarg_ref
@@ -32577,6 +35811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldc_add_ovf_i1.cmd_4694]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_i1\ldc_add_ovf_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_i1
@@ -32584,6 +35819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_add_ovf_i2.cmd_4695]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_i2\ldc_add_ovf_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_i2
@@ -32591,6 +35827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_add_ovf_i4.cmd_4696]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_i4\ldc_add_ovf_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_i4
@@ -32598,6 +35835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_add_ovf_i8.cmd_4697]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_i8\ldc_add_ovf_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_i8
@@ -32605,6 +35843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_add_ovf_u1.cmd_4698]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_u1\ldc_add_ovf_u1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_u1
@@ -32612,6 +35851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_add_ovf_u2.cmd_4699]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_u2\ldc_add_ovf_u2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_u2
@@ -32619,6 +35859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_add_ovf_u4.cmd_4700]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_u4\ldc_add_ovf_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_u4
@@ -32626,6 +35867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_add_ovf_u8.cmd_4701]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_u8\ldc_add_ovf_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_add_ovf_u8
@@ -32633,6 +35875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_ckfinite_r4.cmd_4702]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_ckfinite_r4\ldc_ckfinite_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_ckfinite_r4
@@ -32640,6 +35883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_ckfinite_r8.cmd_4703]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_ckfinite_r8\ldc_ckfinite_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_ckfinite_r8
@@ -32647,6 +35891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_i4_i1.cmd_4704]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_i4_i1\ldc_conv_ovf_i4_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_i4_i1
@@ -32654,6 +35899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_i4_i2.cmd_4705]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_i4_i2\ldc_conv_ovf_i4_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_i4_i2
@@ -32661,6 +35907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_i4_u4.cmd_4706]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_i4_u4\ldc_conv_ovf_i4_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_i4_u4
@@ -32668,6 +35915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_i8_i4.cmd_4707]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_i8_i4\ldc_conv_ovf_i8_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_i8_i4
@@ -32675,6 +35923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_i8_u8.cmd_4708]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_i8_u8\ldc_conv_ovf_i8_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_i8_u8
@@ -32682,6 +35931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_r8_i.cmd_4709]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_r8_i\ldc_conv_ovf_r8_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_r8_i
@@ -32689,6 +35939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_r8_i4.cmd_4710]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_r8_i4\ldc_conv_ovf_r8_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_r8_i4
@@ -32696,6 +35947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_r8_i8.cmd_4711]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_r8_i8\ldc_conv_ovf_r8_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_r8_i8
@@ -32703,6 +35955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_u4_i.cmd_4712]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u4_i\ldc_conv_ovf_u4_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u4_i
@@ -32710,6 +35963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_u4_i4.cmd_4713]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u4_i4\ldc_conv_ovf_u4_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u4_i4
@@ -32717,6 +35971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_u4_u1.cmd_4714]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u4_u1\ldc_conv_ovf_u4_u1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u4_u1
@@ -32724,6 +35979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_u4_u2.cmd_4715]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u4_u2\ldc_conv_ovf_u4_u2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u4_u2
@@ -32731,6 +35987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_u8_i8.cmd_4716]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u8_i8\ldc_conv_ovf_u8_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u8_i8
@@ -32738,6 +35995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_conv_ovf_u8_u4.cmd_4717]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u8_u4\ldc_conv_ovf_u8_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_conv_ovf_u8_u4
@@ -32745,6 +36003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_c_cpblk.cmd_4718]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_c_cpblk\ldc_c_cpblk.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_c_cpblk
@@ -32752,6 +36011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_c_initblk.cmd_4719]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_c_initblk\ldc_c_initblk.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_c_initblk
@@ -32759,6 +36019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_c_nop.cmd_4720]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_c_nop\ldc_c_nop.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_c_nop
@@ -32766,6 +36027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_c_ret.cmd_4721]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_c_ret\ldc_c_ret.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_c_ret
@@ -32773,6 +36035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_c_switch.cmd_4722]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_c_switch\ldc_c_switch.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_c_switch
@@ -32780,6 +36043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_i4.cmd_4723]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_i4\ldc_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_i4
@@ -32787,6 +36051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldc_i8.cmd_4724]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_i8\ldc_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_i8
@@ -32794,6 +36059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldc_mul_ovf_i1.cmd_4725]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_i1\ldc_mul_ovf_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_i1
@@ -32801,6 +36067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_mul_ovf_i2.cmd_4726]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_i2\ldc_mul_ovf_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_i2
@@ -32808,6 +36075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_mul_ovf_i4.cmd_4727]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_i4\ldc_mul_ovf_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_i4
@@ -32815,6 +36083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_mul_ovf_i8.cmd_4728]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_i8\ldc_mul_ovf_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_i8
@@ -32822,6 +36091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_mul_ovf_u1.cmd_4729]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_u1\ldc_mul_ovf_u1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_u1
@@ -32829,6 +36099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_mul_ovf_u2.cmd_4730]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_u2\ldc_mul_ovf_u2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_u2
@@ -32836,6 +36107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_mul_ovf_u4.cmd_4731]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_u4\ldc_mul_ovf_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_u4
@@ -32843,6 +36115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_mul_ovf_u8.cmd_4732]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_u8\ldc_mul_ovf_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_mul_ovf_u8
@@ -32850,6 +36123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_neg_i4.cmd_4733]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_neg_i4\ldc_neg_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_neg_i4
@@ -32857,6 +36131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_neg_i8.cmd_4734]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_neg_i8\ldc_neg_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_neg_i8
@@ -32864,6 +36139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_r4.cmd_4735]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_r4\ldc_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_r4
@@ -32871,6 +36147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldc_r8.cmd_4736]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_r8\ldc_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_r8
@@ -32878,6 +36155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldc_ret_i.cmd_4737]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_i\ldc_ret_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_i
@@ -32885,6 +36163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_ret_i4.cmd_4738]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_i4\ldc_ret_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_i4
@@ -32892,6 +36171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_ret_i8.cmd_4739]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_i8\ldc_ret_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_i8
@@ -32899,6 +36179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_ret_r4.cmd_4740]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_r4\ldc_ret_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_r4
@@ -32906,6 +36187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_ret_r8.cmd_4741]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_r8\ldc_ret_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_r8
@@ -32913,6 +36195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_ret_ref.cmd_4742]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_ref\ldc_ret_ref.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_ret_ref
@@ -32920,6 +36203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_sub_i.cmd_4743]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_i\ldc_sub_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_i
@@ -32927,6 +36211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_sub_ovf_i1.cmd_4744]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_i1\ldc_sub_ovf_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_i1
@@ -32934,6 +36219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_sub_ovf_i2.cmd_4745]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_i2\ldc_sub_ovf_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_i2
@@ -32941,6 +36227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_sub_ovf_i4.cmd_4746]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_i4\ldc_sub_ovf_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_i4
@@ -32948,6 +36235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_sub_ovf_i8.cmd_4747]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_i8\ldc_sub_ovf_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_i8
@@ -32955,6 +36243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_sub_ovf_u1.cmd_4748]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_u1\ldc_sub_ovf_u1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_u1
@@ -32962,6 +36251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_sub_ovf_u2.cmd_4749]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_u2\ldc_sub_ovf_u2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_u2
@@ -32969,6 +36259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_sub_ovf_u4.cmd_4750]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_u4\ldc_sub_ovf_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_u4
@@ -32976,6 +36267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldc_sub_ovf_u8.cmd_4751]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_u8\ldc_sub_ovf_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldc_sub_ovf_u8
@@ -32983,6 +36275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldftn.cmd_4752]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldftn\ldftn.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldftn
@@ -32990,6 +36283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_i.cmd_4753]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldind_i\ldind_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldind_i
@@ -32997,6 +36291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_i1.cmd_4754]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldind_i1\ldind_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldind_i1
@@ -33004,6 +36299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_i2.cmd_4755]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldind_i2\ldind_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldind_i2
@@ -33011,6 +36307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_i4.cmd_4756]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldind_i4\ldind_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldind_i4
@@ -33018,6 +36315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_i8.cmd_4757]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldind_i8\ldind_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldind_i8
@@ -33025,6 +36323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_r4.cmd_4758]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldind_r4\ldind_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldind_r4
@@ -33032,6 +36331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_r8.cmd_4759]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldind_r8\ldind_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldind_r8
@@ -33039,6 +36339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_ref.cmd_4760]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldind_ref\ldind_ref.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldind_ref
@@ -33046,6 +36347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_u1.cmd_4761]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldind_u1\ldind_u1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldind_u1
@@ -33053,6 +36355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_u2.cmd_4762]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldind_u2\ldind_u2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldind_u2
@@ -33060,6 +36363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldind_u4.cmd_4763]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldind_u4\ldind_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldind_u4
@@ -33067,6 +36371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_i.cmd_4764]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldloc_i\ldloc_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldloc_i
@@ -33074,6 +36379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_i4.cmd_4765]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldloc_i4\ldloc_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldloc_i4
@@ -33081,6 +36387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_i8.cmd_4766]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldloc_i8\ldloc_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldloc_i8
@@ -33088,6 +36395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_r4.cmd_4767]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldloc_r4\ldloc_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldloc_r4
@@ -33095,6 +36403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_r8.cmd_4768]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldloc_r8\ldloc_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldloc_r8
@@ -33102,6 +36411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_ref.cmd_4769]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldloc_ref\ldloc_ref.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldloc_ref
@@ -33109,6 +36419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldnull_i.cmd_4770]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldnull_i\ldnull_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldnull_i
@@ -33116,6 +36427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldnull_ref.cmd_4771]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldnull_ref\ldnull_ref.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldnull_ref
@@ -33123,6 +36435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldvirtftn.cmd_4772]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ldvirtftn\ldvirtftn.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ldvirtftn
@@ -33130,6 +36443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [localloc.cmd_4773]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\localloc\localloc.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\localloc
@@ -33137,6 +36451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_i4.cmd_4774]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_i4\mul_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_i4
@@ -33144,6 +36459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_i8.cmd_4775]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_i8\mul_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_i8
@@ -33151,6 +36467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_ovf_i1.cmd_4776]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_i1\mul_ovf_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_i1
@@ -33158,6 +36475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_ovf_i2.cmd_4777]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_i2\mul_ovf_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_i2
@@ -33165,6 +36483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_ovf_i4.cmd_4778]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_i4\mul_ovf_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_i4
@@ -33172,6 +36491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_ovf_i8.cmd_4779]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_i8\mul_ovf_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_i8
@@ -33179,6 +36499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_ovf_u1.cmd_4780]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_u1\mul_ovf_u1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_u1
@@ -33186,6 +36507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_ovf_u2.cmd_4781]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_u2\mul_ovf_u2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_u2
@@ -33193,6 +36515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_ovf_u4.cmd_4782]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_u4\mul_ovf_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_u4
@@ -33200,6 +36523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_ovf_u8.cmd_4783]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_u8\mul_ovf_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_ovf_u8
@@ -33207,6 +36531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_r4.cmd_4784]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_r4\mul_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_r4
@@ -33214,6 +36539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mul_r8.cmd_4785]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\mul_r8\mul_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\mul_r8
@@ -33221,6 +36547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [neg_i4.cmd_4786]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\neg_i4\neg_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\neg_i4
@@ -33228,6 +36555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [neg_i8.cmd_4787]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\neg_i8\neg_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\neg_i8
@@ -33235,6 +36563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [neg_r4.cmd_4788]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\neg_r4\neg_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\neg_r4
@@ -33242,6 +36571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [neg_r8.cmd_4789]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\neg_r8\neg_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\neg_r8
@@ -33249,6 +36579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nop.cmd_4790]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\nop\nop.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\nop
@@ -33256,6 +36587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [not_u4.cmd_4791]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\not_u4\not_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\not_u4
@@ -33263,6 +36595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [not_u8.cmd_4792]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\not_u8\not_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\not_u8
@@ -33270,6 +36603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [or_u4.cmd_4793]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\or_u4\or_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\or_u4
@@ -33277,6 +36611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [or_u8.cmd_4794]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\or_u8\or_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\or_u8
@@ -33284,6 +36619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [pop4.cmd_4795]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\pop4\pop4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\pop4
@@ -33291,6 +36627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [pop8.cmd_4796]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\pop8\pop8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\pop8
@@ -33298,6 +36635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [popi.cmd_4797]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\popi\popi.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\popi
@@ -33305,6 +36643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [refs.cmd_4798]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\refs\refs.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\refs
@@ -33312,6 +36651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rem_i4.cmd_4799]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\rem_i4\rem_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\rem_i4
@@ -33319,6 +36659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rem_i8.cmd_4800]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\rem_i8\rem_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\rem_i8
@@ -33326,13 +36667,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rem_r4.cmd_4801]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\rem_r4\rem_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\rem_r4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [rem_r8.cmd_4802]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\rem_r8\rem_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\rem_r8
@@ -33340,6 +36683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rem_u4.cmd_4803]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\rem_u4\rem_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\rem_u4
@@ -33347,6 +36691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rem_u8.cmd_4804]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\rem_u8\rem_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\rem_u8
@@ -33354,6 +36699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ret.cmd_4805]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ret\ret.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ret
@@ -33361,6 +36707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ret_i.cmd_4806]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ret_i\ret_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ret_i
@@ -33368,6 +36715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ret_i4.cmd_4807]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ret_i4\ret_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ret_i4
@@ -33375,6 +36723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ret_i8.cmd_4808]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ret_i8\ret_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ret_i8
@@ -33382,6 +36731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ret_r4.cmd_4809]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ret_r4\ret_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ret_r4
@@ -33389,6 +36739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ret_r8.cmd_4810]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ret_r8\ret_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ret_r8
@@ -33396,6 +36747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ret_ref.cmd_4811]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\ret_ref\ret_ref.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\ret_ref
@@ -33403,6 +36755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [shl_u4.cmd_4812]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\shl_u4\shl_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\shl_u4
@@ -33410,6 +36763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [shl_u8.cmd_4813]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\shl_u8\shl_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\shl_u8
@@ -33417,6 +36771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [shr_i4.cmd_4814]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\shr_i4\shr_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\shr_i4
@@ -33424,6 +36779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [shr_i8.cmd_4815]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\shr_i8\shr_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\shr_i8
@@ -33431,6 +36787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [shr_u4.cmd_4816]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\shr_u4\shr_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\shr_u4
@@ -33438,6 +36795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [shr_u8.cmd_4817]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\shr_u8\shr_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\shr_u8
@@ -33445,6 +36803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sizeof.cmd_4818]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sizeof\sizeof.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sizeof
@@ -33452,6 +36811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [starg_i.cmd_4819]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\starg_i\starg_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\starg_i
@@ -33459,6 +36819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [starg_i4.cmd_4820]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\starg_i4\starg_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\starg_i4
@@ -33466,6 +36827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [starg_i8.cmd_4821]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\starg_i8\starg_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\starg_i8
@@ -33473,6 +36835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [starg_r4.cmd_4822]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\starg_r4\starg_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\starg_r4
@@ -33480,6 +36843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [starg_r8.cmd_4823]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\starg_r8\starg_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\starg_r8
@@ -33487,6 +36851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [starg_ref.cmd_4824]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\starg_ref\starg_ref.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\starg_ref
@@ -33494,6 +36859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stind_i1.cmd_4825]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stind_i1\stind_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stind_i1
@@ -33501,6 +36867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stind_i2.cmd_4826]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stind_i2\stind_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stind_i2
@@ -33508,6 +36875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stind_i4.cmd_4827]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stind_i4\stind_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stind_i4
@@ -33515,6 +36883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stind_i8.cmd_4828]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stind_i8\stind_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stind_i8
@@ -33522,6 +36891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stind_r8.cmd_4829]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stind_r8\stind_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stind_r8
@@ -33529,6 +36899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stind_ref.cmd_4830]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stind_ref\stind_ref.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stind_ref
@@ -33536,6 +36907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stloc_i.cmd_4831]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stloc_i\stloc_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stloc_i
@@ -33543,6 +36915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stloc_i4.cmd_4832]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stloc_i4\stloc_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stloc_i4
@@ -33550,6 +36923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stloc_i8.cmd_4833]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stloc_i8\stloc_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stloc_i8
@@ -33557,6 +36931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stloc_r4.cmd_4834]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stloc_r4\stloc_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stloc_r4
@@ -33564,6 +36939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stloc_r8.cmd_4835]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stloc_r8\stloc_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stloc_r8
@@ -33571,6 +36947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [stloc_ref.cmd_4836]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\stloc_ref\stloc_ref.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\stloc_ref
@@ -33578,6 +36955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_i.cmd_4837]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_i\sub_i.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_i
@@ -33585,6 +36963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_i4.cmd_4838]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_i4\sub_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_i4
@@ -33592,6 +36971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_i8.cmd_4839]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_i8\sub_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_i8
@@ -33599,6 +36979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_ovf_i1.cmd_4840]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_i1\sub_ovf_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_i1
@@ -33606,6 +36987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_ovf_i2.cmd_4841]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_i2\sub_ovf_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_i2
@@ -33613,6 +36995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_ovf_i4.cmd_4842]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_i4\sub_ovf_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_i4
@@ -33620,6 +37003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_ovf_i8.cmd_4843]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_i8\sub_ovf_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_i8
@@ -33627,6 +37011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_ovf_u1.cmd_4844]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_u1\sub_ovf_u1.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_u1
@@ -33634,6 +37019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_ovf_u2.cmd_4845]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_u2\sub_ovf_u2.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_u2
@@ -33641,6 +37027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_ovf_u4.cmd_4846]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_u4\sub_ovf_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_u4
@@ -33648,6 +37035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_ovf_u8.cmd_4847]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_u8\sub_ovf_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_ovf_u8
@@ -33655,6 +37043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_r4.cmd_4848]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_r4\sub_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_r4
@@ -33662,6 +37051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sub_r8.cmd_4849]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\sub_r8\sub_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\sub_r8
@@ -33669,6 +37059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [switch.cmd_4850]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\switch\switch.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\switch
@@ -33676,6 +37067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xor_u4.cmd_4851]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\xor_u4\xor_u4.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\xor_u4
@@ -33683,6 +37075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xor_u8.cmd_4852]
 RelativePath=JIT\IL_Conformance\Old\Conformance_Base\xor_u8\xor_u8.cmd
 WorkingDir=JIT\IL_Conformance\Old\Conformance_Base\xor_u8
@@ -33690,6 +37083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AutoInit.cmd_4853]
 RelativePath=JIT\IL_Conformance\Old\directed\AutoInit\AutoInit.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\AutoInit
@@ -33697,6 +37091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [heap_ovf.cmd_4854]
 RelativePath=JIT\IL_Conformance\Old\directed\heap_ovf\heap_ovf.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\heap_ovf
@@ -33704,6 +37099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_s_i1.cmd_4855]
 RelativePath=JIT\IL_Conformance\Old\directed\ldarg_s_i1\ldarg_s_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldarg_s_i1
@@ -33711,6 +37107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_s_i2.cmd_4856]
 RelativePath=JIT\IL_Conformance\Old\directed\ldarg_s_i2\ldarg_s_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldarg_s_i2
@@ -33718,6 +37115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_s_i4.cmd_4857]
 RelativePath=JIT\IL_Conformance\Old\directed\ldarg_s_i4\ldarg_s_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldarg_s_i4
@@ -33725,6 +37123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_s_i8.cmd_4858]
 RelativePath=JIT\IL_Conformance\Old\directed\ldarg_s_i8\ldarg_s_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldarg_s_i8
@@ -33732,6 +37131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_s_r4.cmd_4859]
 RelativePath=JIT\IL_Conformance\Old\directed\ldarg_s_r4\ldarg_s_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldarg_s_r4
@@ -33739,6 +37139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldarg_s_r8.cmd_4860]
 RelativePath=JIT\IL_Conformance\Old\directed\ldarg_s_r8\ldarg_s_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldarg_s_r8
@@ -33746,6 +37147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloca_s_i1.cmd_4861]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloca_s_i1\ldloca_s_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloca_s_i1
@@ -33753,6 +37155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloca_s_i2.cmd_4862]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloca_s_i2\ldloca_s_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloca_s_i2
@@ -33760,6 +37163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloca_s_i4.cmd_4863]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloca_s_i4\ldloca_s_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloca_s_i4
@@ -33767,6 +37171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloca_s_i8.cmd_4864]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloca_s_i8\ldloca_s_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloca_s_i8
@@ -33774,6 +37179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloca_s_r4.cmd_4865]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloca_s_r4\ldloca_s_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloca_s_r4
@@ -33781,6 +37187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloca_s_r8.cmd_4866]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloca_s_r8\ldloca_s_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloca_s_r8
@@ -33788,6 +37195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_s_i1.cmd_4867]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloc_s_i1\ldloc_s_i1.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloc_s_i1
@@ -33795,6 +37203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_s_i2.cmd_4868]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloc_s_i2\ldloc_s_i2.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloc_s_i2
@@ -33802,6 +37211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_s_i4.cmd_4869]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloc_s_i4\ldloc_s_i4.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloc_s_i4
@@ -33809,6 +37219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_s_i8.cmd_4870]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloc_s_i8\ldloc_s_i8.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloc_s_i8
@@ -33816,6 +37227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_s_r4.cmd_4871]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloc_s_r4\ldloc_s_r4.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloc_s_r4
@@ -33823,6 +37235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldloc_s_r8.cmd_4872]
 RelativePath=JIT\IL_Conformance\Old\directed\ldloc_s_r8\ldloc_s_r8.cmd
 WorkingDir=JIT\IL_Conformance\Old\directed\ldloc_s_r8
@@ -33830,6 +37243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [array_tests.cmd_4873]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\array_tests\array_tests.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\array_tests
@@ -33837,6 +37251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Box_Unbox.cmd_4874]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\Box_Unbox\Box_Unbox.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\Box_Unbox
@@ -33844,6 +37259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callintf.cmd_4875]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\callintf\callintf.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\callintf
@@ -33851,6 +37267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callnonvirt.cmd_4876]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\callnonvirt\callnonvirt.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\callnonvirt
@@ -33858,6 +37275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callstatic.cmd_4877]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\callstatic\callstatic.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\callstatic
@@ -33865,6 +37283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callsuper.cmd_4878]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\callsuper\callsuper.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\callsuper
@@ -33872,6 +37291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [callvirt.cmd_4879]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\callvirt\callvirt.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\callvirt
@@ -33879,6 +37299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass.cmd_4880]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\castclass\castclass.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\castclass
@@ -33886,6 +37307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cpobj.cmd_4881]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\cpobj\cpobj.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\cpobj
@@ -33893,6 +37315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [fielda_tests.cmd_4882]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\fielda_tests\fielda_tests.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\fielda_tests
@@ -33900,6 +37323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [field_tests.cmd_4883]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\field_tests\field_tests.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\field_tests
@@ -33907,6 +37331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [initobj.cmd_4884]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\initobj\initobj.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\initobj
@@ -33914,6 +37339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [isinst.cmd_4885]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\isinst\isinst.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\isinst
@@ -33921,6 +37347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldlen.cmd_4886]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\ldlen\ldlen.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\ldlen
@@ -33928,6 +37355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldobj.cmd_4887]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\ldobj\ldobj.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\ldobj
@@ -33935,6 +37363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldstr.cmd_4888]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\ldstr\ldstr.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\ldstr
@@ -33942,6 +37371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldtoken.cmd_4889]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\ldtoken\ldtoken.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\ldtoken
@@ -33949,6 +37379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ldvirtftn.cmd_4890]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\ldvirtftn\ldvirtftn.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\ldvirtftn
@@ -33956,6 +37387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [localloc.cmd_4891]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\localloc\localloc.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\localloc
@@ -33963,6 +37395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [newobj.cmd_4892]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\newobj\newobj.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\newobj
@@ -33970,6 +37403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seh_tests.cmd_4893]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\seh_tests\seh_tests.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\seh_tests
@@ -33977,6 +37411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw.cmd_4894]
 RelativePath=JIT\IL_Conformance\Old\objectmodel\throw\throw.cmd
 WorkingDir=JIT\IL_Conformance\Old\objectmodel\throw
@@ -33984,6 +37419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [repro52.cmd_4895]
 RelativePath=JIT\jit64\ebvts\cs\generics\generics\repro52\repro52.cmd
 WorkingDir=JIT\jit64\ebvts\cs\generics\generics\repro52
@@ -33991,6 +37427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loopEH.cmd_4896]
 RelativePath=JIT\jit64\eh\basics\loopEH\loopEH.cmd
 WorkingDir=JIT\jit64\eh\basics\loopEH
@@ -33998,6 +37435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyintryfilter1.cmd_4897]
 RelativePath=JIT\jit64\eh\basics\throwinfinallyintryfilter1\throwinfinallyintryfilter1.cmd
 WorkingDir=JIT\jit64\eh\basics\throwinfinallyintryfilter1
@@ -34005,6 +37443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyintryfilter2.cmd_4898]
 RelativePath=JIT\jit64\eh\basics\throwinfinallyintryfilter2\throwinfinallyintryfilter2.cmd
 WorkingDir=JIT\jit64\eh\basics\throwinfinallyintryfilter2
@@ -34012,6 +37451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyintryfilter3.cmd_4899]
 RelativePath=JIT\jit64\eh\basics\throwinfinallyintryfilter3\throwinfinallyintryfilter3.cmd
 WorkingDir=JIT\jit64\eh\basics\throwinfinallyintryfilter3
@@ -34019,6 +37459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwisfirstinstruction.cmd_4900]
 RelativePath=JIT\jit64\eh\basics\throwisfirstinstruction\throwisfirstinstruction.cmd
 WorkingDir=JIT\jit64\eh\basics\throwisfirstinstruction
@@ -34026,6 +37467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedTryRegionsWithSameOffset1.cmd_4901]
 RelativePath=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset1\nestedTryRegionsWithSameOffset1.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset1
@@ -34033,6 +37475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedTryRegionsWithSameOffset1_o.cmd_4902]
 RelativePath=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset1_o\nestedTryRegionsWithSameOffset1_o.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset1_o
@@ -34040,6 +37483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedTryRegionsWithSameOffset2.cmd_4903]
 RelativePath=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset2\nestedTryRegionsWithSameOffset2.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset2
@@ -34047,6 +37491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedTryRegionsWithSameOffset2_o.cmd_4904]
 RelativePath=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset2_o\nestedTryRegionsWithSameOffset2_o.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset2_o
@@ -34054,6 +37499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedTryRegionsWithSameOffset3.cmd_4905]
 RelativePath=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset3\nestedTryRegionsWithSameOffset3.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset3
@@ -34061,6 +37507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedTryRegionsWithSameOffset3_o.cmd_4906]
 RelativePath=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset3_o\nestedTryRegionsWithSameOffset3_o.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nestedTryRegionsWithSameOffset3_o
@@ -34068,6 +37515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexitincatch.cmd_4907]
 RelativePath=JIT\jit64\eh\FinallyExec\nonlocalexitincatch\nonlocalexitincatch.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nonlocalexitincatch
@@ -34075,6 +37523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexitinfinally.cmd_4908]
 RelativePath=JIT\jit64\eh\FinallyExec\nonlocalexitinfinally\nonlocalexitinfinally.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nonlocalexitinfinally
@@ -34082,6 +37531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexitinhandler.cmd_4909]
 RelativePath=JIT\jit64\eh\FinallyExec\nonlocalexitinhandler\nonlocalexitinhandler.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nonlocalexitinhandler
@@ -34089,6 +37539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexitinroot.cmd_4910]
 RelativePath=JIT\jit64\eh\FinallyExec\nonlocalexitinroot\nonlocalexitinroot.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nonlocalexitinroot
@@ -34096,6 +37547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexitintry.cmd_4911]
 RelativePath=JIT\jit64\eh\FinallyExec\nonlocalexitintry\nonlocalexitintry.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nonlocalexitintry
@@ -34103,6 +37555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalgotoinatryblockinahandler.cmd_4912]
 RelativePath=JIT\jit64\eh\FinallyExec\nonlocalgotoinatryblockinahandler\nonlocalgotoinatryblockinahandler.cmd
 WorkingDir=JIT\jit64\eh\FinallyExec\nonlocalgotoinatryblockinahandler
@@ -34110,6 +37563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexitfromnestedcatch.cmd_4913]
 RelativePath=JIT\jit64\eh\Leaves\nonlocalexitfromnestedcatch\nonlocalexitfromnestedcatch.cmd
 WorkingDir=JIT\jit64\eh\Leaves\nonlocalexitfromnestedcatch
@@ -34117,6 +37571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [148343.cmd_4914]
 RelativePath=JIT\jit64\gc\misc\148343\148343.cmd
 WorkingDir=JIT\jit64\gc\misc\148343
@@ -34124,6 +37579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [9param.cmd_4915]
 RelativePath=JIT\jit64\gc\misc\9param\9param.cmd
 WorkingDir=JIT\jit64\gc\misc\9param
@@ -34131,6 +37587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [9_and_alloca2.cmd_4916]
 RelativePath=JIT\jit64\gc\misc\9_and_alloca2\9_and_alloca2.cmd
 WorkingDir=JIT\jit64\gc\misc\9_and_alloca2
@@ -34138,6 +37595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [alloca3.cmd_4917]
 RelativePath=JIT\jit64\gc\misc\alloca3\alloca3.cmd
 WorkingDir=JIT\jit64\gc\misc\alloca3
@@ -34145,6 +37603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh1.cmd_4918]
 RelativePath=JIT\jit64\gc\misc\eh1\eh1.cmd
 WorkingDir=JIT\jit64\gc\misc\eh1
@@ -34152,6 +37611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [fgtest1.cmd_4919]
 RelativePath=JIT\jit64\gc\misc\fgtest1\fgtest1.cmd
 WorkingDir=JIT\jit64\gc\misc\fgtest1
@@ -34159,6 +37619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [fgtest2.cmd_4920]
 RelativePath=JIT\jit64\gc\misc\fgtest2\fgtest2.cmd
 WorkingDir=JIT\jit64\gc\misc\fgtest2
@@ -34166,6 +37627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [gc-pinned-code-motion.cmd_4922]
 RelativePath=JIT\jit64\gc\misc\gc-pinned-code-motion\gc-pinned-code-motion.cmd
 WorkingDir=JIT\jit64\gc\misc\gc-pinned-code-motion
@@ -34173,6 +37635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [gcparaminreg.cmd_4923]
 RelativePath=JIT\jit64\gc\misc\gcparaminreg\gcparaminreg.cmd
 WorkingDir=JIT\jit64\gc\misc\gcparaminreg
@@ -34180,6 +37643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ret_struct_test1.cmd_4924]
 RelativePath=JIT\jit64\gc\misc\ret_struct_test1\ret_struct_test1.cmd
 WorkingDir=JIT\jit64\gc\misc\ret_struct_test1
@@ -34187,6 +37651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ret_struct_test4.cmd_4925]
 RelativePath=JIT\jit64\gc\misc\ret_struct_test4\ret_struct_test4.cmd
 WorkingDir=JIT\jit64\gc\misc\ret_struct_test4
@@ -34194,6 +37659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [simple1.cmd_4926]
 RelativePath=JIT\jit64\gc\misc\simple1\simple1.cmd
 WorkingDir=JIT\jit64\gc\misc\simple1
@@ -34201,6 +37667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct1.cmd_4927]
 RelativePath=JIT\jit64\gc\misc\struct1\struct1.cmd
 WorkingDir=JIT\jit64\gc\misc\struct1
@@ -34208,6 +37675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct1_2.cmd_4928]
 RelativePath=JIT\jit64\gc\misc\struct1_2\struct1_2.cmd
 WorkingDir=JIT\jit64\gc\misc\struct1_2
@@ -34215,6 +37683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct1_4.cmd_4929]
 RelativePath=JIT\jit64\gc\misc\struct1_4\struct1_4.cmd
 WorkingDir=JIT\jit64\gc\misc\struct1_4
@@ -34222,6 +37691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct1_5.cmd_4930]
 RelativePath=JIT\jit64\gc\misc\struct1_5\struct1_5.cmd
 WorkingDir=JIT\jit64\gc\misc\struct1_5
@@ -34229,6 +37699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct2.cmd_4931]
 RelativePath=JIT\jit64\gc\misc\struct2\struct2.cmd
 WorkingDir=JIT\jit64\gc\misc\struct2
@@ -34236,6 +37707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct2_2.cmd_4932]
 RelativePath=JIT\jit64\gc\misc\struct2_2\struct2_2.cmd
 WorkingDir=JIT\jit64\gc\misc\struct2_2
@@ -34243,6 +37715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct2_4.cmd_4933]
 RelativePath=JIT\jit64\gc\misc\struct2_4\struct2_4.cmd
 WorkingDir=JIT\jit64\gc\misc\struct2_4
@@ -34250,6 +37723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct2_5.cmd_4934]
 RelativePath=JIT\jit64\gc\misc\struct2_5\struct2_5.cmd
 WorkingDir=JIT\jit64\gc\misc\struct2_5
@@ -34257,6 +37731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct2_5_2.cmd_4935]
 RelativePath=JIT\jit64\gc\misc\struct2_5_2\struct2_5_2.cmd
 WorkingDir=JIT\jit64\gc\misc\struct2_5_2
@@ -34264,6 +37739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct3.cmd_4936]
 RelativePath=JIT\jit64\gc\misc\struct3\struct3.cmd
 WorkingDir=JIT\jit64\gc\misc\struct3
@@ -34271,6 +37747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct3_2.cmd_4937]
 RelativePath=JIT\jit64\gc\misc\struct3_2\struct3_2.cmd
 WorkingDir=JIT\jit64\gc\misc\struct3_2
@@ -34278,6 +37755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct3_4.cmd_4938]
 RelativePath=JIT\jit64\gc\misc\struct3_4\struct3_4.cmd
 WorkingDir=JIT\jit64\gc\misc\struct3_4
@@ -34285,6 +37763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct3_5.cmd_4939]
 RelativePath=JIT\jit64\gc\misc\struct3_5\struct3_5.cmd
 WorkingDir=JIT\jit64\gc\misc\struct3_5
@@ -34292,6 +37771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct4.cmd_4940]
 RelativePath=JIT\jit64\gc\misc\struct4\struct4.cmd
 WorkingDir=JIT\jit64\gc\misc\struct4
@@ -34299,6 +37779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct4_2.cmd_4941]
 RelativePath=JIT\jit64\gc\misc\struct4_2\struct4_2.cmd
 WorkingDir=JIT\jit64\gc\misc\struct4_2
@@ -34306,6 +37787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct4_4.cmd_4942]
 RelativePath=JIT\jit64\gc\misc\struct4_4\struct4_4.cmd
 WorkingDir=JIT\jit64\gc\misc\struct4_4
@@ -34313,6 +37795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct4_5.cmd_4943]
 RelativePath=JIT\jit64\gc\misc\struct4_5\struct4_5.cmd
 WorkingDir=JIT\jit64\gc\misc\struct4_5
@@ -34320,6 +37803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct5.cmd_4944]
 RelativePath=JIT\jit64\gc\misc\struct5\struct5.cmd
 WorkingDir=JIT\jit64\gc\misc\struct5
@@ -34327,6 +37811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct5_2.cmd_4945]
 RelativePath=JIT\jit64\gc\misc\struct5_2\struct5_2.cmd
 WorkingDir=JIT\jit64\gc\misc\struct5_2
@@ -34334,6 +37819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct5_4.cmd_4946]
 RelativePath=JIT\jit64\gc\misc\struct5_4\struct5_4.cmd
 WorkingDir=JIT\jit64\gc\misc\struct5_4
@@ -34341,6 +37827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct5_5.cmd_4947]
 RelativePath=JIT\jit64\gc\misc\struct5_5\struct5_5.cmd
 WorkingDir=JIT\jit64\gc\misc\struct5_5
@@ -34348,6 +37835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct6.cmd_4948]
 RelativePath=JIT\jit64\gc\misc\struct6\struct6.cmd
 WorkingDir=JIT\jit64\gc\misc\struct6
@@ -34355,6 +37843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct6_2.cmd_4949]
 RelativePath=JIT\jit64\gc\misc\struct6_2\struct6_2.cmd
 WorkingDir=JIT\jit64\gc\misc\struct6_2
@@ -34362,6 +37851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct6_4.cmd_4950]
 RelativePath=JIT\jit64\gc\misc\struct6_4\struct6_4.cmd
 WorkingDir=JIT\jit64\gc\misc\struct6_4
@@ -34369,6 +37859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct6_5.cmd_4951]
 RelativePath=JIT\jit64\gc\misc\struct6_5\struct6_5.cmd
 WorkingDir=JIT\jit64\gc\misc\struct6_5
@@ -34376,6 +37867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct7_1.cmd_4952]
 RelativePath=JIT\jit64\gc\misc\struct7_1\struct7_1.cmd
 WorkingDir=JIT\jit64\gc\misc\struct7_1
@@ -34383,6 +37875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct8.cmd_4953]
 RelativePath=JIT\jit64\gc\misc\struct8\struct8.cmd
 WorkingDir=JIT\jit64\gc\misc\struct8
@@ -34390,6 +37883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct9.cmd_4954]
 RelativePath=JIT\jit64\gc\misc\struct9\struct9.cmd
 WorkingDir=JIT\jit64\gc\misc\struct9
@@ -34397,6 +37891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [struct9_2.cmd_4955]
 RelativePath=JIT\jit64\gc\misc\struct9_2\struct9_2.cmd
 WorkingDir=JIT\jit64\gc\misc\struct9_2
@@ -34404,6 +37899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp1_1.cmd_4956]
 RelativePath=JIT\jit64\gc\misc\structfp1_1\structfp1_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp1_1
@@ -34411,6 +37907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp1_2.cmd_4957]
 RelativePath=JIT\jit64\gc\misc\structfp1_2\structfp1_2.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp1_2
@@ -34418,6 +37915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp1_3.cmd_4958]
 RelativePath=JIT\jit64\gc\misc\structfp1_3\structfp1_3.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp1_3
@@ -34425,6 +37923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp1_4.cmd_4959]
 RelativePath=JIT\jit64\gc\misc\structfp1_4\structfp1_4.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp1_4
@@ -34432,6 +37931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp1_5.cmd_4960]
 RelativePath=JIT\jit64\gc\misc\structfp1_5\structfp1_5.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp1_5
@@ -34439,6 +37939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp1_6.cmd_4961]
 RelativePath=JIT\jit64\gc\misc\structfp1_6\structfp1_6.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp1_6
@@ -34446,6 +37947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp2_1.cmd_4962]
 RelativePath=JIT\jit64\gc\misc\structfp2_1\structfp2_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp2_1
@@ -34453,6 +37955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp2_2.cmd_4963]
 RelativePath=JIT\jit64\gc\misc\structfp2_2\structfp2_2.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp2_2
@@ -34460,6 +37963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp2_3.cmd_4964]
 RelativePath=JIT\jit64\gc\misc\structfp2_3\structfp2_3.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp2_3
@@ -34467,6 +37971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp2_4.cmd_4965]
 RelativePath=JIT\jit64\gc\misc\structfp2_4\structfp2_4.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp2_4
@@ -34474,6 +37979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp3_1.cmd_4966]
 RelativePath=JIT\jit64\gc\misc\structfp3_1\structfp3_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp3_1
@@ -34481,6 +37987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp4_1.cmd_4967]
 RelativePath=JIT\jit64\gc\misc\structfp4_1\structfp4_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp4_1
@@ -34488,6 +37995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp5_1.cmd_4968]
 RelativePath=JIT\jit64\gc\misc\structfp5_1\structfp5_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp5_1
@@ -34495,6 +38003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfp6_1.cmd_4969]
 RelativePath=JIT\jit64\gc\misc\structfp6_1\structfp6_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structfp6_1
@@ -34502,6 +38011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structfpseh5_1.cmd_4970]
 RelativePath=JIT\jit64\gc\misc\structfpseh5_1\structfpseh5_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structfpseh5_1
@@ -34509,6 +38019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [structfpseh6_1.cmd_4971]
 RelativePath=JIT\jit64\gc\misc\structfpseh6_1\structfpseh6_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structfpseh6_1
@@ -34516,6 +38027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [structref1_1.cmd_4972]
 RelativePath=JIT\jit64\gc\misc\structref1_1\structref1_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structref1_1
@@ -34523,6 +38035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret1_1.cmd_4973]
 RelativePath=JIT\jit64\gc\misc\structret1_1\structret1_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structret1_1
@@ -34530,6 +38043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret1_2.cmd_4974]
 RelativePath=JIT\jit64\gc\misc\structret1_2\structret1_2.cmd
 WorkingDir=JIT\jit64\gc\misc\structret1_2
@@ -34537,6 +38051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret1_3.cmd_4975]
 RelativePath=JIT\jit64\gc\misc\structret1_3\structret1_3.cmd
 WorkingDir=JIT\jit64\gc\misc\structret1_3
@@ -34544,6 +38059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret2_1.cmd_4976]
 RelativePath=JIT\jit64\gc\misc\structret2_1\structret2_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structret2_1
@@ -34551,6 +38067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret2_2.cmd_4977]
 RelativePath=JIT\jit64\gc\misc\structret2_2\structret2_2.cmd
 WorkingDir=JIT\jit64\gc\misc\structret2_2
@@ -34558,6 +38075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret2_3.cmd_4978]
 RelativePath=JIT\jit64\gc\misc\structret2_3\structret2_3.cmd
 WorkingDir=JIT\jit64\gc\misc\structret2_3
@@ -34565,6 +38083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret3_1.cmd_4979]
 RelativePath=JIT\jit64\gc\misc\structret3_1\structret3_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structret3_1
@@ -34572,6 +38091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret3_2.cmd_4980]
 RelativePath=JIT\jit64\gc\misc\structret3_2\structret3_2.cmd
 WorkingDir=JIT\jit64\gc\misc\structret3_2
@@ -34579,6 +38099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret3_3.cmd_4981]
 RelativePath=JIT\jit64\gc\misc\structret3_3\structret3_3.cmd
 WorkingDir=JIT\jit64\gc\misc\structret3_3
@@ -34586,6 +38107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret4_1.cmd_4982]
 RelativePath=JIT\jit64\gc\misc\structret4_1\structret4_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structret4_1
@@ -34593,6 +38115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret4_2.cmd_4983]
 RelativePath=JIT\jit64\gc\misc\structret4_2\structret4_2.cmd
 WorkingDir=JIT\jit64\gc\misc\structret4_2
@@ -34600,6 +38123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret4_3.cmd_4984]
 RelativePath=JIT\jit64\gc\misc\structret4_3\structret4_3.cmd
 WorkingDir=JIT\jit64\gc\misc\structret4_3
@@ -34607,6 +38131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret5_1.cmd_4985]
 RelativePath=JIT\jit64\gc\misc\structret5_1\structret5_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structret5_1
@@ -34614,6 +38139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret5_2.cmd_4986]
 RelativePath=JIT\jit64\gc\misc\structret5_2\structret5_2.cmd
 WorkingDir=JIT\jit64\gc\misc\structret5_2
@@ -34621,6 +38147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret5_3.cmd_4987]
 RelativePath=JIT\jit64\gc\misc\structret5_3\structret5_3.cmd
 WorkingDir=JIT\jit64\gc\misc\structret5_3
@@ -34628,6 +38155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret6_1.cmd_4988]
 RelativePath=JIT\jit64\gc\misc\structret6_1\structret6_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structret6_1
@@ -34635,6 +38163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret6_2.cmd_4989]
 RelativePath=JIT\jit64\gc\misc\structret6_2\structret6_2.cmd
 WorkingDir=JIT\jit64\gc\misc\structret6_2
@@ -34642,6 +38171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structret6_3.cmd_4990]
 RelativePath=JIT\jit64\gc\misc\structret6_3\structret6_3.cmd
 WorkingDir=JIT\jit64\gc\misc\structret6_3
@@ -34649,6 +38179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structva1_1.cmd_4991]
 RelativePath=JIT\jit64\gc\misc\structva1_1\structva1_1.cmd
 WorkingDir=JIT\jit64\gc\misc\structva1_1
@@ -34656,6 +38187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test1.cmd_4992]
 RelativePath=JIT\jit64\gc\misc\test1\test1.cmd
 WorkingDir=JIT\jit64\gc\misc\test1
@@ -34663,6 +38195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test2.cmd_4993]
 RelativePath=JIT\jit64\gc\misc\test2\test2.cmd
 WorkingDir=JIT\jit64\gc\misc\test2
@@ -34670,6 +38203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test3.cmd_4994]
 RelativePath=JIT\jit64\gc\misc\test3\test3.cmd
 WorkingDir=JIT\jit64\gc\misc\test3
@@ -34677,6 +38211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test_noalloca.cmd_4995]
 RelativePath=JIT\jit64\gc\misc\test_noalloca\test_noalloca.cmd
 WorkingDir=JIT\jit64\gc\misc\test_noalloca
@@ -34684,6 +38219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vbil.cmd_4996]
 RelativePath=JIT\jit64\gc\misc\vbil\vbil.cmd
 WorkingDir=JIT\jit64\gc\misc\vbil
@@ -34691,6 +38227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [143837.cmd_4997]
 RelativePath=JIT\jit64\gc\regress\vswhidbey\143837\143837.cmd
 WorkingDir=JIT\jit64\gc\regress\vswhidbey\143837
@@ -34698,6 +38235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [339415.cmd_4998]
 RelativePath=JIT\jit64\gc\regress\vswhidbey\339415\339415.cmd
 WorkingDir=JIT\jit64\gc\regress\vswhidbey\339415
@@ -34705,6 +38243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd0A_d.cmd_4999]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nd0A_d\hfa_nd0A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nd0A_d
@@ -34712,6 +38251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd0A_r.cmd_5000]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nd0A_r\hfa_nd0A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nd0A_r
@@ -34719,6 +38259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd1A_d.cmd_5001]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nd1A_d\hfa_nd1A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nd1A_d
@@ -34726,6 +38267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd1A_r.cmd_5002]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nd1A_r\hfa_nd1A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nd1A_r
@@ -34733,6 +38275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd2A_d.cmd_5003]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nd2A_d\hfa_nd2A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nd2A_d
@@ -34740,6 +38283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_nd2A_r.cmd_5004]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nd2A_r\hfa_nd2A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nd2A_r
@@ -34747,6 +38291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_nf0A_d.cmd_5005]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nf0A_d\hfa_nf0A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nf0A_d
@@ -34754,6 +38299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf0A_r.cmd_5006]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nf0A_r\hfa_nf0A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nf0A_r
@@ -34761,6 +38307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf1A_d.cmd_5007]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nf1A_d\hfa_nf1A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nf1A_d
@@ -34768,6 +38315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf1A_r.cmd_5008]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nf1A_r\hfa_nf1A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nf1A_r
@@ -34775,6 +38323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf2A_d.cmd_5009]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nf2A_d\hfa_nf2A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nf2A_d
@@ -34782,6 +38331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_nf2A_r.cmd_5010]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_nf2A_r\hfa_nf2A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_nf2A_r
@@ -34789,6 +38339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_sd0A_d.cmd_5011]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sd0A_d\hfa_sd0A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sd0A_d
@@ -34796,6 +38347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd0A_r.cmd_5012]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sd0A_r\hfa_sd0A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sd0A_r
@@ -34803,6 +38355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd1A_d.cmd_5013]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sd1A_d\hfa_sd1A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sd1A_d
@@ -34810,6 +38363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd1A_r.cmd_5014]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sd1A_r\hfa_sd1A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sd1A_r
@@ -34817,20 +38371,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd2A_d.cmd_5015]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sd2A_d\hfa_sd2A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sd2A_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_sd2A_r.cmd_5016]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sd2A_r\hfa_sd2A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sd2A_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_sf0A_d.cmd_5017]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sf0A_d\hfa_sf0A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sf0A_d
@@ -34838,6 +38395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf0A_r.cmd_5018]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sf0A_r\hfa_sf0A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sf0A_r
@@ -34845,6 +38403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf1A_d.cmd_5019]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sf1A_d\hfa_sf1A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sf1A_d
@@ -34852,6 +38411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf1A_r.cmd_5020]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sf1A_r\hfa_sf1A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sf1A_r
@@ -34859,20 +38419,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf2A_d.cmd_5021]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sf2A_d\hfa_sf2A_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sf2A_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_sf2A_r.cmd_5022]
 RelativePath=JIT\jit64\hfa\main\testA\hfa_sf2A_r\hfa_sf2A_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testA\hfa_sf2A_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_nd0B_d.cmd_5023]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_nd0B_d\hfa_nd0B_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_nd0B_d
@@ -34880,6 +38443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd0B_r.cmd_5024]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_nd0B_r\hfa_nd0B_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_nd0B_r
@@ -34887,6 +38451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd2B_d.cmd_5025]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_nd2B_d\hfa_nd2B_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_nd2B_d
@@ -34894,6 +38459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_nd2B_r.cmd_5026]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_nd2B_r\hfa_nd2B_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_nd2B_r
@@ -34901,6 +38467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_nf0B_d.cmd_5027]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_nf0B_d\hfa_nf0B_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_nf0B_d
@@ -34908,6 +38475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf0B_r.cmd_5028]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_nf0B_r\hfa_nf0B_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_nf0B_r
@@ -34915,6 +38483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf2B_d.cmd_5029]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_nf2B_d\hfa_nf2B_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_nf2B_d
@@ -34922,6 +38491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_nf2B_r.cmd_5030]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_nf2B_r\hfa_nf2B_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_nf2B_r
@@ -34929,6 +38499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_sd0B_d.cmd_5031]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_sd0B_d\hfa_sd0B_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_sd0B_d
@@ -34936,6 +38507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd0B_r.cmd_5032]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_sd0B_r\hfa_sd0B_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_sd0B_r
@@ -34943,20 +38515,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd2B_d.cmd_5033]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_sd2B_d\hfa_sd2B_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_sd2B_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_sd2B_r.cmd_5034]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_sd2B_r\hfa_sd2B_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_sd2B_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_sf0B_d.cmd_5035]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_sf0B_d\hfa_sf0B_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_sf0B_d
@@ -34964,6 +38539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf0B_r.cmd_5036]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_sf0B_r\hfa_sf0B_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_sf0B_r
@@ -34971,20 +38547,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf2B_d.cmd_5037]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_sf2B_d\hfa_sf2B_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_sf2B_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_sf2B_r.cmd_5038]
 RelativePath=JIT\jit64\hfa\main\testB\hfa_sf2B_r\hfa_sf2B_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testB\hfa_sf2B_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;ISSUE_4946
 HostStyle=0
+
 [hfa_nd0C_d.cmd_5039]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nd0C_d\hfa_nd0C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nd0C_d
@@ -34992,6 +38571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd0C_r.cmd_5040]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nd0C_r\hfa_nd0C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nd0C_r
@@ -34999,6 +38579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd1C_d.cmd_5041]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nd1C_d\hfa_nd1C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nd1C_d
@@ -35006,6 +38587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd1C_r.cmd_5042]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nd1C_r\hfa_nd1C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nd1C_r
@@ -35013,20 +38595,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd2C_d.cmd_5043]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nd2C_d\hfa_nd2C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nd2C_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP
+Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP;ISSUE_4946
 HostStyle=0
+
 [hfa_nd2C_r.cmd_5044]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nd2C_r\hfa_nd2C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nd2C_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP
+Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP;ISSUE_4946
 HostStyle=0
+
 [hfa_nf0C_d.cmd_5045]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nf0C_d\hfa_nf0C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nf0C_d
@@ -35034,6 +38619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf0C_r.cmd_5046]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nf0C_r\hfa_nf0C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nf0C_r
@@ -35041,6 +38627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf1C_d.cmd_5047]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nf1C_d\hfa_nf1C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nf1C_d
@@ -35048,6 +38635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf1C_r.cmd_5048]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nf1C_r\hfa_nf1C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nf1C_r
@@ -35055,20 +38643,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf2C_d.cmd_5049]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nf2C_d\hfa_nf2C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nf2C_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP
+Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP;ISSUE_4946
 HostStyle=0
+
 [hfa_nf2C_r.cmd_5050]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_nf2C_r\hfa_nf2C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_nf2C_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP
+Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP;ISSUE_4946
 HostStyle=0
+
 [hfa_sd0C_d.cmd_5051]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sd0C_d\hfa_sd0C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sd0C_d
@@ -35076,6 +38667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd0C_r.cmd_5052]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sd0C_r\hfa_sd0C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sd0C_r
@@ -35083,6 +38675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd1C_d.cmd_5053]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sd1C_d\hfa_sd1C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sd1C_d
@@ -35090,6 +38683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd1C_r.cmd_5054]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sd1C_r\hfa_sd1C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sd1C_r
@@ -35097,20 +38691,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd2C_d.cmd_5055]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sd2C_d\hfa_sd2C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sd2C_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;NATIVE_INTEROP;ISSUE_4946
 HostStyle=0
+
 [hfa_sd2C_r.cmd_5056]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sd2C_r\hfa_sd2C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sd2C_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;NATIVE_INTEROP;ISSUE_4946
 HostStyle=0
+
 [hfa_sf0C_d.cmd_5057]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sf0C_d\hfa_sf0C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sf0C_d
@@ -35118,6 +38715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf0C_r.cmd_5058]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sf0C_r\hfa_sf0C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sf0C_r
@@ -35125,6 +38723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf1C_d.cmd_5059]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sf1C_d\hfa_sf1C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sf1C_d
@@ -35132,6 +38731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf1C_r.cmd_5060]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sf1C_r\hfa_sf1C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sf1C_r
@@ -35139,20 +38739,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf2C_d.cmd_5061]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sf2C_d\hfa_sf2C_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sf2C_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;NATIVE_INTEROP;ISSUE_4946
 HostStyle=0
+
 [hfa_sf2C_r.cmd_5062]
 RelativePath=JIT\jit64\hfa\main\testC\hfa_sf2C_r\hfa_sf2C_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testC\hfa_sf2C_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;ISSUE_4946;NATIVE_INTEROP;ISSUE_5639
+Categories=Pri0;ISSUE_5639;EXPECTED_PASS;NATIVE_INTEROP;ISSUE_4946
 HostStyle=0
+
 [hfa_nd0E_d.cmd_5063]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nd0E_d\hfa_nd0E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nd0E_d
@@ -35160,6 +38763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd0E_r.cmd_5064]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nd0E_r\hfa_nd0E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nd0E_r
@@ -35167,6 +38771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd1E_d.cmd_5065]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nd1E_d\hfa_nd1E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nd1E_d
@@ -35174,6 +38779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd1E_r.cmd_5066]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nd1E_r\hfa_nd1E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nd1E_r
@@ -35181,6 +38787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd2E_d.cmd_5067]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nd2E_d\hfa_nd2E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nd2E_d
@@ -35188,6 +38795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [hfa_nd2E_r.cmd_5068]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nd2E_r\hfa_nd2E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nd2E_r
@@ -35195,6 +38803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [hfa_nf0E_d.cmd_5069]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nf0E_d\hfa_nf0E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nf0E_d
@@ -35202,6 +38811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf0E_r.cmd_5070]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nf0E_r\hfa_nf0E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nf0E_r
@@ -35209,6 +38819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf1E_d.cmd_5071]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nf1E_d\hfa_nf1E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nf1E_d
@@ -35216,6 +38827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf1E_r.cmd_5072]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nf1E_r\hfa_nf1E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nf1E_r
@@ -35223,6 +38835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf2E_d.cmd_5073]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nf2E_d\hfa_nf2E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nf2E_d
@@ -35230,6 +38843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [hfa_nf2E_r.cmd_5074]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_nf2E_r\hfa_nf2E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_nf2E_r
@@ -35237,6 +38851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [hfa_sd0E_d.cmd_5075]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sd0E_d\hfa_sd0E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sd0E_d
@@ -35244,6 +38859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd0E_r.cmd_5076]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sd0E_r\hfa_sd0E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sd0E_r
@@ -35251,6 +38867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd1E_d.cmd_5077]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sd1E_d\hfa_sd1E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sd1E_d
@@ -35258,6 +38875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd1E_r.cmd_5078]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sd1E_r\hfa_sd1E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sd1E_r
@@ -35265,6 +38883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd2E_d.cmd_5079]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sd2E_d\hfa_sd2E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sd2E_d
@@ -35272,6 +38891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [hfa_sd2E_r.cmd_5080]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sd2E_r\hfa_sd2E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sd2E_r
@@ -35279,6 +38899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [hfa_sf0E_d.cmd_5081]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sf0E_d\hfa_sf0E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sf0E_d
@@ -35286,6 +38907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf0E_r.cmd_5082]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sf0E_r\hfa_sf0E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sf0E_r
@@ -35293,6 +38915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf1E_d.cmd_5083]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sf1E_d\hfa_sf1E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sf1E_d
@@ -35300,6 +38923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf1E_r.cmd_5084]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sf1E_r\hfa_sf1E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sf1E_r
@@ -35307,6 +38931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf2E_d.cmd_5085]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sf2E_d\hfa_sf2E_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sf2E_d
@@ -35314,6 +38939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [hfa_sf2E_r.cmd_5086]
 RelativePath=JIT\jit64\hfa\main\testE\hfa_sf2E_r\hfa_sf2E_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testE\hfa_sf2E_r
@@ -35321,6 +38947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [hfa_nd0G_d.cmd_5087]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nd0G_d\hfa_nd0G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nd0G_d
@@ -35328,6 +38955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd0G_r.cmd_5088]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nd0G_r\hfa_nd0G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nd0G_r
@@ -35335,6 +38963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd1G_d.cmd_5089]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nd1G_d\hfa_nd1G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nd1G_d
@@ -35342,6 +38971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd1G_r.cmd_5090]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nd1G_r\hfa_nd1G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nd1G_r
@@ -35349,6 +38979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd2G_d.cmd_5091]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nd2G_d\hfa_nd2G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nd2G_d
@@ -35356,6 +38987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nd2G_r.cmd_5092]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nd2G_r\hfa_nd2G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nd2G_r
@@ -35363,6 +38995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf0G_d.cmd_5093]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nf0G_d\hfa_nf0G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nf0G_d
@@ -35370,6 +39003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf0G_r.cmd_5094]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nf0G_r\hfa_nf0G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nf0G_r
@@ -35377,6 +39011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf1G_d.cmd_5095]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nf1G_d\hfa_nf1G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nf1G_d
@@ -35384,6 +39019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf1G_r.cmd_5096]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nf1G_r\hfa_nf1G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nf1G_r
@@ -35391,6 +39027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf2G_d.cmd_5097]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nf2G_d\hfa_nf2G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nf2G_d
@@ -35398,6 +39035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_nf2G_r.cmd_5098]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_nf2G_r\hfa_nf2G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_nf2G_r
@@ -35405,6 +39043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd0G_d.cmd_5099]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sd0G_d\hfa_sd0G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sd0G_d
@@ -35412,6 +39051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd0G_r.cmd_5100]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sd0G_r\hfa_sd0G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sd0G_r
@@ -35419,6 +39059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd1G_d.cmd_5101]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sd1G_d\hfa_sd1G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sd1G_d
@@ -35426,6 +39067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd1G_r.cmd_5102]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sd1G_r\hfa_sd1G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sd1G_r
@@ -35433,6 +39075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd2G_d.cmd_5103]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sd2G_d\hfa_sd2G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sd2G_d
@@ -35440,6 +39083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sd2G_r.cmd_5104]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sd2G_r\hfa_sd2G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sd2G_r
@@ -35447,6 +39091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf0G_d.cmd_5105]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sf0G_d\hfa_sf0G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sf0G_d
@@ -35454,6 +39099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf0G_r.cmd_5106]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sf0G_r\hfa_sf0G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sf0G_r
@@ -35461,6 +39107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf1G_d.cmd_5107]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sf1G_d\hfa_sf1G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sf1G_d
@@ -35468,6 +39115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf1G_r.cmd_5108]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sf1G_r\hfa_sf1G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sf1G_r
@@ -35475,6 +39123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf2G_d.cmd_5109]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sf2G_d\hfa_sf2G_d.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sf2G_d
@@ -35482,6 +39131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hfa_sf2G_r.cmd_5110]
 RelativePath=JIT\jit64\hfa\main\testG\hfa_sf2G_r\hfa_sf2G_r.cmd
 WorkingDir=JIT\jit64\hfa\main\testG\hfa_sf2G_r
@@ -35489,6 +39139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call03_dynamic.cmd_5111]
 RelativePath=JIT\jit64\localloc\call\call03_dynamic\call03_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\call\call03_dynamic
@@ -35496,6 +39147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call03_large.cmd_5112]
 RelativePath=JIT\jit64\localloc\call\call03_large\call03_large.cmd
 WorkingDir=JIT\jit64\localloc\call\call03_large
@@ -35503,6 +39155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call03_small.cmd_5113]
 RelativePath=JIT\jit64\localloc\call\call03_small\call03_small.cmd
 WorkingDir=JIT\jit64\localloc\call\call03_small
@@ -35510,6 +39163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call04_dynamic.cmd_5114]
 RelativePath=JIT\jit64\localloc\call\call04_dynamic\call04_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\call\call04_dynamic
@@ -35517,6 +39171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call04_large.cmd_5115]
 RelativePath=JIT\jit64\localloc\call\call04_large\call04_large.cmd
 WorkingDir=JIT\jit64\localloc\call\call04_large
@@ -35524,6 +39179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call04_small.cmd_5116]
 RelativePath=JIT\jit64\localloc\call\call04_small\call04_small.cmd
 WorkingDir=JIT\jit64\localloc\call\call04_small
@@ -35531,6 +39187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call05_dynamic.cmd_5117]
 RelativePath=JIT\jit64\localloc\call\call05_dynamic\call05_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\call\call05_dynamic
@@ -35538,6 +39195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call05_large.cmd_5118]
 RelativePath=JIT\jit64\localloc\call\call05_large\call05_large.cmd
 WorkingDir=JIT\jit64\localloc\call\call05_large
@@ -35545,6 +39203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call05_small.cmd_5119]
 RelativePath=JIT\jit64\localloc\call\call05_small\call05_small.cmd
 WorkingDir=JIT\jit64\localloc\call\call05_small
@@ -35552,6 +39211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call06_dynamic.cmd_5120]
 RelativePath=JIT\jit64\localloc\call\call06_dynamic\call06_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\call\call06_dynamic
@@ -35559,6 +39219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call06_large.cmd_5121]
 RelativePath=JIT\jit64\localloc\call\call06_large\call06_large.cmd
 WorkingDir=JIT\jit64\localloc\call\call06_large
@@ -35566,6 +39227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call06_small.cmd_5122]
 RelativePath=JIT\jit64\localloc\call\call06_small\call06_small.cmd
 WorkingDir=JIT\jit64\localloc\call\call06_small
@@ -35573,6 +39235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call07_dynamic.cmd_5123]
 RelativePath=JIT\jit64\localloc\call\call07_dynamic\call07_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\call\call07_dynamic
@@ -35580,6 +39243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call07_small.cmd_5124]
 RelativePath=JIT\jit64\localloc\call\call07_small\call07_small.cmd
 WorkingDir=JIT\jit64\localloc\call\call07_small
@@ -35587,6 +39251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh01_dynamic.cmd_5125]
 RelativePath=JIT\jit64\localloc\eh\eh01_dynamic\eh01_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh01_dynamic
@@ -35594,6 +39259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh01_large.cmd_5126]
 RelativePath=JIT\jit64\localloc\eh\eh01_large\eh01_large.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh01_large
@@ -35601,6 +39267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh01_small.cmd_5127]
 RelativePath=JIT\jit64\localloc\eh\eh01_small\eh01_small.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh01_small
@@ -35608,6 +39275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh02_dynamic.cmd_5128]
 RelativePath=JIT\jit64\localloc\eh\eh02_dynamic\eh02_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh02_dynamic
@@ -35615,6 +39283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh02_large.cmd_5129]
 RelativePath=JIT\jit64\localloc\eh\eh02_large\eh02_large.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh02_large
@@ -35622,6 +39291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh02_small.cmd_5130]
 RelativePath=JIT\jit64\localloc\eh\eh02_small\eh02_small.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh02_small
@@ -35629,6 +39299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh03_dynamic.cmd_5131]
 RelativePath=JIT\jit64\localloc\eh\eh03_dynamic\eh03_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh03_dynamic
@@ -35636,6 +39307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh03_large.cmd_5132]
 RelativePath=JIT\jit64\localloc\eh\eh03_large\eh03_large.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh03_large
@@ -35643,6 +39315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh03_small.cmd_5133]
 RelativePath=JIT\jit64\localloc\eh\eh03_small\eh03_small.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh03_small
@@ -35650,6 +39323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh04_dynamic.cmd_5134]
 RelativePath=JIT\jit64\localloc\eh\eh04_dynamic\eh04_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh04_dynamic
@@ -35657,6 +39331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh04_large.cmd_5135]
 RelativePath=JIT\jit64\localloc\eh\eh04_large\eh04_large.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh04_large
@@ -35664,6 +39339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh04_small.cmd_5136]
 RelativePath=JIT\jit64\localloc\eh\eh04_small\eh04_small.cmd
 WorkingDir=JIT\jit64\localloc\eh\eh04_small
@@ -35671,6 +39347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh05_dynamic.cmd_5137]
 RelativePath=JIT\jit64\localloc\ehverify\eh05_dynamic\eh05_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh05_dynamic
@@ -35678,6 +39355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh05_large.cmd_5138]
 RelativePath=JIT\jit64\localloc\ehverify\eh05_large\eh05_large.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh05_large
@@ -35685,6 +39363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh05_small.cmd_5139]
 RelativePath=JIT\jit64\localloc\ehverify\eh05_small\eh05_small.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh05_small
@@ -35692,6 +39371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh06_dynamic.cmd_5140]
 RelativePath=JIT\jit64\localloc\ehverify\eh06_dynamic\eh06_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh06_dynamic
@@ -35699,6 +39379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh06_large.cmd_5141]
 RelativePath=JIT\jit64\localloc\ehverify\eh06_large\eh06_large.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh06_large
@@ -35706,6 +39387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh06_small.cmd_5142]
 RelativePath=JIT\jit64\localloc\ehverify\eh06_small\eh06_small.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh06_small
@@ -35713,6 +39395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh07_dynamic.cmd_5143]
 RelativePath=JIT\jit64\localloc\ehverify\eh07_dynamic\eh07_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh07_dynamic
@@ -35720,6 +39403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh07_large.cmd_5144]
 RelativePath=JIT\jit64\localloc\ehverify\eh07_large\eh07_large.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh07_large
@@ -35727,6 +39411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh07_small.cmd_5145]
 RelativePath=JIT\jit64\localloc\ehverify\eh07_small\eh07_small.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh07_small
@@ -35734,6 +39419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh08_dynamic.cmd_5146]
 RelativePath=JIT\jit64\localloc\ehverify\eh08_dynamic\eh08_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh08_dynamic
@@ -35741,6 +39427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh08_large.cmd_5147]
 RelativePath=JIT\jit64\localloc\ehverify\eh08_large\eh08_large.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh08_large
@@ -35748,6 +39435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh08_small.cmd_5148]
 RelativePath=JIT\jit64\localloc\ehverify\eh08_small\eh08_small.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh08_small
@@ -35755,6 +39443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh09_dynamic.cmd_5149]
 RelativePath=JIT\jit64\localloc\ehverify\eh09_dynamic\eh09_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh09_dynamic
@@ -35762,6 +39451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh09_large.cmd_5150]
 RelativePath=JIT\jit64\localloc\ehverify\eh09_large\eh09_large.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh09_large
@@ -35769,6 +39459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh09_small.cmd_5151]
 RelativePath=JIT\jit64\localloc\ehverify\eh09_small\eh09_small.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh09_small
@@ -35776,6 +39467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh11_dynamic.cmd_5152]
 RelativePath=JIT\jit64\localloc\ehverify\eh11_dynamic\eh11_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh11_dynamic
@@ -35783,6 +39475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh11_large.cmd_5153]
 RelativePath=JIT\jit64\localloc\ehverify\eh11_large\eh11_large.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh11_large
@@ -35790,6 +39483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh11_small.cmd_5154]
 RelativePath=JIT\jit64\localloc\ehverify\eh11_small\eh11_small.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh11_small
@@ -35797,6 +39491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh12_dynamic.cmd_5155]
 RelativePath=JIT\jit64\localloc\ehverify\eh12_dynamic\eh12_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh12_dynamic
@@ -35804,6 +39499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh12_large.cmd_5156]
 RelativePath=JIT\jit64\localloc\ehverify\eh12_large\eh12_large.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh12_large
@@ -35811,6 +39507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh12_small.cmd_5157]
 RelativePath=JIT\jit64\localloc\ehverify\eh12_small\eh12_small.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh12_small
@@ -35818,6 +39515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh13_dynamic.cmd_5158]
 RelativePath=JIT\jit64\localloc\ehverify\eh13_dynamic\eh13_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh13_dynamic
@@ -35825,6 +39523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh13_large.cmd_5159]
 RelativePath=JIT\jit64\localloc\ehverify\eh13_large\eh13_large.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh13_large
@@ -35832,6 +39531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [eh13_small.cmd_5160]
 RelativePath=JIT\jit64\localloc\ehverify\eh13_small\eh13_small.cmd
 WorkingDir=JIT\jit64\localloc\ehverify\eh13_small
@@ -35839,6 +39539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind01_dynamic.cmd_5161]
 RelativePath=JIT\jit64\localloc\unwind\unwind01_dynamic\unwind01_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind01_dynamic
@@ -35846,6 +39547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind01_large.cmd_5162]
 RelativePath=JIT\jit64\localloc\unwind\unwind01_large\unwind01_large.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind01_large
@@ -35853,6 +39555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind01_small.cmd_5163]
 RelativePath=JIT\jit64\localloc\unwind\unwind01_small\unwind01_small.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind01_small
@@ -35860,6 +39563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind02_dynamic.cmd_5164]
 RelativePath=JIT\jit64\localloc\unwind\unwind02_dynamic\unwind02_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind02_dynamic
@@ -35867,6 +39571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind02_large.cmd_5165]
 RelativePath=JIT\jit64\localloc\unwind\unwind02_large\unwind02_large.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind02_large
@@ -35874,6 +39579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind02_small.cmd_5166]
 RelativePath=JIT\jit64\localloc\unwind\unwind02_small\unwind02_small.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind02_small
@@ -35881,6 +39587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind03_dynamic.cmd_5167]
 RelativePath=JIT\jit64\localloc\unwind\unwind03_dynamic\unwind03_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind03_dynamic
@@ -35888,6 +39595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind03_large.cmd_5168]
 RelativePath=JIT\jit64\localloc\unwind\unwind03_large\unwind03_large.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind03_large
@@ -35895,6 +39603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind03_small.cmd_5169]
 RelativePath=JIT\jit64\localloc\unwind\unwind03_small\unwind03_small.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind03_small
@@ -35902,6 +39611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind04_dynamic.cmd_5170]
 RelativePath=JIT\jit64\localloc\unwind\unwind04_dynamic\unwind04_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind04_dynamic
@@ -35909,6 +39619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind04_large.cmd_5171]
 RelativePath=JIT\jit64\localloc\unwind\unwind04_large\unwind04_large.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind04_large
@@ -35916,6 +39627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind04_small.cmd_5172]
 RelativePath=JIT\jit64\localloc\unwind\unwind04_small\unwind04_small.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind04_small
@@ -35923,6 +39635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind05_dynamic.cmd_5173]
 RelativePath=JIT\jit64\localloc\unwind\unwind05_dynamic\unwind05_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind05_dynamic
@@ -35930,6 +39643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind05_large.cmd_5174]
 RelativePath=JIT\jit64\localloc\unwind\unwind05_large\unwind05_large.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind05_large
@@ -35937,6 +39651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind05_small.cmd_5175]
 RelativePath=JIT\jit64\localloc\unwind\unwind05_small\unwind05_small.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind05_small
@@ -35944,6 +39659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind06_dynamic.cmd_5176]
 RelativePath=JIT\jit64\localloc\unwind\unwind06_dynamic\unwind06_dynamic.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind06_dynamic
@@ -35951,6 +39667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind06_large.cmd_5177]
 RelativePath=JIT\jit64\localloc\unwind\unwind06_large\unwind06_large.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind06_large
@@ -35958,6 +39675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unwind06_small.cmd_5178]
 RelativePath=JIT\jit64\localloc\unwind\unwind06_small\unwind06_small.cmd
 WorkingDir=JIT\jit64\localloc\unwind\unwind06_small
@@ -35965,6 +39683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [zeroinit01_large.cmd_5182]
 RelativePath=JIT\jit64\localloc\zeroinit\zeroinit01_large\zeroinit01_large.cmd
 WorkingDir=JIT\jit64\localloc\zeroinit\zeroinit01_large
@@ -35972,6 +39691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [zeroInit01_small.cmd_5183]
 RelativePath=JIT\jit64\localloc\zeroinit\zeroInit01_small\zeroInit01_small.cmd
 WorkingDir=JIT\jit64\localloc\zeroinit\zeroInit01_small
@@ -35979,6 +39699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i04.cmd_5188]
 RelativePath=JIT\jit64\mcc\interop\mcc_i04\mcc_i04.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i04
@@ -35986,6 +39707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [mcc_i05.cmd_5189]
 RelativePath=JIT\jit64\mcc\interop\mcc_i05\mcc_i05.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i05
@@ -35993,6 +39715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [mcc_i06.cmd_5190]
 RelativePath=JIT\jit64\mcc\interop\mcc_i06\mcc_i06.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i06
@@ -36000,6 +39723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [mcc_i07.cmd_5191]
 RelativePath=JIT\jit64\mcc\interop\mcc_i07\mcc_i07.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i07
@@ -36007,6 +39731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [mcc_i14.cmd_5196]
 RelativePath=JIT\jit64\mcc\interop\mcc_i14\mcc_i14.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i14
@@ -36014,6 +39739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i15.cmd_5197]
 RelativePath=JIT\jit64\mcc\interop\mcc_i15\mcc_i15.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i15
@@ -36021,6 +39747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i16.cmd_5198]
 RelativePath=JIT\jit64\mcc\interop\mcc_i16\mcc_i16.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i16
@@ -36028,6 +39755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i17.cmd_5199]
 RelativePath=JIT\jit64\mcc\interop\mcc_i17\mcc_i17.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i17
@@ -36035,6 +39763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i34.cmd_5204]
 RelativePath=JIT\jit64\mcc\interop\mcc_i34\mcc_i34.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i34
@@ -36042,6 +39771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i35.cmd_5205]
 RelativePath=JIT\jit64\mcc\interop\mcc_i35\mcc_i35.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i35
@@ -36049,6 +39779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i36.cmd_5206]
 RelativePath=JIT\jit64\mcc\interop\mcc_i36\mcc_i36.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i36
@@ -36056,6 +39787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i37.cmd_5207]
 RelativePath=JIT\jit64\mcc\interop\mcc_i37\mcc_i37.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i37
@@ -36063,6 +39795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i54.cmd_5212]
 RelativePath=JIT\jit64\mcc\interop\mcc_i54\mcc_i54.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i54
@@ -36070,6 +39803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i55.cmd_5213]
 RelativePath=JIT\jit64\mcc\interop\mcc_i55\mcc_i55.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i55
@@ -36077,6 +39811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i56.cmd_5214]
 RelativePath=JIT\jit64\mcc\interop\mcc_i56\mcc_i56.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i56
@@ -36084,6 +39819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i57.cmd_5215]
 RelativePath=JIT\jit64\mcc\interop\mcc_i57\mcc_i57.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i57
@@ -36091,6 +39827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i64.cmd_5220]
 RelativePath=JIT\jit64\mcc\interop\mcc_i64\mcc_i64.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i64
@@ -36098,6 +39835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i65.cmd_5221]
 RelativePath=JIT\jit64\mcc\interop\mcc_i65\mcc_i65.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i65
@@ -36105,6 +39843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i66.cmd_5222]
 RelativePath=JIT\jit64\mcc\interop\mcc_i66\mcc_i66.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i66
@@ -36112,6 +39851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i67.cmd_5223]
 RelativePath=JIT\jit64\mcc\interop\mcc_i67\mcc_i67.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i67
@@ -36119,6 +39859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i74.cmd_5228]
 RelativePath=JIT\jit64\mcc\interop\mcc_i74\mcc_i74.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i74
@@ -36126,6 +39867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i75.cmd_5229]
 RelativePath=JIT\jit64\mcc\interop\mcc_i75\mcc_i75.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i75
@@ -36133,6 +39875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i76.cmd_5230]
 RelativePath=JIT\jit64\mcc\interop\mcc_i76\mcc_i76.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i76
@@ -36140,6 +39883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i77.cmd_5231]
 RelativePath=JIT\jit64\mcc\interop\mcc_i77\mcc_i77.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i77
@@ -36147,6 +39891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mcc_i84.cmd_5236]
 RelativePath=JIT\jit64\mcc\interop\mcc_i84\mcc_i84.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i84
@@ -36154,6 +39899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [mcc_i85.cmd_5237]
 RelativePath=JIT\jit64\mcc\interop\mcc_i85\mcc_i85.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i85
@@ -36161,6 +39907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [mcc_i86.cmd_5238]
 RelativePath=JIT\jit64\mcc\interop\mcc_i86\mcc_i86.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i86
@@ -36168,6 +39915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [mcc_i87.cmd_5239]
 RelativePath=JIT\jit64\mcc\interop\mcc_i87\mcc_i87.cmd
 WorkingDir=JIT\jit64\mcc\interop\mcc_i87
@@ -36175,6 +39923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;NATIVE_INTEROP
 HostStyle=0
+
 [CGRecurseAAA_d.cmd_5240]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAA_d\CGRecurseAAA_d.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAA_d
@@ -36182,6 +39931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseAAA_do.cmd_5241]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAA_do\CGRecurseAAA_do.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAA_do
@@ -36189,6 +39939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseAAA_r.cmd_5242]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAA_r\CGRecurseAAA_r.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAA_r
@@ -36196,6 +39947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseAAA_ro.cmd_5243]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAA_ro\CGRecurseAAA_ro.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAA_ro
@@ -36203,6 +39955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseAAC_d.cmd_5244]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAC_d\CGRecurseAAC_d.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAC_d
@@ -36210,6 +39963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseAAC_do.cmd_5245]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAC_do\CGRecurseAAC_do.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAC_do
@@ -36217,6 +39971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseAAC_r.cmd_5246]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAC_r\CGRecurseAAC_r.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAC_r
@@ -36224,6 +39979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseAAC_ro.cmd_5247]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAC_ro\CGRecurseAAC_ro.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseAAC_ro
@@ -36231,6 +39987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseACA_d.cmd_5248]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseACA_d\CGRecurseACA_d.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseACA_d
@@ -36238,6 +39995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseACA_do.cmd_5249]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseACA_do\CGRecurseACA_do.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseACA_do
@@ -36245,6 +40003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseACA_r.cmd_5250]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseACA_r\CGRecurseACA_r.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseACA_r
@@ -36252,6 +40011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseACA_ro.cmd_5251]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseACA_ro\CGRecurseACA_ro.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseACA_ro
@@ -36259,6 +40019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseACC_d.cmd_5252]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseACC_d\CGRecurseACC_d.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseACC_d
@@ -36266,6 +40027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseACC_do.cmd_5253]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseACC_do\CGRecurseACC_do.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseACC_do
@@ -36273,6 +40035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseACC_r.cmd_5254]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseACC_r\CGRecurseACC_r.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseACC_r
@@ -36280,6 +40043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CGRecurseACC_ro.cmd_5255]
 RelativePath=JIT\jit64\opt\cg\CGRecurse\CGRecurseACC_ro\CGRecurseACC_ro.cmd
 WorkingDir=JIT\jit64\opt\cg\CGRecurse\CGRecurseACC_ro
@@ -36287,6 +40051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CgStress1_d.cmd_5256]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress1_d\CgStress1_d.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress1_d
@@ -36294,6 +40059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;REQ_LARGE_GEN0
 HostStyle=0
+
 [CgStress1_do.cmd_5257]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress1_do\CgStress1_do.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress1_do
@@ -36301,6 +40067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;REQ_LARGE_GEN0
 HostStyle=0
+
 [CgStress1_r.cmd_5258]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress1_r\CgStress1_r.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress1_r
@@ -36308,6 +40075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;REQ_LARGE_GEN0
 HostStyle=0
+
 [CgStress1_ro.cmd_5259]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress1_ro\CgStress1_ro.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress1_ro
@@ -36315,6 +40083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;REQ_LARGE_GEN0
 HostStyle=0
+
 [CgStress2_d.cmd_5260]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress2_d\CgStress2_d.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress2_d
@@ -36322,6 +40091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CgStress2_do.cmd_5261]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress2_do\CgStress2_do.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress2_do
@@ -36329,6 +40099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CgStress2_r.cmd_5262]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress2_r\CgStress2_r.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress2_r
@@ -36336,6 +40107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CgStress2_ro.cmd_5263]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress2_ro\CgStress2_ro.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress2_ro
@@ -36343,6 +40115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CgStress3_d.cmd_5264]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress3_d\CgStress3_d.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress3_d
@@ -36350,6 +40123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CgStress3_do.cmd_5265]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress3_do\CgStress3_do.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress3_do
@@ -36357,6 +40131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CgStress3_r.cmd_5266]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress3_r\CgStress3_r.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress3_r
@@ -36364,6 +40139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CgStress3_ro.cmd_5267]
 RelativePath=JIT\jit64\opt\cg\cgstress\CgStress3_ro\CgStress3_ro.cmd
 WorkingDir=JIT\jit64\opt\cg\cgstress\CgStress3_ro
@@ -36371,6 +40147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jmp_dbg.cmd_5268]
 RelativePath=JIT\jit64\opt\cg\il\jmp_dbg\jmp_dbg.cmd
 WorkingDir=JIT\jit64\opt\cg\il\jmp_dbg
@@ -36378,6 +40155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jmp_impl.cmd_5269]
 RelativePath=JIT\jit64\opt\cg\il\jmp_impl\jmp_impl.cmd
 WorkingDir=JIT\jit64\opt\cg\il\jmp_impl
@@ -36385,6 +40163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jmp_opt.cmd_5270]
 RelativePath=JIT\jit64\opt\cg\il\jmp_opt\jmp_opt.cmd
 WorkingDir=JIT\jit64\opt\cg\il\jmp_opt
@@ -36392,6 +40171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jmp_ret.cmd_5271]
 RelativePath=JIT\jit64\opt\cg\il\jmp_ret\jmp_ret.cmd
 WorkingDir=JIT\jit64\opt\cg\il\jmp_ret
@@ -36399,6 +40179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldftn_dbg.cmd_5272]
 RelativePath=JIT\jit64\opt\cg\il\ldftn_dbg\ldftn_dbg.cmd
 WorkingDir=JIT\jit64\opt\cg\il\ldftn_dbg
@@ -36406,6 +40187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldftn_impl.cmd_5273]
 RelativePath=JIT\jit64\opt\cg\il\ldftn_impl\ldftn_impl.cmd
 WorkingDir=JIT\jit64\opt\cg\il\ldftn_impl
@@ -36413,6 +40195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldftn_opt.cmd_5274]
 RelativePath=JIT\jit64\opt\cg\il\ldftn_opt\ldftn_opt.cmd
 WorkingDir=JIT\jit64\opt\cg\il\ldftn_opt
@@ -36420,6 +40203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ldftn_ret.cmd_5275]
 RelativePath=JIT\jit64\opt\cg\il\ldftn_ret\ldftn_ret.cmd
 WorkingDir=JIT\jit64\opt\cg\il\ldftn_ret
@@ -36427,6 +40211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cprop001_d.cmd_5276]
 RelativePath=JIT\jit64\opt\cprop\cprop001_d\cprop001_d.cmd
 WorkingDir=JIT\jit64\opt\cprop\cprop001_d
@@ -36434,6 +40219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cprop001_do.cmd_5277]
 RelativePath=JIT\jit64\opt\cprop\cprop001_do\cprop001_do.cmd
 WorkingDir=JIT\jit64\opt\cprop\cprop001_do
@@ -36441,6 +40227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cprop001_r.cmd_5278]
 RelativePath=JIT\jit64\opt\cprop\cprop001_r\cprop001_r.cmd
 WorkingDir=JIT\jit64\opt\cprop\cprop001_r
@@ -36448,6 +40235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cprop001_ro.cmd_5279]
 RelativePath=JIT\jit64\opt\cprop\cprop001_ro\cprop001_ro.cmd
 WorkingDir=JIT\jit64\opt\cprop\cprop001_ro
@@ -36455,6 +40243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cprop002.cmd_5280]
 RelativePath=JIT\jit64\opt\cprop\cprop002\cprop002.cmd
 WorkingDir=JIT\jit64\opt\cprop\cprop002
@@ -36462,6 +40251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Dev10_844071.cmd_5281]
 RelativePath=JIT\jit64\opt\cprop\Dev10_844071\Dev10_844071.cmd
 WorkingDir=JIT\jit64\opt\cprop\Dev10_844071
@@ -36469,6 +40259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Dev10_884217_IL.cmd_5282]
 RelativePath=JIT\jit64\opt\cprop\Dev10_884217_IL\Dev10_884217_IL.cmd
 WorkingDir=JIT\jit64\opt\cprop\Dev10_884217_IL
@@ -36476,6 +40267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [implicitDownConv.cmd_5283]
 RelativePath=JIT\jit64\opt\cprop\implicitDownConv\implicitDownConv.cmd
 WorkingDir=JIT\jit64\opt\cprop\implicitDownConv
@@ -36483,6 +40275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [arrayexpr1.cmd_5284]
 RelativePath=JIT\jit64\opt\cse\arrayexpr1\arrayexpr1.cmd
 WorkingDir=JIT\jit64\opt\cse\arrayexpr1
@@ -36490,6 +40283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arrayexpr2_d_loop_try.cmd_5285]
 RelativePath=JIT\jit64\opt\cse\arrayexpr2_d_loop_try\arrayexpr2_d_loop_try.cmd
 WorkingDir=JIT\jit64\opt\cse\arrayexpr2_d_loop_try
@@ -36497,6 +40291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [arrayexpr2_r.cmd_5286]
 RelativePath=JIT\jit64\opt\cse\arrayexpr2_r\arrayexpr2_r.cmd
 WorkingDir=JIT\jit64\opt\cse\arrayexpr2_r
@@ -36504,6 +40299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arrayexpr2_ro_loop.cmd_5287]
 RelativePath=JIT\jit64\opt\cse\arrayexpr2_ro_loop\arrayexpr2_ro_loop.cmd
 WorkingDir=JIT\jit64\opt\cse\arrayexpr2_ro_loop
@@ -36511,6 +40307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [arrayexpr2_r_loop.cmd_5288]
 RelativePath=JIT\jit64\opt\cse\arrayexpr2_r_loop\arrayexpr2_r_loop.cmd
 WorkingDir=JIT\jit64\opt\cse\arrayexpr2_r_loop
@@ -36518,6 +40315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [arrayexpr2_r_loop_try.cmd_5289]
 RelativePath=JIT\jit64\opt\cse\arrayexpr2_r_loop_try\arrayexpr2_r_loop_try.cmd
 WorkingDir=JIT\jit64\opt\cse\arrayexpr2_r_loop_try
@@ -36525,6 +40323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [arrayexpr2_r_try.cmd_5290]
 RelativePath=JIT\jit64\opt\cse\arrayexpr2_r_try\arrayexpr2_r_try.cmd
 WorkingDir=JIT\jit64\opt\cse\arrayexpr2_r_try
@@ -36532,6 +40331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [fieldexpr1.cmd_5291]
 RelativePath=JIT\jit64\opt\cse\fieldexpr1\fieldexpr1.cmd
 WorkingDir=JIT\jit64\opt\cse\fieldexpr1
@@ -36539,6 +40339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [fieldexpr1_1.cmd_5292]
 RelativePath=JIT\jit64\opt\cse\fieldexpr1_1\fieldexpr1_1.cmd
 WorkingDir=JIT\jit64\opt\cse\fieldexpr1_1
@@ -36546,6 +40347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [fieldexpr2.cmd_5293]
 RelativePath=JIT\jit64\opt\cse\fieldexpr2\fieldexpr2.cmd
 WorkingDir=JIT\jit64\opt\cse\fieldexpr2
@@ -36553,6 +40355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [fieldExprUnchecked1.cmd_5294]
 RelativePath=JIT\jit64\opt\cse\fieldExprUnchecked1\fieldExprUnchecked1.cmd
 WorkingDir=JIT\jit64\opt\cse\fieldExprUnchecked1
@@ -36560,6 +40363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [HugeArray.cmd_5295]
 RelativePath=JIT\jit64\opt\cse\HugeArray\HugeArray.cmd
 WorkingDir=JIT\jit64\opt\cse\HugeArray
@@ -36567,34 +40371,39 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [HugeArray1.cmd_5296]
 RelativePath=JIT\jit64\opt\cse\HugeArray1\HugeArray1.cmd
 WorkingDir=JIT\jit64\opt\cse\HugeArray1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [hugeexpr1.cmd_5297]
 RelativePath=JIT\jit64\opt\cse\hugeexpr1\hugeexpr1.cmd
 WorkingDir=JIT\jit64\opt\cse\hugeexpr1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [HugeField1.cmd_5298]
 RelativePath=JIT\jit64\opt\cse\HugeField1\HugeField1.cmd
 WorkingDir=JIT\jit64\opt\cse\HugeField1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [HugeField2.cmd_5299]
 RelativePath=JIT\jit64\opt\cse\HugeField2\HugeField2.cmd
 WorkingDir=JIT\jit64\opt\cse\HugeField2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [hugeSimpleExpr1.cmd_5300]
 RelativePath=JIT\jit64\opt\cse\hugeSimpleExpr1\hugeSimpleExpr1.cmd
 WorkingDir=JIT\jit64\opt\cse\hugeSimpleExpr1
@@ -36602,6 +40411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mixedexpr1_d_loop_try.cmd_5301]
 RelativePath=JIT\jit64\opt\cse\mixedexpr1_d_loop_try\mixedexpr1_d_loop_try.cmd
 WorkingDir=JIT\jit64\opt\cse\mixedexpr1_d_loop_try
@@ -36609,6 +40419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixedexpr1_r.cmd_5302]
 RelativePath=JIT\jit64\opt\cse\mixedexpr1_r\mixedexpr1_r.cmd
 WorkingDir=JIT\jit64\opt\cse\mixedexpr1_r
@@ -36616,6 +40427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mixedexpr1_ro_loop.cmd_5303]
 RelativePath=JIT\jit64\opt\cse\mixedexpr1_ro_loop\mixedexpr1_ro_loop.cmd
 WorkingDir=JIT\jit64\opt\cse\mixedexpr1_ro_loop
@@ -36623,6 +40435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixedexpr1_r_loop.cmd_5304]
 RelativePath=JIT\jit64\opt\cse\mixedexpr1_r_loop\mixedexpr1_r_loop.cmd
 WorkingDir=JIT\jit64\opt\cse\mixedexpr1_r_loop
@@ -36630,6 +40443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixedexpr1_r_loop_try.cmd_5305]
 RelativePath=JIT\jit64\opt\cse\mixedexpr1_r_loop_try\mixedexpr1_r_loop_try.cmd
 WorkingDir=JIT\jit64\opt\cse\mixedexpr1_r_loop_try
@@ -36637,6 +40451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixedexpr1_r_try.cmd_5306]
 RelativePath=JIT\jit64\opt\cse\mixedexpr1_r_try\mixedexpr1_r_try.cmd
 WorkingDir=JIT\jit64\opt\cse\mixedexpr1_r_try
@@ -36644,6 +40459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [pointerexpr1.cmd_5307]
 RelativePath=JIT\jit64\opt\cse\pointerexpr1\pointerexpr1.cmd
 WorkingDir=JIT\jit64\opt\cse\pointerexpr1
@@ -36651,6 +40467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [pointerexpr1_1.cmd_5308]
 RelativePath=JIT\jit64\opt\cse\pointerexpr1_1\pointerexpr1_1.cmd
 WorkingDir=JIT\jit64\opt\cse\pointerexpr1_1
@@ -36658,6 +40475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [simpleexpr1.cmd_5309]
 RelativePath=JIT\jit64\opt\cse\simpleexpr1\simpleexpr1.cmd
 WorkingDir=JIT\jit64\opt\cse\simpleexpr1
@@ -36665,6 +40483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [simpleexpr1_1.cmd_5310]
 RelativePath=JIT\jit64\opt\cse\simpleexpr1_1\simpleexpr1_1.cmd
 WorkingDir=JIT\jit64\opt\cse\simpleexpr1_1
@@ -36672,6 +40491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [simpleexpr2.cmd_5311]
 RelativePath=JIT\jit64\opt\cse\simpleexpr2\simpleexpr2.cmd
 WorkingDir=JIT\jit64\opt\cse\simpleexpr2
@@ -36679,6 +40499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [simpleexpr3.cmd_5312]
 RelativePath=JIT\jit64\opt\cse\simpleexpr3\simpleexpr3.cmd
 WorkingDir=JIT\jit64\opt\cse\simpleexpr3
@@ -36686,6 +40507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [simpleexpr4_d_loop_try.cmd_5313]
 RelativePath=JIT\jit64\opt\cse\simpleexpr4_d_loop_try\simpleexpr4_d_loop_try.cmd
 WorkingDir=JIT\jit64\opt\cse\simpleexpr4_d_loop_try
@@ -36693,6 +40515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simpleexpr4_r.cmd_5314]
 RelativePath=JIT\jit64\opt\cse\simpleexpr4_r\simpleexpr4_r.cmd
 WorkingDir=JIT\jit64\opt\cse\simpleexpr4_r
@@ -36700,6 +40523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [simpleexpr4_ro_loop.cmd_5315]
 RelativePath=JIT\jit64\opt\cse\simpleexpr4_ro_loop\simpleexpr4_ro_loop.cmd
 WorkingDir=JIT\jit64\opt\cse\simpleexpr4_ro_loop
@@ -36707,6 +40531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simpleexpr4_r_loop.cmd_5316]
 RelativePath=JIT\jit64\opt\cse\simpleexpr4_r_loop\simpleexpr4_r_loop.cmd
 WorkingDir=JIT\jit64\opt\cse\simpleexpr4_r_loop
@@ -36714,6 +40539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simpleexpr4_r_loop_try.cmd_5317]
 RelativePath=JIT\jit64\opt\cse\simpleexpr4_r_loop_try\simpleexpr4_r_loop_try.cmd
 WorkingDir=JIT\jit64\opt\cse\simpleexpr4_r_loop_try
@@ -36721,6 +40547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simpleexpr4_r_try.cmd_5318]
 RelativePath=JIT\jit64\opt\cse\simpleexpr4_r_try\simpleexpr4_r_try.cmd
 WorkingDir=JIT\jit64\opt\cse\simpleexpr4_r_try
@@ -36728,6 +40555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExpr1_1.cmd_5319]
 RelativePath=JIT\jit64\opt\cse\staticFieldExpr1_1\staticFieldExpr1_1.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExpr1_1
@@ -36735,6 +40563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExpr1_d_loop_try.cmd_5320]
 RelativePath=JIT\jit64\opt\cse\staticFieldExpr1_d_loop_try\staticFieldExpr1_d_loop_try.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExpr1_d_loop_try
@@ -36742,6 +40571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExpr1_r.cmd_5321]
 RelativePath=JIT\jit64\opt\cse\staticFieldExpr1_r\staticFieldExpr1_r.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExpr1_r
@@ -36749,6 +40579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExpr1_ro_loop.cmd_5322]
 RelativePath=JIT\jit64\opt\cse\staticFieldExpr1_ro_loop\staticFieldExpr1_ro_loop.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExpr1_ro_loop
@@ -36756,6 +40587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExpr1_r_loop.cmd_5323]
 RelativePath=JIT\jit64\opt\cse\staticFieldExpr1_r_loop\staticFieldExpr1_r_loop.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExpr1_r_loop
@@ -36763,6 +40595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExpr1_r_loop_try.cmd_5324]
 RelativePath=JIT\jit64\opt\cse\staticFieldExpr1_r_loop_try\staticFieldExpr1_r_loop_try.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExpr1_r_loop_try
@@ -36770,6 +40603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExpr1_r_try.cmd_5325]
 RelativePath=JIT\jit64\opt\cse\staticFieldExpr1_r_try\staticFieldExpr1_r_try.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExpr1_r_try
@@ -36777,6 +40611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExprUnchecked1_d_loop_try.cmd_5326]
 RelativePath=JIT\jit64\opt\cse\staticFieldExprUnchecked1_d_loop_try\staticFieldExprUnchecked1_d_loop_try.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExprUnchecked1_d_loop_try
@@ -36784,6 +40619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExprUnchecked1_r.cmd_5327]
 RelativePath=JIT\jit64\opt\cse\staticFieldExprUnchecked1_r\staticFieldExprUnchecked1_r.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExprUnchecked1_r
@@ -36791,6 +40627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [staticFieldExprUnchecked1_ro_loop.cmd_5328]
 RelativePath=JIT\jit64\opt\cse\staticFieldExprUnchecked1_ro_loop\staticFieldExprUnchecked1_ro_loop.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExprUnchecked1_ro_loop
@@ -36798,6 +40635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExprUnchecked1_r_loop.cmd_5329]
 RelativePath=JIT\jit64\opt\cse\staticFieldExprUnchecked1_r_loop\staticFieldExprUnchecked1_r_loop.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExprUnchecked1_r_loop
@@ -36805,6 +40643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExprUnchecked1_r_loop_try.cmd_5330]
 RelativePath=JIT\jit64\opt\cse\staticFieldExprUnchecked1_r_loop_try\staticFieldExprUnchecked1_r_loop_try.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExprUnchecked1_r_loop_try
@@ -36812,6 +40651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [staticFieldExprUnchecked1_r_try.cmd_5331]
 RelativePath=JIT\jit64\opt\cse\staticFieldExprUnchecked1_r_try\staticFieldExprUnchecked1_r_try.cmd
 WorkingDir=JIT\jit64\opt\cse\staticFieldExprUnchecked1_r_try
@@ -36819,6 +40659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [volatilefield.cmd_5332]
 RelativePath=JIT\jit64\opt\cse\volatilefield\volatilefield.cmd
 WorkingDir=JIT\jit64\opt\cse\volatilefield
@@ -36826,6 +40667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [volatilestaticfield.cmd_5333]
 RelativePath=JIT\jit64\opt\cse\volatilestaticfield\volatilestaticfield.cmd
 WorkingDir=JIT\jit64\opt\cse\volatilestaticfield
@@ -36833,6 +40675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [VolatileTest_op_add.cmd_5334]
 RelativePath=JIT\jit64\opt\cse\VolatileTest_op_add\VolatileTest_op_add.cmd
 WorkingDir=JIT\jit64\opt\cse\VolatileTest_op_add
@@ -36840,6 +40683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VolatileTest_op_and.cmd_5335]
 RelativePath=JIT\jit64\opt\cse\VolatileTest_op_and\VolatileTest_op_and.cmd
 WorkingDir=JIT\jit64\opt\cse\VolatileTest_op_and
@@ -36847,6 +40691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VolatileTest_op_div.cmd_5336]
 RelativePath=JIT\jit64\opt\cse\VolatileTest_op_div\VolatileTest_op_div.cmd
 WorkingDir=JIT\jit64\opt\cse\VolatileTest_op_div
@@ -36854,6 +40699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VolatileTest_op_mod.cmd_5337]
 RelativePath=JIT\jit64\opt\cse\VolatileTest_op_mod\VolatileTest_op_mod.cmd
 WorkingDir=JIT\jit64\opt\cse\VolatileTest_op_mod
@@ -36861,6 +40707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VolatileTest_op_mul.cmd_5338]
 RelativePath=JIT\jit64\opt\cse\VolatileTest_op_mul\VolatileTest_op_mul.cmd
 WorkingDir=JIT\jit64\opt\cse\VolatileTest_op_mul
@@ -36868,6 +40715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VolatileTest_op_or.cmd_5339]
 RelativePath=JIT\jit64\opt\cse\VolatileTest_op_or\VolatileTest_op_or.cmd
 WorkingDir=JIT\jit64\opt\cse\VolatileTest_op_or
@@ -36875,6 +40723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VolatileTest_op_shr.cmd_5340]
 RelativePath=JIT\jit64\opt\cse\VolatileTest_op_shr\VolatileTest_op_shr.cmd
 WorkingDir=JIT\jit64\opt\cse\VolatileTest_op_shr
@@ -36882,6 +40731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VolatileTest_op_sub.cmd_5341]
 RelativePath=JIT\jit64\opt\cse\VolatileTest_op_sub\VolatileTest_op_sub.cmd
 WorkingDir=JIT\jit64\opt\cse\VolatileTest_op_sub
@@ -36889,6 +40739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VolatileTest_op_xor.cmd_5342]
 RelativePath=JIT\jit64\opt\cse\VolatileTest_op_xor\VolatileTest_op_xor.cmd
 WorkingDir=JIT\jit64\opt\cse\VolatileTest_op_xor
@@ -36896,6 +40747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [caninline_d.cmd_5343]
 RelativePath=JIT\jit64\opt\inl\caninline_d\caninline_d.cmd
 WorkingDir=JIT\jit64\opt\inl\caninline_d
@@ -36903,6 +40755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [caninline_do.cmd_5344]
 RelativePath=JIT\jit64\opt\inl\caninline_do\caninline_do.cmd
 WorkingDir=JIT\jit64\opt\inl\caninline_do
@@ -36910,6 +40763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [caninline_r.cmd_5345]
 RelativePath=JIT\jit64\opt\inl\caninline_r\caninline_r.cmd
 WorkingDir=JIT\jit64\opt\inl\caninline_r
@@ -36917,6 +40771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [caninline_ro.cmd_5346]
 RelativePath=JIT\jit64\opt\inl\caninline_ro\caninline_ro.cmd
 WorkingDir=JIT\jit64\opt\inl\caninline_ro
@@ -36924,6 +40779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [inl001.cmd_5347]
 RelativePath=JIT\jit64\opt\inl\inl001\inl001.cmd
 WorkingDir=JIT\jit64\opt\inl\inl001
@@ -36931,6 +40787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lim_001.cmd_5348]
 RelativePath=JIT\jit64\opt\lim\lim_001\lim_001.cmd
 WorkingDir=JIT\jit64\opt\lim\lim_001
@@ -36938,6 +40795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lim_002.cmd_5349]
 RelativePath=JIT\jit64\opt\lim\lim_002\lim_002.cmd
 WorkingDir=JIT\jit64\opt\lim\lim_002
@@ -36945,6 +40803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lur_01.cmd_5350]
 RelativePath=JIT\jit64\opt\lur\lur_01\lur_01.cmd
 WorkingDir=JIT\jit64\opt\lur\lur_01
@@ -36952,6 +40811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lur_02.cmd_5351]
 RelativePath=JIT\jit64\opt\lur\lur_02\lur_02.cmd
 WorkingDir=JIT\jit64\opt\lur\lur_02
@@ -36959,6 +40819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [osr001.cmd_5352]
 RelativePath=JIT\jit64\opt\osr\osr001\osr001.cmd
 WorkingDir=JIT\jit64\opt\osr\osr001
@@ -36966,6 +40827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [osr015.cmd_5353]
 RelativePath=JIT\jit64\opt\osr\osr015\osr015.cmd
 WorkingDir=JIT\jit64\opt\osr\osr015
@@ -36973,6 +40835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [193825_udo.cmd_5354]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\193825\193825_udo\193825_udo.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\193825\193825_udo
@@ -36980,6 +40843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [193825_uro.cmd_5355]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\193825\193825_uro\193825_uro.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\193825\193825_uro
@@ -36987,6 +40851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bne_dbg.cmd_5356]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\bne_dbg\bne_dbg.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\bne_dbg
@@ -36994,6 +40859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [bne_opt.cmd_5357]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\bne_opt\bne_opt.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\bne_opt
@@ -37001,6 +40867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [conv_dbg.cmd_5358]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\conv_dbg\conv_dbg.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\conv_dbg
@@ -37008,6 +40875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [conv_opt.cmd_5359]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\conv_opt\conv_opt.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\conv_opt
@@ -37015,6 +40883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [div_dbg.cmd_5360]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\div_dbg\div_dbg.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\div_dbg
@@ -37022,6 +40891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [div_opt.cmd_5361]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\div_opt\div_opt.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\div_opt
@@ -37029,6 +40899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mul1_dbg.cmd_5362]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\mul1_dbg\mul1_dbg.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\mul1_dbg
@@ -37036,6 +40907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mul1_opt.cmd_5363]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\mul1_opt\mul1_opt.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\mul1_opt
@@ -37043,6 +40915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mul_exception_dbg.cmd_5364]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\mul_exception_dbg\mul_exception_dbg.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\mul_exception_dbg
@@ -37050,6 +40923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [mul_exception_opt.cmd_5365]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\mul_exception_opt\mul_exception_opt.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\mul_exception_opt
@@ -37057,6 +40931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [rem_dbg.cmd_5366]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\rem_dbg\rem_dbg.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\rem_dbg
@@ -37064,6 +40939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [rem_opt.cmd_5367]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\223862\rem_opt\rem_opt.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\223862\rem_opt
@@ -37071,6 +40947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [conv_dbg.cmd_5368]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\228572\conv_dbg\conv_dbg.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\228572\conv_dbg
@@ -37078,6 +40955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [conv_opt.cmd_5369]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\228572\conv_opt\conv_opt.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\228572\conv_opt
@@ -37085,6 +40963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [foo2_dbg.cmd_5370]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\481244\foo2_dbg\foo2_dbg.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\481244\foo2_dbg
@@ -37092,6 +40971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [foo2_opt.cmd_5371]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\481244\foo2_opt\foo2_opt.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\481244\foo2_opt
@@ -37099,6 +40979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [foo_dbg.cmd_5372]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\481244\foo_dbg\foo_dbg.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\481244\foo_dbg
@@ -37106,6 +40987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [foo_opt.cmd_5373]
 RelativePath=JIT\jit64\opt\regress\vswhidbey\481244\foo_opt\foo_opt.cmd
 WorkingDir=JIT\jit64\opt\regress\vswhidbey\481244\foo_opt
@@ -37113,6 +40995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayBound_o.cmd_5374]
 RelativePath=JIT\jit64\opt\rngchk\ArrayBound_o\ArrayBound_o.cmd
 WorkingDir=JIT\jit64\opt\rngchk\ArrayBound_o
@@ -37120,6 +41003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayWith2Loops_o.cmd_5375]
 RelativePath=JIT\jit64\opt\rngchk\ArrayWith2Loops_o\ArrayWith2Loops_o.cmd
 WorkingDir=JIT\jit64\opt\rngchk\ArrayWith2Loops_o
@@ -37127,6 +41011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayWithFunc_o.cmd_5376]
 RelativePath=JIT\jit64\opt\rngchk\ArrayWithFunc_o\ArrayWithFunc_o.cmd
 WorkingDir=JIT\jit64\opt\rngchk\ArrayWithFunc_o
@@ -37134,6 +41019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ArrayWithThread_o.cmd_5377]
 RelativePath=JIT\jit64\opt\rngchk\ArrayWithThread_o\ArrayWithThread_o.cmd
 WorkingDir=JIT\jit64\opt\rngchk\ArrayWithThread_o
@@ -37141,6 +41027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BadMatrixMul_o.cmd_5378]
 RelativePath=JIT\jit64\opt\rngchk\BadMatrixMul_o\BadMatrixMul_o.cmd
 WorkingDir=JIT\jit64\opt\rngchk\BadMatrixMul_o
@@ -37148,6 +41035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [JaggedArray_o.cmd_5379]
 RelativePath=JIT\jit64\opt\rngchk\JaggedArray_o\JaggedArray_o.cmd
 WorkingDir=JIT\jit64\opt\rngchk\JaggedArray_o
@@ -37155,6 +41043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [MatrixMul_o.cmd_5380]
 RelativePath=JIT\jit64\opt\rngchk\MatrixMul_o\MatrixMul_o.cmd
 WorkingDir=JIT\jit64\opt\rngchk\MatrixMul_o
@@ -37162,6 +41051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [RngchkStress1_o.cmd_5381]
 RelativePath=JIT\jit64\opt\rngchk\RngchkStress1_o\RngchkStress1_o.cmd
 WorkingDir=JIT\jit64\opt\rngchk\RngchkStress1_o
@@ -37169,6 +41059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [RngchkStress2_o.cmd_5382]
 RelativePath=JIT\jit64\opt\rngchk\RngchkStress2_o\RngchkStress2_o.cmd
 WorkingDir=JIT\jit64\opt\rngchk\RngchkStress2_o
@@ -37176,13 +41067,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [RngchkStress3.cmd_5383]
 RelativePath=JIT\jit64\opt\rngchk\RngchkStress3\RngchkStress3.cmd
 WorkingDir=JIT\jit64\opt\rngchk\RngchkStress3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [SimpleArray_01_o.cmd_5384]
 RelativePath=JIT\jit64\opt\rngchk\SimpleArray_01_o\SimpleArray_01_o.cmd
 WorkingDir=JIT\jit64\opt\rngchk\SimpleArray_01_o
@@ -37190,6 +41083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [foo.cmd_5385]
 RelativePath=JIT\jit64\regress\asurt\143616\foo\foo.cmd
 WorkingDir=JIT\jit64\regress\asurt\143616\foo
@@ -37197,6 +41091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [103087.cmd_5386]
 RelativePath=JIT\jit64\regress\ddb\103087\103087\103087.cmd
 WorkingDir=JIT\jit64\regress\ddb\103087\103087
@@ -37204,6 +41099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [113574.cmd_5387]
 RelativePath=JIT\jit64\regress\ddb\113574\113574\113574.cmd
 WorkingDir=JIT\jit64\regress\ddb\113574\113574
@@ -37211,6 +41107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [118414.cmd_5388]
 RelativePath=JIT\jit64\regress\ddb\118414\118414\118414.cmd
 WorkingDir=JIT\jit64\regress\ddb\118414\118414
@@ -37218,6 +41115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [127931.cmd_5389]
 RelativePath=JIT\jit64\regress\ddb\127931\127931\127931.cmd
 WorkingDir=JIT\jit64\regress\ddb\127931\127931
@@ -37225,6 +41123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [132977.cmd_5390]
 RelativePath=JIT\jit64\regress\ddb\132977\132977\132977.cmd
 WorkingDir=JIT\jit64\regress\ddb\132977\132977
@@ -37232,6 +41131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ddb87766.cmd_5391]
 RelativePath=JIT\jit64\regress\ddb\87766\ddb87766\ddb87766.cmd
 WorkingDir=JIT\jit64\regress\ddb\87766\ddb87766
@@ -37239,6 +41139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [objectusedonlyinhandler.cmd_5392]
 RelativePath=JIT\jit64\regress\ndpw\14888\objectusedonlyinhandler\objectusedonlyinhandler.cmd
 WorkingDir=JIT\jit64\regress\ndpw\14888\objectusedonlyinhandler
@@ -37246,6 +41147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simple.cmd_5393]
 RelativePath=JIT\jit64\regress\ndpw\160545\simple\simple.cmd
 WorkingDir=JIT\jit64\regress\ndpw\160545\simple
@@ -37253,6 +41155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [interior_pointer.cmd_5394]
 RelativePath=JIT\jit64\regress\ndpw\21015\interior_pointer\interior_pointer.cmd
 WorkingDir=JIT\jit64\regress\ndpw\21015\interior_pointer
@@ -37260,6 +41163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5396]
 RelativePath=JIT\jit64\regress\phoenix\62322\test\test.cmd
 WorkingDir=JIT\jit64\regress\phoenix\62322\test
@@ -37267,13 +41171,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test1.cmd_5397]
 RelativePath=JIT\jit64\regress\vsw\102754\test1\test1.cmd
 WorkingDir=JIT\jit64\regress\vsw\102754\test1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5398]
 RelativePath=JIT\jit64\regress\vsw\102964\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\102964\test
@@ -37281,6 +41187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5399]
 RelativePath=JIT\jit64\regress\vsw\102974\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\102974\test
@@ -37288,6 +41195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5400]
 RelativePath=JIT\jit64\regress\vsw\153682\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\153682\test
@@ -37295,6 +41203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5401]
 RelativePath=JIT\jit64\regress\vsw\266693\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\266693\test
@@ -37302,6 +41211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5402]
 RelativePath=JIT\jit64\regress\vsw\286991\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\286991\test
@@ -37309,6 +41219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5403]
 RelativePath=JIT\jit64\regress\vsw\329169\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\329169\test
@@ -37316,6 +41227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test1.cmd_5404]
 RelativePath=JIT\jit64\regress\vsw\333007\test1\test1.cmd
 WorkingDir=JIT\jit64\regress\vsw\333007\test1
@@ -37323,6 +41235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test1.cmd_5405]
 RelativePath=JIT\jit64\regress\vsw\336666\test1\test1.cmd
 WorkingDir=JIT\jit64\regress\vsw\336666\test1
@@ -37330,6 +41243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5406]
 RelativePath=JIT\jit64\regress\vsw\373472\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\373472\test
@@ -37337,13 +41251,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test_il.cmd_5407]
 RelativePath=JIT\jit64\regress\vsw\373472\test_il\test_il.cmd
 WorkingDir=JIT\jit64\regress\vsw\373472\test_il
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5408]
 RelativePath=JIT\jit64\regress\vsw\404708\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\404708\test
@@ -37351,6 +41267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5409]
 RelativePath=JIT\jit64\regress\vsw\460412\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\460412\test
@@ -37358,6 +41275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5410]
 RelativePath=JIT\jit64\regress\vsw\471729\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\471729\test
@@ -37365,6 +41283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5411]
 RelativePath=JIT\jit64\regress\vsw\517867\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\517867\test
@@ -37372,6 +41291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test1.cmd_5412]
 RelativePath=JIT\jit64\regress\vsw\524070\test1\test1.cmd
 WorkingDir=JIT\jit64\regress\vsw\524070\test1
@@ -37379,6 +41299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test2.cmd_5413]
 RelativePath=JIT\jit64\regress\vsw\524070\test2\test2.cmd
 WorkingDir=JIT\jit64\regress\vsw\524070\test2
@@ -37386,6 +41307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [simple-repro.cmd_5414]
 RelativePath=JIT\jit64\regress\vsw\528315\simple-repro\simple-repro.cmd
 WorkingDir=JIT\jit64\regress\vsw\528315\simple-repro
@@ -37393,6 +41315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [exchange.cmd_5415]
 RelativePath=JIT\jit64\regress\vsw\534486\exchange\exchange.cmd
 WorkingDir=JIT\jit64\regress\vsw\534486\exchange
@@ -37400,6 +41323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test1.cmd_5416]
 RelativePath=JIT\jit64\regress\vsw\538615\test1\test1.cmd
 WorkingDir=JIT\jit64\regress\vsw\538615\test1
@@ -37407,6 +41331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test1.cmd_5417]
 RelativePath=JIT\jit64\regress\vsw\539509\test1\test1.cmd
 WorkingDir=JIT\jit64\regress\vsw\539509\test1
@@ -37414,6 +41339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test1.cmd_5418]
 RelativePath=JIT\jit64\regress\vsw\541067\test1\test1.cmd
 WorkingDir=JIT\jit64\regress\vsw\541067\test1
@@ -37421,6 +41347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5419]
 RelativePath=JIT\jit64\regress\vsw\543229\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\543229\test
@@ -37428,6 +41355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5420]
 RelativePath=JIT\jit64\regress\vsw\543645\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\543645\test
@@ -37435,6 +41363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5421]
 RelativePath=JIT\jit64\regress\vsw\549880\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\549880\test
@@ -37442,6 +41371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5422]
 RelativePath=JIT\jit64\regress\vsw\552940\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\552940\test
@@ -37449,6 +41379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [opadd.cmd_5423]
 RelativePath=JIT\jit64\regress\vsw\560402\opadd\opadd.cmd
 WorkingDir=JIT\jit64\regress\vsw\560402\opadd
@@ -37456,6 +41387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [opmul.cmd_5424]
 RelativePath=JIT\jit64\regress\vsw\560402\opmul\opmul.cmd
 WorkingDir=JIT\jit64\regress\vsw\560402\opmul
@@ -37463,6 +41395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [opsub.cmd_5425]
 RelativePath=JIT\jit64\regress\vsw\560402\opsub\opsub.cmd
 WorkingDir=JIT\jit64\regress\vsw\560402\opsub
@@ -37470,6 +41403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5426]
 RelativePath=JIT\jit64\regress\vsw\568666\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\568666\test
@@ -37477,6 +41411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_5427]
 RelativePath=JIT\jit64\regress\vsw\575343\test\test.cmd
 WorkingDir=JIT\jit64\regress\vsw\575343\test
@@ -37484,6 +41419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test2.cmd_5428]
 RelativePath=JIT\jit64\regress\vsw\575343\test2\test2.cmd
 WorkingDir=JIT\jit64\regress\vsw\575343\test2
@@ -37491,6 +41427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stret.cmd_5429]
 RelativePath=JIT\jit64\regress\vsw\601425\stret\stret.cmd
 WorkingDir=JIT\jit64\regress\vsw\601425\stret
@@ -37498,6 +41435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Bug606733.cmd_5430]
 RelativePath=JIT\jit64\regress\vsw\606733\Bug606733\Bug606733.cmd
 WorkingDir=JIT\jit64\regress\vsw\606733\Bug606733
@@ -37505,6 +41443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [607586.cmd_5431]
 RelativePath=JIT\jit64\regress\vsw\607586\607586\607586.cmd
 WorkingDir=JIT\jit64\regress\vsw\607586\607586
@@ -37512,6 +41451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [vsw610378.cmd_5432]
 RelativePath=JIT\jit64\regress\vsw\610378\vsw610378\vsw610378.cmd
 WorkingDir=JIT\jit64\regress\vsw\610378\vsw610378
@@ -37519,6 +41459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [overflow01_add.cmd_5433]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow01_add\overflow01_add.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow01_add
@@ -37526,6 +41467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow01_div.cmd_5434]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow01_div\overflow01_div.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow01_div
@@ -37533,6 +41475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow01_mul.cmd_5435]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow01_mul\overflow01_mul.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow01_mul
@@ -37540,6 +41483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow01_sub.cmd_5436]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow01_sub\overflow01_sub.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow01_sub
@@ -37547,6 +41491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow02_add.cmd_5437]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow02_add\overflow02_add.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow02_add
@@ -37554,6 +41499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow02_div.cmd_5438]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow02_div\overflow02_div.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow02_div
@@ -37561,6 +41507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow02_mul.cmd_5439]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow02_mul\overflow02_mul.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow02_mul
@@ -37568,6 +41515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow02_sub.cmd_5440]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow02_sub\overflow02_sub.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow02_sub
@@ -37575,6 +41523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow03_add.cmd_5441]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow03_add\overflow03_add.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow03_add
@@ -37582,6 +41531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow03_div.cmd_5442]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow03_div\overflow03_div.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow03_div
@@ -37589,6 +41539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow03_mul.cmd_5443]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow03_mul\overflow03_mul.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow03_mul
@@ -37596,6 +41547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow03_sub.cmd_5444]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow03_sub\overflow03_sub.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow03_sub
@@ -37603,6 +41555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow04_add.cmd_5445]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow04_add\overflow04_add.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow04_add
@@ -37610,6 +41563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow04_div.cmd_5446]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow04_div\overflow04_div.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow04_div
@@ -37617,6 +41571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow04_mul.cmd_5447]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow04_mul\overflow04_mul.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow04_mul
@@ -37624,6 +41579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [overflow04_sub.cmd_5448]
 RelativePath=JIT\jit64\rtchecks\overflow\overflow04_sub\overflow04_sub.cmd
 WorkingDir=JIT\jit64\rtchecks\overflow\overflow04_sub
@@ -37631,6 +41587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox001.cmd_5449]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox001\box-unbox001.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox001
@@ -37638,6 +41595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox002.cmd_5450]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox002\box-unbox002.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox002
@@ -37645,6 +41603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox003.cmd_5451]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox003\box-unbox003.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox003
@@ -37652,6 +41611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox004.cmd_5452]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox004\box-unbox004.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox004
@@ -37659,6 +41619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox005.cmd_5453]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox005\box-unbox005.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox005
@@ -37666,6 +41627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox006.cmd_5454]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox006\box-unbox006.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox006
@@ -37673,6 +41635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox007.cmd_5455]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox007\box-unbox007.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox007
@@ -37680,6 +41643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox008.cmd_5456]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox008\box-unbox008.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox008
@@ -37687,6 +41651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox009.cmd_5457]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox009\box-unbox009.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox009
@@ -37694,6 +41659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox010.cmd_5458]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox010\box-unbox010.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox010
@@ -37701,6 +41667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox011.cmd_5459]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox011\box-unbox011.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox011
@@ -37708,6 +41675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox012.cmd_5460]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox012\box-unbox012.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox012
@@ -37715,6 +41683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox013.cmd_5461]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox013\box-unbox013.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox013
@@ -37722,6 +41691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox014.cmd_5462]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox014\box-unbox014.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox014
@@ -37729,6 +41699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox015.cmd_5463]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox015\box-unbox015.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox015
@@ -37736,6 +41707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox016.cmd_5464]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox016\box-unbox016.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox016
@@ -37743,6 +41715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox017.cmd_5465]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox017\box-unbox017.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox017
@@ -37750,6 +41723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox018.cmd_5466]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox018\box-unbox018.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox018
@@ -37757,6 +41731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox019.cmd_5467]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox019\box-unbox019.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox019
@@ -37764,6 +41739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox020.cmd_5468]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox020\box-unbox020.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox020
@@ -37771,6 +41747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox021.cmd_5469]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox021\box-unbox021.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox021
@@ -37778,6 +41755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox022.cmd_5470]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox022\box-unbox022.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox022
@@ -37785,6 +41763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox023.cmd_5471]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox023\box-unbox023.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox023
@@ -37792,6 +41771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox024.cmd_5472]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox024\box-unbox024.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox024
@@ -37799,6 +41779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox025.cmd_5473]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox025\box-unbox025.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox025
@@ -37806,6 +41787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox026.cmd_5474]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox026\box-unbox026.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox026
@@ -37813,6 +41795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox027.cmd_5475]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox027\box-unbox027.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox027
@@ -37820,6 +41803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox028.cmd_5476]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox028\box-unbox028.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox028
@@ -37827,6 +41811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox029.cmd_5477]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox029\box-unbox029.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox029
@@ -37834,6 +41819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox030.cmd_5478]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox030\box-unbox030.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox030
@@ -37841,6 +41827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox031.cmd_5479]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox031\box-unbox031.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox031
@@ -37848,6 +41835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox032.cmd_5480]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox032\box-unbox032.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox032
@@ -37855,6 +41843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox033.cmd_5481]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox033\box-unbox033.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox033
@@ -37862,6 +41851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox034.cmd_5482]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox034\box-unbox034.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox034
@@ -37869,6 +41859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox037.cmd_5483]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox037\box-unbox037.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox037
@@ -37876,6 +41867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox038.cmd_5484]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox038\box-unbox038.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox038
@@ -37883,6 +41875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox039.cmd_5485]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox039\box-unbox039.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox039
@@ -37890,6 +41883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox040.cmd_5486]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox040\box-unbox040.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox040
@@ -37897,6 +41891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox041.cmd_5487]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox041\box-unbox041.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox041
@@ -37904,6 +41899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox042.cmd_5488]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox042\box-unbox042.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox042
@@ -37911,6 +41907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox043.cmd_5489]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox043\box-unbox043.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox043
@@ -37918,6 +41915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox044.cmd_5490]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox044\box-unbox044.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox044
@@ -37925,6 +41923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox045.cmd_5491]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox045\box-unbox045.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\box-unbox\box-unbox045
@@ -37932,6 +41931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-enum001.cmd_5492]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\enum\box-unbox-enum001\box-unbox-enum001.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\enum\box-unbox-enum001
@@ -37939,6 +41939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-enum002.cmd_5493]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\enum\box-unbox-enum002\box-unbox-enum002.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\enum\box-unbox-enum002
@@ -37946,6 +41947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-enum003.cmd_5494]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\enum\box-unbox-enum003\box-unbox-enum003.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\enum\box-unbox-enum003
@@ -37953,6 +41955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics001.cmd_5495]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics001\box-unbox-generics001.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics001
@@ -37960,6 +41963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics002.cmd_5496]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics002\box-unbox-generics002.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics002
@@ -37967,6 +41971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics003.cmd_5497]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics003\box-unbox-generics003.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics003
@@ -37974,6 +41979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics004.cmd_5498]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics004\box-unbox-generics004.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics004
@@ -37981,6 +41987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics005.cmd_5499]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics005\box-unbox-generics005.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics005
@@ -37988,6 +41995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics006.cmd_5500]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics006\box-unbox-generics006.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics006
@@ -37995,6 +42003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics007.cmd_5501]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics007\box-unbox-generics007.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics007
@@ -38002,6 +42011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics008.cmd_5502]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics008\box-unbox-generics008.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics008
@@ -38009,6 +42019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics009.cmd_5503]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics009\box-unbox-generics009.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics009
@@ -38016,6 +42027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics010.cmd_5504]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics010\box-unbox-generics010.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics010
@@ -38023,6 +42035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics011.cmd_5505]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics011\box-unbox-generics011.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics011
@@ -38030,6 +42043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics012.cmd_5506]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics012\box-unbox-generics012.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics012
@@ -38037,6 +42051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics013.cmd_5507]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics013\box-unbox-generics013.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics013
@@ -38044,6 +42059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics014.cmd_5508]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics014\box-unbox-generics014.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics014
@@ -38051,6 +42067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics015.cmd_5509]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics015\box-unbox-generics015.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics015
@@ -38058,6 +42075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics016.cmd_5510]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics016\box-unbox-generics016.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics016
@@ -38065,6 +42083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics017.cmd_5511]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics017\box-unbox-generics017.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics017
@@ -38072,6 +42091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics018.cmd_5512]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics018\box-unbox-generics018.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics018
@@ -38079,6 +42099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics019.cmd_5513]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics019\box-unbox-generics019.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics019
@@ -38086,6 +42107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics020.cmd_5514]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics020\box-unbox-generics020.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics020
@@ -38093,6 +42115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics021.cmd_5515]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics021\box-unbox-generics021.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics021
@@ -38100,6 +42123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics022.cmd_5516]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics022\box-unbox-generics022.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics022
@@ -38107,6 +42131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics023.cmd_5517]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics023\box-unbox-generics023.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics023
@@ -38114,6 +42139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics024.cmd_5518]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics024\box-unbox-generics024.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics024
@@ -38121,6 +42147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics025.cmd_5519]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics025\box-unbox-generics025.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics025
@@ -38128,6 +42155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics026.cmd_5520]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics026\box-unbox-generics026.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics026
@@ -38135,6 +42163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics027.cmd_5521]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics027\box-unbox-generics027.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics027
@@ -38142,6 +42171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics028.cmd_5522]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics028\box-unbox-generics028.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics028
@@ -38149,6 +42179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics029.cmd_5523]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics029\box-unbox-generics029.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics029
@@ -38156,6 +42187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics030.cmd_5524]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics030\box-unbox-generics030.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics030
@@ -38163,6 +42195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics031.cmd_5525]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics031\box-unbox-generics031.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics031
@@ -38170,6 +42203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics032.cmd_5526]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics032\box-unbox-generics032.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics032
@@ -38177,6 +42211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics033.cmd_5527]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics033\box-unbox-generics033.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics033
@@ -38184,6 +42219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics034.cmd_5528]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics034\box-unbox-generics034.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics034
@@ -38191,6 +42227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics037.cmd_5529]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics037\box-unbox-generics037.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics037
@@ -38198,6 +42235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics038.cmd_5530]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics038\box-unbox-generics038.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics038
@@ -38205,6 +42243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics039.cmd_5531]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics039\box-unbox-generics039.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics039
@@ -38212,6 +42251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics040.cmd_5532]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics040\box-unbox-generics040.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics040
@@ -38219,6 +42259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics041.cmd_5533]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics041\box-unbox-generics041.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics041
@@ -38226,6 +42267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics042.cmd_5534]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics042\box-unbox-generics042.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics042
@@ -38233,6 +42275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics043.cmd_5535]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics043\box-unbox-generics043.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics043
@@ -38240,6 +42283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics044.cmd_5536]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics044\box-unbox-generics044.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics044
@@ -38247,6 +42291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-generics045.cmd_5537]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics045\box-unbox-generics045.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\generics\box-unbox-generics045
@@ -38254,6 +42299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface001.cmd_5538]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface001\box-unbox-interface001.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface001
@@ -38261,6 +42307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface002.cmd_5539]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface002\box-unbox-interface002.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface002
@@ -38268,6 +42315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface003.cmd_5540]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface003\box-unbox-interface003.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface003
@@ -38275,6 +42323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface004.cmd_5541]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface004\box-unbox-interface004.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface004
@@ -38282,6 +42331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface005.cmd_5542]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface005\box-unbox-interface005.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface005
@@ -38289,6 +42339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface006.cmd_5543]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface006\box-unbox-interface006.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface006
@@ -38296,6 +42347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface007.cmd_5544]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface007\box-unbox-interface007.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface007
@@ -38303,6 +42355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface008.cmd_5545]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface008\box-unbox-interface008.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface008
@@ -38310,6 +42363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface009.cmd_5546]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface009\box-unbox-interface009.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface009
@@ -38317,6 +42371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface010.cmd_5547]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface010\box-unbox-interface010.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface010
@@ -38324,6 +42379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface011.cmd_5548]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface011\box-unbox-interface011.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface011
@@ -38331,6 +42387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface012.cmd_5549]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface012\box-unbox-interface012.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface012
@@ -38338,6 +42395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface013.cmd_5550]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface013\box-unbox-interface013.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface013
@@ -38345,6 +42403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface014.cmd_5551]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface014\box-unbox-interface014.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface014
@@ -38352,6 +42411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface015.cmd_5552]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface015\box-unbox-interface015.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface015
@@ -38359,6 +42419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface016.cmd_5553]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface016\box-unbox-interface016.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface016
@@ -38366,6 +42427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface017.cmd_5554]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface017\box-unbox-interface017.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface017
@@ -38373,6 +42435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-interface018.cmd_5555]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface018\box-unbox-interface018.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\interface\box-unbox-interface018
@@ -38380,6 +42443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null001.cmd_5556]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null001\box-unbox-null001.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null001
@@ -38387,6 +42451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null002.cmd_5557]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null002\box-unbox-null002.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null002
@@ -38394,6 +42459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null003.cmd_5558]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null003\box-unbox-null003.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null003
@@ -38401,6 +42467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null004.cmd_5559]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null004\box-unbox-null004.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null004
@@ -38408,6 +42475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null005.cmd_5560]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null005\box-unbox-null005.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null005
@@ -38415,6 +42483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null006.cmd_5561]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null006\box-unbox-null006.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null006
@@ -38422,6 +42491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null007.cmd_5562]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null007\box-unbox-null007.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null007
@@ -38429,6 +42499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null008.cmd_5563]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null008\box-unbox-null008.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null008
@@ -38436,6 +42507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null009.cmd_5564]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null009\box-unbox-null009.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null009
@@ -38443,6 +42515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null010.cmd_5565]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null010\box-unbox-null010.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null010
@@ -38450,6 +42523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null011.cmd_5566]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null011\box-unbox-null011.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null011
@@ -38457,6 +42531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null012.cmd_5567]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null012\box-unbox-null012.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null012
@@ -38464,6 +42539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null013.cmd_5568]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null013\box-unbox-null013.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null013
@@ -38471,6 +42547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null014.cmd_5569]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null014\box-unbox-null014.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null014
@@ -38478,6 +42555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null015.cmd_5570]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null015\box-unbox-null015.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null015
@@ -38485,6 +42563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null016.cmd_5571]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null016\box-unbox-null016.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null016
@@ -38492,6 +42571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null017.cmd_5572]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null017\box-unbox-null017.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null017
@@ -38499,6 +42579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null018.cmd_5573]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null018\box-unbox-null018.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null018
@@ -38506,6 +42587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null019.cmd_5574]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null019\box-unbox-null019.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null019
@@ -38513,6 +42595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null020.cmd_5575]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null020\box-unbox-null020.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null020
@@ -38520,6 +42603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null021.cmd_5576]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null021\box-unbox-null021.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null021
@@ -38527,6 +42611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null022.cmd_5577]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null022\box-unbox-null022.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null022
@@ -38534,6 +42619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null023.cmd_5578]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null023\box-unbox-null023.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null023
@@ -38541,6 +42627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null024.cmd_5579]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null024\box-unbox-null024.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null024
@@ -38548,6 +42635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null025.cmd_5580]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null025\box-unbox-null025.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null025
@@ -38555,6 +42643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null026.cmd_5581]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null026\box-unbox-null026.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null026
@@ -38562,6 +42651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null027.cmd_5582]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null027\box-unbox-null027.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null027
@@ -38569,6 +42659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null028.cmd_5583]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null028\box-unbox-null028.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null028
@@ -38576,6 +42667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null029.cmd_5584]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null029\box-unbox-null029.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null029
@@ -38583,6 +42675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null030.cmd_5585]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null030\box-unbox-null030.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null030
@@ -38590,6 +42683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null031.cmd_5586]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null031\box-unbox-null031.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null031
@@ -38597,6 +42691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null032.cmd_5587]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null032\box-unbox-null032.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null032
@@ -38604,6 +42699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null033.cmd_5588]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null033\box-unbox-null033.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null033
@@ -38611,6 +42707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null034.cmd_5589]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null034\box-unbox-null034.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null034
@@ -38618,6 +42715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null037.cmd_5590]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null037\box-unbox-null037.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null037
@@ -38625,6 +42723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null038.cmd_5591]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null038\box-unbox-null038.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null038
@@ -38632,6 +42731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null039.cmd_5592]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null039\box-unbox-null039.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null039
@@ -38639,6 +42739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null040.cmd_5593]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null040\box-unbox-null040.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null040
@@ -38646,6 +42747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null041.cmd_5594]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null041\box-unbox-null041.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null041
@@ -38653,6 +42755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null042.cmd_5595]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null042\box-unbox-null042.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null042
@@ -38660,6 +42763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null043.cmd_5596]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null043\box-unbox-null043.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null043
@@ -38667,6 +42771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null044.cmd_5597]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null044\box-unbox-null044.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null044
@@ -38674,6 +42779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-null045.cmd_5598]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null045\box-unbox-null045.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\null\box-unbox-null045
@@ -38681,6 +42787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value001.cmd_5599]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value001\box-unbox-value001.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value001
@@ -38688,6 +42795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value002.cmd_5600]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value002\box-unbox-value002.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value002
@@ -38695,6 +42803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value003.cmd_5601]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value003\box-unbox-value003.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value003
@@ -38702,6 +42811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value004.cmd_5602]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value004\box-unbox-value004.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value004
@@ -38709,6 +42819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value005.cmd_5603]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value005\box-unbox-value005.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value005
@@ -38716,6 +42827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value006.cmd_5604]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value006\box-unbox-value006.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value006
@@ -38723,6 +42835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value007.cmd_5605]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value007\box-unbox-value007.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value007
@@ -38730,6 +42843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value008.cmd_5606]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value008\box-unbox-value008.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value008
@@ -38737,6 +42851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value009.cmd_5607]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value009\box-unbox-value009.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value009
@@ -38744,6 +42859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value010.cmd_5608]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value010\box-unbox-value010.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value010
@@ -38751,6 +42867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value011.cmd_5609]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value011\box-unbox-value011.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value011
@@ -38758,6 +42875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value012.cmd_5610]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value012\box-unbox-value012.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value012
@@ -38765,6 +42883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value013.cmd_5611]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value013\box-unbox-value013.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value013
@@ -38772,6 +42891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value014.cmd_5612]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value014\box-unbox-value014.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value014
@@ -38779,6 +42899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value015.cmd_5613]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value015\box-unbox-value015.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value015
@@ -38786,6 +42907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value016.cmd_5614]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value016\box-unbox-value016.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value016
@@ -38793,6 +42915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value017.cmd_5615]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value017\box-unbox-value017.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value017
@@ -38800,6 +42923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value018.cmd_5616]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value018\box-unbox-value018.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value018
@@ -38807,6 +42931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value019.cmd_5617]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value019\box-unbox-value019.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value019
@@ -38814,6 +42939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value020.cmd_5618]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value020\box-unbox-value020.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value020
@@ -38821,6 +42947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value021.cmd_5619]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value021\box-unbox-value021.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value021
@@ -38828,6 +42955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value022.cmd_5620]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value022\box-unbox-value022.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value022
@@ -38835,6 +42963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value023.cmd_5621]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value023\box-unbox-value023.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value023
@@ -38842,6 +42971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value024.cmd_5622]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value024\box-unbox-value024.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value024
@@ -38849,6 +42979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value025.cmd_5623]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value025\box-unbox-value025.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value025
@@ -38856,6 +42987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value026.cmd_5624]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value026\box-unbox-value026.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value026
@@ -38863,6 +42995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value027.cmd_5625]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value027\box-unbox-value027.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value027
@@ -38870,6 +43003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value028.cmd_5626]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value028\box-unbox-value028.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value028
@@ -38877,6 +43011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value029.cmd_5627]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value029\box-unbox-value029.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value029
@@ -38884,6 +43019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value030.cmd_5628]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value030\box-unbox-value030.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value030
@@ -38891,6 +43027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value031.cmd_5629]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value031\box-unbox-value031.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value031
@@ -38898,6 +43035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value032.cmd_5630]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value032\box-unbox-value032.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value032
@@ -38905,6 +43043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value033.cmd_5631]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value033\box-unbox-value033.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value033
@@ -38912,6 +43051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value034.cmd_5632]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value034\box-unbox-value034.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value034
@@ -38919,6 +43059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value037.cmd_5633]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value037\box-unbox-value037.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value037
@@ -38926,6 +43067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value038.cmd_5634]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value038\box-unbox-value038.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value038
@@ -38933,6 +43075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value039.cmd_5635]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value039\box-unbox-value039.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value039
@@ -38940,6 +43083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value040.cmd_5636]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value040\box-unbox-value040.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value040
@@ -38947,6 +43091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value041.cmd_5637]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value041\box-unbox-value041.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value041
@@ -38954,6 +43099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value042.cmd_5638]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value042\box-unbox-value042.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value042
@@ -38961,6 +43107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value043.cmd_5639]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value043\box-unbox-value043.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value043
@@ -38968,6 +43115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value044.cmd_5640]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value044\box-unbox-value044.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value044
@@ -38975,6 +43123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [box-unbox-value045.cmd_5641]
 RelativePath=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value045\box-unbox-value045.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\box-unbox\value\box-unbox-value045
@@ -38982,6 +43131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass001.cmd_5642]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass001\castclass001.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass001
@@ -38989,6 +43139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass002.cmd_5643]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass002\castclass002.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass002
@@ -38996,6 +43147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass003.cmd_5644]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass003\castclass003.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass003
@@ -39003,6 +43155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass004.cmd_5645]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass004\castclass004.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass004
@@ -39010,6 +43163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass005.cmd_5646]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass005\castclass005.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass005
@@ -39017,6 +43171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass006.cmd_5647]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass006\castclass006.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass006
@@ -39024,6 +43179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass007.cmd_5648]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass007\castclass007.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass007
@@ -39031,6 +43187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass008.cmd_5649]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass008\castclass008.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass008
@@ -39038,6 +43195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass009.cmd_5650]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass009\castclass009.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass009
@@ -39045,6 +43203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass010.cmd_5651]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass010\castclass010.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass010
@@ -39052,6 +43211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass011.cmd_5652]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass011\castclass011.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass011
@@ -39059,6 +43219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass012.cmd_5653]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass012\castclass012.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass012
@@ -39066,6 +43227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass013.cmd_5654]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass013\castclass013.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass013
@@ -39073,6 +43235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass014.cmd_5655]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass014\castclass014.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass014
@@ -39080,6 +43243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass015.cmd_5656]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass015\castclass015.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass015
@@ -39087,6 +43251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass016.cmd_5657]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass016\castclass016.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass016
@@ -39094,6 +43259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass017.cmd_5658]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass017\castclass017.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass017
@@ -39101,6 +43267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass018.cmd_5659]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass018\castclass018.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass018
@@ -39108,6 +43275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass019.cmd_5660]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass019\castclass019.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass019
@@ -39115,6 +43283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass020.cmd_5661]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass020\castclass020.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass020
@@ -39122,6 +43291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass021.cmd_5662]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass021\castclass021.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass021
@@ -39129,6 +43299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass022.cmd_5663]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass022\castclass022.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass022
@@ -39136,6 +43307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass023.cmd_5664]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass023\castclass023.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass023
@@ -39143,6 +43315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass024.cmd_5665]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass024\castclass024.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass024
@@ -39150,6 +43323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass025.cmd_5666]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass025\castclass025.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass025
@@ -39157,6 +43331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass026.cmd_5667]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass026\castclass026.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass026
@@ -39164,6 +43339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass027.cmd_5668]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass027\castclass027.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass027
@@ -39171,6 +43347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass028.cmd_5669]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass028\castclass028.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass028
@@ -39178,6 +43355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass029.cmd_5670]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass029\castclass029.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass029
@@ -39185,6 +43363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass030.cmd_5671]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass030\castclass030.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass030
@@ -39192,6 +43371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass031.cmd_5672]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass031\castclass031.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass031
@@ -39199,6 +43379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass032.cmd_5673]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass032\castclass032.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass032
@@ -39206,6 +43387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass033.cmd_5674]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass033\castclass033.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass033
@@ -39213,6 +43395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass034.cmd_5675]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass034\castclass034.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass034
@@ -39220,6 +43403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass037.cmd_5676]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass037\castclass037.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass037
@@ -39227,6 +43411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass038.cmd_5677]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass038\castclass038.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass038
@@ -39234,6 +43419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass039.cmd_5678]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass039\castclass039.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass039
@@ -39241,6 +43427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass040.cmd_5679]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass040\castclass040.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass040
@@ -39248,6 +43435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass041.cmd_5680]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass041\castclass041.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass041
@@ -39255,6 +43443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass042.cmd_5681]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass042\castclass042.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass042
@@ -39262,6 +43451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass043.cmd_5682]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass043\castclass043.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass043
@@ -39269,6 +43459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass044.cmd_5683]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass044\castclass044.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass044
@@ -39276,6 +43467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass045.cmd_5684]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass045\castclass045.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\castclass\castclass045
@@ -39283,6 +43475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-enum001.cmd_5685]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\enum\castclass-enum001\castclass-enum001.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\enum\castclass-enum001
@@ -39290,6 +43483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-enum002.cmd_5686]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\enum\castclass-enum002\castclass-enum002.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\enum\castclass-enum002
@@ -39297,6 +43491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-enum003.cmd_5687]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\enum\castclass-enum003\castclass-enum003.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\enum\castclass-enum003
@@ -39304,6 +43499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics001.cmd_5688]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics001\castclass-generics001.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics001
@@ -39311,6 +43507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics002.cmd_5689]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics002\castclass-generics002.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics002
@@ -39318,6 +43515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics003.cmd_5690]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics003\castclass-generics003.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics003
@@ -39325,6 +43523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics004.cmd_5691]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics004\castclass-generics004.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics004
@@ -39332,6 +43531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics005.cmd_5692]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics005\castclass-generics005.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics005
@@ -39339,6 +43539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics006.cmd_5693]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics006\castclass-generics006.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics006
@@ -39346,6 +43547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics007.cmd_5694]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics007\castclass-generics007.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics007
@@ -39353,6 +43555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics008.cmd_5695]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics008\castclass-generics008.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics008
@@ -39360,6 +43563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics009.cmd_5696]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics009\castclass-generics009.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics009
@@ -39367,6 +43571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics010.cmd_5697]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics010\castclass-generics010.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics010
@@ -39374,6 +43579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics011.cmd_5698]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics011\castclass-generics011.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics011
@@ -39381,6 +43587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics012.cmd_5699]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics012\castclass-generics012.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics012
@@ -39388,6 +43595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics013.cmd_5700]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics013\castclass-generics013.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics013
@@ -39395,6 +43603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics014.cmd_5701]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics014\castclass-generics014.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics014
@@ -39402,6 +43611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics015.cmd_5702]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics015\castclass-generics015.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics015
@@ -39409,6 +43619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics016.cmd_5703]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics016\castclass-generics016.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics016
@@ -39416,6 +43627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics017.cmd_5704]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics017\castclass-generics017.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics017
@@ -39423,6 +43635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics018.cmd_5705]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics018\castclass-generics018.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics018
@@ -39430,6 +43643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics019.cmd_5706]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics019\castclass-generics019.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics019
@@ -39437,6 +43651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics020.cmd_5707]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics020\castclass-generics020.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics020
@@ -39444,6 +43659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics021.cmd_5708]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics021\castclass-generics021.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics021
@@ -39451,6 +43667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics022.cmd_5709]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics022\castclass-generics022.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics022
@@ -39458,6 +43675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics023.cmd_5710]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics023\castclass-generics023.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics023
@@ -39465,6 +43683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics024.cmd_5711]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics024\castclass-generics024.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics024
@@ -39472,6 +43691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics025.cmd_5712]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics025\castclass-generics025.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics025
@@ -39479,6 +43699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics026.cmd_5713]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics026\castclass-generics026.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics026
@@ -39486,6 +43707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics027.cmd_5714]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics027\castclass-generics027.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics027
@@ -39493,6 +43715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics028.cmd_5715]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics028\castclass-generics028.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics028
@@ -39500,6 +43723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics029.cmd_5716]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics029\castclass-generics029.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics029
@@ -39507,6 +43731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics030.cmd_5717]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics030\castclass-generics030.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics030
@@ -39514,6 +43739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics031.cmd_5718]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics031\castclass-generics031.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics031
@@ -39521,6 +43747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics032.cmd_5719]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics032\castclass-generics032.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics032
@@ -39528,6 +43755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics033.cmd_5720]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics033\castclass-generics033.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics033
@@ -39535,6 +43763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics034.cmd_5721]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics034\castclass-generics034.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics034
@@ -39542,6 +43771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics037.cmd_5722]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics037\castclass-generics037.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics037
@@ -39549,6 +43779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics038.cmd_5723]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics038\castclass-generics038.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics038
@@ -39556,6 +43787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics039.cmd_5724]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics039\castclass-generics039.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics039
@@ -39563,6 +43795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics040.cmd_5725]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics040\castclass-generics040.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics040
@@ -39570,6 +43803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics041.cmd_5726]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics041\castclass-generics041.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics041
@@ -39577,6 +43811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics042.cmd_5727]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics042\castclass-generics042.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics042
@@ -39584,6 +43819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics043.cmd_5728]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics043\castclass-generics043.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics043
@@ -39591,6 +43827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics044.cmd_5729]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics044\castclass-generics044.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics044
@@ -39598,6 +43835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-generics045.cmd_5730]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics045\castclass-generics045.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\generics\castclass-generics045
@@ -39605,6 +43843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface001.cmd_5731]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface001\castclass-interface001.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface001
@@ -39612,6 +43851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface002.cmd_5732]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface002\castclass-interface002.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface002
@@ -39619,6 +43859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface003.cmd_5733]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface003\castclass-interface003.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface003
@@ -39626,6 +43867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface004.cmd_5734]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface004\castclass-interface004.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface004
@@ -39633,6 +43875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface005.cmd_5735]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface005\castclass-interface005.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface005
@@ -39640,6 +43883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface006.cmd_5736]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface006\castclass-interface006.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface006
@@ -39647,6 +43891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface007.cmd_5737]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface007\castclass-interface007.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface007
@@ -39654,6 +43899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface008.cmd_5738]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface008\castclass-interface008.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface008
@@ -39661,6 +43907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface009.cmd_5739]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface009\castclass-interface009.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface009
@@ -39668,6 +43915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface010.cmd_5740]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface010\castclass-interface010.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface010
@@ -39675,6 +43923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface011.cmd_5741]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface011\castclass-interface011.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface011
@@ -39682,6 +43931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface012.cmd_5742]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface012\castclass-interface012.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface012
@@ -39689,6 +43939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface013.cmd_5743]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface013\castclass-interface013.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface013
@@ -39696,6 +43947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface014.cmd_5744]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface014\castclass-interface014.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface014
@@ -39703,6 +43955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface015.cmd_5745]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface015\castclass-interface015.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface015
@@ -39710,6 +43963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface016.cmd_5746]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface016\castclass-interface016.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface016
@@ -39717,6 +43971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface017.cmd_5747]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface017\castclass-interface017.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface017
@@ -39724,6 +43979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-interface018.cmd_5748]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface018\castclass-interface018.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\interface\castclass-interface018
@@ -39731,6 +43987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null001.cmd_5749]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null001\castclass-null001.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null001
@@ -39738,6 +43995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null002.cmd_5750]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null002\castclass-null002.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null002
@@ -39745,6 +44003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null003.cmd_5751]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null003\castclass-null003.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null003
@@ -39752,6 +44011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null004.cmd_5752]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null004\castclass-null004.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null004
@@ -39759,6 +44019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null005.cmd_5753]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null005\castclass-null005.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null005
@@ -39766,6 +44027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null006.cmd_5754]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null006\castclass-null006.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null006
@@ -39773,6 +44035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null007.cmd_5755]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null007\castclass-null007.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null007
@@ -39780,6 +44043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null008.cmd_5756]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null008\castclass-null008.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null008
@@ -39787,6 +44051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null009.cmd_5757]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null009\castclass-null009.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null009
@@ -39794,6 +44059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null010.cmd_5758]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null010\castclass-null010.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null010
@@ -39801,6 +44067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null011.cmd_5759]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null011\castclass-null011.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null011
@@ -39808,6 +44075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null012.cmd_5760]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null012\castclass-null012.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null012
@@ -39815,6 +44083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null013.cmd_5761]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null013\castclass-null013.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null013
@@ -39822,6 +44091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null014.cmd_5762]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null014\castclass-null014.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null014
@@ -39829,6 +44099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null015.cmd_5763]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null015\castclass-null015.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null015
@@ -39836,6 +44107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null016.cmd_5764]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null016\castclass-null016.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null016
@@ -39843,6 +44115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null017.cmd_5765]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null017\castclass-null017.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null017
@@ -39850,6 +44123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null018.cmd_5766]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null018\castclass-null018.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null018
@@ -39857,6 +44131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null019.cmd_5767]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null019\castclass-null019.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null019
@@ -39864,6 +44139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null020.cmd_5768]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null020\castclass-null020.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null020
@@ -39871,6 +44147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null021.cmd_5769]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null021\castclass-null021.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null021
@@ -39878,6 +44155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null022.cmd_5770]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null022\castclass-null022.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null022
@@ -39885,6 +44163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null023.cmd_5771]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null023\castclass-null023.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null023
@@ -39892,6 +44171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null024.cmd_5772]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null024\castclass-null024.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null024
@@ -39899,6 +44179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null025.cmd_5773]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null025\castclass-null025.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null025
@@ -39906,6 +44187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null026.cmd_5774]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null026\castclass-null026.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null026
@@ -39913,6 +44195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null027.cmd_5775]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null027\castclass-null027.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null027
@@ -39920,6 +44203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null028.cmd_5776]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null028\castclass-null028.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null028
@@ -39927,6 +44211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null029.cmd_5777]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null029\castclass-null029.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null029
@@ -39934,6 +44219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null030.cmd_5778]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null030\castclass-null030.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null030
@@ -39941,6 +44227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null031.cmd_5779]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null031\castclass-null031.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null031
@@ -39948,6 +44235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null032.cmd_5780]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null032\castclass-null032.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null032
@@ -39955,6 +44243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null033.cmd_5781]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null033\castclass-null033.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null033
@@ -39962,6 +44251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null034.cmd_5782]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null034\castclass-null034.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null034
@@ -39969,6 +44259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null037.cmd_5783]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null037\castclass-null037.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null037
@@ -39976,6 +44267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null038.cmd_5784]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null038\castclass-null038.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null038
@@ -39983,6 +44275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null039.cmd_5785]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null039\castclass-null039.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null039
@@ -39990,6 +44283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null040.cmd_5786]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null040\castclass-null040.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null040
@@ -39997,6 +44291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null041.cmd_5787]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null041\castclass-null041.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null041
@@ -40004,6 +44299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null042.cmd_5788]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null042\castclass-null042.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null042
@@ -40011,6 +44307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null043.cmd_5789]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null043\castclass-null043.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null043
@@ -40018,6 +44315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null044.cmd_5790]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null044\castclass-null044.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null044
@@ -40025,6 +44323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [castclass-null045.cmd_5791]
 RelativePath=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null045\castclass-null045.cmd
 WorkingDir=JIT\jit64\valuetypes\nullable\castclass\null\castclass-null045
@@ -40032,6 +44331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ver_fg_13.cmd_5792]
 RelativePath=JIT\jit64\verif\sniff\fg\ver_fg_13\ver_fg_13.cmd
 WorkingDir=JIT\jit64\verif\sniff\fg\ver_fg_13
@@ -40039,6 +44339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghuge_b.cmd_5793]
 RelativePath=JIT\Methodical\Arrays\huge\_il_dbghuge_b\_il_dbghuge_b.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_dbghuge_b
@@ -40046,6 +44347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghuge_i4.cmd_5794]
 RelativePath=JIT\Methodical\Arrays\huge\_il_dbghuge_i4\_il_dbghuge_i4.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_dbghuge_i4
@@ -40053,6 +44355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghuge_objref.cmd_5795]
 RelativePath=JIT\Methodical\Arrays\huge\_il_dbghuge_objref\_il_dbghuge_objref.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_dbghuge_objref
@@ -40060,6 +44363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghuge_r4.cmd_5796]
 RelativePath=JIT\Methodical\Arrays\huge\_il_dbghuge_r4\_il_dbghuge_r4.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_dbghuge_r4
@@ -40067,6 +44371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghuge_r8.cmd_5797]
 RelativePath=JIT\Methodical\Arrays\huge\_il_dbghuge_r8\_il_dbghuge_r8.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_dbghuge_r8
@@ -40074,6 +44379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghuge_struct.cmd_5798]
 RelativePath=JIT\Methodical\Arrays\huge\_il_dbghuge_struct\_il_dbghuge_struct.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_dbghuge_struct
@@ -40081,6 +44387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghuge_u8.cmd_5799]
 RelativePath=JIT\Methodical\Arrays\huge\_il_dbghuge_u8\_il_dbghuge_u8.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_dbghuge_u8
@@ -40088,6 +44395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhuge_b.cmd_5800]
 RelativePath=JIT\Methodical\Arrays\huge\_il_relhuge_b\_il_relhuge_b.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_relhuge_b
@@ -40095,6 +44403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhuge_i4.cmd_5801]
 RelativePath=JIT\Methodical\Arrays\huge\_il_relhuge_i4\_il_relhuge_i4.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_relhuge_i4
@@ -40102,6 +44411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhuge_objref.cmd_5802]
 RelativePath=JIT\Methodical\Arrays\huge\_il_relhuge_objref\_il_relhuge_objref.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_relhuge_objref
@@ -40109,6 +44419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhuge_r4.cmd_5803]
 RelativePath=JIT\Methodical\Arrays\huge\_il_relhuge_r4\_il_relhuge_r4.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_relhuge_r4
@@ -40116,6 +44427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhuge_r8.cmd_5804]
 RelativePath=JIT\Methodical\Arrays\huge\_il_relhuge_r8\_il_relhuge_r8.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_relhuge_r8
@@ -40123,6 +44435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhuge_struct.cmd_5805]
 RelativePath=JIT\Methodical\Arrays\huge\_il_relhuge_struct\_il_relhuge_struct.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_relhuge_struct
@@ -40130,6 +44443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhuge_u8.cmd_5806]
 RelativePath=JIT\Methodical\Arrays\huge\_il_relhuge_u8\_il_relhuge_u8.cmd
 WorkingDir=JIT\Methodical\Arrays\huge\_il_relhuge_u8
@@ -40137,6 +44451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [huge_struct.cmd_5807]
 RelativePath=JIT\Methodical\Arrays\huge_struct\huge_struct.cmd
 WorkingDir=JIT\Methodical\Arrays\huge_struct
@@ -40144,6 +44459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcs.cmd_5808]
 RelativePath=JIT\Methodical\Arrays\lcs\_dbglcs\_dbglcs.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_dbglcs
@@ -40151,6 +44467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcs2.cmd_5809]
 RelativePath=JIT\Methodical\Arrays\lcs\_dbglcs2\_dbglcs2.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_dbglcs2
@@ -40158,6 +44475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcsbas.cmd_5810]
 RelativePath=JIT\Methodical\Arrays\lcs\_dbglcsbas\_dbglcsbas.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_dbglcsbas
@@ -40165,6 +44483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcsbox.cmd_5811]
 RelativePath=JIT\Methodical\Arrays\lcs\_dbglcsbox\_dbglcsbox.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_dbglcsbox
@@ -40172,6 +44491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcsmax.cmd_5812]
 RelativePath=JIT\Methodical\Arrays\lcs\_dbglcsmax\_dbglcsmax.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_dbglcsmax
@@ -40179,6 +44499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcsmixed.cmd_5813]
 RelativePath=JIT\Methodical\Arrays\lcs\_dbglcsmixed\_dbglcsmixed.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_dbglcsmixed
@@ -40186,6 +44507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcsval.cmd_5814]
 RelativePath=JIT\Methodical\Arrays\lcs\_dbglcsval\_dbglcsval.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_dbglcsval
@@ -40193,13 +44515,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcsvalbox.cmd_5815]
 RelativePath=JIT\Methodical\Arrays\lcs\_dbglcsvalbox\_dbglcsvalbox.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_dbglcsvalbox
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;GCSTRESS_FAIL;ISSUE_6065
+Categories=GCSTRESS_FAIL;Pri0;JIT;ISSUE_6065;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbglcs_ldlen.cmd_5816]
 RelativePath=JIT\Methodical\Arrays\lcs\_il_dbglcs_ldlen\_il_dbglcs_ldlen.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_il_dbglcs_ldlen
@@ -40207,6 +44531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rellcs_ldlen.cmd_5817]
 RelativePath=JIT\Methodical\Arrays\lcs\_il_rellcs_ldlen\_il_rellcs_ldlen.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_il_rellcs_ldlen
@@ -40214,6 +44539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rellcs.cmd_5818]
 RelativePath=JIT\Methodical\Arrays\lcs\_rellcs\_rellcs.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_rellcs
@@ -40221,6 +44547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rellcs2.cmd_5819]
 RelativePath=JIT\Methodical\Arrays\lcs\_rellcs2\_rellcs2.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_rellcs2
@@ -40228,6 +44555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rellcsbas.cmd_5820]
 RelativePath=JIT\Methodical\Arrays\lcs\_rellcsbas\_rellcsbas.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_rellcsbas
@@ -40235,6 +44563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rellcsbox.cmd_5821]
 RelativePath=JIT\Methodical\Arrays\lcs\_rellcsbox\_rellcsbox.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_rellcsbox
@@ -40242,6 +44571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rellcsmax.cmd_5822]
 RelativePath=JIT\Methodical\Arrays\lcs\_rellcsmax\_rellcsmax.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_rellcsmax
@@ -40249,6 +44579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rellcsmixed.cmd_5823]
 RelativePath=JIT\Methodical\Arrays\lcs\_rellcsmixed\_rellcsmixed.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_rellcsmixed
@@ -40256,6 +44587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rellcsval.cmd_5824]
 RelativePath=JIT\Methodical\Arrays\lcs\_rellcsval\_rellcsval.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_rellcsval
@@ -40263,13 +44595,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rellcsvalbox.cmd_5825]
 RelativePath=JIT\Methodical\Arrays\lcs\_rellcsvalbox\_rellcsvalbox.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_rellcsvalbox
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;GCSTRESS_FAIL;ISSUE_6065
+Categories=GCSTRESS_FAIL;Pri0;JIT;ISSUE_6065;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcs.cmd_5826]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_dbglcs\_speed_dbglcs.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_dbglcs
@@ -40277,6 +44611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcs2.cmd_5827]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_dbglcs2\_speed_dbglcs2.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_dbglcs2
@@ -40284,6 +44619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcsbas.cmd_5828]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_dbglcsbas\_speed_dbglcsbas.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_dbglcsbas
@@ -40291,6 +44627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcsbox.cmd_5829]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_dbglcsbox\_speed_dbglcsbox.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_dbglcsbox
@@ -40298,6 +44635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcsmax.cmd_5830]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_dbglcsmax\_speed_dbglcsmax.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_dbglcsmax
@@ -40305,6 +44643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcsmixed.cmd_5831]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_dbglcsmixed\_speed_dbglcsmixed.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_dbglcsmixed
@@ -40312,6 +44651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcsval.cmd_5832]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_dbglcsval\_speed_dbglcsval.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_dbglcsval
@@ -40319,13 +44659,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcsvalbox.cmd_5833]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_dbglcsvalbox\_speed_dbglcsvalbox.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_dbglcsvalbox
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;GCSTRESS_FAIL;ISSUE_6065
+Categories=6065;JIT;GCSTRESS_FAIL;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcs.cmd_5834]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_rellcs\_speed_rellcs.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_rellcs
@@ -40333,6 +44675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcs2.cmd_5835]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_rellcs2\_speed_rellcs2.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_rellcs2
@@ -40340,6 +44683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcsbas.cmd_5836]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_rellcsbas\_speed_rellcsbas.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_rellcsbas
@@ -40347,6 +44691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcsbox.cmd_5837]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_rellcsbox\_speed_rellcsbox.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_rellcsbox
@@ -40354,6 +44699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcsmax.cmd_5838]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_rellcsmax\_speed_rellcsmax.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_rellcsmax
@@ -40361,6 +44707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcsmixed.cmd_5839]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_rellcsmixed\_speed_rellcsmixed.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_rellcsmixed
@@ -40368,6 +44715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcsval.cmd_5840]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_rellcsval\_speed_rellcsval.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_rellcsval
@@ -40375,13 +44723,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcsvalbox.cmd_5841]
 RelativePath=JIT\Methodical\Arrays\lcs\_speed_rellcsvalbox\_speed_rellcsvalbox.cmd
 WorkingDir=JIT\Methodical\Arrays\lcs\_speed_rellcsvalbox
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;GCSTRESS_FAIL;ISSUE_6065
+Categories=GCSTRESS_FAIL;Pri0;JIT;ISSUE_6065;EXPECTED_PASS
 HostStyle=0
+
 [_dbgarrres.cmd_5842]
 RelativePath=JIT\Methodical\Arrays\misc\_dbgarrres\_dbgarrres.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_dbgarrres
@@ -40389,6 +44739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbggcarr.cmd_5843]
 RelativePath=JIT\Methodical\Arrays\misc\_dbggcarr\_dbggcarr.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_dbggcarr
@@ -40396,6 +44747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgselfref.cmd_5844]
 RelativePath=JIT\Methodical\Arrays\misc\_dbgselfref\_dbgselfref.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_dbgselfref
@@ -40403,6 +44755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgaddress.cmd_5845]
 RelativePath=JIT\Methodical\Arrays\misc\_il_dbgaddress\_il_dbgaddress.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_dbgaddress
@@ -40410,6 +44763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbggcarr.cmd_5846]
 RelativePath=JIT\Methodical\Arrays\misc\_il_dbggcarr\_il_dbggcarr.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_dbggcarr
@@ -40417,13 +44771,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbginitializearray.cmd_5847]
 RelativePath=JIT\Methodical\Arrays\misc\_il_dbginitializearray\_il_dbginitializearray.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_dbginitializearray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_il_dbginitializearray_enum.cmd_5848]
 RelativePath=JIT\Methodical\Arrays\misc\_il_dbginitializearray_enum\_il_dbginitializearray_enum.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_dbginitializearray_enum
@@ -40431,6 +44787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldelem_get.cmd_5849]
 RelativePath=JIT\Methodical\Arrays\misc\_il_dbgldelem_get\_il_dbgldelem_get.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_dbgldelem_get
@@ -40438,6 +44795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbglength0.cmd_5850]
 RelativePath=JIT\Methodical\Arrays\misc\_il_dbglength0\_il_dbglength0.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_dbglength0
@@ -40445,6 +44803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbglengthm2.cmd_5851]
 RelativePath=JIT\Methodical\Arrays\misc\_il_dbglengthm2\_il_dbglengthm2.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_dbglengthm2
@@ -40452,6 +44811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgselfref.cmd_5852]
 RelativePath=JIT\Methodical\Arrays\misc\_il_dbgselfref\_il_dbgselfref.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_dbgselfref
@@ -40459,6 +44819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reladdress.cmd_5853]
 RelativePath=JIT\Methodical\Arrays\misc\_il_reladdress\_il_reladdress.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_reladdress
@@ -40466,13 +44827,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relarrres.cmd_5854]
 RelativePath=JIT\Methodical\Arrays\misc\_il_relarrres\_il_relarrres.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_relarrres
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_il_relgcarr.cmd_5855]
 RelativePath=JIT\Methodical\Arrays\misc\_il_relgcarr\_il_relgcarr.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_relgcarr
@@ -40480,13 +44843,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relinitializearray.cmd_5856]
 RelativePath=JIT\Methodical\Arrays\misc\_il_relinitializearray\_il_relinitializearray.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_relinitializearray
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_il_relinitializearray_enum.cmd_5857]
 RelativePath=JIT\Methodical\Arrays\misc\_il_relinitializearray_enum\_il_relinitializearray_enum.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_relinitializearray_enum
@@ -40494,6 +44859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldelem_get.cmd_5858]
 RelativePath=JIT\Methodical\Arrays\misc\_il_relldelem_get\_il_relldelem_get.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_relldelem_get
@@ -40501,6 +44867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_rellength0.cmd_5859]
 RelativePath=JIT\Methodical\Arrays\misc\_il_rellength0\_il_rellength0.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_rellength0
@@ -40508,6 +44875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_rellengthm2.cmd_5860]
 RelativePath=JIT\Methodical\Arrays\misc\_il_rellengthm2\_il_rellengthm2.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_rellengthm2
@@ -40515,6 +44883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relselfref.cmd_5861]
 RelativePath=JIT\Methodical\Arrays\misc\_il_relselfref\_il_relselfref.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_il_relselfref
@@ -40522,6 +44891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relarrres.cmd_5862]
 RelativePath=JIT\Methodical\Arrays\misc\_relarrres\_relarrres.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_relarrres
@@ -40529,6 +44899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relgcarr.cmd_5863]
 RelativePath=JIT\Methodical\Arrays\misc\_relgcarr\_relgcarr.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_relgcarr
@@ -40536,6 +44907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relselfref.cmd_5864]
 RelativePath=JIT\Methodical\Arrays\misc\_relselfref\_relselfref.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_relselfref
@@ -40543,6 +44915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgarrres.cmd_5865]
 RelativePath=JIT\Methodical\Arrays\misc\_speed_dbgarrres\_speed_dbgarrres.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_speed_dbgarrres
@@ -40550,6 +44923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbggcarr.cmd_5866]
 RelativePath=JIT\Methodical\Arrays\misc\_speed_dbggcarr\_speed_dbggcarr.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_speed_dbggcarr
@@ -40557,6 +44931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgselfref.cmd_5867]
 RelativePath=JIT\Methodical\Arrays\misc\_speed_dbgselfref\_speed_dbgselfref.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_speed_dbgselfref
@@ -40564,6 +44939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relarrres.cmd_5868]
 RelativePath=JIT\Methodical\Arrays\misc\_speed_relarrres\_speed_relarrres.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_speed_relarrres
@@ -40571,6 +44947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relgcarr.cmd_5869]
 RelativePath=JIT\Methodical\Arrays\misc\_speed_relgcarr\_speed_relgcarr.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_speed_relgcarr
@@ -40578,6 +44955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relselfref.cmd_5870]
 RelativePath=JIT\Methodical\Arrays\misc\_speed_relselfref\_speed_relselfref.cmd
 WorkingDir=JIT\Methodical\Arrays\misc\_speed_relselfref
@@ -40585,6 +44963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgfloat64_range1.cmd_5871]
 RelativePath=JIT\Methodical\Arrays\range\_il_dbgfloat64_range1\_il_dbgfloat64_range1.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_dbgfloat64_range1
@@ -40592,6 +44971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgfloat64_range2.cmd_5872]
 RelativePath=JIT\Methodical\Arrays\range\_il_dbgfloat64_range2\_il_dbgfloat64_range2.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_dbgfloat64_range2
@@ -40599,6 +44979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgint32_0.cmd_5873]
 RelativePath=JIT\Methodical\Arrays\range\_il_dbgint32_0\_il_dbgint32_0.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_dbgint32_0
@@ -40606,6 +44987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgint32_0_5a.cmd_5874]
 RelativePath=JIT\Methodical\Arrays\range\_il_dbgint32_0_5a\_il_dbgint32_0_5a.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_dbgint32_0_5a
@@ -40613,6 +44995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgint32_0_5b.cmd_5875]
 RelativePath=JIT\Methodical\Arrays\range\_il_dbgint32_0_5b\_il_dbgint32_0_5b.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_dbgint32_0_5b
@@ -40620,6 +45003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgint32_1.cmd_5876]
 RelativePath=JIT\Methodical\Arrays\range\_il_dbgint32_1\_il_dbgint32_1.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_dbgint32_1
@@ -40627,6 +45011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgint32_m1.cmd_5877]
 RelativePath=JIT\Methodical\Arrays\range\_il_dbgint32_m1\_il_dbgint32_m1.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_dbgint32_m1
@@ -40634,6 +45019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgint32_neg_range.cmd_5878]
 RelativePath=JIT\Methodical\Arrays\range\_il_dbgint32_neg_range\_il_dbgint32_neg_range.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_dbgint32_neg_range
@@ -40641,6 +45027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgint32_range1.cmd_5879]
 RelativePath=JIT\Methodical\Arrays\range\_il_dbgint32_range1\_il_dbgint32_range1.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_dbgint32_range1
@@ -40648,6 +45035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgint32_range2.cmd_5880]
 RelativePath=JIT\Methodical\Arrays\range\_il_dbgint32_range2\_il_dbgint32_range2.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_dbgint32_range2
@@ -40655,6 +45043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relfloat64_range1.cmd_5881]
 RelativePath=JIT\Methodical\Arrays\range\_il_relfloat64_range1\_il_relfloat64_range1.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_relfloat64_range1
@@ -40662,6 +45051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relfloat64_range2.cmd_5882]
 RelativePath=JIT\Methodical\Arrays\range\_il_relfloat64_range2\_il_relfloat64_range2.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_relfloat64_range2
@@ -40669,6 +45059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relint32_0.cmd_5883]
 RelativePath=JIT\Methodical\Arrays\range\_il_relint32_0\_il_relint32_0.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_relint32_0
@@ -40676,6 +45067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relint32_0_5a.cmd_5884]
 RelativePath=JIT\Methodical\Arrays\range\_il_relint32_0_5a\_il_relint32_0_5a.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_relint32_0_5a
@@ -40683,6 +45075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relint32_0_5b.cmd_5885]
 RelativePath=JIT\Methodical\Arrays\range\_il_relint32_0_5b\_il_relint32_0_5b.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_relint32_0_5b
@@ -40690,6 +45083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relint32_1.cmd_5886]
 RelativePath=JIT\Methodical\Arrays\range\_il_relint32_1\_il_relint32_1.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_relint32_1
@@ -40697,6 +45091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relint32_m1.cmd_5887]
 RelativePath=JIT\Methodical\Arrays\range\_il_relint32_m1\_il_relint32_m1.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_relint32_m1
@@ -40704,6 +45099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relint32_neg_range.cmd_5888]
 RelativePath=JIT\Methodical\Arrays\range\_il_relint32_neg_range\_il_relint32_neg_range.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_relint32_neg_range
@@ -40711,6 +45107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relint32_range1.cmd_5889]
 RelativePath=JIT\Methodical\Arrays\range\_il_relint32_range1\_il_relint32_range1.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_relint32_range1
@@ -40718,6 +45115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relint32_range2.cmd_5890]
 RelativePath=JIT\Methodical\Arrays\range\_il_relint32_range2\_il_relint32_range2.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_relint32_range2
@@ -40725,6 +45123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relnegIndexRngChkElim.cmd_5891]
 RelativePath=JIT\Methodical\Arrays\range\_il_relnegIndexRngChkElim\_il_relnegIndexRngChkElim.cmd
 WorkingDir=JIT\Methodical\Arrays\range\_il_relnegIndexRngChkElim
@@ -40732,6 +45131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4flat_cs_d.cmd_5892]
 RelativePath=JIT\Methodical\AsgOp\i4\i4flat_cs_d\i4flat_cs_d.cmd
 WorkingDir=JIT\Methodical\AsgOp\i4\i4flat_cs_d
@@ -40739,6 +45139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4flat_cs_do.cmd_5893]
 RelativePath=JIT\Methodical\AsgOp\i4\i4flat_cs_do\i4flat_cs_do.cmd
 WorkingDir=JIT\Methodical\AsgOp\i4\i4flat_cs_do
@@ -40746,6 +45147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4flat_cs_r.cmd_5894]
 RelativePath=JIT\Methodical\AsgOp\i4\i4flat_cs_r\i4flat_cs_r.cmd
 WorkingDir=JIT\Methodical\AsgOp\i4\i4flat_cs_r
@@ -40753,6 +45155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4flat_cs_ro.cmd_5895]
 RelativePath=JIT\Methodical\AsgOp\i4\i4flat_cs_ro\i4flat_cs_ro.cmd
 WorkingDir=JIT\Methodical\AsgOp\i4\i4flat_cs_ro
@@ -40760,6 +45163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4_cs_d.cmd_5896]
 RelativePath=JIT\Methodical\AsgOp\i4\i4_cs_d\i4_cs_d.cmd
 WorkingDir=JIT\Methodical\AsgOp\i4\i4_cs_d
@@ -40767,6 +45171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4_cs_do.cmd_5897]
 RelativePath=JIT\Methodical\AsgOp\i4\i4_cs_do\i4_cs_do.cmd
 WorkingDir=JIT\Methodical\AsgOp\i4\i4_cs_do
@@ -40774,6 +45179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4_cs_r.cmd_5898]
 RelativePath=JIT\Methodical\AsgOp\i4\i4_cs_r\i4_cs_r.cmd
 WorkingDir=JIT\Methodical\AsgOp\i4\i4_cs_r
@@ -40781,6 +45187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4_cs_ro.cmd_5899]
 RelativePath=JIT\Methodical\AsgOp\i4\i4_cs_ro\i4_cs_ro.cmd
 WorkingDir=JIT\Methodical\AsgOp\i4\i4_cs_ro
@@ -40788,6 +45195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8flat_cs_d.cmd_5900]
 RelativePath=JIT\Methodical\AsgOp\i8\i8flat_cs_d\i8flat_cs_d.cmd
 WorkingDir=JIT\Methodical\AsgOp\i8\i8flat_cs_d
@@ -40795,6 +45203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8flat_cs_do.cmd_5901]
 RelativePath=JIT\Methodical\AsgOp\i8\i8flat_cs_do\i8flat_cs_do.cmd
 WorkingDir=JIT\Methodical\AsgOp\i8\i8flat_cs_do
@@ -40802,6 +45211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8flat_cs_r.cmd_5902]
 RelativePath=JIT\Methodical\AsgOp\i8\i8flat_cs_r\i8flat_cs_r.cmd
 WorkingDir=JIT\Methodical\AsgOp\i8\i8flat_cs_r
@@ -40809,6 +45219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8flat_cs_ro.cmd_5903]
 RelativePath=JIT\Methodical\AsgOp\i8\i8flat_cs_ro\i8flat_cs_ro.cmd
 WorkingDir=JIT\Methodical\AsgOp\i8\i8flat_cs_ro
@@ -40816,6 +45227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8_cs_d.cmd_5904]
 RelativePath=JIT\Methodical\AsgOp\i8\i8_cs_d\i8_cs_d.cmd
 WorkingDir=JIT\Methodical\AsgOp\i8\i8_cs_d
@@ -40823,6 +45235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8_cs_do.cmd_5905]
 RelativePath=JIT\Methodical\AsgOp\i8\i8_cs_do\i8_cs_do.cmd
 WorkingDir=JIT\Methodical\AsgOp\i8\i8_cs_do
@@ -40830,6 +45243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8_cs_r.cmd_5906]
 RelativePath=JIT\Methodical\AsgOp\i8\i8_cs_r\i8_cs_r.cmd
 WorkingDir=JIT\Methodical\AsgOp\i8\i8_cs_r
@@ -40837,6 +45251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8_cs_ro.cmd_5907]
 RelativePath=JIT\Methodical\AsgOp\i8\i8_cs_ro\i8_cs_ro.cmd
 WorkingDir=JIT\Methodical\AsgOp\i8\i8_cs_ro
@@ -40844,6 +45259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4flat_cs_d.cmd_5908]
 RelativePath=JIT\Methodical\AsgOp\r4\r4flat_cs_d\r4flat_cs_d.cmd
 WorkingDir=JIT\Methodical\AsgOp\r4\r4flat_cs_d
@@ -40851,6 +45267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4flat_cs_do.cmd_5909]
 RelativePath=JIT\Methodical\AsgOp\r4\r4flat_cs_do\r4flat_cs_do.cmd
 WorkingDir=JIT\Methodical\AsgOp\r4\r4flat_cs_do
@@ -40858,6 +45275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4flat_cs_r.cmd_5910]
 RelativePath=JIT\Methodical\AsgOp\r4\r4flat_cs_r\r4flat_cs_r.cmd
 WorkingDir=JIT\Methodical\AsgOp\r4\r4flat_cs_r
@@ -40865,6 +45283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4flat_cs_ro.cmd_5911]
 RelativePath=JIT\Methodical\AsgOp\r4\r4flat_cs_ro\r4flat_cs_ro.cmd
 WorkingDir=JIT\Methodical\AsgOp\r4\r4flat_cs_ro
@@ -40872,6 +45291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4_cs_d.cmd_5912]
 RelativePath=JIT\Methodical\AsgOp\r4\r4_cs_d\r4_cs_d.cmd
 WorkingDir=JIT\Methodical\AsgOp\r4\r4_cs_d
@@ -40879,6 +45299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4_cs_do.cmd_5913]
 RelativePath=JIT\Methodical\AsgOp\r4\r4_cs_do\r4_cs_do.cmd
 WorkingDir=JIT\Methodical\AsgOp\r4\r4_cs_do
@@ -40886,6 +45307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4_cs_r.cmd_5914]
 RelativePath=JIT\Methodical\AsgOp\r4\r4_cs_r\r4_cs_r.cmd
 WorkingDir=JIT\Methodical\AsgOp\r4\r4_cs_r
@@ -40893,6 +45315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4_cs_ro.cmd_5915]
 RelativePath=JIT\Methodical\AsgOp\r4\r4_cs_ro\r4_cs_ro.cmd
 WorkingDir=JIT\Methodical\AsgOp\r4\r4_cs_ro
@@ -40900,6 +45323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8flat_cs_d.cmd_5916]
 RelativePath=JIT\Methodical\AsgOp\r8\r8flat_cs_d\r8flat_cs_d.cmd
 WorkingDir=JIT\Methodical\AsgOp\r8\r8flat_cs_d
@@ -40907,6 +45331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8flat_cs_do.cmd_5917]
 RelativePath=JIT\Methodical\AsgOp\r8\r8flat_cs_do\r8flat_cs_do.cmd
 WorkingDir=JIT\Methodical\AsgOp\r8\r8flat_cs_do
@@ -40914,6 +45339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8flat_cs_r.cmd_5918]
 RelativePath=JIT\Methodical\AsgOp\r8\r8flat_cs_r\r8flat_cs_r.cmd
 WorkingDir=JIT\Methodical\AsgOp\r8\r8flat_cs_r
@@ -40921,6 +45347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8flat_cs_ro.cmd_5919]
 RelativePath=JIT\Methodical\AsgOp\r8\r8flat_cs_ro\r8flat_cs_ro.cmd
 WorkingDir=JIT\Methodical\AsgOp\r8\r8flat_cs_ro
@@ -40928,6 +45355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8_cs_d.cmd_5920]
 RelativePath=JIT\Methodical\AsgOp\r8\r8_cs_d\r8_cs_d.cmd
 WorkingDir=JIT\Methodical\AsgOp\r8\r8_cs_d
@@ -40935,6 +45363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8_cs_do.cmd_5921]
 RelativePath=JIT\Methodical\AsgOp\r8\r8_cs_do\r8_cs_do.cmd
 WorkingDir=JIT\Methodical\AsgOp\r8\r8_cs_do
@@ -40942,6 +45371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8_cs_r.cmd_5922]
 RelativePath=JIT\Methodical\AsgOp\r8\r8_cs_r\r8_cs_r.cmd
 WorkingDir=JIT\Methodical\AsgOp\r8\r8_cs_r
@@ -40949,6 +45379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8_cs_ro.cmd_5923]
 RelativePath=JIT\Methodical\AsgOp\r8\r8_cs_ro\r8_cs_ro.cmd
 WorkingDir=JIT\Methodical\AsgOp\r8\r8_cs_ro
@@ -40956,6 +45387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgarray.cmd_5924]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_dbgarray\_il_dbgarray.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_dbgarray
@@ -40963,6 +45395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgchain.cmd_5925]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_dbgchain\_il_dbgchain.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_dbgchain
@@ -40970,6 +45403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgfinally.cmd_5926]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_dbgfinally\_il_dbgfinally.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_dbgfinally
@@ -40977,6 +45411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghuge_filter.cmd_5927]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_dbghuge_filter\_il_dbghuge_filter.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_dbghuge_filter
@@ -40984,6 +45419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgjump.cmd_5928]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_dbgjump\_il_dbgjump.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_dbgjump
@@ -40991,6 +45427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbglocal.cmd_5929]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_dbglocal\_il_dbglocal.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_dbglocal
@@ -40998,6 +45435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbglocalloc.cmd_5930]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_dbglocalloc\_il_dbglocalloc.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_dbglocalloc
@@ -41005,6 +45443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgsimple.cmd_5931]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_dbgsimple\_il_dbgsimple.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_dbgsimple
@@ -41012,6 +45451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtailcall.cmd_5932]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_dbgtailcall\_il_dbgtailcall.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_dbgtailcall
@@ -41019,6 +45459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtry.cmd_5933]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_dbgtry\_il_dbgtry.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_dbgtry
@@ -41026,6 +45467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relarray.cmd_5934]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_relarray\_il_relarray.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_relarray
@@ -41033,6 +45475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relchain.cmd_5935]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_relchain\_il_relchain.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_relchain
@@ -41040,6 +45483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relfinally.cmd_5936]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_relfinally\_il_relfinally.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_relfinally
@@ -41047,6 +45491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhuge_filter.cmd_5937]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_relhuge_filter\_il_relhuge_filter.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_relhuge_filter
@@ -41054,6 +45499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reljump.cmd_5938]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_reljump\_il_reljump.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_reljump
@@ -41061,6 +45507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_rellocal.cmd_5939]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_rellocal\_il_rellocal.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_rellocal
@@ -41068,6 +45515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rellocalloc.cmd_5940]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_rellocalloc\_il_rellocalloc.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_rellocalloc
@@ -41075,6 +45523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relsimple.cmd_5941]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_relsimple\_il_relsimple.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_relsimple
@@ -41082,6 +45531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltailcall.cmd_5942]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_reltailcall\_il_reltailcall.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_reltailcall
@@ -41089,6 +45539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltry.cmd_5943]
 RelativePath=JIT\Methodical\Boxing\boxunbox\_il_reltry\_il_reltry.cmd
 WorkingDir=JIT\Methodical\Boxing\boxunbox\_il_reltry
@@ -41096,6 +45547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbginstance_cs.cmd_5944]
 RelativePath=JIT\Methodical\Boxing\callconv\_dbginstance_cs\_dbginstance_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\callconv\_dbginstance_cs
@@ -41103,6 +45555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbginstance_il.cmd_5945]
 RelativePath=JIT\Methodical\Boxing\callconv\_dbginstance_il\_dbginstance_il.cmd
 WorkingDir=JIT\Methodical\Boxing\callconv\_dbginstance_il
@@ -41110,6 +45563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_odbginstance_cs.cmd_5946]
 RelativePath=JIT\Methodical\Boxing\callconv\_odbginstance_cs\_odbginstance_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\callconv\_odbginstance_cs
@@ -41117,6 +45571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_orelinstance_cs.cmd_5947]
 RelativePath=JIT\Methodical\Boxing\callconv\_orelinstance_cs\_orelinstance_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\callconv\_orelinstance_cs
@@ -41124,6 +45579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relinstance_cs.cmd_5948]
 RelativePath=JIT\Methodical\Boxing\callconv\_relinstance_cs\_relinstance_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\callconv\_relinstance_cs
@@ -41131,6 +45587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relinstance_il.cmd_5949]
 RelativePath=JIT\Methodical\Boxing\callconv\_relinstance_il\_relinstance_il.cmd
 WorkingDir=JIT\Methodical\Boxing\callconv\_relinstance_il
@@ -41138,6 +45595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgfibo_cs.cmd_5950]
 RelativePath=JIT\Methodical\Boxing\functional\_dbgfibo_cs\_dbgfibo_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_dbgfibo_cs
@@ -41145,6 +45603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgfibo_il.cmd_5951]
 RelativePath=JIT\Methodical\Boxing\functional\_dbgfibo_il\_dbgfibo_il.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_dbgfibo_il
@@ -41152,6 +45611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgsin_cs.cmd_5952]
 RelativePath=JIT\Methodical\Boxing\functional\_dbgsin_cs\_dbgsin_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_dbgsin_cs
@@ -41159,6 +45619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgsin_il.cmd_5953]
 RelativePath=JIT\Methodical\Boxing\functional\_dbgsin_il\_dbgsin_il.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_dbgsin_il
@@ -41166,6 +45627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_odbgfibo_cs.cmd_5954]
 RelativePath=JIT\Methodical\Boxing\functional\_odbgfibo_cs\_odbgfibo_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_odbgfibo_cs
@@ -41173,6 +45635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_odbgsin_cs.cmd_5955]
 RelativePath=JIT\Methodical\Boxing\functional\_odbgsin_cs\_odbgsin_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_odbgsin_cs
@@ -41180,6 +45643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_orelfibo_cs.cmd_5956]
 RelativePath=JIT\Methodical\Boxing\functional\_orelfibo_cs\_orelfibo_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_orelfibo_cs
@@ -41187,6 +45651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_orelsin_cs.cmd_5957]
 RelativePath=JIT\Methodical\Boxing\functional\_orelsin_cs\_orelsin_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_orelsin_cs
@@ -41194,6 +45659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relfibo_cs.cmd_5958]
 RelativePath=JIT\Methodical\Boxing\functional\_relfibo_cs\_relfibo_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_relfibo_cs
@@ -41201,6 +45667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relfibo_il.cmd_5959]
 RelativePath=JIT\Methodical\Boxing\functional\_relfibo_il\_relfibo_il.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_relfibo_il
@@ -41208,6 +45675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relsin_cs.cmd_5960]
 RelativePath=JIT\Methodical\Boxing\functional\_relsin_cs\_relsin_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_relsin_cs
@@ -41215,6 +45683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relsin_il.cmd_5961]
 RelativePath=JIT\Methodical\Boxing\functional\_relsin_il\_relsin_il.cmd
 WorkingDir=JIT\Methodical\Boxing\functional\_relsin_il
@@ -41222,13 +45691,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgconcurgc_il.cmd_5962]
 RelativePath=JIT\Methodical\Boxing\misc\_dbgconcurgc_il\_dbgconcurgc_il.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_dbgconcurgc_il
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;
+Categories=;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgenum_cs.cmd_5963]
 RelativePath=JIT\Methodical\Boxing\misc\_dbgenum_cs\_dbgenum_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_dbgenum_cs
@@ -41236,6 +45707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgenum_il.cmd_5964]
 RelativePath=JIT\Methodical\Boxing\misc\_dbgenum_il\_dbgenum_il.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_dbgenum_il
@@ -41243,6 +45715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgnestval_cs.cmd_5965]
 RelativePath=JIT\Methodical\Boxing\misc\_dbgnestval_cs\_dbgnestval_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_dbgnestval_cs
@@ -41250,6 +45723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgnestval_il.cmd_5966]
 RelativePath=JIT\Methodical\Boxing\misc\_dbgnestval_il\_dbgnestval_il.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_dbgnestval_il
@@ -41257,6 +45731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgtailjump_cs.cmd_5967]
 RelativePath=JIT\Methodical\Boxing\misc\_dbgtailjump_cs\_dbgtailjump_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_dbgtailjump_cs
@@ -41264,6 +45739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgtailjump_il.cmd_5968]
 RelativePath=JIT\Methodical\Boxing\misc\_dbgtailjump_il\_dbgtailjump_il.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_dbgtailjump_il
@@ -41271,6 +45747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgtypedref.cmd_5969]
 RelativePath=JIT\Methodical\Boxing\misc\_dbgtypedref\_dbgtypedref.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_dbgtypedref
@@ -41278,6 +45755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_odbgenum_cs.cmd_5970]
 RelativePath=JIT\Methodical\Boxing\misc\_odbgenum_cs\_odbgenum_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_odbgenum_cs
@@ -41285,6 +45763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_odbgnestval_cs.cmd_5971]
 RelativePath=JIT\Methodical\Boxing\misc\_odbgnestval_cs\_odbgnestval_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_odbgnestval_cs
@@ -41292,6 +45771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_odbgtailjump_cs.cmd_5972]
 RelativePath=JIT\Methodical\Boxing\misc\_odbgtailjump_cs\_odbgtailjump_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_odbgtailjump_cs
@@ -41299,6 +45779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_orelenum_cs.cmd_5973]
 RelativePath=JIT\Methodical\Boxing\misc\_orelenum_cs\_orelenum_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_orelenum_cs
@@ -41306,6 +45787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_orelnestval_cs.cmd_5974]
 RelativePath=JIT\Methodical\Boxing\misc\_orelnestval_cs\_orelnestval_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_orelnestval_cs
@@ -41313,6 +45795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_oreltailjump_cs.cmd_5975]
 RelativePath=JIT\Methodical\Boxing\misc\_oreltailjump_cs\_oreltailjump_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_oreltailjump_cs
@@ -41320,6 +45803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relconcurgc_il.cmd_5976]
 RelativePath=JIT\Methodical\Boxing\misc\_relconcurgc_il\_relconcurgc_il.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_relconcurgc_il
@@ -41327,6 +45811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relenum_cs.cmd_5977]
 RelativePath=JIT\Methodical\Boxing\misc\_relenum_cs\_relenum_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_relenum_cs
@@ -41334,6 +45819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relenum_il.cmd_5978]
 RelativePath=JIT\Methodical\Boxing\misc\_relenum_il\_relenum_il.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_relenum_il
@@ -41341,6 +45827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relnestval_cs.cmd_5979]
 RelativePath=JIT\Methodical\Boxing\misc\_relnestval_cs\_relnestval_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_relnestval_cs
@@ -41348,6 +45835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relnestval_il.cmd_5980]
 RelativePath=JIT\Methodical\Boxing\misc\_relnestval_il\_relnestval_il.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_relnestval_il
@@ -41355,6 +45843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_reltailjump_cs.cmd_5981]
 RelativePath=JIT\Methodical\Boxing\misc\_reltailjump_cs\_reltailjump_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_reltailjump_cs
@@ -41362,6 +45851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_reltailjump_il.cmd_5982]
 RelativePath=JIT\Methodical\Boxing\misc\_reltailjump_il\_reltailjump_il.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_reltailjump_il
@@ -41369,6 +45859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_reltypedref.cmd_5983]
 RelativePath=JIT\Methodical\Boxing\misc\_reltypedref\_reltypedref.cmd
 WorkingDir=JIT\Methodical\Boxing\misc\_reltypedref
@@ -41376,6 +45867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgsin_cs.cmd_5984]
 RelativePath=JIT\Methodical\Boxing\morph\_dbgsin_cs\_dbgsin_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\morph\_dbgsin_cs
@@ -41383,6 +45875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_odbgsin_cs.cmd_5985]
 RelativePath=JIT\Methodical\Boxing\morph\_odbgsin_cs\_odbgsin_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\morph\_odbgsin_cs
@@ -41390,6 +45883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_orelsin_cs.cmd_5986]
 RelativePath=JIT\Methodical\Boxing\morph\_orelsin_cs\_orelsin_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\morph\_orelsin_cs
@@ -41397,6 +45891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relsin_cs.cmd_5987]
 RelativePath=JIT\Methodical\Boxing\morph\_relsin_cs\_relsin_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\morph\_relsin_cs
@@ -41404,6 +45899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgfault.cmd_5988]
 RelativePath=JIT\Methodical\Boxing\seh\_dbgfault\_dbgfault.cmd
 WorkingDir=JIT\Methodical\Boxing\seh\_dbgfault
@@ -41411,6 +45907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgfilter.cmd_5989]
 RelativePath=JIT\Methodical\Boxing\seh\_dbgfilter\_dbgfilter.cmd
 WorkingDir=JIT\Methodical\Boxing\seh\_dbgfilter
@@ -41418,6 +45915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgtry_cs.cmd_5990]
 RelativePath=JIT\Methodical\Boxing\seh\_dbgtry_cs\_dbgtry_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\seh\_dbgtry_cs
@@ -41425,6 +45923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgtry_il.cmd_5991]
 RelativePath=JIT\Methodical\Boxing\seh\_dbgtry_il\_dbgtry_il.cmd
 WorkingDir=JIT\Methodical\Boxing\seh\_dbgtry_il
@@ -41432,6 +45931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_odbgtry_cs.cmd_5992]
 RelativePath=JIT\Methodical\Boxing\seh\_odbgtry_cs\_odbgtry_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\seh\_odbgtry_cs
@@ -41439,6 +45939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_oreltry_cs.cmd_5993]
 RelativePath=JIT\Methodical\Boxing\seh\_oreltry_cs\_oreltry_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\seh\_oreltry_cs
@@ -41446,6 +45947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relfault.cmd_5994]
 RelativePath=JIT\Methodical\Boxing\seh\_relfault\_relfault.cmd
 WorkingDir=JIT\Methodical\Boxing\seh\_relfault
@@ -41453,6 +45955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relfilter.cmd_5995]
 RelativePath=JIT\Methodical\Boxing\seh\_relfilter\_relfilter.cmd
 WorkingDir=JIT\Methodical\Boxing\seh\_relfilter
@@ -41460,6 +45963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_reltry_cs.cmd_5996]
 RelativePath=JIT\Methodical\Boxing\seh\_reltry_cs\_reltry_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\seh\_reltry_cs
@@ -41467,6 +45971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_reltry_il.cmd_5997]
 RelativePath=JIT\Methodical\Boxing\seh\_reltry_il\_reltry_il.cmd
 WorkingDir=JIT\Methodical\Boxing\seh\_reltry_il
@@ -41474,6 +45979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgsin_cs_cs.cmd_5998]
 RelativePath=JIT\Methodical\Boxing\xlang\_dbgsin_cs_cs\_dbgsin_cs_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_dbgsin_cs_cs
@@ -41481,20 +45987,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgsin_il_cs.cmd_6000]
 RelativePath=JIT\Methodical\Boxing\xlang\_dbgsin_il_cs\_dbgsin_il_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_dbgsin_il_cs
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_dbgsin_il_il.cmd_6001]
 RelativePath=JIT\Methodical\Boxing\xlang\_dbgsin_il_il\_dbgsin_il_il.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_dbgsin_il_il
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_odbgsin_cs_cs.cmd_6002]
 RelativePath=JIT\Methodical\Boxing\xlang\_odbgsin_cs_cs\_odbgsin_cs_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_odbgsin_cs_cs
@@ -41502,20 +46011,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_odbgsin_il_cs.cmd_6004]
 RelativePath=JIT\Methodical\Boxing\xlang\_odbgsin_il_cs\_odbgsin_il_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_odbgsin_il_cs
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_odbgsin_il_il.cmd_6005]
 RelativePath=JIT\Methodical\Boxing\xlang\_odbgsin_il_il\_odbgsin_il_il.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_odbgsin_il_il
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_orelsin_cs_cs.cmd_6006]
 RelativePath=JIT\Methodical\Boxing\xlang\_orelsin_cs_cs\_orelsin_cs_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_orelsin_cs_cs
@@ -41523,20 +46035,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_orelsin_il_cs.cmd_6008]
 RelativePath=JIT\Methodical\Boxing\xlang\_orelsin_il_cs\_orelsin_il_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_orelsin_il_cs
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_orelsin_il_il.cmd_6009]
 RelativePath=JIT\Methodical\Boxing\xlang\_orelsin_il_il\_orelsin_il_il.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_orelsin_il_il
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_relsin_cs_cs.cmd_6010]
 RelativePath=JIT\Methodical\Boxing\xlang\_relsin_cs_cs\_relsin_cs_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_relsin_cs_cs
@@ -41544,20 +46059,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relsin_il_cs.cmd_6012]
 RelativePath=JIT\Methodical\Boxing\xlang\_relsin_il_cs\_relsin_il_cs.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_relsin_il_cs
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_relsin_il_il.cmd_6013]
 RelativePath=JIT\Methodical\Boxing\xlang\_relsin_il_il\_relsin_il_il.cmd
 WorkingDir=JIT\Methodical\Boxing\xlang\_relsin_il_il
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgarrays.cmd_6014]
 RelativePath=JIT\Methodical\casts\array\_il_dbgarrays\_il_dbgarrays.cmd
 WorkingDir=JIT\Methodical\casts\array\_il_dbgarrays
@@ -41565,6 +46083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcastclass_ldlen.cmd_6015]
 RelativePath=JIT\Methodical\casts\array\_il_dbgcastclass_ldlen\_il_dbgcastclass_ldlen.cmd
 WorkingDir=JIT\Methodical\casts\array\_il_dbgcastclass_ldlen
@@ -41572,6 +46091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgisinst_ldlen.cmd_6016]
 RelativePath=JIT\Methodical\casts\array\_il_dbgisinst_ldlen\_il_dbgisinst_ldlen.cmd
 WorkingDir=JIT\Methodical\casts\array\_il_dbgisinst_ldlen
@@ -41579,6 +46099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relarrays.cmd_6017]
 RelativePath=JIT\Methodical\casts\array\_il_relarrays\_il_relarrays.cmd
 WorkingDir=JIT\Methodical\casts\array\_il_relarrays
@@ -41586,6 +46107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcastclass_ldlen.cmd_6018]
 RelativePath=JIT\Methodical\casts\array\_il_relcastclass_ldlen\_il_relcastclass_ldlen.cmd
 WorkingDir=JIT\Methodical\casts\array\_il_relcastclass_ldlen
@@ -41593,6 +46115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relisinst_ldlen.cmd_6019]
 RelativePath=JIT\Methodical\casts\array\_il_relisinst_ldlen\_il_relisinst_ldlen.cmd
 WorkingDir=JIT\Methodical\casts\array\_il_relisinst_ldlen
@@ -41600,6 +46123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgcastclass_call.cmd_6020]
 RelativePath=JIT\Methodical\casts\coverage\_dbgcastclass_call\_dbgcastclass_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_dbgcastclass_call
@@ -41607,6 +46131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgcastclass_ldarg.cmd_6021]
 RelativePath=JIT\Methodical\casts\coverage\_dbgcastclass_ldarg\_dbgcastclass_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_dbgcastclass_ldarg
@@ -41614,6 +46139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgcastclass_ldloc.cmd_6022]
 RelativePath=JIT\Methodical\casts\coverage\_dbgcastclass_ldloc\_dbgcastclass_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_dbgcastclass_ldloc
@@ -41621,6 +46147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgcastclass_newobj.cmd_6023]
 RelativePath=JIT\Methodical\casts\coverage\_dbgcastclass_newobj\_dbgcastclass_newobj.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_dbgcastclass_newobj
@@ -41628,6 +46155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgisinst_call.cmd_6024]
 RelativePath=JIT\Methodical\casts\coverage\_dbgisinst_call\_dbgisinst_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_dbgisinst_call
@@ -41635,6 +46163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgisinst_ldarg.cmd_6025]
 RelativePath=JIT\Methodical\casts\coverage\_dbgisinst_ldarg\_dbgisinst_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_dbgisinst_ldarg
@@ -41642,6 +46171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgisinst_ldloc.cmd_6026]
 RelativePath=JIT\Methodical\casts\coverage\_dbgisinst_ldloc\_dbgisinst_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_dbgisinst_ldloc
@@ -41649,6 +46179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgisinst_newobj.cmd_6027]
 RelativePath=JIT\Methodical\casts\coverage\_dbgisinst_newobj\_dbgisinst_newobj.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_dbgisinst_newobj
@@ -41656,6 +46187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcastclass_call.cmd_6028]
 RelativePath=JIT\Methodical\casts\coverage\_il_dbgcastclass_call\_il_dbgcastclass_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_dbgcastclass_call
@@ -41663,6 +46195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcastclass_calli.cmd_6029]
 RelativePath=JIT\Methodical\casts\coverage\_il_dbgcastclass_calli\_il_dbgcastclass_calli.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_dbgcastclass_calli
@@ -41670,6 +46203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcastclass_ldarg.cmd_6030]
 RelativePath=JIT\Methodical\casts\coverage\_il_dbgcastclass_ldarg\_il_dbgcastclass_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_dbgcastclass_ldarg
@@ -41677,6 +46211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcastclass_ldloc.cmd_6031]
 RelativePath=JIT\Methodical\casts\coverage\_il_dbgcastclass_ldloc\_il_dbgcastclass_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_dbgcastclass_ldloc
@@ -41684,6 +46219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgisinst_call.cmd_6032]
 RelativePath=JIT\Methodical\casts\coverage\_il_dbgisinst_call\_il_dbgisinst_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_dbgisinst_call
@@ -41691,6 +46227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgisinst_calli.cmd_6033]
 RelativePath=JIT\Methodical\casts\coverage\_il_dbgisinst_calli\_il_dbgisinst_calli.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_dbgisinst_calli
@@ -41698,6 +46235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgisinst_ldarg.cmd_6034]
 RelativePath=JIT\Methodical\casts\coverage\_il_dbgisinst_ldarg\_il_dbgisinst_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_dbgisinst_ldarg
@@ -41705,6 +46243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgisinst_ldloc.cmd_6035]
 RelativePath=JIT\Methodical\casts\coverage\_il_dbgisinst_ldloc\_il_dbgisinst_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_dbgisinst_ldloc
@@ -41712,6 +46251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldnull.cmd_6036]
 RelativePath=JIT\Methodical\casts\coverage\_il_dbgldnull\_il_dbgldnull.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_dbgldnull
@@ -41719,6 +46259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcastclass_call.cmd_6037]
 RelativePath=JIT\Methodical\casts\coverage\_il_relcastclass_call\_il_relcastclass_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_relcastclass_call
@@ -41726,6 +46267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcastclass_calli.cmd_6038]
 RelativePath=JIT\Methodical\casts\coverage\_il_relcastclass_calli\_il_relcastclass_calli.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_relcastclass_calli
@@ -41733,6 +46275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcastclass_ldarg.cmd_6039]
 RelativePath=JIT\Methodical\casts\coverage\_il_relcastclass_ldarg\_il_relcastclass_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_relcastclass_ldarg
@@ -41740,6 +46283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcastclass_ldloc.cmd_6040]
 RelativePath=JIT\Methodical\casts\coverage\_il_relcastclass_ldloc\_il_relcastclass_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_relcastclass_ldloc
@@ -41747,6 +46291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relisinst_call.cmd_6041]
 RelativePath=JIT\Methodical\casts\coverage\_il_relisinst_call\_il_relisinst_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_relisinst_call
@@ -41754,6 +46299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relisinst_calli.cmd_6042]
 RelativePath=JIT\Methodical\casts\coverage\_il_relisinst_calli\_il_relisinst_calli.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_relisinst_calli
@@ -41761,6 +46307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relisinst_ldarg.cmd_6043]
 RelativePath=JIT\Methodical\casts\coverage\_il_relisinst_ldarg\_il_relisinst_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_relisinst_ldarg
@@ -41768,6 +46315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relisinst_ldloc.cmd_6044]
 RelativePath=JIT\Methodical\casts\coverage\_il_relisinst_ldloc\_il_relisinst_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_relisinst_ldloc
@@ -41775,6 +46323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldnull.cmd_6045]
 RelativePath=JIT\Methodical\casts\coverage\_il_relldnull\_il_relldnull.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_il_relldnull
@@ -41782,6 +46331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relcastclass_call.cmd_6046]
 RelativePath=JIT\Methodical\casts\coverage\_relcastclass_call\_relcastclass_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_relcastclass_call
@@ -41789,6 +46339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relcastclass_ldarg.cmd_6047]
 RelativePath=JIT\Methodical\casts\coverage\_relcastclass_ldarg\_relcastclass_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_relcastclass_ldarg
@@ -41796,6 +46347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relcastclass_ldloc.cmd_6048]
 RelativePath=JIT\Methodical\casts\coverage\_relcastclass_ldloc\_relcastclass_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_relcastclass_ldloc
@@ -41803,6 +46355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relcastclass_newobj.cmd_6049]
 RelativePath=JIT\Methodical\casts\coverage\_relcastclass_newobj\_relcastclass_newobj.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_relcastclass_newobj
@@ -41810,6 +46363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relisinst_call.cmd_6050]
 RelativePath=JIT\Methodical\casts\coverage\_relisinst_call\_relisinst_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_relisinst_call
@@ -41817,6 +46371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relisinst_ldarg.cmd_6051]
 RelativePath=JIT\Methodical\casts\coverage\_relisinst_ldarg\_relisinst_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_relisinst_ldarg
@@ -41824,6 +46379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relisinst_ldloc.cmd_6052]
 RelativePath=JIT\Methodical\casts\coverage\_relisinst_ldloc\_relisinst_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_relisinst_ldloc
@@ -41831,6 +46387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relisinst_newobj.cmd_6053]
 RelativePath=JIT\Methodical\casts\coverage\_relisinst_newobj\_relisinst_newobj.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_relisinst_newobj
@@ -41838,6 +46395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgcastclass_call.cmd_6054]
 RelativePath=JIT\Methodical\casts\coverage\_speed_dbgcastclass_call\_speed_dbgcastclass_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_dbgcastclass_call
@@ -41845,6 +46403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgcastclass_ldarg.cmd_6055]
 RelativePath=JIT\Methodical\casts\coverage\_speed_dbgcastclass_ldarg\_speed_dbgcastclass_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_dbgcastclass_ldarg
@@ -41852,6 +46411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgcastclass_ldloc.cmd_6056]
 RelativePath=JIT\Methodical\casts\coverage\_speed_dbgcastclass_ldloc\_speed_dbgcastclass_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_dbgcastclass_ldloc
@@ -41859,6 +46419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgcastclass_newobj.cmd_6057]
 RelativePath=JIT\Methodical\casts\coverage\_speed_dbgcastclass_newobj\_speed_dbgcastclass_newobj.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_dbgcastclass_newobj
@@ -41866,6 +46427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgisinst_call.cmd_6058]
 RelativePath=JIT\Methodical\casts\coverage\_speed_dbgisinst_call\_speed_dbgisinst_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_dbgisinst_call
@@ -41873,6 +46435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgisinst_ldarg.cmd_6059]
 RelativePath=JIT\Methodical\casts\coverage\_speed_dbgisinst_ldarg\_speed_dbgisinst_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_dbgisinst_ldarg
@@ -41880,6 +46443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgisinst_ldloc.cmd_6060]
 RelativePath=JIT\Methodical\casts\coverage\_speed_dbgisinst_ldloc\_speed_dbgisinst_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_dbgisinst_ldloc
@@ -41887,6 +46451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgisinst_newobj.cmd_6061]
 RelativePath=JIT\Methodical\casts\coverage\_speed_dbgisinst_newobj\_speed_dbgisinst_newobj.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_dbgisinst_newobj
@@ -41894,6 +46459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relcastclass_call.cmd_6062]
 RelativePath=JIT\Methodical\casts\coverage\_speed_relcastclass_call\_speed_relcastclass_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_relcastclass_call
@@ -41901,6 +46467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relcastclass_ldarg.cmd_6063]
 RelativePath=JIT\Methodical\casts\coverage\_speed_relcastclass_ldarg\_speed_relcastclass_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_relcastclass_ldarg
@@ -41908,6 +46475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relcastclass_ldloc.cmd_6064]
 RelativePath=JIT\Methodical\casts\coverage\_speed_relcastclass_ldloc\_speed_relcastclass_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_relcastclass_ldloc
@@ -41915,6 +46483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relcastclass_newobj.cmd_6065]
 RelativePath=JIT\Methodical\casts\coverage\_speed_relcastclass_newobj\_speed_relcastclass_newobj.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_relcastclass_newobj
@@ -41922,6 +46491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relisinst_call.cmd_6066]
 RelativePath=JIT\Methodical\casts\coverage\_speed_relisinst_call\_speed_relisinst_call.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_relisinst_call
@@ -41929,6 +46499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relisinst_ldarg.cmd_6067]
 RelativePath=JIT\Methodical\casts\coverage\_speed_relisinst_ldarg\_speed_relisinst_ldarg.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_relisinst_ldarg
@@ -41936,6 +46507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relisinst_ldloc.cmd_6068]
 RelativePath=JIT\Methodical\casts\coverage\_speed_relisinst_ldloc\_speed_relisinst_ldloc.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_relisinst_ldloc
@@ -41943,6 +46515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relisinst_newobj.cmd_6069]
 RelativePath=JIT\Methodical\casts\coverage\_speed_relisinst_newobj\_speed_relisinst_newobj.cmd
 WorkingDir=JIT\Methodical\casts\coverage\_speed_relisinst_newobj
@@ -41950,6 +46523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgiface1.cmd_6070]
 RelativePath=JIT\Methodical\casts\iface\_dbgiface1\_dbgiface1.cmd
 WorkingDir=JIT\Methodical\casts\iface\_dbgiface1
@@ -41957,6 +46531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgiface2.cmd_6071]
 RelativePath=JIT\Methodical\casts\iface\_il_dbgiface2\_il_dbgiface2.cmd
 WorkingDir=JIT\Methodical\casts\iface\_il_dbgiface2
@@ -41964,6 +46539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reliface2.cmd_6072]
 RelativePath=JIT\Methodical\casts\iface\_il_reliface2\_il_reliface2.cmd
 WorkingDir=JIT\Methodical\casts\iface\_il_reliface2
@@ -41971,6 +46547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_reliface1.cmd_6073]
 RelativePath=JIT\Methodical\casts\iface\_reliface1\_reliface1.cmd
 WorkingDir=JIT\Methodical\casts\iface\_reliface1
@@ -41978,6 +46555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgiface1.cmd_6074]
 RelativePath=JIT\Methodical\casts\iface\_speed_dbgiface1\_speed_dbgiface1.cmd
 WorkingDir=JIT\Methodical\casts\iface\_speed_dbgiface1
@@ -41985,6 +46563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_reliface1.cmd_6075]
 RelativePath=JIT\Methodical\casts\iface\_speed_reliface1\_speed_reliface1.cmd
 WorkingDir=JIT\Methodical\casts\iface\_speed_reliface1
@@ -41992,6 +46571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relCommonBase.cmd_6076]
 RelativePath=JIT\Methodical\casts\ilseq\_il_relCommonBase\_il_relCommonBase.cmd
 WorkingDir=JIT\Methodical\casts\ilseq\_il_relCommonBase
@@ -41999,6 +46579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgcast_throw.cmd_6078]
 RelativePath=JIT\Methodical\casts\SEH\_dbgcast_throw\_dbgcast_throw.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_dbgcast_throw
@@ -42006,6 +46587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgthrow.cmd_6079]
 RelativePath=JIT\Methodical\casts\SEH\_dbgthrow\_dbgthrow.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_dbgthrow
@@ -42013,6 +46595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcastclass_catch.cmd_6080]
 RelativePath=JIT\Methodical\casts\SEH\_il_dbgcastclass_catch\_il_dbgcastclass_catch.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_il_dbgcastclass_catch
@@ -42020,6 +46603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcastclass_catch_neg.cmd_6081]
 RelativePath=JIT\Methodical\casts\SEH\_il_dbgcastclass_catch_neg\_il_dbgcastclass_catch_neg.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_il_dbgcastclass_catch_neg
@@ -42027,6 +46611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgfilter.cmd_6082]
 RelativePath=JIT\Methodical\casts\SEH\_il_dbgfilter\_il_dbgfilter.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_il_dbgfilter
@@ -42034,6 +46619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgisinst_catch.cmd_6083]
 RelativePath=JIT\Methodical\casts\SEH\_il_dbgisinst_catch\_il_dbgisinst_catch.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_il_dbgisinst_catch
@@ -42041,6 +46627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgisinst_catch_neg.cmd_6084]
 RelativePath=JIT\Methodical\casts\SEH\_il_dbgisinst_catch_neg\_il_dbgisinst_catch_neg.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_il_dbgisinst_catch_neg
@@ -42048,6 +46635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcastclass_catch.cmd_6085]
 RelativePath=JIT\Methodical\casts\SEH\_il_relcastclass_catch\_il_relcastclass_catch.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_il_relcastclass_catch
@@ -42055,6 +46643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcastclass_catch_neg.cmd_6086]
 RelativePath=JIT\Methodical\casts\SEH\_il_relcastclass_catch_neg\_il_relcastclass_catch_neg.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_il_relcastclass_catch_neg
@@ -42062,6 +46651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relfilter.cmd_6087]
 RelativePath=JIT\Methodical\casts\SEH\_il_relfilter\_il_relfilter.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_il_relfilter
@@ -42069,6 +46659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relisinst_catch.cmd_6088]
 RelativePath=JIT\Methodical\casts\SEH\_il_relisinst_catch\_il_relisinst_catch.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_il_relisinst_catch
@@ -42076,6 +46667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relisinst_catch_neg.cmd_6089]
 RelativePath=JIT\Methodical\casts\SEH\_il_relisinst_catch_neg\_il_relisinst_catch_neg.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_il_relisinst_catch_neg
@@ -42083,6 +46675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relcast_throw.cmd_6090]
 RelativePath=JIT\Methodical\casts\SEH\_relcast_throw\_relcast_throw.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_relcast_throw
@@ -42090,6 +46683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relthrow.cmd_6091]
 RelativePath=JIT\Methodical\casts\SEH\_relthrow\_relthrow.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_relthrow
@@ -42097,6 +46691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgcast_throw.cmd_6092]
 RelativePath=JIT\Methodical\casts\SEH\_speed_dbgcast_throw\_speed_dbgcast_throw.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_speed_dbgcast_throw
@@ -42104,6 +46699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgthrow.cmd_6093]
 RelativePath=JIT\Methodical\casts\SEH\_speed_dbgthrow\_speed_dbgthrow.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_speed_dbgthrow
@@ -42111,6 +46707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relcast_throw.cmd_6094]
 RelativePath=JIT\Methodical\casts\SEH\_speed_relcast_throw\_speed_relcast_throw.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_speed_relcast_throw
@@ -42118,6 +46715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relthrow.cmd_6095]
 RelativePath=JIT\Methodical\casts\SEH\_speed_relthrow\_speed_relthrow.cmd
 WorkingDir=JIT\Methodical\casts\SEH\_speed_relthrow
@@ -42125,6 +46723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [assemname_cs_d.cmd_6096]
 RelativePath=JIT\Methodical\cctor\misc\assemname_cs_d\assemname_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\misc\assemname_cs_d
@@ -42132,6 +46731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [assemname_cs_do.cmd_6097]
 RelativePath=JIT\Methodical\cctor\misc\assemname_cs_do\assemname_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\misc\assemname_cs_do
@@ -42139,6 +46739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [assemname_cs_r.cmd_6098]
 RelativePath=JIT\Methodical\cctor\misc\assemname_cs_r\assemname_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\misc\assemname_cs_r
@@ -42146,6 +46747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [assemname_cs_ro.cmd_6099]
 RelativePath=JIT\Methodical\cctor\misc\assemname_cs_ro\assemname_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\misc\assemname_cs_ro
@@ -42153,6 +46755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadlock_il_d.cmd_6100]
 RelativePath=JIT\Methodical\cctor\misc\deadlock_il_d\deadlock_il_d.cmd
 WorkingDir=JIT\Methodical\cctor\misc\deadlock_il_d
@@ -42160,6 +46763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [deadlock_il_r.cmd_6101]
 RelativePath=JIT\Methodical\cctor\misc\deadlock_il_r\deadlock_il_r.cmd
 WorkingDir=JIT\Methodical\cctor\misc\deadlock_il_r
@@ -42167,6 +46771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [throw_cs_d.cmd_6102]
 RelativePath=JIT\Methodical\cctor\misc\Desktop\throw_cs_d\throw_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\misc\Desktop\throw_cs_d
@@ -42174,6 +46779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw_cs_do.cmd_6103]
 RelativePath=JIT\Methodical\cctor\misc\Desktop\throw_cs_do\throw_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\misc\Desktop\throw_cs_do
@@ -42181,6 +46787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw_cs_r.cmd_6104]
 RelativePath=JIT\Methodical\cctor\misc\Desktop\throw_cs_r\throw_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\misc\Desktop\throw_cs_r
@@ -42188,6 +46795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw_cs_ro.cmd_6105]
 RelativePath=JIT\Methodical\cctor\misc\Desktop\throw_cs_ro\throw_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\misc\Desktop\throw_cs_ro
@@ -42195,6 +46803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [threads1_cs_d.cmd_6108]
 RelativePath=JIT\Methodical\cctor\misc\threads1_cs_d\threads1_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\misc\threads1_cs_d
@@ -42202,6 +46811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [threads1_cs_do.cmd_6109]
 RelativePath=JIT\Methodical\cctor\misc\threads1_cs_do\threads1_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\misc\threads1_cs_do
@@ -42209,6 +46819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [threads1_cs_r.cmd_6110]
 RelativePath=JIT\Methodical\cctor\misc\threads1_cs_r\threads1_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\misc\threads1_cs_r
@@ -42216,6 +46827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [threads1_cs_ro.cmd_6111]
 RelativePath=JIT\Methodical\cctor\misc\threads1_cs_ro\threads1_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\misc\threads1_cs_ro
@@ -42223,6 +46835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [threads2_cs_d.cmd_6112]
 RelativePath=JIT\Methodical\cctor\misc\threads2_cs_d\threads2_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\misc\threads2_cs_d
@@ -42230,6 +46843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [threads2_cs_do.cmd_6113]
 RelativePath=JIT\Methodical\cctor\misc\threads2_cs_do\threads2_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\misc\threads2_cs_do
@@ -42237,6 +46851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [threads2_cs_r.cmd_6114]
 RelativePath=JIT\Methodical\cctor\misc\threads2_cs_r\threads2_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\misc\threads2_cs_r
@@ -42244,6 +46859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [threads2_cs_ro.cmd_6115]
 RelativePath=JIT\Methodical\cctor\misc\threads2_cs_ro\threads2_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\misc\threads2_cs_ro
@@ -42251,6 +46867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw_cs_d.cmd_6116]
 RelativePath=JIT\Methodical\cctor\misc\throw_cs_d\throw_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\misc\throw_cs_d
@@ -42258,6 +46875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw_cs_do.cmd_6117]
 RelativePath=JIT\Methodical\cctor\misc\throw_cs_do\throw_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\misc\throw_cs_do
@@ -42265,6 +46883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw_cs_r.cmd_6118]
 RelativePath=JIT\Methodical\cctor\misc\throw_cs_r\throw_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\misc\throw_cs_r
@@ -42272,6 +46891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw_cs_ro.cmd_6119]
 RelativePath=JIT\Methodical\cctor\misc\throw_cs_ro\throw_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\misc\throw_cs_ro
@@ -42279,6 +46899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [prefldinit3_il_r.cmd_6120]
 RelativePath=JIT\Methodical\cctor\simple\Desktop\prefldinit3_il_r\prefldinit3_il_r.cmd
 WorkingDir=JIT\Methodical\cctor\simple\Desktop\prefldinit3_il_r
@@ -42286,6 +46907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise1b_cs_d.cmd_6121]
 RelativePath=JIT\Methodical\cctor\simple\precise1b_cs_d\precise1b_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise1b_cs_d
@@ -42293,6 +46915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise1b_cs_do.cmd_6122]
 RelativePath=JIT\Methodical\cctor\simple\precise1b_cs_do\precise1b_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise1b_cs_do
@@ -42300,6 +46923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise1b_cs_r.cmd_6123]
 RelativePath=JIT\Methodical\cctor\simple\precise1b_cs_r\precise1b_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise1b_cs_r
@@ -42307,6 +46931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise1b_cs_ro.cmd_6124]
 RelativePath=JIT\Methodical\cctor\simple\precise1b_cs_ro\precise1b_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise1b_cs_ro
@@ -42314,6 +46939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise1_cs_d.cmd_6125]
 RelativePath=JIT\Methodical\cctor\simple\precise1_cs_d\precise1_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise1_cs_d
@@ -42321,6 +46947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise1_cs_do.cmd_6126]
 RelativePath=JIT\Methodical\cctor\simple\precise1_cs_do\precise1_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise1_cs_do
@@ -42328,6 +46955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise1_cs_r.cmd_6127]
 RelativePath=JIT\Methodical\cctor\simple\precise1_cs_r\precise1_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise1_cs_r
@@ -42335,6 +46963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise1_cs_ro.cmd_6128]
 RelativePath=JIT\Methodical\cctor\simple\precise1_cs_ro\precise1_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise1_cs_ro
@@ -42342,6 +46971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise2_cs_d.cmd_6129]
 RelativePath=JIT\Methodical\cctor\simple\precise2_cs_d\precise2_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise2_cs_d
@@ -42349,6 +46979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise2_cs_do.cmd_6130]
 RelativePath=JIT\Methodical\cctor\simple\precise2_cs_do\precise2_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise2_cs_do
@@ -42356,6 +46987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise2_cs_r.cmd_6131]
 RelativePath=JIT\Methodical\cctor\simple\precise2_cs_r\precise2_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise2_cs_r
@@ -42363,6 +46995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise2_cs_ro.cmd_6132]
 RelativePath=JIT\Methodical\cctor\simple\precise2_cs_ro\precise2_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise2_cs_ro
@@ -42370,6 +47003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise4_cs_d.cmd_6133]
 RelativePath=JIT\Methodical\cctor\simple\precise4_cs_d\precise4_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise4_cs_d
@@ -42377,6 +47011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise4_cs_do.cmd_6134]
 RelativePath=JIT\Methodical\cctor\simple\precise4_cs_do\precise4_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise4_cs_do
@@ -42384,6 +47019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise4_cs_r.cmd_6135]
 RelativePath=JIT\Methodical\cctor\simple\precise4_cs_r\precise4_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise4_cs_r
@@ -42391,6 +47027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [precise4_cs_ro.cmd_6136]
 RelativePath=JIT\Methodical\cctor\simple\precise4_cs_ro\precise4_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\simple\precise4_cs_ro
@@ -42398,6 +47035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [prefldinit1_il_d.cmd_6137]
 RelativePath=JIT\Methodical\cctor\simple\prefldinit1_il_d\prefldinit1_il_d.cmd
 WorkingDir=JIT\Methodical\cctor\simple\prefldinit1_il_d
@@ -42405,6 +47043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [prefldinit1_il_r.cmd_6138]
 RelativePath=JIT\Methodical\cctor\simple\prefldinit1_il_r\prefldinit1_il_r.cmd
 WorkingDir=JIT\Methodical\cctor\simple\prefldinit1_il_r
@@ -42412,6 +47051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [prefldinit2_il_d.cmd_6139]
 RelativePath=JIT\Methodical\cctor\simple\prefldinit2_il_d\prefldinit2_il_d.cmd
 WorkingDir=JIT\Methodical\cctor\simple\prefldinit2_il_d
@@ -42419,6 +47059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [prefldinit2_il_r.cmd_6140]
 RelativePath=JIT\Methodical\cctor\simple\prefldinit2_il_r\prefldinit2_il_r.cmd
 WorkingDir=JIT\Methodical\cctor\simple\prefldinit2_il_r
@@ -42426,6 +47067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [prefldinit4_il_d.cmd_6141]
 RelativePath=JIT\Methodical\cctor\simple\prefldinit4_il_d\prefldinit4_il_d.cmd
 WorkingDir=JIT\Methodical\cctor\simple\prefldinit4_il_d
@@ -42433,6 +47075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [prefldinit4_il_r.cmd_6142]
 RelativePath=JIT\Methodical\cctor\simple\prefldinit4_il_r\prefldinit4_il_r.cmd
 WorkingDir=JIT\Methodical\cctor\simple\prefldinit4_il_r
@@ -42440,6 +47083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [xprecise1b_cs_d.cmd_6143]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise1b_cs_d\xprecise1b_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise1b_cs_d
@@ -42447,6 +47091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise1b_cs_do.cmd_6144]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise1b_cs_do\xprecise1b_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise1b_cs_do
@@ -42454,6 +47099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise1b_cs_r.cmd_6145]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise1b_cs_r\xprecise1b_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise1b_cs_r
@@ -42461,6 +47107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise1b_cs_ro.cmd_6146]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise1b_cs_ro\xprecise1b_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise1b_cs_ro
@@ -42468,6 +47115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise1_cs_d.cmd_6147]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise1_cs_d\xprecise1_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise1_cs_d
@@ -42475,6 +47123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise1_cs_do.cmd_6148]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise1_cs_do\xprecise1_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise1_cs_do
@@ -42482,6 +47131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise1_cs_r.cmd_6149]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise1_cs_r\xprecise1_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise1_cs_r
@@ -42489,6 +47139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise1_cs_ro.cmd_6150]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise1_cs_ro\xprecise1_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise1_cs_ro
@@ -42496,6 +47147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise2_cs_d.cmd_6151]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise2_cs_d\xprecise2_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise2_cs_d
@@ -42503,6 +47155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise2_cs_do.cmd_6152]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise2_cs_do\xprecise2_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise2_cs_do
@@ -42510,6 +47163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise2_cs_r.cmd_6153]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise2_cs_r\xprecise2_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise2_cs_r
@@ -42517,6 +47171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise2_cs_ro.cmd_6154]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise2_cs_ro\xprecise2_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise2_cs_ro
@@ -42524,6 +47179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise4_cs_d.cmd_6155]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise4_cs_d\xprecise4_cs_d.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise4_cs_d
@@ -42531,6 +47187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise4_cs_do.cmd_6156]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise4_cs_do\xprecise4_cs_do.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise4_cs_do
@@ -42538,6 +47195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise4_cs_r.cmd_6157]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise4_cs_r\xprecise4_cs_r.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise4_cs_r
@@ -42545,6 +47203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [xprecise4_cs_ro.cmd_6158]
 RelativePath=JIT\Methodical\cctor\xassem\xprecise4_cs_ro\xprecise4_cs_ro.cmd
 WorkingDir=JIT\Methodical\cctor\xassem\xprecise4_cs_ro
@@ -42552,6 +47211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b39946.cmd_6160]
 RelativePath=JIT\Methodical\Coverage\b39946\b39946.cmd
 WorkingDir=JIT\Methodical\Coverage\b39946
@@ -42559,6 +47219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b433189.cmd_6161]
 RelativePath=JIT\Methodical\Coverage\b433189\b433189.cmd
 WorkingDir=JIT\Methodical\Coverage\b433189
@@ -42566,6 +47227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b518440.cmd_6162]
 RelativePath=JIT\Methodical\Coverage\b518440\b518440.cmd
 WorkingDir=JIT\Methodical\Coverage\b518440
@@ -42573,6 +47235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [hole.cmd_6163]
 RelativePath=JIT\Methodical\Coverage\hole\hole.cmd
 WorkingDir=JIT\Methodical\Coverage\hole
@@ -42580,6 +47243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [decimaldiv_cs_d.cmd_6166]
 RelativePath=JIT\Methodical\divrem\div\decimaldiv_cs_d\decimaldiv_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\div\decimaldiv_cs_d
@@ -42587,13 +47251,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [decimaldiv_cs_do.cmd_6167]
 RelativePath=JIT\Methodical\divrem\div\decimaldiv_cs_do\decimaldiv_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\div\decimaldiv_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [decimaldiv_cs_r.cmd_6168]
 RelativePath=JIT\Methodical\divrem\div\decimaldiv_cs_r\decimaldiv_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\div\decimaldiv_cs_r
@@ -42601,13 +47267,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [decimaldiv_cs_ro.cmd_6169]
 RelativePath=JIT\Methodical\divrem\div\decimaldiv_cs_ro\decimaldiv_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\div\decimaldiv_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [i4div_cs_d.cmd_6170]
 RelativePath=JIT\Methodical\divrem\div\i4div_cs_d\i4div_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\div\i4div_cs_d
@@ -42615,13 +47283,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4div_cs_do.cmd_6171]
 RelativePath=JIT\Methodical\divrem\div\i4div_cs_do\i4div_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\div\i4div_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [i4div_cs_r.cmd_6172]
 RelativePath=JIT\Methodical\divrem\div\i4div_cs_r\i4div_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\div\i4div_cs_r
@@ -42629,13 +47299,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4div_cs_ro.cmd_6173]
 RelativePath=JIT\Methodical\divrem\div\i4div_cs_ro\i4div_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\div\i4div_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [i8div_cs_d.cmd_6174]
 RelativePath=JIT\Methodical\divrem\div\i8div_cs_d\i8div_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\div\i8div_cs_d
@@ -42643,13 +47315,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8div_cs_do.cmd_6175]
 RelativePath=JIT\Methodical\divrem\div\i8div_cs_do\i8div_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\div\i8div_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [i8div_cs_r.cmd_6176]
 RelativePath=JIT\Methodical\divrem\div\i8div_cs_r\i8div_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\div\i8div_cs_r
@@ -42657,13 +47331,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8div_cs_ro.cmd_6177]
 RelativePath=JIT\Methodical\divrem\div\i8div_cs_ro\i8div_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\div\i8div_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [negSignedMod.cmd_6178]
 RelativePath=JIT\Methodical\divrem\div\negSignedMod\negSignedMod.cmd
 WorkingDir=JIT\Methodical\divrem\div\negSignedMod
@@ -42671,6 +47347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [overlddiv_cs_d.cmd_6179]
 RelativePath=JIT\Methodical\divrem\div\overlddiv_cs_d\overlddiv_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\div\overlddiv_cs_d
@@ -42678,13 +47355,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [overlddiv_cs_do.cmd_6180]
 RelativePath=JIT\Methodical\divrem\div\overlddiv_cs_do\overlddiv_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\div\overlddiv_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [overlddiv_cs_r.cmd_6181]
 RelativePath=JIT\Methodical\divrem\div\overlddiv_cs_r\overlddiv_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\div\overlddiv_cs_r
@@ -42692,13 +47371,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [overlddiv_cs_ro.cmd_6182]
 RelativePath=JIT\Methodical\divrem\div\overlddiv_cs_ro\overlddiv_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\div\overlddiv_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [r4div_cs_d.cmd_6183]
 RelativePath=JIT\Methodical\divrem\div\r4div_cs_d\r4div_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\div\r4div_cs_d
@@ -42706,13 +47387,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4div_cs_do.cmd_6184]
 RelativePath=JIT\Methodical\divrem\div\r4div_cs_do\r4div_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\div\r4div_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [r4div_cs_r.cmd_6185]
 RelativePath=JIT\Methodical\divrem\div\r4div_cs_r\r4div_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\div\r4div_cs_r
@@ -42720,13 +47403,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4div_cs_ro.cmd_6186]
 RelativePath=JIT\Methodical\divrem\div\r4div_cs_ro\r4div_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\div\r4div_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [r8div_cs_d.cmd_6187]
 RelativePath=JIT\Methodical\divrem\div\r8div_cs_d\r8div_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\div\r8div_cs_d
@@ -42734,13 +47419,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8div_cs_do.cmd_6188]
 RelativePath=JIT\Methodical\divrem\div\r8div_cs_do\r8div_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\div\r8div_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [r8div_cs_r.cmd_6189]
 RelativePath=JIT\Methodical\divrem\div\r8div_cs_r\r8div_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\div\r8div_cs_r
@@ -42748,13 +47435,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8div_cs_ro.cmd_6190]
 RelativePath=JIT\Methodical\divrem\div\r8div_cs_ro\r8div_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\div\r8div_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [u4div_cs_d.cmd_6191]
 RelativePath=JIT\Methodical\divrem\div\u4div_cs_d\u4div_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\div\u4div_cs_d
@@ -42762,13 +47451,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [u4div_cs_do.cmd_6192]
 RelativePath=JIT\Methodical\divrem\div\u4div_cs_do\u4div_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\div\u4div_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [u4div_cs_r.cmd_6193]
 RelativePath=JIT\Methodical\divrem\div\u4div_cs_r\u4div_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\div\u4div_cs_r
@@ -42776,13 +47467,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [u4div_cs_ro.cmd_6194]
 RelativePath=JIT\Methodical\divrem\div\u4div_cs_ro\u4div_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\div\u4div_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [u8div_cs_d.cmd_6195]
 RelativePath=JIT\Methodical\divrem\div\u8div_cs_d\u8div_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\div\u8div_cs_d
@@ -42790,13 +47483,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [u8div_cs_do.cmd_6196]
 RelativePath=JIT\Methodical\divrem\div\u8div_cs_do\u8div_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\div\u8div_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [u8div_cs_r.cmd_6197]
 RelativePath=JIT\Methodical\divrem\div\u8div_cs_r\u8div_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\div\u8div_cs_r
@@ -42804,13 +47499,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [u8div_cs_ro.cmd_6198]
 RelativePath=JIT\Methodical\divrem\div\u8div_cs_ro\u8div_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\div\u8div_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [decimalrem_cs_d.cmd_6199]
 RelativePath=JIT\Methodical\divrem\rem\decimalrem_cs_d\decimalrem_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\rem\decimalrem_cs_d
@@ -42818,13 +47515,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [decimalrem_cs_do.cmd_6200]
 RelativePath=JIT\Methodical\divrem\rem\decimalrem_cs_do\decimalrem_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\rem\decimalrem_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [decimalrem_cs_r.cmd_6201]
 RelativePath=JIT\Methodical\divrem\rem\decimalrem_cs_r\decimalrem_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\rem\decimalrem_cs_r
@@ -42832,13 +47531,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [decimalrem_cs_ro.cmd_6202]
 RelativePath=JIT\Methodical\divrem\rem\decimalrem_cs_ro\decimalrem_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\rem\decimalrem_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [i4rem_cs_d.cmd_6203]
 RelativePath=JIT\Methodical\divrem\rem\i4rem_cs_d\i4rem_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\rem\i4rem_cs_d
@@ -42846,13 +47547,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4rem_cs_do.cmd_6204]
 RelativePath=JIT\Methodical\divrem\rem\i4rem_cs_do\i4rem_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\rem\i4rem_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [i4rem_cs_r.cmd_6205]
 RelativePath=JIT\Methodical\divrem\rem\i4rem_cs_r\i4rem_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\rem\i4rem_cs_r
@@ -42860,13 +47563,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i4rem_cs_ro.cmd_6206]
 RelativePath=JIT\Methodical\divrem\rem\i4rem_cs_ro\i4rem_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\rem\i4rem_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [i8rem_cs_d.cmd_6207]
 RelativePath=JIT\Methodical\divrem\rem\i8rem_cs_d\i8rem_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\rem\i8rem_cs_d
@@ -42874,13 +47579,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8rem_cs_do.cmd_6208]
 RelativePath=JIT\Methodical\divrem\rem\i8rem_cs_do\i8rem_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\rem\i8rem_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [i8rem_cs_r.cmd_6209]
 RelativePath=JIT\Methodical\divrem\rem\i8rem_cs_r\i8rem_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\rem\i8rem_cs_r
@@ -42888,13 +47595,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [i8rem_cs_ro.cmd_6210]
 RelativePath=JIT\Methodical\divrem\rem\i8rem_cs_ro\i8rem_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\rem\i8rem_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [overldrem_cs_d.cmd_6211]
 RelativePath=JIT\Methodical\divrem\rem\overldrem_cs_d\overldrem_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\rem\overldrem_cs_d
@@ -42902,13 +47611,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [overldrem_cs_do.cmd_6212]
 RelativePath=JIT\Methodical\divrem\rem\overldrem_cs_do\overldrem_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\rem\overldrem_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [overldrem_cs_r.cmd_6213]
 RelativePath=JIT\Methodical\divrem\rem\overldrem_cs_r\overldrem_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\rem\overldrem_cs_r
@@ -42916,13 +47627,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [overldrem_cs_ro.cmd_6214]
 RelativePath=JIT\Methodical\divrem\rem\overldrem_cs_ro\overldrem_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\rem\overldrem_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [r4rem_cs_d.cmd_6215]
 RelativePath=JIT\Methodical\divrem\rem\r4rem_cs_d\r4rem_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\rem\r4rem_cs_d
@@ -42930,13 +47643,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4rem_cs_do.cmd_6216]
 RelativePath=JIT\Methodical\divrem\rem\r4rem_cs_do\r4rem_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\rem\r4rem_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [r4rem_cs_r.cmd_6217]
 RelativePath=JIT\Methodical\divrem\rem\r4rem_cs_r\r4rem_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\rem\r4rem_cs_r
@@ -42944,13 +47659,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4rem_cs_ro.cmd_6218]
 RelativePath=JIT\Methodical\divrem\rem\r4rem_cs_ro\r4rem_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\rem\r4rem_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [r8rem_cs_d.cmd_6219]
 RelativePath=JIT\Methodical\divrem\rem\r8rem_cs_d\r8rem_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\rem\r8rem_cs_d
@@ -42958,13 +47675,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8rem_cs_do.cmd_6220]
 RelativePath=JIT\Methodical\divrem\rem\r8rem_cs_do\r8rem_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\rem\r8rem_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [r8rem_cs_r.cmd_6221]
 RelativePath=JIT\Methodical\divrem\rem\r8rem_cs_r\r8rem_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\rem\r8rem_cs_r
@@ -42972,13 +47691,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8rem_cs_ro.cmd_6222]
 RelativePath=JIT\Methodical\divrem\rem\r8rem_cs_ro\r8rem_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\rem\r8rem_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [u4rem_cs_d.cmd_6223]
 RelativePath=JIT\Methodical\divrem\rem\u4rem_cs_d\u4rem_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\rem\u4rem_cs_d
@@ -42986,13 +47707,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [u4rem_cs_do.cmd_6224]
 RelativePath=JIT\Methodical\divrem\rem\u4rem_cs_do\u4rem_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\rem\u4rem_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [u4rem_cs_r.cmd_6225]
 RelativePath=JIT\Methodical\divrem\rem\u4rem_cs_r\u4rem_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\rem\u4rem_cs_r
@@ -43000,13 +47723,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [u4rem_cs_ro.cmd_6226]
 RelativePath=JIT\Methodical\divrem\rem\u4rem_cs_ro\u4rem_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\rem\u4rem_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [u8rem_cs_d.cmd_6227]
 RelativePath=JIT\Methodical\divrem\rem\u8rem_cs_d\u8rem_cs_d.cmd
 WorkingDir=JIT\Methodical\divrem\rem\u8rem_cs_d
@@ -43014,13 +47739,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [u8rem_cs_do.cmd_6228]
 RelativePath=JIT\Methodical\divrem\rem\u8rem_cs_do\u8rem_cs_do.cmd
 WorkingDir=JIT\Methodical\divrem\rem\u8rem_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [u8rem_cs_r.cmd_6229]
 RelativePath=JIT\Methodical\divrem\rem\u8rem_cs_r\u8rem_cs_r.cmd
 WorkingDir=JIT\Methodical\divrem\rem\u8rem_cs_r
@@ -43028,13 +47755,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [u8rem_cs_ro.cmd_6230]
 RelativePath=JIT\Methodical\divrem\rem\u8rem_cs_ro\u8rem_cs_ro.cmd
 WorkingDir=JIT\Methodical\divrem\rem\u8rem_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL
+Categories=Pri0;JIT;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [dblarray1_cs_d.cmd_6231]
 RelativePath=JIT\Methodical\doublearray\dblarray1_cs_d\dblarray1_cs_d.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray1_cs_d
@@ -43042,6 +47771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray1_cs_do.cmd_6232]
 RelativePath=JIT\Methodical\doublearray\dblarray1_cs_do\dblarray1_cs_do.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray1_cs_do
@@ -43049,6 +47779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray1_cs_r.cmd_6233]
 RelativePath=JIT\Methodical\doublearray\dblarray1_cs_r\dblarray1_cs_r.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray1_cs_r
@@ -43056,6 +47787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray1_cs_ro.cmd_6234]
 RelativePath=JIT\Methodical\doublearray\dblarray1_cs_ro\dblarray1_cs_ro.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray1_cs_ro
@@ -43063,6 +47795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray2_cs_d.cmd_6235]
 RelativePath=JIT\Methodical\doublearray\dblarray2_cs_d\dblarray2_cs_d.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray2_cs_d
@@ -43070,6 +47803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray2_cs_do.cmd_6236]
 RelativePath=JIT\Methodical\doublearray\dblarray2_cs_do\dblarray2_cs_do.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray2_cs_do
@@ -43077,6 +47811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray2_cs_r.cmd_6237]
 RelativePath=JIT\Methodical\doublearray\dblarray2_cs_r\dblarray2_cs_r.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray2_cs_r
@@ -43084,6 +47819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray2_cs_ro.cmd_6238]
 RelativePath=JIT\Methodical\doublearray\dblarray2_cs_ro\dblarray2_cs_ro.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray2_cs_ro
@@ -43091,6 +47827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray3_cs_d.cmd_6239]
 RelativePath=JIT\Methodical\doublearray\dblarray3_cs_d\dblarray3_cs_d.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray3_cs_d
@@ -43098,6 +47835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray3_cs_do.cmd_6240]
 RelativePath=JIT\Methodical\doublearray\dblarray3_cs_do\dblarray3_cs_do.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray3_cs_do
@@ -43105,6 +47843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray3_cs_r.cmd_6241]
 RelativePath=JIT\Methodical\doublearray\dblarray3_cs_r\dblarray3_cs_r.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray3_cs_r
@@ -43112,6 +47851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray3_cs_ro.cmd_6242]
 RelativePath=JIT\Methodical\doublearray\dblarray3_cs_ro\dblarray3_cs_ro.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray3_cs_ro
@@ -43119,6 +47859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray4_cs_d.cmd_6243]
 RelativePath=JIT\Methodical\doublearray\dblarray4_cs_d\dblarray4_cs_d.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray4_cs_d
@@ -43126,6 +47867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray4_cs_do.cmd_6244]
 RelativePath=JIT\Methodical\doublearray\dblarray4_cs_do\dblarray4_cs_do.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray4_cs_do
@@ -43133,6 +47875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray4_cs_r.cmd_6245]
 RelativePath=JIT\Methodical\doublearray\dblarray4_cs_r\dblarray4_cs_r.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray4_cs_r
@@ -43140,6 +47883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dblarray4_cs_ro.cmd_6246]
 RelativePath=JIT\Methodical\doublearray\dblarray4_cs_ro\dblarray4_cs_ro.cmd
 WorkingDir=JIT\Methodical\doublearray\dblarray4_cs_ro
@@ -43147,6 +47891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bug_445388.cmd_6247]
 RelativePath=JIT\Methodical\dynamic_methods\bug_445388\bug_445388.cmd
 WorkingDir=JIT\Methodical\dynamic_methods\bug_445388
@@ -43154,6 +47899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [emptyfinally_d.cmd_6248]
 RelativePath=JIT\Methodical\eh\basics\emptyfinally_d\emptyfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\emptyfinally_d
@@ -43161,6 +47907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [emptyfinally_r.cmd_6249]
 RelativePath=JIT\Methodical\eh\basics\emptyfinally_r\emptyfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\emptyfinally_r
@@ -43168,6 +47915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [multihandler_d.cmd_6250]
 RelativePath=JIT\Methodical\eh\basics\multihandler_d\multihandler_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\multihandler_d
@@ -43175,6 +47923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [multihandler_do.cmd_6251]
 RelativePath=JIT\Methodical\eh\basics\multihandler_do\multihandler_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\multihandler_do
@@ -43182,6 +47931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [multihandler_r.cmd_6252]
 RelativePath=JIT\Methodical\eh\basics\multihandler_r\multihandler_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\multihandler_r
@@ -43189,6 +47939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [multihandler_ro.cmd_6253]
 RelativePath=JIT\Methodical\eh\basics\multihandler_ro\multihandler_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\multihandler_ro
@@ -43196,6 +47947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincatch_d.cmd_6254]
 RelativePath=JIT\Methodical\eh\basics\throwincatch_d\throwincatch_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwincatch_d
@@ -43203,6 +47955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincatch_do.cmd_6255]
 RelativePath=JIT\Methodical\eh\basics\throwincatch_do\throwincatch_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwincatch_do
@@ -43210,6 +47963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincatch_r.cmd_6256]
 RelativePath=JIT\Methodical\eh\basics\throwincatch_r\throwincatch_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwincatch_r
@@ -43217,6 +47971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincatch_ro.cmd_6257]
 RelativePath=JIT\Methodical\eh\basics\throwincatch_ro\throwincatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwincatch_ro
@@ -43224,6 +47979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinclassconstructor_d.cmd_6258]
 RelativePath=JIT\Methodical\eh\basics\throwinclassconstructor_d\throwinclassconstructor_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinclassconstructor_d
@@ -43231,6 +47987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinclassconstructor_do.cmd_6259]
 RelativePath=JIT\Methodical\eh\basics\throwinclassconstructor_do\throwinclassconstructor_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinclassconstructor_do
@@ -43238,6 +47995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinclassconstructor_r.cmd_6260]
 RelativePath=JIT\Methodical\eh\basics\throwinclassconstructor_r\throwinclassconstructor_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinclassconstructor_r
@@ -43245,6 +48003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinclassconstructor_ro.cmd_6261]
 RelativePath=JIT\Methodical\eh\basics\throwinclassconstructor_ro\throwinclassconstructor_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinclassconstructor_ro
@@ -43252,6 +48011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinexcept_d.cmd_6262]
 RelativePath=JIT\Methodical\eh\basics\throwinexcept_d\throwinexcept_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinexcept_d
@@ -43259,6 +48019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinexcept_r.cmd_6263]
 RelativePath=JIT\Methodical\eh\basics\throwinexcept_r\throwinexcept_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinexcept_r
@@ -43266,6 +48027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfault_d.cmd_6264]
 RelativePath=JIT\Methodical\eh\basics\throwinfault_d\throwinfault_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfault_d
@@ -43273,6 +48035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfault_r.cmd_6265]
 RelativePath=JIT\Methodical\eh\basics\throwinfault_r\throwinfault_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfault_r
@@ -43280,6 +48043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfilter_d.cmd_6266]
 RelativePath=JIT\Methodical\eh\basics\throwinfilter_d\throwinfilter_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfilter_d
@@ -43287,6 +48051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfilter_r.cmd_6267]
 RelativePath=JIT\Methodical\eh\basics\throwinfilter_r\throwinfilter_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfilter_r
@@ -43294,6 +48059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyerrpathfn_d.cmd_6268]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyerrpathfn_d\throwinfinallyerrpathfn_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyerrpathfn_d
@@ -43301,6 +48067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyerrpathfn_do.cmd_6269]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyerrpathfn_do\throwinfinallyerrpathfn_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyerrpathfn_do
@@ -43308,6 +48075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyerrpathfn_r.cmd_6270]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyerrpathfn_r\throwinfinallyerrpathfn_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyerrpathfn_r
@@ -43315,6 +48083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyerrpathfn_ro.cmd_6271]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyerrpathfn_ro\throwinfinallyerrpathfn_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyerrpathfn_ro
@@ -43322,6 +48091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyerrpath_d.cmd_6272]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyerrpath_d\throwinfinallyerrpath_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyerrpath_d
@@ -43329,6 +48099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyerrpath_do.cmd_6273]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyerrpath_do\throwinfinallyerrpath_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyerrpath_do
@@ -43336,6 +48107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyerrpath_r.cmd_6274]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyerrpath_r\throwinfinallyerrpath_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyerrpath_r
@@ -43343,6 +48115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyerrpath_ro.cmd_6275]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyerrpath_ro\throwinfinallyerrpath_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyerrpath_ro
@@ -43350,6 +48123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyintryfilter1_d.cmd_6276]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyintryfilter1_d\throwinfinallyintryfilter1_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyintryfilter1_d
@@ -43357,6 +48131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyintryfilter1_r.cmd_6277]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyintryfilter1_r\throwinfinallyintryfilter1_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyintryfilter1_r
@@ -43364,6 +48139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyintryfilter2_d.cmd_6278]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyintryfilter2_d\throwinfinallyintryfilter2_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyintryfilter2_d
@@ -43371,6 +48147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyintryfilter2_r.cmd_6279]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyintryfilter2_r\throwinfinallyintryfilter2_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyintryfilter2_r
@@ -43378,6 +48155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyintryfilter3_d.cmd_6280]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyintryfilter3_d\throwinfinallyintryfilter3_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyintryfilter3_d
@@ -43385,6 +48163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyintryfilter3_r.cmd_6281]
 RelativePath=JIT\Methodical\eh\basics\throwinfinallyintryfilter3_r\throwinfinallyintryfilter3_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinallyintryfilter3_r
@@ -43392,6 +48171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_d.cmd_6282]
 RelativePath=JIT\Methodical\eh\basics\throwinfinally_d\throwinfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinally_d
@@ -43399,6 +48179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_do.cmd_6283]
 RelativePath=JIT\Methodical\eh\basics\throwinfinally_do\throwinfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinally_do
@@ -43406,6 +48187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_r.cmd_6284]
 RelativePath=JIT\Methodical\eh\basics\throwinfinally_r\throwinfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinally_r
@@ -43413,6 +48195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_ro.cmd_6285]
 RelativePath=JIT\Methodical\eh\basics\throwinfinally_ro\throwinfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwinfinally_ro
@@ -43420,6 +48203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwisfirstinstruction_d.cmd_6286]
 RelativePath=JIT\Methodical\eh\basics\throwisfirstinstruction_d\throwisfirstinstruction_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwisfirstinstruction_d
@@ -43427,6 +48211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwisfirstinstruction_r.cmd_6287]
 RelativePath=JIT\Methodical\eh\basics\throwisfirstinstruction_r\throwisfirstinstruction_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwisfirstinstruction_r
@@ -43434,6 +48219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwoutside_d.cmd_6288]
 RelativePath=JIT\Methodical\eh\basics\throwoutside_d\throwoutside_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwoutside_d
@@ -43441,6 +48227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwoutside_do.cmd_6289]
 RelativePath=JIT\Methodical\eh\basics\throwoutside_do\throwoutside_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwoutside_do
@@ -43448,6 +48235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwoutside_r.cmd_6290]
 RelativePath=JIT\Methodical\eh\basics\throwoutside_r\throwoutside_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwoutside_r
@@ -43455,6 +48243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwoutside_ro.cmd_6291]
 RelativePath=JIT\Methodical\eh\basics\throwoutside_ro\throwoutside_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\throwoutside_ro
@@ -43462,6 +48251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchtrycatch_d.cmd_6292]
 RelativePath=JIT\Methodical\eh\basics\trycatchtrycatch_d\trycatchtrycatch_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\trycatchtrycatch_d
@@ -43469,6 +48259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchtrycatch_do.cmd_6293]
 RelativePath=JIT\Methodical\eh\basics\trycatchtrycatch_do\trycatchtrycatch_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\trycatchtrycatch_do
@@ -43476,6 +48267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchtrycatch_r.cmd_6294]
 RelativePath=JIT\Methodical\eh\basics\trycatchtrycatch_r\trycatchtrycatch_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\trycatchtrycatch_r
@@ -43483,6 +48275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchtrycatch_ro.cmd_6295]
 RelativePath=JIT\Methodical\eh\basics\trycatchtrycatch_ro\trycatchtrycatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\trycatchtrycatch_ro
@@ -43490,6 +48283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatch_d.cmd_6296]
 RelativePath=JIT\Methodical\eh\basics\trycatch_d\trycatch_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\trycatch_d
@@ -43497,6 +48291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatch_do.cmd_6297]
 RelativePath=JIT\Methodical\eh\basics\trycatch_do\trycatch_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\trycatch_do
@@ -43504,6 +48299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatch_r.cmd_6298]
 RelativePath=JIT\Methodical\eh\basics\trycatch_r\trycatch_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\trycatch_r
@@ -43511,6 +48307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatch_ro.cmd_6299]
 RelativePath=JIT\Methodical\eh\basics\trycatch_ro\trycatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\trycatch_ro
@@ -43518,6 +48315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryexcept_d.cmd_6300]
 RelativePath=JIT\Methodical\eh\basics\tryexcept_d\tryexcept_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryexcept_d
@@ -43525,6 +48323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryexcept_r.cmd_6301]
 RelativePath=JIT\Methodical\eh\basics\tryexcept_r\tryexcept_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryexcept_r
@@ -43532,6 +48331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfaulttrycatchfn_d.cmd_6302]
 RelativePath=JIT\Methodical\eh\basics\tryfaulttrycatchfn_d\tryfaulttrycatchfn_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfaulttrycatchfn_d
@@ -43539,6 +48339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfaulttrycatchfn_r.cmd_6303]
 RelativePath=JIT\Methodical\eh\basics\tryfaulttrycatchfn_r\tryfaulttrycatchfn_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfaulttrycatchfn_r
@@ -43546,6 +48347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfaulttrycatch_d.cmd_6304]
 RelativePath=JIT\Methodical\eh\basics\tryfaulttrycatch_d\tryfaulttrycatch_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfaulttrycatch_d
@@ -43553,6 +48355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfaulttrycatch_r.cmd_6305]
 RelativePath=JIT\Methodical\eh\basics\tryfaulttrycatch_r\tryfaulttrycatch_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfaulttrycatch_r
@@ -43560,6 +48363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfault_d.cmd_6306]
 RelativePath=JIT\Methodical\eh\basics\tryfault_d\tryfault_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfault_d
@@ -43567,6 +48371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfault_r.cmd_6307]
 RelativePath=JIT\Methodical\eh\basics\tryfault_r\tryfault_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfault_r
@@ -43574,6 +48379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallytrycatch_d.cmd_6308]
 RelativePath=JIT\Methodical\eh\basics\tryfinallytrycatch_d\tryfinallytrycatch_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallytrycatch_d
@@ -43581,6 +48387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallytrycatch_do.cmd_6309]
 RelativePath=JIT\Methodical\eh\basics\tryfinallytrycatch_do\tryfinallytrycatch_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallytrycatch_do
@@ -43588,6 +48395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallytrycatch_r.cmd_6310]
 RelativePath=JIT\Methodical\eh\basics\tryfinallytrycatch_r\tryfinallytrycatch_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallytrycatch_r
@@ -43595,6 +48403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallytrycatch_ro.cmd_6311]
 RelativePath=JIT\Methodical\eh\basics\tryfinallytrycatch_ro\tryfinallytrycatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallytrycatch_ro
@@ -43602,6 +48411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallytryfinally_d.cmd_6312]
 RelativePath=JIT\Methodical\eh\basics\tryfinallytryfinally_d\tryfinallytryfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallytryfinally_d
@@ -43609,6 +48419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallytryfinally_do.cmd_6313]
 RelativePath=JIT\Methodical\eh\basics\tryfinallytryfinally_do\tryfinallytryfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallytryfinally_do
@@ -43616,6 +48427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallytryfinally_r.cmd_6314]
 RelativePath=JIT\Methodical\eh\basics\tryfinallytryfinally_r\tryfinallytryfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallytryfinally_r
@@ -43623,6 +48435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallytryfinally_ro.cmd_6315]
 RelativePath=JIT\Methodical\eh\basics\tryfinallytryfinally_ro\tryfinallytryfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallytryfinally_ro
@@ -43630,6 +48443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallywith2endfinally_d.cmd_6316]
 RelativePath=JIT\Methodical\eh\basics\tryfinallywith2endfinally_d\tryfinallywith2endfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallywith2endfinally_d
@@ -43637,6 +48451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallywith2endfinally_r.cmd_6317]
 RelativePath=JIT\Methodical\eh\basics\tryfinallywith2endfinally_r\tryfinallywith2endfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallywith2endfinally_r
@@ -43644,6 +48459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallywith2reachableendfinally_d.cmd_6318]
 RelativePath=JIT\Methodical\eh\basics\tryfinallywith2reachableendfinally_d\tryfinallywith2reachableendfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallywith2reachableendfinally_d
@@ -43651,6 +48467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallywith2reachableendfinally_r.cmd_6319]
 RelativePath=JIT\Methodical\eh\basics\tryfinallywith2reachableendfinally_r\tryfinallywith2reachableendfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinallywith2reachableendfinally_r
@@ -43658,6 +48475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinally_d.cmd_6320]
 RelativePath=JIT\Methodical\eh\basics\tryfinally_d\tryfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinally_d
@@ -43665,6 +48483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinally_do.cmd_6321]
 RelativePath=JIT\Methodical\eh\basics\tryfinally_do\tryfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinally_do
@@ -43672,6 +48491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinally_r.cmd_6322]
 RelativePath=JIT\Methodical\eh\basics\tryfinally_r\tryfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinally_r
@@ -43679,6 +48499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinally_ro.cmd_6323]
 RelativePath=JIT\Methodical\eh\basics\tryfinally_ro\tryfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\tryfinally_ro
@@ -43686,6 +48507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trythrowcatchfinally_d.cmd_6324]
 RelativePath=JIT\Methodical\eh\basics\trythrowcatchfinally_d\trythrowcatchfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\trythrowcatchfinally_d
@@ -43693,6 +48515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trythrowcatchfinally_do.cmd_6325]
 RelativePath=JIT\Methodical\eh\basics\trythrowcatchfinally_do\trythrowcatchfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\trythrowcatchfinally_do
@@ -43700,6 +48523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trythrowcatchfinally_r.cmd_6326]
 RelativePath=JIT\Methodical\eh\basics\trythrowcatchfinally_r\trythrowcatchfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\trythrowcatchfinally_r
@@ -43707,6 +48531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trythrowcatchfinally_ro.cmd_6327]
 RelativePath=JIT\Methodical\eh\basics\trythrowcatchfinally_ro\trythrowcatchfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\trythrowcatchfinally_ro
@@ -43714,6 +48539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trythrowcatch_d.cmd_6328]
 RelativePath=JIT\Methodical\eh\basics\trythrowcatch_d\trythrowcatch_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\trythrowcatch_d
@@ -43721,6 +48547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trythrowcatch_do.cmd_6329]
 RelativePath=JIT\Methodical\eh\basics\trythrowcatch_do\trythrowcatch_do.cmd
 WorkingDir=JIT\Methodical\eh\basics\trythrowcatch_do
@@ -43728,6 +48555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trythrowcatch_r.cmd_6330]
 RelativePath=JIT\Methodical\eh\basics\trythrowcatch_r\trythrowcatch_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\trythrowcatch_r
@@ -43735,6 +48563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trythrowcatch_ro.cmd_6331]
 RelativePath=JIT\Methodical\eh\basics\trythrowcatch_ro\trythrowcatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\basics\trythrowcatch_ro
@@ -43742,6 +48571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trythrowexcept_d.cmd_6332]
 RelativePath=JIT\Methodical\eh\basics\trythrowexcept_d\trythrowexcept_d.cmd
 WorkingDir=JIT\Methodical\eh\basics\trythrowexcept_d
@@ -43749,6 +48579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trythrowexcept_r.cmd_6333]
 RelativePath=JIT\Methodical\eh\basics\trythrowexcept_r\trythrowexcept_r.cmd
 WorkingDir=JIT\Methodical\eh\basics\trythrowexcept_r
@@ -43756,6 +48587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unsafe_d.cmd_6334]
 RelativePath=JIT\Methodical\eh\cs\unsafe_d\unsafe_d.cmd
 WorkingDir=JIT\Methodical\eh\cs\unsafe_d
@@ -43763,6 +48595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unsafe_do.cmd_6335]
 RelativePath=JIT\Methodical\eh\cs\unsafe_do\unsafe_do.cmd
 WorkingDir=JIT\Methodical\eh\cs\unsafe_do
@@ -43770,6 +48603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unsafe_r.cmd_6336]
 RelativePath=JIT\Methodical\eh\cs\unsafe_r\unsafe_r.cmd
 WorkingDir=JIT\Methodical\eh\cs\unsafe_r
@@ -43777,6 +48611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [unsafe_ro.cmd_6337]
 RelativePath=JIT\Methodical\eh\cs\unsafe_ro\unsafe_ro.cmd
 WorkingDir=JIT\Methodical\eh\cs\unsafe_ro
@@ -43784,6 +48619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badcodeaftercatch_d.cmd_6338]
 RelativePath=JIT\Methodical\eh\deadcode\badcodeaftercatch_d\badcodeaftercatch_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\badcodeaftercatch_d
@@ -43791,6 +48627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badcodeaftercatch_r.cmd_6339]
 RelativePath=JIT\Methodical\eh\deadcode\badcodeaftercatch_r\badcodeaftercatch_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\badcodeaftercatch_r
@@ -43798,6 +48635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badcodeafterfault_d.cmd_6340]
 RelativePath=JIT\Methodical\eh\deadcode\badcodeafterfault_d\badcodeafterfault_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\badcodeafterfault_d
@@ -43805,6 +48643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badcodeafterfault_r.cmd_6341]
 RelativePath=JIT\Methodical\eh\deadcode\badcodeafterfault_r\badcodeafterfault_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\badcodeafterfault_r
@@ -43812,6 +48651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badcodeafterfilter_d.cmd_6342]
 RelativePath=JIT\Methodical\eh\deadcode\badcodeafterfilter_d\badcodeafterfilter_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\badcodeafterfilter_d
@@ -43819,6 +48659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badcodeafterfilter_r.cmd_6343]
 RelativePath=JIT\Methodical\eh\deadcode\badcodeafterfilter_r\badcodeafterfilter_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\badcodeafterfilter_r
@@ -43826,6 +48667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badcodeaftertry_d.cmd_6346]
 RelativePath=JIT\Methodical\eh\deadcode\badcodeaftertry_d\badcodeaftertry_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\badcodeaftertry_d
@@ -43833,6 +48675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badcodeaftertry_r.cmd_6347]
 RelativePath=JIT\Methodical\eh\deadcode\badcodeaftertry_r\badcodeaftertry_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\badcodeaftertry_r
@@ -43840,6 +48683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badcodeinsidefinally_d.cmd_6348]
 RelativePath=JIT\Methodical\eh\deadcode\badcodeinsidefinally_d\badcodeinsidefinally_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\badcodeinsidefinally_d
@@ -43847,6 +48691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [badcodeinsidefinally_r.cmd_6349]
 RelativePath=JIT\Methodical\eh\deadcode\badcodeinsidefinally_r\badcodeinsidefinally_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\badcodeinsidefinally_r
@@ -43854,6 +48699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [branchoverendfinally_d.cmd_6350]
 RelativePath=JIT\Methodical\eh\deadcode\branchoverendfinally_d\branchoverendfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\branchoverendfinally_d
@@ -43861,6 +48707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [branchoverendfinally_r.cmd_6351]
 RelativePath=JIT\Methodical\eh\deadcode\branchoverendfinally_r\branchoverendfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\branchoverendfinally_r
@@ -43868,6 +48715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadcodeincatch_d.cmd_6352]
 RelativePath=JIT\Methodical\eh\deadcode\deadcodeincatch_d\deadcodeincatch_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadcodeincatch_d
@@ -43875,6 +48723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadcodeincatch_r.cmd_6353]
 RelativePath=JIT\Methodical\eh\deadcode\deadcodeincatch_r\deadcodeincatch_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadcodeincatch_r
@@ -43882,6 +48731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadEHregionacrossBB_d.cmd_6354]
 RelativePath=JIT\Methodical\eh\deadcode\deadEHregionacrossBB_d\deadEHregionacrossBB_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadEHregionacrossBB_d
@@ -43889,6 +48739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadEHregionacrossBB_r.cmd_6355]
 RelativePath=JIT\Methodical\eh\deadcode\deadEHregionacrossBB_r\deadEHregionacrossBB_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadEHregionacrossBB_r
@@ -43896,6 +48747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadnonlocalexit_d.cmd_6356]
 RelativePath=JIT\Methodical\eh\deadcode\deadnonlocalexit_d\deadnonlocalexit_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadnonlocalexit_d
@@ -43903,6 +48755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadnonlocalexit_r.cmd_6357]
 RelativePath=JIT\Methodical\eh\deadcode\deadnonlocalexit_r\deadnonlocalexit_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadnonlocalexit_r
@@ -43910,6 +48763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadoponerrorinfunclet_d.cmd_6358]
 RelativePath=JIT\Methodical\eh\deadcode\deadoponerrorinfunclet_d\deadoponerrorinfunclet_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadoponerrorinfunclet_d
@@ -43917,6 +48771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadoponerrorinfunclet_r.cmd_6359]
 RelativePath=JIT\Methodical\eh\deadcode\deadoponerrorinfunclet_r\deadoponerrorinfunclet_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadoponerrorinfunclet_r
@@ -43924,6 +48779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadoponerror_d.cmd_6360]
 RelativePath=JIT\Methodical\eh\deadcode\deadoponerror_d\deadoponerror_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadoponerror_d
@@ -43931,6 +48787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadoponerror_r.cmd_6361]
 RelativePath=JIT\Methodical\eh\deadcode\deadoponerror_r\deadoponerror_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadoponerror_r
@@ -43938,6 +48795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadrgninfunclet_d.cmd_6362]
 RelativePath=JIT\Methodical\eh\deadcode\deadrgninfunclet_d\deadrgninfunclet_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadrgninfunclet_d
@@ -43945,6 +48803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadrgninfunclet_r.cmd_6363]
 RelativePath=JIT\Methodical\eh\deadcode\deadrgninfunclet_r\deadrgninfunclet_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadrgninfunclet_r
@@ -43952,6 +48811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadtrycatch_d.cmd_6364]
 RelativePath=JIT\Methodical\eh\deadcode\deadtrycatch_d\deadtrycatch_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadtrycatch_d
@@ -43959,6 +48819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadtrycatch_r.cmd_6365]
 RelativePath=JIT\Methodical\eh\deadcode\deadtrycatch_r\deadtrycatch_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadtrycatch_r
@@ -43966,6 +48827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadtryfinallythrow_d.cmd_6366]
 RelativePath=JIT\Methodical\eh\deadcode\deadtryfinallythrow_d\deadtryfinallythrow_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadtryfinallythrow_d
@@ -43973,6 +48835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadtryfinallythrow_r.cmd_6367]
 RelativePath=JIT\Methodical\eh\deadcode\deadtryfinallythrow_r\deadtryfinallythrow_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadtryfinallythrow_r
@@ -43980,6 +48843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadtryfinally_d.cmd_6368]
 RelativePath=JIT\Methodical\eh\deadcode\deadtryfinally_d\deadtryfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadtryfinally_d
@@ -43987,6 +48851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deadtryfinally_r.cmd_6369]
 RelativePath=JIT\Methodical\eh\deadcode\deadtryfinally_r\deadtryfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\deadtryfinally_r
@@ -43994,6 +48859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [endfinallyinloop_d.cmd_6370]
 RelativePath=JIT\Methodical\eh\deadcode\endfinallyinloop_d\endfinallyinloop_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\endfinallyinloop_d
@@ -44001,6 +48867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [endfinallyinloop_r.cmd_6371]
 RelativePath=JIT\Methodical\eh\deadcode\endfinallyinloop_r\endfinallyinloop_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\endfinallyinloop_r
@@ -44008,6 +48875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loopstrswitchgoto_d.cmd_6372]
 RelativePath=JIT\Methodical\eh\deadcode\loopstrswitchgoto_d\loopstrswitchgoto_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\loopstrswitchgoto_d
@@ -44015,6 +48883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loopstrswitchgoto_do.cmd_6373]
 RelativePath=JIT\Methodical\eh\deadcode\loopstrswitchgoto_do\loopstrswitchgoto_do.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\loopstrswitchgoto_do
@@ -44022,6 +48891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loopstrswitchgoto_r.cmd_6374]
 RelativePath=JIT\Methodical\eh\deadcode\loopstrswitchgoto_r\loopstrswitchgoto_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\loopstrswitchgoto_r
@@ -44029,6 +48899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loopstrswitchgoto_ro.cmd_6375]
 RelativePath=JIT\Methodical\eh\deadcode\loopstrswitchgoto_ro\loopstrswitchgoto_ro.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\loopstrswitchgoto_ro
@@ -44036,6 +48907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [severaldeadehregions_d.cmd_6376]
 RelativePath=JIT\Methodical\eh\deadcode\severaldeadehregions_d\severaldeadehregions_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\severaldeadehregions_d
@@ -44043,6 +48915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [severaldeadehregions_r.cmd_6377]
 RelativePath=JIT\Methodical\eh\deadcode\severaldeadehregions_r\severaldeadehregions_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\severaldeadehregions_r
@@ -44050,6 +48923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [severalnesteddeadehregions_d.cmd_6378]
 RelativePath=JIT\Methodical\eh\deadcode\severalnesteddeadehregions_d\severalnesteddeadehregions_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\severalnesteddeadehregions_d
@@ -44057,6 +48931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [severalnesteddeadehregions_r.cmd_6379]
 RelativePath=JIT\Methodical\eh\deadcode\severalnesteddeadehregions_r\severalnesteddeadehregions_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\severalnesteddeadehregions_r
@@ -44064,6 +48939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simpledeadehregion_d.cmd_6380]
 RelativePath=JIT\Methodical\eh\deadcode\simpledeadehregion_d\simpledeadehregion_d.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\simpledeadehregion_d
@@ -44071,6 +48947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simpledeadehregion_r.cmd_6381]
 RelativePath=JIT\Methodical\eh\deadcode\simpledeadehregion_r\simpledeadehregion_r.cmd
 WorkingDir=JIT\Methodical\eh\deadcode\simpledeadehregion_r
@@ -44078,6 +48955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [backwardleave_d.cmd_6382]
 RelativePath=JIT\Methodical\eh\disconnected\backwardleave_d\backwardleave_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\backwardleave_d
@@ -44085,6 +48963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [backwardleave_r.cmd_6383]
 RelativePath=JIT\Methodical\eh\disconnected\backwardleave_r\backwardleave_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\backwardleave_r
@@ -44092,6 +48971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchbeforetrybody_d.cmd_6384]
 RelativePath=JIT\Methodical\eh\disconnected\catchbeforetrybody_d\catchbeforetrybody_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\catchbeforetrybody_d
@@ -44099,6 +48979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchbeforetrybody_r.cmd_6385]
 RelativePath=JIT\Methodical\eh\disconnected\catchbeforetrybody_r\catchbeforetrybody_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\catchbeforetrybody_r
@@ -44106,6 +48987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchtryintryfinally_d.cmd_6386]
 RelativePath=JIT\Methodical\eh\disconnected\catchtryintryfinally_d\catchtryintryfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\catchtryintryfinally_d
@@ -44113,6 +48995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchtryintryfinally_r.cmd_6387]
 RelativePath=JIT\Methodical\eh\disconnected\catchtryintryfinally_r\catchtryintryfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\catchtryintryfinally_r
@@ -44120,6 +49003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [faultbeforetrybody_d.cmd_6388]
 RelativePath=JIT\Methodical\eh\disconnected\faultbeforetrybody_d\faultbeforetrybody_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\faultbeforetrybody_d
@@ -44127,6 +49011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [faultbeforetrybody_r.cmd_6389]
 RelativePath=JIT\Methodical\eh\disconnected\faultbeforetrybody_r\faultbeforetrybody_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\faultbeforetrybody_r
@@ -44134,6 +49019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [finallybeforetrybody_d.cmd_6390]
 RelativePath=JIT\Methodical\eh\disconnected\finallybeforetrybody_d\finallybeforetrybody_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\finallybeforetrybody_d
@@ -44141,6 +49027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [finallybeforetrybody_r.cmd_6391]
 RelativePath=JIT\Methodical\eh\disconnected\finallybeforetrybody_r\finallybeforetrybody_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\finallybeforetrybody_r
@@ -44148,6 +49035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [finallytryintryfinally_d.cmd_6392]
 RelativePath=JIT\Methodical\eh\disconnected\finallytryintryfinally_d\finallytryintryfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\finallytryintryfinally_d
@@ -44155,6 +49043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [finallytryintryfinally_r.cmd_6393]
 RelativePath=JIT\Methodical\eh\disconnected\finallytryintryfinally_r\finallytryintryfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\finallytryintryfinally_r
@@ -44162,6 +49051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [reversedhandlers_d.cmd_6394]
 RelativePath=JIT\Methodical\eh\disconnected\reversedhandlers_d\reversedhandlers_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\reversedhandlers_d
@@ -44169,6 +49059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [reversedhandlers_r.cmd_6395]
 RelativePath=JIT\Methodical\eh\disconnected\reversedhandlers_r\reversedhandlers_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\reversedhandlers_r
@@ -44176,6 +49067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [reversedtryblock_d.cmd_6396]
 RelativePath=JIT\Methodical\eh\disconnected\reversedtryblock_d\reversedtryblock_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\reversedtryblock_d
@@ -44183,6 +49075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [reversedtryblock_r.cmd_6397]
 RelativePath=JIT\Methodical\eh\disconnected\reversedtryblock_r\reversedtryblock_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\reversedtryblock_r
@@ -44190,6 +49083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sehhandlerbeforetry_d.cmd_6398]
 RelativePath=JIT\Methodical\eh\disconnected\sehhandlerbeforetry_d\sehhandlerbeforetry_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\sehhandlerbeforetry_d
@@ -44197,6 +49091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [sehhandlerbeforetry_r.cmd_6399]
 RelativePath=JIT\Methodical\eh\disconnected\sehhandlerbeforetry_r\sehhandlerbeforetry_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\sehhandlerbeforetry_r
@@ -44204,6 +49099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [testeit_d.cmd_6400]
 RelativePath=JIT\Methodical\eh\disconnected\testeit_d\testeit_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\testeit_d
@@ -44211,6 +49107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [testeit_r.cmd_6401]
 RelativePath=JIT\Methodical\eh\disconnected\testeit_r\testeit_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\testeit_r
@@ -44218,6 +49115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trybodyinbetweencatchhandlers_d.cmd_6402]
 RelativePath=JIT\Methodical\eh\disconnected\trybodyinbetweencatchhandlers_d\trybodyinbetweencatchhandlers_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\trybodyinbetweencatchhandlers_d
@@ -44225,6 +49123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trybodyinbetweencatchhandlers_r.cmd_6403]
 RelativePath=JIT\Methodical\eh\disconnected\trybodyinbetweencatchhandlers_r\trybodyinbetweencatchhandlers_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\trybodyinbetweencatchhandlers_r
@@ -44232,6 +49131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallyincatchtry_d.cmd_6404]
 RelativePath=JIT\Methodical\eh\disconnected\tryfinallyincatchtry_d\tryfinallyincatchtry_d.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\tryfinallyincatchtry_d
@@ -44239,6 +49139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallyincatchtry_r.cmd_6405]
 RelativePath=JIT\Methodical\eh\disconnected\tryfinallyincatchtry_r\tryfinallyincatchtry_r.cmd
 WorkingDir=JIT\Methodical\eh\disconnected\tryfinallyincatchtry_r
@@ -44246,6 +49147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchrettoinnertry_cs_d.cmd_6406]
 RelativePath=JIT\Methodical\eh\finallyexec\catchrettoinnertry_cs_d\catchrettoinnertry_cs_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\catchrettoinnertry_cs_d
@@ -44253,6 +49155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchrettoinnertry_cs_do.cmd_6407]
 RelativePath=JIT\Methodical\eh\finallyexec\catchrettoinnertry_cs_do\catchrettoinnertry_cs_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\catchrettoinnertry_cs_do
@@ -44260,6 +49163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchrettoinnertry_cs_r.cmd_6408]
 RelativePath=JIT\Methodical\eh\finallyexec\catchrettoinnertry_cs_r\catchrettoinnertry_cs_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\catchrettoinnertry_cs_r
@@ -44267,6 +49171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchrettoinnertry_cs_ro.cmd_6409]
 RelativePath=JIT\Methodical\eh\finallyexec\catchrettoinnertry_cs_ro\catchrettoinnertry_cs_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\catchrettoinnertry_cs_ro
@@ -44274,6 +49179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchrettoinnertry_d.cmd_6410]
 RelativePath=JIT\Methodical\eh\finallyexec\catchrettoinnertry_d\catchrettoinnertry_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\catchrettoinnertry_d
@@ -44281,6 +49187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchrettoinnertry_r.cmd_6411]
 RelativePath=JIT\Methodical\eh\finallyexec\catchrettoinnertry_r\catchrettoinnertry_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\catchrettoinnertry_r
@@ -44288,6 +49195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [localgotoinahandler_d.cmd_6412]
 RelativePath=JIT\Methodical\eh\finallyexec\localgotoinahandler_d\localgotoinahandler_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\localgotoinahandler_d
@@ -44295,6 +49203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [localgotoinahandler_do.cmd_6413]
 RelativePath=JIT\Methodical\eh\finallyexec\localgotoinahandler_do\localgotoinahandler_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\localgotoinahandler_do
@@ -44302,6 +49211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [localgotoinahandler_r.cmd_6414]
 RelativePath=JIT\Methodical\eh\finallyexec\localgotoinahandler_r\localgotoinahandler_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\localgotoinahandler_r
@@ -44309,6 +49219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [localgotoinahandler_ro.cmd_6415]
 RelativePath=JIT\Methodical\eh\finallyexec\localgotoinahandler_ro\localgotoinahandler_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\localgotoinahandler_ro
@@ -44316,6 +49227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loopinfinally_d.cmd_6416]
 RelativePath=JIT\Methodical\eh\finallyexec\loopinfinally_d\loopinfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\loopinfinally_d
@@ -44323,6 +49235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loopinfinally_do.cmd_6417]
 RelativePath=JIT\Methodical\eh\finallyexec\loopinfinally_do\loopinfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\loopinfinally_do
@@ -44330,6 +49243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loopinfinally_r.cmd_6418]
 RelativePath=JIT\Methodical\eh\finallyexec\loopinfinally_r\loopinfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\loopinfinally_r
@@ -44337,6 +49251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loopinfinally_ro.cmd_6419]
 RelativePath=JIT\Methodical\eh\finallyexec\loopinfinally_ro\loopinfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\loopinfinally_ro
@@ -44344,6 +49259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedfinallycall_d.cmd_6420]
 RelativePath=JIT\Methodical\eh\finallyexec\nestedfinallycall_d\nestedfinallycall_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nestedfinallycall_d
@@ -44351,6 +49267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedfinallycall_r.cmd_6421]
 RelativePath=JIT\Methodical\eh\finallyexec\nestedfinallycall_r\nestedfinallycall_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nestedfinallycall_r
@@ -44358,6 +49275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexittobeginningoftry_d.cmd_6422]
 RelativePath=JIT\Methodical\eh\finallyexec\nonlocalexittobeginningoftry_d\nonlocalexittobeginningoftry_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nonlocalexittobeginningoftry_d
@@ -44365,6 +49283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexittobeginningoftry_do.cmd_6423]
 RelativePath=JIT\Methodical\eh\finallyexec\nonlocalexittobeginningoftry_do\nonlocalexittobeginningoftry_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nonlocalexittobeginningoftry_do
@@ -44372,6 +49291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexittobeginningoftry_r.cmd_6424]
 RelativePath=JIT\Methodical\eh\finallyexec\nonlocalexittobeginningoftry_r\nonlocalexittobeginningoftry_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nonlocalexittobeginningoftry_r
@@ -44379,6 +49299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexittobeginningoftry_ro.cmd_6425]
 RelativePath=JIT\Methodical\eh\finallyexec\nonlocalexittobeginningoftry_ro\nonlocalexittobeginningoftry_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nonlocalexittobeginningoftry_ro
@@ -44386,6 +49307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexittonestedsibling_d.cmd_6426]
 RelativePath=JIT\Methodical\eh\finallyexec\nonlocalexittonestedsibling_d\nonlocalexittonestedsibling_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nonlocalexittonestedsibling_d
@@ -44393,6 +49315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexittonestedsibling_r.cmd_6427]
 RelativePath=JIT\Methodical\eh\finallyexec\nonlocalexittonestedsibling_r\nonlocalexittonestedsibling_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nonlocalexittonestedsibling_r
@@ -44400,6 +49323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalgotoinatryblockinahandler_d.cmd_6428]
 RelativePath=JIT\Methodical\eh\finallyexec\nonlocalgotoinatryblockinahandler_d\nonlocalgotoinatryblockinahandler_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nonlocalgotoinatryblockinahandler_d
@@ -44407,6 +49331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalgotoinatryblockinahandler_do.cmd_6429]
 RelativePath=JIT\Methodical\eh\finallyexec\nonlocalgotoinatryblockinahandler_do\nonlocalgotoinatryblockinahandler_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nonlocalgotoinatryblockinahandler_do
@@ -44414,6 +49339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalgotoinatryblockinahandler_r.cmd_6430]
 RelativePath=JIT\Methodical\eh\finallyexec\nonlocalgotoinatryblockinahandler_r\nonlocalgotoinatryblockinahandler_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nonlocalgotoinatryblockinahandler_r
@@ -44421,6 +49347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalgotoinatryblockinahandler_ro.cmd_6431]
 RelativePath=JIT\Methodical\eh\finallyexec\nonlocalgotoinatryblockinahandler_ro\nonlocalgotoinatryblockinahandler_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\nonlocalgotoinatryblockinahandler_ro
@@ -44428,6 +49355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplenonlocalexitnestedintrycatch_d.cmd_6432]
 RelativePath=JIT\Methodical\eh\finallyexec\simplenonlocalexitnestedintrycatch_d\simplenonlocalexitnestedintrycatch_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\simplenonlocalexitnestedintrycatch_d
@@ -44435,6 +49363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplenonlocalexitnestedintrycatch_do.cmd_6433]
 RelativePath=JIT\Methodical\eh\finallyexec\simplenonlocalexitnestedintrycatch_do\simplenonlocalexitnestedintrycatch_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\simplenonlocalexitnestedintrycatch_do
@@ -44442,6 +49371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplenonlocalexitnestedintrycatch_r.cmd_6434]
 RelativePath=JIT\Methodical\eh\finallyexec\simplenonlocalexitnestedintrycatch_r\simplenonlocalexitnestedintrycatch_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\simplenonlocalexitnestedintrycatch_r
@@ -44449,6 +49379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplenonlocalexitnestedintrycatch_ro.cmd_6435]
 RelativePath=JIT\Methodical\eh\finallyexec\simplenonlocalexitnestedintrycatch_ro\simplenonlocalexitnestedintrycatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\simplenonlocalexitnestedintrycatch_ro
@@ -44456,6 +49387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplenonlocalexit_d.cmd_6436]
 RelativePath=JIT\Methodical\eh\finallyexec\simplenonlocalexit_d\simplenonlocalexit_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\simplenonlocalexit_d
@@ -44463,6 +49395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplenonlocalexit_do.cmd_6437]
 RelativePath=JIT\Methodical\eh\finallyexec\simplenonlocalexit_do\simplenonlocalexit_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\simplenonlocalexit_do
@@ -44470,6 +49403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplenonlocalexit_r.cmd_6438]
 RelativePath=JIT\Methodical\eh\finallyexec\simplenonlocalexit_r\simplenonlocalexit_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\simplenonlocalexit_r
@@ -44477,6 +49411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplenonlocalexit_ro.cmd_6439]
 RelativePath=JIT\Methodical\eh\finallyexec\simplenonlocalexit_ro\simplenonlocalexit_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\simplenonlocalexit_ro
@@ -44484,6 +49419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [switchincatch_d.cmd_6440]
 RelativePath=JIT\Methodical\eh\finallyexec\switchincatch_d\switchincatch_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\switchincatch_d
@@ -44491,6 +49427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [switchincatch_do.cmd_6441]
 RelativePath=JIT\Methodical\eh\finallyexec\switchincatch_do\switchincatch_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\switchincatch_do
@@ -44498,6 +49435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [switchincatch_r.cmd_6442]
 RelativePath=JIT\Methodical\eh\finallyexec\switchincatch_r\switchincatch_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\switchincatch_r
@@ -44505,6 +49443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [switchincatch_ro.cmd_6443]
 RelativePath=JIT\Methodical\eh\finallyexec\switchincatch_ro\switchincatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\switchincatch_ro
@@ -44512,6 +49451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit1_d.cmd_6444]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit1_d\tryCatchFinallyThrow_nonlocalexit1_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit1_d
@@ -44519,6 +49459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit1_do.cmd_6445]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit1_do\tryCatchFinallyThrow_nonlocalexit1_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit1_do
@@ -44526,6 +49467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit1_r.cmd_6446]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit1_r\tryCatchFinallyThrow_nonlocalexit1_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit1_r
@@ -44533,6 +49475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit1_ro.cmd_6447]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit1_ro\tryCatchFinallyThrow_nonlocalexit1_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit1_ro
@@ -44540,6 +49483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit2_d.cmd_6448]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit2_d\tryCatchFinallyThrow_nonlocalexit2_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit2_d
@@ -44547,6 +49491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit2_do.cmd_6449]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit2_do\tryCatchFinallyThrow_nonlocalexit2_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit2_do
@@ -44554,6 +49499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit2_r.cmd_6450]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit2_r\tryCatchFinallyThrow_nonlocalexit2_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit2_r
@@ -44561,6 +49507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit2_ro.cmd_6451]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit2_ro\tryCatchFinallyThrow_nonlocalexit2_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit2_ro
@@ -44568,6 +49515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit3_d.cmd_6452]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit3_d\tryCatchFinallyThrow_nonlocalexit3_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit3_d
@@ -44575,6 +49523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit3_do.cmd_6453]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit3_do\tryCatchFinallyThrow_nonlocalexit3_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit3_do
@@ -44582,6 +49531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit3_r.cmd_6454]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit3_r\tryCatchFinallyThrow_nonlocalexit3_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit3_r
@@ -44589,6 +49539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit3_ro.cmd_6455]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit3_ro\tryCatchFinallyThrow_nonlocalexit3_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit3_ro
@@ -44596,6 +49547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit4_d.cmd_6456]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit4_d\tryCatchFinallyThrow_nonlocalexit4_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit4_d
@@ -44603,6 +49555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit4_do.cmd_6457]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit4_do\tryCatchFinallyThrow_nonlocalexit4_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit4_do
@@ -44610,6 +49563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit4_r.cmd_6458]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit4_r\tryCatchFinallyThrow_nonlocalexit4_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit4_r
@@ -44617,6 +49571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryCatchFinallyThrow_nonlocalexit4_ro.cmd_6459]
 RelativePath=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit4_ro\tryCatchFinallyThrow_nonlocalexit4_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryCatchFinallyThrow_nonlocalexit4_ro
@@ -44624,6 +49579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallythrow_nonlocalexit_d.cmd_6460]
 RelativePath=JIT\Methodical\eh\finallyexec\tryfinallythrow_nonlocalexit_d\tryfinallythrow_nonlocalexit_d.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryfinallythrow_nonlocalexit_d
@@ -44631,6 +49587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallythrow_nonlocalexit_do.cmd_6461]
 RelativePath=JIT\Methodical\eh\finallyexec\tryfinallythrow_nonlocalexit_do\tryfinallythrow_nonlocalexit_do.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryfinallythrow_nonlocalexit_do
@@ -44638,6 +49595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallythrow_nonlocalexit_r.cmd_6462]
 RelativePath=JIT\Methodical\eh\finallyexec\tryfinallythrow_nonlocalexit_r\tryfinallythrow_nonlocalexit_r.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryfinallythrow_nonlocalexit_r
@@ -44645,6 +49603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallythrow_nonlocalexit_ro.cmd_6463]
 RelativePath=JIT\Methodical\eh\finallyexec\tryfinallythrow_nonlocalexit_ro\tryfinallythrow_nonlocalexit_ro.cmd
 WorkingDir=JIT\Methodical\eh\finallyexec\tryfinallythrow_nonlocalexit_ro
@@ -44652,6 +49611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincatch_d.cmd_6464]
 RelativePath=JIT\Methodical\eh\generics\throwincatch_d\throwincatch_d.cmd
 WorkingDir=JIT\Methodical\eh\generics\throwincatch_d
@@ -44659,6 +49619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincatch_do.cmd_6465]
 RelativePath=JIT\Methodical\eh\generics\throwincatch_do\throwincatch_do.cmd
 WorkingDir=JIT\Methodical\eh\generics\throwincatch_do
@@ -44666,6 +49627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincatch_r.cmd_6466]
 RelativePath=JIT\Methodical\eh\generics\throwincatch_r\throwincatch_r.cmd
 WorkingDir=JIT\Methodical\eh\generics\throwincatch_r
@@ -44673,6 +49635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincatch_ro.cmd_6467]
 RelativePath=JIT\Methodical\eh\generics\throwincatch_ro\throwincatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\generics\throwincatch_ro
@@ -44680,6 +49643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchnestedtype_d.cmd_6468]
 RelativePath=JIT\Methodical\eh\generics\trycatchnestedtype_d\trycatchnestedtype_d.cmd
 WorkingDir=JIT\Methodical\eh\generics\trycatchnestedtype_d
@@ -44687,6 +49651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchnestedtype_do.cmd_6469]
 RelativePath=JIT\Methodical\eh\generics\trycatchnestedtype_do\trycatchnestedtype_do.cmd
 WorkingDir=JIT\Methodical\eh\generics\trycatchnestedtype_do
@@ -44694,6 +49659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchnestedtype_r.cmd_6470]
 RelativePath=JIT\Methodical\eh\generics\trycatchnestedtype_r\trycatchnestedtype_r.cmd
 WorkingDir=JIT\Methodical\eh\generics\trycatchnestedtype_r
@@ -44701,6 +49667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchnestedtype_ro.cmd_6471]
 RelativePath=JIT\Methodical\eh\generics\trycatchnestedtype_ro\trycatchnestedtype_ro.cmd
 WorkingDir=JIT\Methodical\eh\generics\trycatchnestedtype_ro
@@ -44708,6 +49675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchsimpletype_d.cmd_6472]
 RelativePath=JIT\Methodical\eh\generics\trycatchsimpletype_d\trycatchsimpletype_d.cmd
 WorkingDir=JIT\Methodical\eh\generics\trycatchsimpletype_d
@@ -44715,6 +49683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchsimpletype_do.cmd_6473]
 RelativePath=JIT\Methodical\eh\generics\trycatchsimpletype_do\trycatchsimpletype_do.cmd
 WorkingDir=JIT\Methodical\eh\generics\trycatchsimpletype_do
@@ -44722,6 +49691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchsimpletype_r.cmd_6474]
 RelativePath=JIT\Methodical\eh\generics\trycatchsimpletype_r\trycatchsimpletype_r.cmd
 WorkingDir=JIT\Methodical\eh\generics\trycatchsimpletype_r
@@ -44729,6 +49699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchsimpletype_ro.cmd_6475]
 RelativePath=JIT\Methodical\eh\generics\trycatchsimpletype_ro\trycatchsimpletype_ro.cmd
 WorkingDir=JIT\Methodical\eh\generics\trycatchsimpletype_ro
@@ -44736,6 +49707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ehso.cmd_6476]
 RelativePath=JIT\Methodical\eh\interactions\ehso\ehso.cmd
 WorkingDir=JIT\Methodical\eh\interactions\ehso
@@ -44743,6 +49715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [gcincatch_d.cmd_6477]
 RelativePath=JIT\Methodical\eh\interactions\gcincatch_d\gcincatch_d.cmd
 WorkingDir=JIT\Methodical\eh\interactions\gcincatch_d
@@ -44750,6 +49723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [gcincatch_do.cmd_6478]
 RelativePath=JIT\Methodical\eh\interactions\gcincatch_do\gcincatch_do.cmd
 WorkingDir=JIT\Methodical\eh\interactions\gcincatch_do
@@ -44757,6 +49731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [gcincatch_r.cmd_6479]
 RelativePath=JIT\Methodical\eh\interactions\gcincatch_r\gcincatch_r.cmd
 WorkingDir=JIT\Methodical\eh\interactions\gcincatch_r
@@ -44764,6 +49739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [gcincatch_ro.cmd_6480]
 RelativePath=JIT\Methodical\eh\interactions\gcincatch_ro\gcincatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\interactions\gcincatch_ro
@@ -44771,6 +49747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rangecheckinfinally_d.cmd_6481]
 RelativePath=JIT\Methodical\eh\interactions\rangecheckinfinally_d\rangecheckinfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\interactions\rangecheckinfinally_d
@@ -44778,6 +49755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rangecheckinfinally_do.cmd_6482]
 RelativePath=JIT\Methodical\eh\interactions\rangecheckinfinally_do\rangecheckinfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\interactions\rangecheckinfinally_do
@@ -44785,6 +49763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rangecheckinfinally_r.cmd_6483]
 RelativePath=JIT\Methodical\eh\interactions\rangecheckinfinally_r\rangecheckinfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\interactions\rangecheckinfinally_r
@@ -44792,6 +49771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rangecheckinfinally_ro.cmd_6484]
 RelativePath=JIT\Methodical\eh\interactions\rangecheckinfinally_ro\rangecheckinfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\interactions\rangecheckinfinally_ro
@@ -44799,6 +49779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [strswitchfinal_d.cmd_6485]
 RelativePath=JIT\Methodical\eh\interactions\strswitchfinal_d\strswitchfinal_d.cmd
 WorkingDir=JIT\Methodical\eh\interactions\strswitchfinal_d
@@ -44806,6 +49787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [strswitchfinal_do.cmd_6486]
 RelativePath=JIT\Methodical\eh\interactions\strswitchfinal_do\strswitchfinal_do.cmd
 WorkingDir=JIT\Methodical\eh\interactions\strswitchfinal_do
@@ -44813,6 +49795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [strswitchfinal_r.cmd_6487]
 RelativePath=JIT\Methodical\eh\interactions\strswitchfinal_r\strswitchfinal_r.cmd
 WorkingDir=JIT\Methodical\eh\interactions\strswitchfinal_r
@@ -44820,6 +49803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [strswitchfinal_ro.cmd_6488]
 RelativePath=JIT\Methodical\eh\interactions\strswitchfinal_ro\strswitchfinal_ro.cmd
 WorkingDir=JIT\Methodical\eh\interactions\strswitchfinal_ro
@@ -44827,6 +49811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [switchinfinally_d.cmd_6489]
 RelativePath=JIT\Methodical\eh\interactions\switchinfinally_d\switchinfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\interactions\switchinfinally_d
@@ -44834,6 +49819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [switchinfinally_do.cmd_6490]
 RelativePath=JIT\Methodical\eh\interactions\switchinfinally_do\switchinfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\interactions\switchinfinally_do
@@ -44841,6 +49827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [switchinfinally_r.cmd_6491]
 RelativePath=JIT\Methodical\eh\interactions\switchinfinally_r\switchinfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\interactions\switchinfinally_r
@@ -44848,6 +49835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [switchinfinally_ro.cmd_6492]
 RelativePath=JIT\Methodical\eh\interactions\switchinfinally_ro\switchinfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\interactions\switchinfinally_ro
@@ -44855,6 +49843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw1dimarray_d.cmd_6493]
 RelativePath=JIT\Methodical\eh\interactions\throw1dimarray_d\throw1dimarray_d.cmd
 WorkingDir=JIT\Methodical\eh\interactions\throw1dimarray_d
@@ -44862,6 +49851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw1dimarray_r.cmd_6494]
 RelativePath=JIT\Methodical\eh\interactions\throw1dimarray_r\throw1dimarray_r.cmd
 WorkingDir=JIT\Methodical\eh\interactions\throw1dimarray_r
@@ -44869,6 +49859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw2dimarray_d.cmd_6495]
 RelativePath=JIT\Methodical\eh\interactions\throw2dimarray_d\throw2dimarray_d.cmd
 WorkingDir=JIT\Methodical\eh\interactions\throw2dimarray_d
@@ -44876,6 +49867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throw2dimarray_r.cmd_6496]
 RelativePath=JIT\Methodical\eh\interactions\throw2dimarray_r\throw2dimarray_r.cmd
 WorkingDir=JIT\Methodical\eh\interactions\throw2dimarray_r
@@ -44883,6 +49875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [volatilefromfinally.cmd_6497]
 RelativePath=JIT\Methodical\eh\interactions\volatilefromfinally\volatilefromfinally.cmd
 WorkingDir=JIT\Methodical\eh\interactions\volatilefromfinally
@@ -44890,6 +49883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [2branchesoutoftry_d.cmd_6498]
 RelativePath=JIT\Methodical\eh\leaves\2branchesoutoftry_d\2branchesoutoftry_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\2branchesoutoftry_d
@@ -44897,6 +49891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [2branchesoutoftry_r.cmd_6499]
 RelativePath=JIT\Methodical\eh\leaves\2branchesoutoftry_r\2branchesoutoftry_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\2branchesoutoftry_r
@@ -44904,6 +49899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [backwardleaveincatch_d.cmd_6500]
 RelativePath=JIT\Methodical\eh\leaves\backwardleaveincatch_d\backwardleaveincatch_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\backwardleaveincatch_d
@@ -44911,6 +49907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [backwardleaveincatch_r.cmd_6501]
 RelativePath=JIT\Methodical\eh\leaves\backwardleaveincatch_r\backwardleaveincatch_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\backwardleaveincatch_r
@@ -44918,6 +49915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [branchbackwardswithcatch_d.cmd_6502]
 RelativePath=JIT\Methodical\eh\leaves\branchbackwardswithcatch_d\branchbackwardswithcatch_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\branchbackwardswithcatch_d
@@ -44925,6 +49923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [branchbackwardswithcatch_r.cmd_6503]
 RelativePath=JIT\Methodical\eh\leaves\branchbackwardswithcatch_r\branchbackwardswithcatch_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\branchbackwardswithcatch_r
@@ -44932,6 +49931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [branchbackwardswithfinally_d.cmd_6504]
 RelativePath=JIT\Methodical\eh\leaves\branchbackwardswithfinally_d\branchbackwardswithfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\branchbackwardswithfinally_d
@@ -44939,6 +49939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [branchbackwardswithfinally_r.cmd_6505]
 RelativePath=JIT\Methodical\eh\leaves\branchbackwardswithfinally_r\branchbackwardswithfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\branchbackwardswithfinally_r
@@ -44946,6 +49947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [branchoutofnestedtryfinally_d.cmd_6506]
 RelativePath=JIT\Methodical\eh\leaves\branchoutofnestedtryfinally_d\branchoutofnestedtryfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\branchoutofnestedtryfinally_d
@@ -44953,6 +49955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [branchoutofnestedtryfinally_r.cmd_6507]
 RelativePath=JIT\Methodical\eh\leaves\branchoutofnestedtryfinally_r\branchoutofnestedtryfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\branchoutofnestedtryfinally_r
@@ -44960,6 +49963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [branchoutoftryfinally_d.cmd_6508]
 RelativePath=JIT\Methodical\eh\leaves\branchoutoftryfinally_d\branchoutoftryfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\branchoutoftryfinally_d
@@ -44967,6 +49971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [branchoutoftryfinally_r.cmd_6509]
 RelativePath=JIT\Methodical\eh\leaves\branchoutoftryfinally_r\branchoutoftryfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\branchoutoftryfinally_r
@@ -44974,6 +49979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchretnonlocalexitinfunclet_d.cmd_6510]
 RelativePath=JIT\Methodical\eh\leaves\catchretnonlocalexitinfunclet_d\catchretnonlocalexitinfunclet_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\catchretnonlocalexitinfunclet_d
@@ -44981,6 +49987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchretnonlocalexitinfunclet_do.cmd_6511]
 RelativePath=JIT\Methodical\eh\leaves\catchretnonlocalexitinfunclet_do\catchretnonlocalexitinfunclet_do.cmd
 WorkingDir=JIT\Methodical\eh\leaves\catchretnonlocalexitinfunclet_do
@@ -44988,6 +49995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchretnonlocalexitinfunclet_r.cmd_6512]
 RelativePath=JIT\Methodical\eh\leaves\catchretnonlocalexitinfunclet_r\catchretnonlocalexitinfunclet_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\catchretnonlocalexitinfunclet_r
@@ -44995,6 +50003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchretnonlocalexitinfunclet_ro.cmd_6513]
 RelativePath=JIT\Methodical\eh\leaves\catchretnonlocalexitinfunclet_ro\catchretnonlocalexitinfunclet_ro.cmd
 WorkingDir=JIT\Methodical\eh\leaves\catchretnonlocalexitinfunclet_ro
@@ -45002,6 +50011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [forwardleaveincatch_d.cmd_6514]
 RelativePath=JIT\Methodical\eh\leaves\forwardleaveincatch_d\forwardleaveincatch_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\forwardleaveincatch_d
@@ -45009,6 +50019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [forwardleaveincatch_r.cmd_6515]
 RelativePath=JIT\Methodical\eh\leaves\forwardleaveincatch_r\forwardleaveincatch_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\forwardleaveincatch_r
@@ -45016,6 +50027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [labelbeforefinally_d.cmd_6516]
 RelativePath=JIT\Methodical\eh\leaves\labelbeforefinally_d\labelbeforefinally_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\labelbeforefinally_d
@@ -45023,6 +50035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [labelbeforefinally_r.cmd_6517]
 RelativePath=JIT\Methodical\eh\leaves\labelbeforefinally_r\labelbeforefinally_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\labelbeforefinally_r
@@ -45030,6 +50043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [labelbeginningfinally_d.cmd_6518]
 RelativePath=JIT\Methodical\eh\leaves\labelbeginningfinally_d\labelbeginningfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\labelbeginningfinally_d
@@ -45037,6 +50051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [labelbeginningfinally_r.cmd_6519]
 RelativePath=JIT\Methodical\eh\leaves\labelbeginningfinally_r\labelbeginningfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\labelbeginningfinally_r
@@ -45044,6 +50059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [leaveinsameregion_d.cmd_6520]
 RelativePath=JIT\Methodical\eh\leaves\leaveinsameregion_d\leaveinsameregion_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\leaveinsameregion_d
@@ -45051,6 +50067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [leaveinsameregion_r.cmd_6521]
 RelativePath=JIT\Methodical\eh\leaves\leaveinsameregion_r\leaveinsameregion_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\leaveinsameregion_r
@@ -45058,6 +50075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [leaveintotrybody_d.cmd_6522]
 RelativePath=JIT\Methodical\eh\leaves\leaveintotrybody_d\leaveintotrybody_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\leaveintotrybody_d
@@ -45065,6 +50083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [leaveintotrybody_r.cmd_6523]
 RelativePath=JIT\Methodical\eh\leaves\leaveintotrybody_r\leaveintotrybody_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\leaveintotrybody_r
@@ -45072,6 +50091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexitfromnestedcatch_d.cmd_6524]
 RelativePath=JIT\Methodical\eh\leaves\nonlocalexitfromnestedcatch_d\nonlocalexitfromnestedcatch_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\nonlocalexitfromnestedcatch_d
@@ -45079,6 +50099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexitfromnestedcatch_do.cmd_6525]
 RelativePath=JIT\Methodical\eh\leaves\nonlocalexitfromnestedcatch_do\nonlocalexitfromnestedcatch_do.cmd
 WorkingDir=JIT\Methodical\eh\leaves\nonlocalexitfromnestedcatch_do
@@ -45086,6 +50107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexitfromnestedcatch_r.cmd_6526]
 RelativePath=JIT\Methodical\eh\leaves\nonlocalexitfromnestedcatch_r\nonlocalexitfromnestedcatch_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\nonlocalexitfromnestedcatch_r
@@ -45093,6 +50115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nonlocalexitfromnestedcatch_ro.cmd_6527]
 RelativePath=JIT\Methodical\eh\leaves\nonlocalexitfromnestedcatch_ro\nonlocalexitfromnestedcatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\leaves\nonlocalexitfromnestedcatch_ro
@@ -45100,6 +50123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [oponerror_d.cmd_6528]
 RelativePath=JIT\Methodical\eh\leaves\oponerror_d\oponerror_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\oponerror_d
@@ -45107,6 +50131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [oponerror_do.cmd_6529]
 RelativePath=JIT\Methodical\eh\leaves\oponerror_do\oponerror_do.cmd
 WorkingDir=JIT\Methodical\eh\leaves\oponerror_do
@@ -45114,6 +50139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [oponerror_r.cmd_6530]
 RelativePath=JIT\Methodical\eh\leaves\oponerror_r\oponerror_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\oponerror_r
@@ -45121,6 +50147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [oponerror_ro.cmd_6531]
 RelativePath=JIT\Methodical\eh\leaves\oponerror_ro\oponerror_ro.cmd
 WorkingDir=JIT\Methodical\eh\leaves\oponerror_ro
@@ -45128,6 +50155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallyintrycatchwithleaveintotry_d.cmd_6532]
 RelativePath=JIT\Methodical\eh\leaves\tryfinallyintrycatchwithleaveintotry_d\tryfinallyintrycatchwithleaveintotry_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\tryfinallyintrycatchwithleaveintotry_d
@@ -45135,6 +50163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallyintrycatchwithleaveintotry_r.cmd_6533]
 RelativePath=JIT\Methodical\eh\leaves\tryfinallyintrycatchwithleaveintotry_r\tryfinallyintrycatchwithleaveintotry_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\tryfinallyintrycatchwithleaveintotry_r
@@ -45142,6 +50171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallyloop_d.cmd_6534]
 RelativePath=JIT\Methodical\eh\leaves\tryfinallyloop_d\tryfinallyloop_d.cmd
 WorkingDir=JIT\Methodical\eh\leaves\tryfinallyloop_d
@@ -45149,6 +50179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallyloop_do.cmd_6535]
 RelativePath=JIT\Methodical\eh\leaves\tryfinallyloop_do\tryfinallyloop_do.cmd
 WorkingDir=JIT\Methodical\eh\leaves\tryfinallyloop_do
@@ -45156,6 +50187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallyloop_r.cmd_6536]
 RelativePath=JIT\Methodical\eh\leaves\tryfinallyloop_r\tryfinallyloop_r.cmd
 WorkingDir=JIT\Methodical\eh\leaves\tryfinallyloop_r
@@ -45163,6 +50195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tryfinallyloop_ro.cmd_6537]
 RelativePath=JIT\Methodical\eh\leaves\tryfinallyloop_ro\tryfinallyloop_ro.cmd
 WorkingDir=JIT\Methodical\eh\leaves\tryfinallyloop_ro
@@ -45170,6 +50203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchfiltercatch_d.cmd_6538]
 RelativePath=JIT\Methodical\eh\mixedhandler\catchfiltercatch_d\catchfiltercatch_d.cmd
 WorkingDir=JIT\Methodical\eh\mixedhandler\catchfiltercatch_d
@@ -45177,6 +50211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [catchfiltercatch_r.cmd_6539]
 RelativePath=JIT\Methodical\eh\mixedhandler\catchfiltercatch_r\catchfiltercatch_r.cmd
 WorkingDir=JIT\Methodical\eh\mixedhandler\catchfiltercatch_r
@@ -45184,6 +50219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [filterfiltercatchcatch_d.cmd_6540]
 RelativePath=JIT\Methodical\eh\mixedhandler\filterfiltercatchcatch_d\filterfiltercatchcatch_d.cmd
 WorkingDir=JIT\Methodical\eh\mixedhandler\filterfiltercatchcatch_d
@@ -45191,6 +50227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [filterfiltercatchcatch_r.cmd_6541]
 RelativePath=JIT\Methodical\eh\mixedhandler\filterfiltercatchcatch_r\filterfiltercatchcatch_r.cmd
 WorkingDir=JIT\Methodical\eh\mixedhandler\filterfiltercatchcatch_r
@@ -45198,6 +50235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cascadedcatch_d.cmd_6542]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\cascadedcatch_d\cascadedcatch_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\cascadedcatch_d
@@ -45205,6 +50243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cascadedcatch_r.cmd_6543]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\cascadedcatch_r\cascadedcatch_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\cascadedcatch_r
@@ -45212,6 +50251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cascadedexcept_d.cmd_6544]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\cascadedexcept_d\cascadedexcept_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\cascadedexcept_d
@@ -45219,6 +50259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cascadedexcept_r.cmd_6545]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\cascadedexcept_r\cascadedexcept_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\cascadedexcept_r
@@ -45226,6 +50267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincascadedcatchnofin_d.cmd_6546]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedcatchnofin_d\throwincascadedcatchnofin_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedcatchnofin_d
@@ -45233,6 +50275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincascadedcatchnofin_r.cmd_6547]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedcatchnofin_r\throwincascadedcatchnofin_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedcatchnofin_r
@@ -45240,6 +50283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincascadedcatch_d.cmd_6548]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedcatch_d\throwincascadedcatch_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedcatch_d
@@ -45247,6 +50291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincascadedcatch_r.cmd_6549]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedcatch_r\throwincascadedcatch_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedcatch_r
@@ -45254,6 +50299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincascadedexceptnofin_d.cmd_6550]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedexceptnofin_d\throwincascadedexceptnofin_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedexceptnofin_d
@@ -45261,6 +50307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincascadedexceptnofin_r.cmd_6551]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedexceptnofin_r\throwincascadedexceptnofin_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedexceptnofin_r
@@ -45268,6 +50315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincascadedexcept_d.cmd_6552]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedexcept_d\throwincascadedexcept_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedexcept_d
@@ -45275,6 +50323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwincascadedexcept_r.cmd_6553]
 RelativePath=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedexcept_r\throwincascadedexcept_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\cascadedcatchret\throwincascadedexcept_r
@@ -45282,6 +50331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cascadedcatch_d.cmd_6554]
 RelativePath=JIT\Methodical\eh\nested\general\cascadedcatch_d\cascadedcatch_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\cascadedcatch_d
@@ -45289,6 +50339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cascadedcatch_do.cmd_6555]
 RelativePath=JIT\Methodical\eh\nested\general\cascadedcatch_do\cascadedcatch_do.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\cascadedcatch_do
@@ -45296,6 +50347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cascadedcatch_r.cmd_6556]
 RelativePath=JIT\Methodical\eh\nested\general\cascadedcatch_r\cascadedcatch_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\cascadedcatch_r
@@ -45303,6 +50355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [cascadedcatch_ro.cmd_6557]
 RelativePath=JIT\Methodical\eh\nested\general\cascadedcatch_ro\cascadedcatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\cascadedcatch_ro
@@ -45310,6 +50363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [localvarincatch_d.cmd_6558]
 RelativePath=JIT\Methodical\eh\nested\general\localvarincatch_d\localvarincatch_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\localvarincatch_d
@@ -45317,6 +50371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [localvarincatch_r.cmd_6559]
 RelativePath=JIT\Methodical\eh\nested\general\localvarincatch_r\localvarincatch_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\localvarincatch_r
@@ -45324,6 +50379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [methodthrowsinfinally_d.cmd_6560]
 RelativePath=JIT\Methodical\eh\nested\general\methodthrowsinfinally_d\methodthrowsinfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\methodthrowsinfinally_d
@@ -45331,6 +50387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [methodthrowsinfinally_do.cmd_6561]
 RelativePath=JIT\Methodical\eh\nested\general\methodthrowsinfinally_do\methodthrowsinfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\methodthrowsinfinally_do
@@ -45338,6 +50395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [methodthrowsinfinally_r.cmd_6562]
 RelativePath=JIT\Methodical\eh\nested\general\methodthrowsinfinally_r\methodthrowsinfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\methodthrowsinfinally_r
@@ -45345,6 +50403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [methodthrowsinfinally_ro.cmd_6563]
 RelativePath=JIT\Methodical\eh\nested\general\methodthrowsinfinally_ro\methodthrowsinfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\methodthrowsinfinally_ro
@@ -45352,6 +50411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowincatchnestedinfinally_d.cmd_6564]
 RelativePath=JIT\Methodical\eh\nested\general\rethrowincatchnestedinfinally_d\rethrowincatchnestedinfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\rethrowincatchnestedinfinally_d
@@ -45359,6 +50419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowincatchnestedinfinally_do.cmd_6565]
 RelativePath=JIT\Methodical\eh\nested\general\rethrowincatchnestedinfinally_do\rethrowincatchnestedinfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\rethrowincatchnestedinfinally_do
@@ -45366,6 +50427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowincatchnestedinfinally_r.cmd_6566]
 RelativePath=JIT\Methodical\eh\nested\general\rethrowincatchnestedinfinally_r\rethrowincatchnestedinfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\rethrowincatchnestedinfinally_r
@@ -45373,6 +50435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowincatchnestedinfinally_ro.cmd_6567]
 RelativePath=JIT\Methodical\eh\nested\general\rethrowincatchnestedinfinally_ro\rethrowincatchnestedinfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\rethrowincatchnestedinfinally_ro
@@ -45380,6 +50443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallynestedintry_d.cmd_6568]
 RelativePath=JIT\Methodical\eh\nested\general\throwinfinallynestedintry_d\throwinfinallynestedintry_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinfinallynestedintry_d
@@ -45387,6 +50451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallynestedintry_do.cmd_6569]
 RelativePath=JIT\Methodical\eh\nested\general\throwinfinallynestedintry_do\throwinfinallynestedintry_do.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinfinallynestedintry_do
@@ -45394,6 +50459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallynestedintry_r.cmd_6570]
 RelativePath=JIT\Methodical\eh\nested\general\throwinfinallynestedintry_r\throwinfinallynestedintry_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinfinallynestedintry_r
@@ -45401,6 +50467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallynestedintry_ro.cmd_6571]
 RelativePath=JIT\Methodical\eh\nested\general\throwinfinallynestedintry_ro\throwinfinallynestedintry_ro.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinfinallynestedintry_ro
@@ -45408,6 +50475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_d.cmd_6572]
 RelativePath=JIT\Methodical\eh\nested\general\throwinfinally_d\throwinfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinfinally_d
@@ -45415,6 +50483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_do.cmd_6573]
 RelativePath=JIT\Methodical\eh\nested\general\throwinfinally_do\throwinfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinfinally_do
@@ -45422,6 +50491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_r.cmd_6574]
 RelativePath=JIT\Methodical\eh\nested\general\throwinfinally_r\throwinfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinfinally_r
@@ -45429,6 +50499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_ro.cmd_6575]
 RelativePath=JIT\Methodical\eh\nested\general\throwinfinally_ro\throwinfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinfinally_ro
@@ -45436,6 +50507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedcatch_d.cmd_6576]
 RelativePath=JIT\Methodical\eh\nested\general\throwinnestedcatch_d\throwinnestedcatch_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinnestedcatch_d
@@ -45443,6 +50515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedcatch_r.cmd_6577]
 RelativePath=JIT\Methodical\eh\nested\general\throwinnestedcatch_r\throwinnestedcatch_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinnestedcatch_r
@@ -45450,6 +50523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedfinally_d.cmd_6578]
 RelativePath=JIT\Methodical\eh\nested\general\throwinnestedfinally_d\throwinnestedfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinnestedfinally_d
@@ -45457,6 +50531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedfinally_do.cmd_6579]
 RelativePath=JIT\Methodical\eh\nested\general\throwinnestedfinally_do\throwinnestedfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinnestedfinally_do
@@ -45464,6 +50539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedfinally_r.cmd_6580]
 RelativePath=JIT\Methodical\eh\nested\general\throwinnestedfinally_r\throwinnestedfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinnestedfinally_r
@@ -45471,6 +50547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedfinally_ro.cmd_6581]
 RelativePath=JIT\Methodical\eh\nested\general\throwinnestedfinally_ro\throwinnestedfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\throwinnestedfinally_ro
@@ -45478,6 +50555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchintryfinally_d.cmd_6582]
 RelativePath=JIT\Methodical\eh\nested\general\trycatchintryfinally_d\trycatchintryfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\trycatchintryfinally_d
@@ -45485,6 +50563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchintryfinally_do.cmd_6583]
 RelativePath=JIT\Methodical\eh\nested\general\trycatchintryfinally_do\trycatchintryfinally_do.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\trycatchintryfinally_do
@@ -45492,6 +50571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchintryfinally_r.cmd_6584]
 RelativePath=JIT\Methodical\eh\nested\general\trycatchintryfinally_r\trycatchintryfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\trycatchintryfinally_r
@@ -45499,6 +50579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatchintryfinally_ro.cmd_6585]
 RelativePath=JIT\Methodical\eh\nested\general\trycatchintryfinally_ro\trycatchintryfinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\nested\general\trycatchintryfinally_ro
@@ -45506,6 +50587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedtrycatch_d.cmd_6586]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\nestedtrycatch_d\nestedtrycatch_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\nestedtrycatch_d
@@ -45513,6 +50595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedtrycatch_r.cmd_6587]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\nestedtrycatch_r\nestedtrycatch_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\nestedtrycatch_r
@@ -45520,6 +50603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedtryexcept_d.cmd_6588]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\nestedtryexcept_d\nestedtryexcept_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\nestedtryexcept_d
@@ -45527,6 +50611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedtryexcept_r.cmd_6589]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\nestedtryexcept_r\nestedtryexcept_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\nestedtryexcept_r
@@ -45534,6 +50619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedtryfault_d.cmd_6590]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\nestedtryfault_d\nestedtryfault_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\nestedtryfault_d
@@ -45541,6 +50627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedtryfault_r.cmd_6591]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\nestedtryfault_r\nestedtryfault_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\nestedtryfault_r
@@ -45548,6 +50635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedtryfinally_d.cmd_6592]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\nestedtryfinally_d\nestedtryfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\nestedtryfinally_d
@@ -45555,6 +50643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nestedtryfinally_r.cmd_6593]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\nestedtryfinally_r\nestedtryfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\nestedtryfinally_r
@@ -45562,6 +50651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedtrycatch_d.cmd_6594]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\throwinnestedtrycatch_d\throwinnestedtrycatch_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\throwinnestedtrycatch_d
@@ -45569,6 +50659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedtrycatch_r.cmd_6595]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\throwinnestedtrycatch_r\throwinnestedtrycatch_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\throwinnestedtrycatch_r
@@ -45576,6 +50667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedtryexcept_d.cmd_6596]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryexcept_d\throwinnestedtryexcept_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryexcept_d
@@ -45583,6 +50675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedtryexcept_r.cmd_6597]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryexcept_r\throwinnestedtryexcept_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryexcept_r
@@ -45590,6 +50683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedtryfault_d.cmd_6598]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryfault_d\throwinnestedtryfault_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryfault_d
@@ -45597,6 +50691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedtryfault_r.cmd_6599]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryfault_r\throwinnestedtryfault_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryfault_r
@@ -45604,6 +50699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedtryfinally_d.cmd_6600]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryfinally_d\throwinnestedtryfinally_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryfinally_d
@@ -45611,6 +50707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinnestedtryfinally_r.cmd_6601]
 RelativePath=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryfinally_r\throwinnestedtryfinally_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\nestedtry\throwinnestedtryfinally_r
@@ -45618,6 +50715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallynestedintry_30_d.cmd_6602]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallynestedintry_30_d\throwinfinallynestedintry_30_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallynestedintry_30_d
@@ -45625,6 +50723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallynestedintry_30_do.cmd_6603]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallynestedintry_30_do\throwinfinallynestedintry_30_do.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallynestedintry_30_do
@@ -45632,6 +50731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallynestedintry_30_r.cmd_6604]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallynestedintry_30_r\throwinfinallynestedintry_30_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallynestedintry_30_r
@@ -45639,6 +50739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallynestedintry_30_ro.cmd_6605]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallynestedintry_30_ro\throwinfinallynestedintry_30_ro.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallynestedintry_30_ro
@@ -45646,6 +50747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyrecursive_20_d.cmd_6606]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallyrecursive_20_d\throwinfinallyrecursive_20_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallyrecursive_20_d
@@ -45653,6 +50755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyrecursive_20_do.cmd_6607]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallyrecursive_20_do\throwinfinallyrecursive_20_do.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallyrecursive_20_do
@@ -45660,6 +50763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyrecursive_20_r.cmd_6608]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallyrecursive_20_r\throwinfinallyrecursive_20_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallyrecursive_20_r
@@ -45667,6 +50771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinallyrecursive_20_ro.cmd_6609]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallyrecursive_20_ro\throwinfinallyrecursive_20_ro.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinallyrecursive_20_ro
@@ -45674,6 +50779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_50_d.cmd_6610]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinally_50_d\throwinfinally_50_d.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinally_50_d
@@ -45681,6 +50787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_50_do.cmd_6611]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinally_50_do\throwinfinally_50_do.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinally_50_do
@@ -45688,6 +50795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_50_r.cmd_6612]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinally_50_r\throwinfinally_50_r.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinally_50_r
@@ -45695,6 +50803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwinfinally_50_ro.cmd_6613]
 RelativePath=JIT\Methodical\eh\nested\nonlocalexit\throwinfinally_50_ro\throwinfinally_50_ro.cmd
 WorkingDir=JIT\Methodical\eh\nested\nonlocalexit\throwinfinally_50_ro
@@ -45702,6 +50811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [outermostFinally.cmd_6614]
 RelativePath=JIT\Methodical\eh\regress\asurt\122239\outermostFinally\outermostFinally.cmd
 WorkingDir=JIT\Methodical\eh\regress\asurt\122239\outermostFinally
@@ -45709,6 +50819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [innerFinally_d.cmd_6615]
 RelativePath=JIT\Methodical\eh\regress\asurt\140713\innerFinally_d\innerFinally_d.cmd
 WorkingDir=JIT\Methodical\eh\regress\asurt\140713\innerFinally_d
@@ -45716,6 +50827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [innerFinally_do.cmd_6616]
 RelativePath=JIT\Methodical\eh\regress\asurt\140713\innerFinally_do\innerFinally_do.cmd
 WorkingDir=JIT\Methodical\eh\regress\asurt\140713\innerFinally_do
@@ -45723,6 +50835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [innerFinally_r.cmd_6617]
 RelativePath=JIT\Methodical\eh\regress\asurt\140713\innerFinally_r\innerFinally_r.cmd
 WorkingDir=JIT\Methodical\eh\regress\asurt\140713\innerFinally_r
@@ -45730,6 +50843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [innerFinally_ro.cmd_6618]
 RelativePath=JIT\Methodical\eh\regress\asurt\140713\innerFinally_ro\innerFinally_ro.cmd
 WorkingDir=JIT\Methodical\eh\regress\asurt\140713\innerFinally_ro
@@ -45737,6 +50851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [uncaughtException_d.cmd_6619]
 RelativePath=JIT\Methodical\eh\regress\asurt\141358\uncaughtException_d\uncaughtException_d.cmd
 WorkingDir=JIT\Methodical\eh\regress\asurt\141358\uncaughtException_d
@@ -45744,6 +50859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [uncaughtException_do.cmd_6620]
 RelativePath=JIT\Methodical\eh\regress\asurt\141358\uncaughtException_do\uncaughtException_do.cmd
 WorkingDir=JIT\Methodical\eh\regress\asurt\141358\uncaughtException_do
@@ -45751,6 +50867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [uncaughtException_r.cmd_6621]
 RelativePath=JIT\Methodical\eh\regress\asurt\141358\uncaughtException_r\uncaughtException_r.cmd
 WorkingDir=JIT\Methodical\eh\regress\asurt\141358\uncaughtException_r
@@ -45758,6 +50875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [uncaughtException_ro.cmd_6622]
 RelativePath=JIT\Methodical\eh\regress\asurt\141358\uncaughtException_ro\uncaughtException_ro.cmd
 WorkingDir=JIT\Methodical\eh\regress\asurt\141358\uncaughtException_ro
@@ -45765,6 +50883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [baduwinfo.cmd_6623]
 RelativePath=JIT\Methodical\eh\regress\vswhidbey\148190\baduwinfo\baduwinfo.cmd
 WorkingDir=JIT\Methodical\eh\regress\vswhidbey\148190\baduwinfo
@@ -45772,6 +50891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [baduwinfo1.cmd_6624]
 RelativePath=JIT\Methodical\eh\regress\vswhidbey\148190\baduwinfo1\baduwinfo1.cmd
 WorkingDir=JIT\Methodical\eh\regress\vswhidbey\148190\baduwinfo1
@@ -45779,6 +50899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowinfinallyaftercatch_d.cmd_6625]
 RelativePath=JIT\Methodical\eh\rethrow\rethrowinfinallyaftercatch_d\rethrowinfinallyaftercatch_d.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\rethrowinfinallyaftercatch_d
@@ -45786,6 +50907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowinfinallyaftercatch_do.cmd_6626]
 RelativePath=JIT\Methodical\eh\rethrow\rethrowinfinallyaftercatch_do\rethrowinfinallyaftercatch_do.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\rethrowinfinallyaftercatch_do
@@ -45793,6 +50915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowinfinallyaftercatch_r.cmd_6627]
 RelativePath=JIT\Methodical\eh\rethrow\rethrowinfinallyaftercatch_r\rethrowinfinallyaftercatch_r.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\rethrowinfinallyaftercatch_r
@@ -45800,6 +50923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowinfinallyaftercatch_ro.cmd_6628]
 RelativePath=JIT\Methodical\eh\rethrow\rethrowinfinallyaftercatch_ro\rethrowinfinallyaftercatch_ro.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\rethrowinfinallyaftercatch_ro
@@ -45807,6 +50931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowinfinallyinsidecatch_d.cmd_6629]
 RelativePath=JIT\Methodical\eh\rethrow\rethrowinfinallyinsidecatch_d\rethrowinfinallyinsidecatch_d.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\rethrowinfinallyinsidecatch_d
@@ -45814,6 +50939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowinfinallyinsidecatch_r.cmd_6630]
 RelativePath=JIT\Methodical\eh\rethrow\rethrowinfinallyinsidecatch_r\rethrowinfinallyinsidecatch_r.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\rethrowinfinallyinsidecatch_r
@@ -45821,6 +50947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowwithhandlerscatchingbase_d.cmd_6631]
 RelativePath=JIT\Methodical\eh\rethrow\rethrowwithhandlerscatchingbase_d\rethrowwithhandlerscatchingbase_d.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\rethrowwithhandlerscatchingbase_d
@@ -45828,6 +50955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowwithhandlerscatchingbase_do.cmd_6632]
 RelativePath=JIT\Methodical\eh\rethrow\rethrowwithhandlerscatchingbase_do\rethrowwithhandlerscatchingbase_do.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\rethrowwithhandlerscatchingbase_do
@@ -45835,6 +50963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowwithhandlerscatchingbase_r.cmd_6633]
 RelativePath=JIT\Methodical\eh\rethrow\rethrowwithhandlerscatchingbase_r\rethrowwithhandlerscatchingbase_r.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\rethrowwithhandlerscatchingbase_r
@@ -45842,6 +50971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [rethrowwithhandlerscatchingbase_ro.cmd_6634]
 RelativePath=JIT\Methodical\eh\rethrow\rethrowwithhandlerscatchingbase_ro\rethrowwithhandlerscatchingbase_ro.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\rethrowwithhandlerscatchingbase_ro
@@ -45849,6 +50979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [samerethrowtwice_d.cmd_6635]
 RelativePath=JIT\Methodical\eh\rethrow\samerethrowtwice_d\samerethrowtwice_d.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\samerethrowtwice_d
@@ -45856,6 +50987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [samerethrowtwice_do.cmd_6636]
 RelativePath=JIT\Methodical\eh\rethrow\samerethrowtwice_do\samerethrowtwice_do.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\samerethrowtwice_do
@@ -45863,6 +50995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [samerethrowtwice_r.cmd_6637]
 RelativePath=JIT\Methodical\eh\rethrow\samerethrowtwice_r\samerethrowtwice_r.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\samerethrowtwice_r
@@ -45870,6 +51003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [samerethrowtwice_ro.cmd_6638]
 RelativePath=JIT\Methodical\eh\rethrow\samerethrowtwice_ro\samerethrowtwice_ro.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\samerethrowtwice_ro
@@ -45877,6 +51011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [samethrowtwice_d.cmd_6639]
 RelativePath=JIT\Methodical\eh\rethrow\samethrowtwice_d\samethrowtwice_d.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\samethrowtwice_d
@@ -45884,6 +51019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [samethrowtwice_do.cmd_6640]
 RelativePath=JIT\Methodical\eh\rethrow\samethrowtwice_do\samethrowtwice_do.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\samethrowtwice_do
@@ -45891,6 +51027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [samethrowtwice_r.cmd_6641]
 RelativePath=JIT\Methodical\eh\rethrow\samethrowtwice_r\samethrowtwice_r.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\samethrowtwice_r
@@ -45898,6 +51035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [samethrowtwice_ro.cmd_6642]
 RelativePath=JIT\Methodical\eh\rethrow\samethrowtwice_ro\samethrowtwice_ro.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\samethrowtwice_ro
@@ -45905,6 +51043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplerethrow_d.cmd_6643]
 RelativePath=JIT\Methodical\eh\rethrow\simplerethrow_d\simplerethrow_d.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\simplerethrow_d
@@ -45912,6 +51051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplerethrow_do.cmd_6644]
 RelativePath=JIT\Methodical\eh\rethrow\simplerethrow_do\simplerethrow_do.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\simplerethrow_do
@@ -45919,6 +51059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplerethrow_r.cmd_6645]
 RelativePath=JIT\Methodical\eh\rethrow\simplerethrow_r\simplerethrow_r.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\simplerethrow_r
@@ -45926,6 +51067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [simplerethrow_ro.cmd_6646]
 RelativePath=JIT\Methodical\eh\rethrow\simplerethrow_ro\simplerethrow_ro.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\simplerethrow_ro
@@ -45933,6 +51075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwwithhandlerscatchingbase_d.cmd_6647]
 RelativePath=JIT\Methodical\eh\rethrow\throwwithhandlerscatchingbase_d\throwwithhandlerscatchingbase_d.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\throwwithhandlerscatchingbase_d
@@ -45940,6 +51083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwwithhandlerscatchingbase_do.cmd_6648]
 RelativePath=JIT\Methodical\eh\rethrow\throwwithhandlerscatchingbase_do\throwwithhandlerscatchingbase_do.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\throwwithhandlerscatchingbase_do
@@ -45947,6 +51091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwwithhandlerscatchingbase_r.cmd_6649]
 RelativePath=JIT\Methodical\eh\rethrow\throwwithhandlerscatchingbase_r\throwwithhandlerscatchingbase_r.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\throwwithhandlerscatchingbase_r
@@ -45954,6 +51099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwwithhandlerscatchingbase_ro.cmd_6650]
 RelativePath=JIT\Methodical\eh\rethrow\throwwithhandlerscatchingbase_ro\throwwithhandlerscatchingbase_ro.cmd
 WorkingDir=JIT\Methodical\eh\rethrow\throwwithhandlerscatchingbase_ro
@@ -45961,6 +51107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgconvovf_i8_i.cmd_6651]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgconvovf_i8_i\_il_dbgconvovf_i8_i.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgconvovf_i8_i
@@ -45968,6 +51115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgconvovf_i8_u.cmd_6652]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgconvovf_i8_u\_il_dbgconvovf_i8_u.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgconvovf_i8_u
@@ -45975,6 +51123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgconv_i8_i.cmd_6653]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgconv_i8_i\_il_dbgconv_i8_i.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgconv_i8_i
@@ -45982,6 +51131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgconv_i8_u.cmd_6654]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgconv_i8_u\_il_dbgconv_i8_u.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgconv_i8_u
@@ -45989,6 +51139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_array_merge.cmd_6655]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_array_merge\_il_dbgi_array_merge.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_array_merge
@@ -45996,6 +51147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_box.cmd_6656]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_box\_il_dbgi_box.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_box
@@ -46003,6 +51155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_conv.cmd_6657]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_conv\_il_dbgi_conv.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_conv
@@ -46010,6 +51163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_fld.cmd_6658]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_fld\_il_dbgi_fld.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_fld
@@ -46017,6 +51171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_flood.cmd_6659]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_flood\_il_dbgi_flood.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_flood
@@ -46024,6 +51179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_flow.cmd_6660]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_flow\_il_dbgi_flow.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_flow
@@ -46031,6 +51187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_prop.cmd_6661]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_prop\_il_dbgi_prop.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_prop
@@ -46038,6 +51195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_qsort1.cmd_6662]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_qsort1\_il_dbgi_qsort1.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_qsort1
@@ -46045,6 +51203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_qsort2.cmd_6663]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_qsort2\_il_dbgi_qsort2.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_qsort2
@@ -46052,6 +51211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_ref.cmd_6664]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_ref\_il_dbgi_ref.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_ref
@@ -46059,6 +51219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_seq.cmd_6665]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_seq\_il_dbgi_seq.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_seq
@@ -46066,6 +51227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi_vfld.cmd_6666]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_vfld\_il_dbgi_vfld.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgi_vfld
@@ -46073,6 +51235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgptr.cmd_6667]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgptr\_il_dbgptr.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgptr
@@ -46080,6 +51243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgqperm.cmd_6668]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgqperm\_il_dbgqperm.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgqperm
@@ -46087,6 +51251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgsizeof.cmd_6669]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgsizeof\_il_dbgsizeof.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgsizeof
@@ -46094,6 +51259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_array_merge.cmd_6670]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_array_merge\_il_dbgu_array_merge.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_array_merge
@@ -46101,6 +51267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_box.cmd_6671]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_box\_il_dbgu_box.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_box
@@ -46108,6 +51275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_conv.cmd_6672]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_conv\_il_dbgu_conv.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_conv
@@ -46115,6 +51283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_fld.cmd_6673]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_fld\_il_dbgu_fld.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_fld
@@ -46122,6 +51291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_flood.cmd_6674]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_flood\_il_dbgu_flood.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_flood
@@ -46129,6 +51299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_flow.cmd_6675]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_flow\_il_dbgu_flow.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_flow
@@ -46136,6 +51307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_prop.cmd_6676]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_prop\_il_dbgu_prop.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_prop
@@ -46143,6 +51315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_qsort1.cmd_6677]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_qsort1\_il_dbgu_qsort1.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_qsort1
@@ -46150,6 +51323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_qsort2.cmd_6678]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_qsort2\_il_dbgu_qsort2.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_qsort2
@@ -46157,6 +51331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_ref.cmd_6679]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_ref\_il_dbgu_ref.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_ref
@@ -46164,6 +51339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_seq.cmd_6680]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_seq\_il_dbgu_seq.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_seq
@@ -46171,6 +51347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_vfld.cmd_6681]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_vfld\_il_dbgu_vfld.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_dbgu_vfld
@@ -46178,6 +51355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relconvovf_i8_i.cmd_6682]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relconvovf_i8_i\_il_relconvovf_i8_i.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relconvovf_i8_i
@@ -46185,6 +51363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relconvovf_i8_u.cmd_6683]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relconvovf_i8_u\_il_relconvovf_i8_u.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relconvovf_i8_u
@@ -46192,6 +51371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relconv_i8_i.cmd_6684]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relconv_i8_i\_il_relconv_i8_i.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relconv_i8_i
@@ -46199,6 +51379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relconv_i8_u.cmd_6685]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relconv_i8_u\_il_relconv_i8_u.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relconv_i8_u
@@ -46206,6 +51387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_array_merge.cmd_6686]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_array_merge\_il_reli_array_merge.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_array_merge
@@ -46213,6 +51395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_box.cmd_6687]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_box\_il_reli_box.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_box
@@ -46220,6 +51403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_conv.cmd_6688]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_conv\_il_reli_conv.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_conv
@@ -46227,6 +51411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_fld.cmd_6689]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_fld\_il_reli_fld.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_fld
@@ -46234,6 +51419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_flood.cmd_6690]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_flood\_il_reli_flood.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_flood
@@ -46241,6 +51427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_flow.cmd_6691]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_flow\_il_reli_flow.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_flow
@@ -46248,6 +51435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_prop.cmd_6692]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_prop\_il_reli_prop.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_prop
@@ -46255,6 +51443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_qsort1.cmd_6693]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_qsort1\_il_reli_qsort1.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_qsort1
@@ -46262,6 +51451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_qsort2.cmd_6694]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_qsort2\_il_reli_qsort2.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_qsort2
@@ -46269,6 +51459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_ref.cmd_6695]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_ref\_il_reli_ref.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_ref
@@ -46276,6 +51467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_seq.cmd_6696]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_seq\_il_reli_seq.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_seq
@@ -46283,6 +51475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli_vfld.cmd_6697]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_vfld\_il_reli_vfld.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_reli_vfld
@@ -46290,6 +51483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relptr.cmd_6698]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relptr\_il_relptr.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relptr
@@ -46297,6 +51491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relqperm.cmd_6699]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relqperm\_il_relqperm.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relqperm
@@ -46304,6 +51499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relsizeof.cmd_6700]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relsizeof\_il_relsizeof.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relsizeof
@@ -46311,6 +51507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_array_merge.cmd_6701]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_array_merge\_il_relu_array_merge.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_array_merge
@@ -46318,6 +51515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_box.cmd_6702]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_box\_il_relu_box.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_box
@@ -46325,6 +51523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_conv.cmd_6703]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_conv\_il_relu_conv.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_conv
@@ -46332,6 +51531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_fld.cmd_6704]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_fld\_il_relu_fld.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_fld
@@ -46339,6 +51539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_flood.cmd_6705]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_flood\_il_relu_flood.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_flood
@@ -46346,6 +51547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_flow.cmd_6706]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_flow\_il_relu_flow.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_flow
@@ -46353,6 +51555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_prop.cmd_6707]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_prop\_il_relu_prop.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_prop
@@ -46360,6 +51563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_qsort1.cmd_6708]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_qsort1\_il_relu_qsort1.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_qsort1
@@ -46367,6 +51571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_qsort2.cmd_6709]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_qsort2\_il_relu_qsort2.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_qsort2
@@ -46374,6 +51579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_ref.cmd_6710]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_ref\_il_relu_ref.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_ref
@@ -46381,6 +51587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_seq.cmd_6711]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_seq\_il_relu_seq.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_seq
@@ -46388,6 +51595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_vfld.cmd_6712]
 RelativePath=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_vfld\_il_relu_vfld.cmd
 WorkingDir=JIT\Methodical\ELEMENT_TYPE_IU\_il_relu_vfld
@@ -46395,6 +51603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrefarg_c.cmd_6713]
 RelativePath=JIT\Methodical\explicit\basic\_dbgrefarg_c\_dbgrefarg_c.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_dbgrefarg_c
@@ -46402,6 +51611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrefarg_f4.cmd_6714]
 RelativePath=JIT\Methodical\explicit\basic\_dbgrefarg_f4\_dbgrefarg_f4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_dbgrefarg_f4
@@ -46409,6 +51619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrefarg_f8.cmd_6715]
 RelativePath=JIT\Methodical\explicit\basic\_dbgrefarg_f8\_dbgrefarg_f8.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_dbgrefarg_f8
@@ -46416,6 +51627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrefarg_i1.cmd_6716]
 RelativePath=JIT\Methodical\explicit\basic\_dbgrefarg_i1\_dbgrefarg_i1.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_dbgrefarg_i1
@@ -46423,6 +51635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrefarg_i2.cmd_6717]
 RelativePath=JIT\Methodical\explicit\basic\_dbgrefarg_i2\_dbgrefarg_i2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_dbgrefarg_i2
@@ -46430,6 +51643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrefarg_i4.cmd_6718]
 RelativePath=JIT\Methodical\explicit\basic\_dbgrefarg_i4\_dbgrefarg_i4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_dbgrefarg_i4
@@ -46437,6 +51651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrefarg_o.cmd_6719]
 RelativePath=JIT\Methodical\explicit\basic\_dbgrefarg_o\_dbgrefarg_o.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_dbgrefarg_o
@@ -46444,6 +51659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrefarg_s.cmd_6720]
 RelativePath=JIT\Methodical\explicit\basic\_dbgrefarg_s\_dbgrefarg_s.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_dbgrefarg_s
@@ -46451,6 +51667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefarg_c.cmd_6721]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefarg_c\_il_dbgrefarg_c.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefarg_c
@@ -46458,6 +51675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefarg_f4.cmd_6722]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefarg_f4\_il_dbgrefarg_f4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefarg_f4
@@ -46465,6 +51683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefarg_f8.cmd_6723]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefarg_f8\_il_dbgrefarg_f8.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefarg_f8
@@ -46472,6 +51691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefarg_i1.cmd_6724]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefarg_i1\_il_dbgrefarg_i1.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefarg_i1
@@ -46479,6 +51699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefarg_i2.cmd_6725]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefarg_i2\_il_dbgrefarg_i2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefarg_i2
@@ -46486,6 +51707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefarg_i4.cmd_6726]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefarg_i4\_il_dbgrefarg_i4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefarg_i4
@@ -46493,6 +51715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefarg_o.cmd_6727]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefarg_o\_il_dbgrefarg_o.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefarg_o
@@ -46500,6 +51723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefarg_s.cmd_6728]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefarg_s\_il_dbgrefarg_s.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefarg_s
@@ -46507,6 +51731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefloc_c.cmd_6729]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefloc_c\_il_dbgrefloc_c.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefloc_c
@@ -46514,6 +51739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefloc_i1.cmd_6730]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefloc_i1\_il_dbgrefloc_i1.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefloc_i1
@@ -46521,6 +51747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefloc_i2.cmd_6731]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefloc_i2\_il_dbgrefloc_i2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefloc_i2
@@ -46528,6 +51755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefloc_i4.cmd_6732]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefloc_i4\_il_dbgrefloc_i4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefloc_i4
@@ -46535,6 +51763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefloc_o.cmd_6733]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefloc_o\_il_dbgrefloc_o.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefloc_o
@@ -46542,6 +51771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefloc_o2.cmd_6734]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefloc_o2\_il_dbgrefloc_o2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefloc_o2
@@ -46549,6 +51779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefloc_r4.cmd_6735]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefloc_r4\_il_dbgrefloc_r4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefloc_r4
@@ -46556,6 +51787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefloc_r8.cmd_6736]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefloc_r8\_il_dbgrefloc_r8.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefloc_r8
@@ -46563,6 +51795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefloc_u2.cmd_6737]
 RelativePath=JIT\Methodical\explicit\basic\_il_dbgrefloc_u2\_il_dbgrefloc_u2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_dbgrefloc_u2
@@ -46570,6 +51803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefarg_c.cmd_6738]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefarg_c\_il_relrefarg_c.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefarg_c
@@ -46577,6 +51811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefarg_f4.cmd_6739]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefarg_f4\_il_relrefarg_f4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefarg_f4
@@ -46584,6 +51819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefarg_f8.cmd_6740]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefarg_f8\_il_relrefarg_f8.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefarg_f8
@@ -46591,6 +51827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefarg_i1.cmd_6741]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefarg_i1\_il_relrefarg_i1.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefarg_i1
@@ -46598,6 +51835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefarg_i2.cmd_6742]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefarg_i2\_il_relrefarg_i2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefarg_i2
@@ -46605,6 +51843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefarg_i4.cmd_6743]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefarg_i4\_il_relrefarg_i4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefarg_i4
@@ -46612,6 +51851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefarg_o.cmd_6744]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefarg_o\_il_relrefarg_o.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefarg_o
@@ -46619,6 +51859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefarg_s.cmd_6745]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefarg_s\_il_relrefarg_s.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefarg_s
@@ -46626,6 +51867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefloc_c.cmd_6746]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefloc_c\_il_relrefloc_c.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefloc_c
@@ -46633,6 +51875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefloc_i1.cmd_6747]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefloc_i1\_il_relrefloc_i1.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefloc_i1
@@ -46640,6 +51883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefloc_i2.cmd_6748]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefloc_i2\_il_relrefloc_i2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefloc_i2
@@ -46647,6 +51891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefloc_i4.cmd_6749]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefloc_i4\_il_relrefloc_i4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefloc_i4
@@ -46654,6 +51899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefloc_o.cmd_6750]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefloc_o\_il_relrefloc_o.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefloc_o
@@ -46661,6 +51907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefloc_o2.cmd_6751]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefloc_o2\_il_relrefloc_o2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefloc_o2
@@ -46668,6 +51915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefloc_r4.cmd_6752]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefloc_r4\_il_relrefloc_r4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefloc_r4
@@ -46675,6 +51923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefloc_r8.cmd_6753]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefloc_r8\_il_relrefloc_r8.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefloc_r8
@@ -46682,6 +51931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefloc_u2.cmd_6754]
 RelativePath=JIT\Methodical\explicit\basic\_il_relrefloc_u2\_il_relrefloc_u2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_il_relrefloc_u2
@@ -46689,6 +51939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrefarg_c.cmd_6755]
 RelativePath=JIT\Methodical\explicit\basic\_opt_dbgrefarg_c\_opt_dbgrefarg_c.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_dbgrefarg_c
@@ -46696,6 +51947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrefarg_f4.cmd_6756]
 RelativePath=JIT\Methodical\explicit\basic\_opt_dbgrefarg_f4\_opt_dbgrefarg_f4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_dbgrefarg_f4
@@ -46703,6 +51955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrefarg_f8.cmd_6757]
 RelativePath=JIT\Methodical\explicit\basic\_opt_dbgrefarg_f8\_opt_dbgrefarg_f8.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_dbgrefarg_f8
@@ -46710,6 +51963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrefarg_i1.cmd_6758]
 RelativePath=JIT\Methodical\explicit\basic\_opt_dbgrefarg_i1\_opt_dbgrefarg_i1.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_dbgrefarg_i1
@@ -46717,6 +51971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrefarg_i2.cmd_6759]
 RelativePath=JIT\Methodical\explicit\basic\_opt_dbgrefarg_i2\_opt_dbgrefarg_i2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_dbgrefarg_i2
@@ -46724,6 +51979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrefarg_i4.cmd_6760]
 RelativePath=JIT\Methodical\explicit\basic\_opt_dbgrefarg_i4\_opt_dbgrefarg_i4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_dbgrefarg_i4
@@ -46731,6 +51987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrefarg_o.cmd_6761]
 RelativePath=JIT\Methodical\explicit\basic\_opt_dbgrefarg_o\_opt_dbgrefarg_o.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_dbgrefarg_o
@@ -46738,6 +51995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrefarg_s.cmd_6762]
 RelativePath=JIT\Methodical\explicit\basic\_opt_dbgrefarg_s\_opt_dbgrefarg_s.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_dbgrefarg_s
@@ -46745,6 +52003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrefarg_c.cmd_6763]
 RelativePath=JIT\Methodical\explicit\basic\_opt_relrefarg_c\_opt_relrefarg_c.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_relrefarg_c
@@ -46752,6 +52011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrefarg_f4.cmd_6764]
 RelativePath=JIT\Methodical\explicit\basic\_opt_relrefarg_f4\_opt_relrefarg_f4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_relrefarg_f4
@@ -46759,6 +52019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrefarg_f8.cmd_6765]
 RelativePath=JIT\Methodical\explicit\basic\_opt_relrefarg_f8\_opt_relrefarg_f8.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_relrefarg_f8
@@ -46766,6 +52027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrefarg_i1.cmd_6766]
 RelativePath=JIT\Methodical\explicit\basic\_opt_relrefarg_i1\_opt_relrefarg_i1.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_relrefarg_i1
@@ -46773,6 +52035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrefarg_i2.cmd_6767]
 RelativePath=JIT\Methodical\explicit\basic\_opt_relrefarg_i2\_opt_relrefarg_i2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_relrefarg_i2
@@ -46780,6 +52043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrefarg_i4.cmd_6768]
 RelativePath=JIT\Methodical\explicit\basic\_opt_relrefarg_i4\_opt_relrefarg_i4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_relrefarg_i4
@@ -46787,6 +52051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrefarg_o.cmd_6769]
 RelativePath=JIT\Methodical\explicit\basic\_opt_relrefarg_o\_opt_relrefarg_o.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_relrefarg_o
@@ -46794,6 +52059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrefarg_s.cmd_6770]
 RelativePath=JIT\Methodical\explicit\basic\_opt_relrefarg_s\_opt_relrefarg_s.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_opt_relrefarg_s
@@ -46801,6 +52067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relrefarg_c.cmd_6771]
 RelativePath=JIT\Methodical\explicit\basic\_relrefarg_c\_relrefarg_c.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_relrefarg_c
@@ -46808,6 +52075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relrefarg_f4.cmd_6772]
 RelativePath=JIT\Methodical\explicit\basic\_relrefarg_f4\_relrefarg_f4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_relrefarg_f4
@@ -46815,6 +52083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relrefarg_f8.cmd_6773]
 RelativePath=JIT\Methodical\explicit\basic\_relrefarg_f8\_relrefarg_f8.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_relrefarg_f8
@@ -46822,6 +52091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relrefarg_i1.cmd_6774]
 RelativePath=JIT\Methodical\explicit\basic\_relrefarg_i1\_relrefarg_i1.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_relrefarg_i1
@@ -46829,6 +52099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relrefarg_i2.cmd_6775]
 RelativePath=JIT\Methodical\explicit\basic\_relrefarg_i2\_relrefarg_i2.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_relrefarg_i2
@@ -46836,6 +52107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relrefarg_i4.cmd_6776]
 RelativePath=JIT\Methodical\explicit\basic\_relrefarg_i4\_relrefarg_i4.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_relrefarg_i4
@@ -46843,6 +52115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relrefarg_o.cmd_6777]
 RelativePath=JIT\Methodical\explicit\basic\_relrefarg_o\_relrefarg_o.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_relrefarg_o
@@ -46850,6 +52123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relrefarg_s.cmd_6778]
 RelativePath=JIT\Methodical\explicit\basic\_relrefarg_s\_relrefarg_s.cmd
 WorkingDir=JIT\Methodical\explicit\basic\_relrefarg_s
@@ -46857,6 +52131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_byte_1_d.cmd_6779]
 RelativePath=JIT\Methodical\explicit\coverage\expl_byte_1_d\expl_byte_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_byte_1_d
@@ -46864,6 +52139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_byte_1_r.cmd_6780]
 RelativePath=JIT\Methodical\explicit\coverage\expl_byte_1_r\expl_byte_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_byte_1_r
@@ -46871,6 +52147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_double_1_d.cmd_6781]
 RelativePath=JIT\Methodical\explicit\coverage\expl_double_1_d\expl_double_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_double_1_d
@@ -46878,6 +52155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_double_1_r.cmd_6782]
 RelativePath=JIT\Methodical\explicit\coverage\expl_double_1_r\expl_double_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_double_1_r
@@ -46885,6 +52163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_float_1_d.cmd_6783]
 RelativePath=JIT\Methodical\explicit\coverage\expl_float_1_d\expl_float_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_float_1_d
@@ -46892,6 +52171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_float_1_r.cmd_6784]
 RelativePath=JIT\Methodical\explicit\coverage\expl_float_1_r\expl_float_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_float_1_r
@@ -46899,6 +52179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_byte_1_d.cmd_6785]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_byte_1_d\expl_gc_byte_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_byte_1_d
@@ -46906,6 +52187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_byte_1_r.cmd_6786]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_byte_1_r\expl_gc_byte_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_byte_1_r
@@ -46913,6 +52195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_double_1_d.cmd_6787]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_double_1_d\expl_gc_double_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_double_1_d
@@ -46920,6 +52203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_double_1_r.cmd_6788]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_double_1_r\expl_gc_double_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_double_1_r
@@ -46927,6 +52211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_float_1_d.cmd_6789]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_float_1_d\expl_gc_float_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_float_1_d
@@ -46934,6 +52219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_float_1_r.cmd_6790]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_float_1_r\expl_gc_float_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_float_1_r
@@ -46941,6 +52227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_int_1_d.cmd_6791]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_int_1_d\expl_gc_int_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_int_1_d
@@ -46948,6 +52235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_int_1_r.cmd_6792]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_int_1_r\expl_gc_int_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_int_1_r
@@ -46955,6 +52243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_long_1_d.cmd_6793]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_long_1_d\expl_gc_long_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_long_1_d
@@ -46962,6 +52251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_long_1_r.cmd_6794]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_long_1_r\expl_gc_long_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_long_1_r
@@ -46969,6 +52259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_obj_1_d.cmd_6795]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_obj_1_d\expl_gc_obj_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_obj_1_d
@@ -46976,6 +52267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_obj_1_r.cmd_6796]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_obj_1_r\expl_gc_obj_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_obj_1_r
@@ -46983,6 +52275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_short_1_d.cmd_6797]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_short_1_d\expl_gc_short_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_short_1_d
@@ -46990,6 +52283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_short_1_r.cmd_6798]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_short_1_r\expl_gc_short_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_short_1_r
@@ -46997,6 +52291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_val_1_d.cmd_6799]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_val_1_d\expl_gc_val_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_val_1_d
@@ -47004,6 +52299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_gc_val_1_r.cmd_6800]
 RelativePath=JIT\Methodical\explicit\coverage\expl_gc_val_1_r\expl_gc_val_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_gc_val_1_r
@@ -47011,6 +52307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_int_1_d.cmd_6801]
 RelativePath=JIT\Methodical\explicit\coverage\expl_int_1_d\expl_int_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_int_1_d
@@ -47018,6 +52315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_int_1_r.cmd_6802]
 RelativePath=JIT\Methodical\explicit\coverage\expl_int_1_r\expl_int_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_int_1_r
@@ -47025,6 +52323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_long_1_d.cmd_6803]
 RelativePath=JIT\Methodical\explicit\coverage\expl_long_1_d\expl_long_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_long_1_d
@@ -47032,6 +52331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_long_1_r.cmd_6804]
 RelativePath=JIT\Methodical\explicit\coverage\expl_long_1_r\expl_long_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_long_1_r
@@ -47039,6 +52339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_obj_1_d.cmd_6805]
 RelativePath=JIT\Methodical\explicit\coverage\expl_obj_1_d\expl_obj_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_obj_1_d
@@ -47046,6 +52347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_obj_1_r.cmd_6806]
 RelativePath=JIT\Methodical\explicit\coverage\expl_obj_1_r\expl_obj_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_obj_1_r
@@ -47053,6 +52355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_short_1_d.cmd_6807]
 RelativePath=JIT\Methodical\explicit\coverage\expl_short_1_d\expl_short_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_short_1_d
@@ -47060,6 +52363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_short_1_r.cmd_6808]
 RelativePath=JIT\Methodical\explicit\coverage\expl_short_1_r\expl_short_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_short_1_r
@@ -47067,6 +52371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_val_1_d.cmd_6809]
 RelativePath=JIT\Methodical\explicit\coverage\expl_val_1_d\expl_val_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_val_1_d
@@ -47074,6 +52379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_val_1_r.cmd_6810]
 RelativePath=JIT\Methodical\explicit\coverage\expl_val_1_r\expl_val_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\expl_val_1_r
@@ -47081,20 +52387,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_byte_1_d.cmd_6811]
 RelativePath=JIT\Methodical\explicit\coverage\seq_byte_1_d\seq_byte_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_byte_1_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_FAIL
+Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_byte_1_r.cmd_6812]
 RelativePath=JIT\Methodical\explicit\coverage\seq_byte_1_r\seq_byte_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_byte_1_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_FAIL
+Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_double_1_d.cmd_6813]
 RelativePath=JIT\Methodical\explicit\coverage\seq_double_1_d\seq_double_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_double_1_d
@@ -47102,6 +52411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_double_1_r.cmd_6814]
 RelativePath=JIT\Methodical\explicit\coverage\seq_double_1_r\seq_double_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_double_1_r
@@ -47109,6 +52419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_float_1_d.cmd_6815]
 RelativePath=JIT\Methodical\explicit\coverage\seq_float_1_d\seq_float_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_float_1_d
@@ -47116,6 +52427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_float_1_r.cmd_6816]
 RelativePath=JIT\Methodical\explicit\coverage\seq_float_1_r\seq_float_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_float_1_r
@@ -47123,6 +52435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_byte_1_d.cmd_6817]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_byte_1_d\seq_gc_byte_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_byte_1_d
@@ -47130,6 +52443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_byte_1_r.cmd_6818]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_byte_1_r\seq_gc_byte_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_byte_1_r
@@ -47137,6 +52451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_double_1_d.cmd_6819]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_double_1_d\seq_gc_double_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_double_1_d
@@ -47144,6 +52459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_double_1_r.cmd_6820]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_double_1_r\seq_gc_double_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_double_1_r
@@ -47151,6 +52467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_float_1_d.cmd_6821]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_float_1_d\seq_gc_float_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_float_1_d
@@ -47158,6 +52475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_float_1_r.cmd_6822]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_float_1_r\seq_gc_float_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_float_1_r
@@ -47165,6 +52483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_int_1_d.cmd_6823]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_int_1_d\seq_gc_int_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_int_1_d
@@ -47172,6 +52491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_int_1_r.cmd_6824]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_int_1_r\seq_gc_int_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_int_1_r
@@ -47179,6 +52499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_long_1_d.cmd_6825]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_long_1_d\seq_gc_long_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_long_1_d
@@ -47186,6 +52507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_long_1_r.cmd_6826]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_long_1_r\seq_gc_long_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_long_1_r
@@ -47193,6 +52515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_obj_1_d.cmd_6827]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_obj_1_d\seq_gc_obj_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_obj_1_d
@@ -47200,6 +52523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_obj_1_r.cmd_6828]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_obj_1_r\seq_gc_obj_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_obj_1_r
@@ -47207,6 +52531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_short_1_d.cmd_6829]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_short_1_d\seq_gc_short_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_short_1_d
@@ -47214,6 +52539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_short_1_r.cmd_6830]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_short_1_r\seq_gc_short_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_short_1_r
@@ -47221,6 +52547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_val_1_d.cmd_6831]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_val_1_d\seq_gc_val_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_val_1_d
@@ -47228,6 +52555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_gc_val_1_r.cmd_6832]
 RelativePath=JIT\Methodical\explicit\coverage\seq_gc_val_1_r\seq_gc_val_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_gc_val_1_r
@@ -47235,6 +52563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_int_1_d.cmd_6833]
 RelativePath=JIT\Methodical\explicit\coverage\seq_int_1_d\seq_int_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_int_1_d
@@ -47242,6 +52571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_int_1_r.cmd_6834]
 RelativePath=JIT\Methodical\explicit\coverage\seq_int_1_r\seq_int_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_int_1_r
@@ -47249,6 +52579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_long_1_d.cmd_6835]
 RelativePath=JIT\Methodical\explicit\coverage\seq_long_1_d\seq_long_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_long_1_d
@@ -47256,6 +52587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_long_1_r.cmd_6836]
 RelativePath=JIT\Methodical\explicit\coverage\seq_long_1_r\seq_long_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_long_1_r
@@ -47263,6 +52595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_obj_1_d.cmd_6837]
 RelativePath=JIT\Methodical\explicit\coverage\seq_obj_1_d\seq_obj_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_obj_1_d
@@ -47270,6 +52603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_obj_1_r.cmd_6838]
 RelativePath=JIT\Methodical\explicit\coverage\seq_obj_1_r\seq_obj_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_obj_1_r
@@ -47277,6 +52611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_short_1_d.cmd_6839]
 RelativePath=JIT\Methodical\explicit\coverage\seq_short_1_d\seq_short_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_short_1_d
@@ -47284,6 +52619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_short_1_r.cmd_6840]
 RelativePath=JIT\Methodical\explicit\coverage\seq_short_1_r\seq_short_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_short_1_r
@@ -47291,6 +52627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_val_1_d.cmd_6841]
 RelativePath=JIT\Methodical\explicit\coverage\seq_val_1_d\seq_val_1_d.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_val_1_d
@@ -47298,6 +52635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [seq_val_1_r.cmd_6842]
 RelativePath=JIT\Methodical\explicit\coverage\seq_val_1_r\seq_val_1_r.cmd
 WorkingDir=JIT\Methodical\explicit\coverage\seq_val_1_r
@@ -47305,6 +52643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [expl_funcptr_gc_d.cmd_6843]
 RelativePath=JIT\Methodical\explicit\funcptr\expl_funcptr_gc_d\expl_funcptr_gc_d.cmd
 WorkingDir=JIT\Methodical\explicit\funcptr\expl_funcptr_gc_d
@@ -47312,6 +52651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [expl_funcptr_gc_r.cmd_6844]
 RelativePath=JIT\Methodical\explicit\funcptr\expl_funcptr_gc_r\expl_funcptr_gc_r.cmd
 WorkingDir=JIT\Methodical\explicit\funcptr\expl_funcptr_gc_r
@@ -47319,6 +52659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [expl_funcptr_val_d.cmd_6845]
 RelativePath=JIT\Methodical\explicit\funcptr\expl_funcptr_val_d\expl_funcptr_val_d.cmd
 WorkingDir=JIT\Methodical\explicit\funcptr\expl_funcptr_val_d
@@ -47326,6 +52667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [expl_funcptr_val_r.cmd_6846]
 RelativePath=JIT\Methodical\explicit\funcptr\expl_funcptr_val_r\expl_funcptr_val_r.cmd
 WorkingDir=JIT\Methodical\explicit\funcptr\expl_funcptr_val_r
@@ -47333,6 +52675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [seq_funcptr_gc_d.cmd_6847]
 RelativePath=JIT\Methodical\explicit\funcptr\seq_funcptr_gc_d\seq_funcptr_gc_d.cmd
 WorkingDir=JIT\Methodical\explicit\funcptr\seq_funcptr_gc_d
@@ -47340,6 +52683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [seq_funcptr_gc_r.cmd_6848]
 RelativePath=JIT\Methodical\explicit\funcptr\seq_funcptr_gc_r\seq_funcptr_gc_r.cmd
 WorkingDir=JIT\Methodical\explicit\funcptr\seq_funcptr_gc_r
@@ -47347,6 +52691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [seq_funcptr_val_d.cmd_6849]
 RelativePath=JIT\Methodical\explicit\funcptr\seq_funcptr_val_d\seq_funcptr_val_d.cmd
 WorkingDir=JIT\Methodical\explicit\funcptr\seq_funcptr_val_d
@@ -47354,6 +52699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [seq_funcptr_val_r.cmd_6850]
 RelativePath=JIT\Methodical\explicit\funcptr\seq_funcptr_val_r\seq_funcptr_val_r.cmd
 WorkingDir=JIT\Methodical\explicit\funcptr\seq_funcptr_val_r
@@ -47361,6 +52707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgexplicit1.cmd_6851]
 RelativePath=JIT\Methodical\explicit\misc\_dbgexplicit1\_dbgexplicit1.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_dbgexplicit1
@@ -47368,6 +52715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgexplicit2.cmd_6852]
 RelativePath=JIT\Methodical\explicit\misc\_dbgexplicit2\_dbgexplicit2.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_dbgexplicit2
@@ -47375,6 +52723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgexplicit3.cmd_6853]
 RelativePath=JIT\Methodical\explicit\misc\_dbgexplicit3\_dbgexplicit3.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_dbgexplicit3
@@ -47382,6 +52731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgexplicit4.cmd_6854]
 RelativePath=JIT\Methodical\explicit\misc\_dbgexplicit4\_dbgexplicit4.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_dbgexplicit4
@@ -47389,6 +52739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgexplicit5.cmd_6855]
 RelativePath=JIT\Methodical\explicit\misc\_dbgexplicit5\_dbgexplicit5.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_dbgexplicit5
@@ -47396,6 +52747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgexplicit6.cmd_6856]
 RelativePath=JIT\Methodical\explicit\misc\_dbgexplicit6\_dbgexplicit6.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_dbgexplicit6
@@ -47403,6 +52755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgexplicit7.cmd_6857]
 RelativePath=JIT\Methodical\explicit\misc\_dbgexplicit7\_dbgexplicit7.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_dbgexplicit7
@@ -47410,6 +52763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgexplicit8.cmd_6858]
 RelativePath=JIT\Methodical\explicit\misc\_dbgexplicit8\_dbgexplicit8.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_dbgexplicit8
@@ -47417,6 +52771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefarg_box_f8.cmd_6859]
 RelativePath=JIT\Methodical\explicit\misc\_il_dbgrefarg_box_f8\_il_dbgrefarg_box_f8.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_il_dbgrefarg_box_f8
@@ -47424,6 +52779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefarg_box_val.cmd_6860]
 RelativePath=JIT\Methodical\explicit\misc\_il_dbgrefarg_box_val\_il_dbgrefarg_box_val.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_il_dbgrefarg_box_val
@@ -47431,6 +52787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefarg_box_f8.cmd_6861]
 RelativePath=JIT\Methodical\explicit\misc\_il_relrefarg_box_f8\_il_relrefarg_box_f8.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_il_relrefarg_box_f8
@@ -47438,6 +52795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefarg_box_val.cmd_6862]
 RelativePath=JIT\Methodical\explicit\misc\_il_relrefarg_box_val\_il_relrefarg_box_val.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_il_relrefarg_box_val
@@ -47445,6 +52803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgexplicit1.cmd_6863]
 RelativePath=JIT\Methodical\explicit\misc\_opt_dbgexplicit1\_opt_dbgexplicit1.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_dbgexplicit1
@@ -47452,6 +52811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgexplicit2.cmd_6864]
 RelativePath=JIT\Methodical\explicit\misc\_opt_dbgexplicit2\_opt_dbgexplicit2.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_dbgexplicit2
@@ -47459,6 +52819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgexplicit3.cmd_6865]
 RelativePath=JIT\Methodical\explicit\misc\_opt_dbgexplicit3\_opt_dbgexplicit3.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_dbgexplicit3
@@ -47466,6 +52827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgexplicit4.cmd_6866]
 RelativePath=JIT\Methodical\explicit\misc\_opt_dbgexplicit4\_opt_dbgexplicit4.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_dbgexplicit4
@@ -47473,6 +52835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgexplicit5.cmd_6867]
 RelativePath=JIT\Methodical\explicit\misc\_opt_dbgexplicit5\_opt_dbgexplicit5.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_dbgexplicit5
@@ -47480,6 +52843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgexplicit6.cmd_6868]
 RelativePath=JIT\Methodical\explicit\misc\_opt_dbgexplicit6\_opt_dbgexplicit6.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_dbgexplicit6
@@ -47487,6 +52851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgexplicit7.cmd_6869]
 RelativePath=JIT\Methodical\explicit\misc\_opt_dbgexplicit7\_opt_dbgexplicit7.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_dbgexplicit7
@@ -47494,6 +52859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgexplicit8.cmd_6870]
 RelativePath=JIT\Methodical\explicit\misc\_opt_dbgexplicit8\_opt_dbgexplicit8.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_dbgexplicit8
@@ -47501,6 +52867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relexplicit1.cmd_6871]
 RelativePath=JIT\Methodical\explicit\misc\_opt_relexplicit1\_opt_relexplicit1.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_relexplicit1
@@ -47508,6 +52875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relexplicit2.cmd_6872]
 RelativePath=JIT\Methodical\explicit\misc\_opt_relexplicit2\_opt_relexplicit2.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_relexplicit2
@@ -47515,6 +52883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relexplicit3.cmd_6873]
 RelativePath=JIT\Methodical\explicit\misc\_opt_relexplicit3\_opt_relexplicit3.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_relexplicit3
@@ -47522,6 +52891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relexplicit4.cmd_6874]
 RelativePath=JIT\Methodical\explicit\misc\_opt_relexplicit4\_opt_relexplicit4.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_relexplicit4
@@ -47529,6 +52899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relexplicit5.cmd_6875]
 RelativePath=JIT\Methodical\explicit\misc\_opt_relexplicit5\_opt_relexplicit5.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_relexplicit5
@@ -47536,6 +52907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relexplicit6.cmd_6876]
 RelativePath=JIT\Methodical\explicit\misc\_opt_relexplicit6\_opt_relexplicit6.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_relexplicit6
@@ -47543,6 +52915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relexplicit7.cmd_6877]
 RelativePath=JIT\Methodical\explicit\misc\_opt_relexplicit7\_opt_relexplicit7.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_relexplicit7
@@ -47550,6 +52923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relexplicit8.cmd_6878]
 RelativePath=JIT\Methodical\explicit\misc\_opt_relexplicit8\_opt_relexplicit8.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_opt_relexplicit8
@@ -47557,6 +52931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relexplicit1.cmd_6879]
 RelativePath=JIT\Methodical\explicit\misc\_relexplicit1\_relexplicit1.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_relexplicit1
@@ -47564,6 +52939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relexplicit2.cmd_6880]
 RelativePath=JIT\Methodical\explicit\misc\_relexplicit2\_relexplicit2.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_relexplicit2
@@ -47571,6 +52947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relexplicit3.cmd_6881]
 RelativePath=JIT\Methodical\explicit\misc\_relexplicit3\_relexplicit3.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_relexplicit3
@@ -47578,6 +52955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relexplicit4.cmd_6882]
 RelativePath=JIT\Methodical\explicit\misc\_relexplicit4\_relexplicit4.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_relexplicit4
@@ -47585,6 +52963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relexplicit5.cmd_6883]
 RelativePath=JIT\Methodical\explicit\misc\_relexplicit5\_relexplicit5.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_relexplicit5
@@ -47592,6 +52971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relexplicit6.cmd_6884]
 RelativePath=JIT\Methodical\explicit\misc\_relexplicit6\_relexplicit6.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_relexplicit6
@@ -47599,6 +52979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relexplicit7.cmd_6885]
 RelativePath=JIT\Methodical\explicit\misc\_relexplicit7\_relexplicit7.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_relexplicit7
@@ -47606,6 +52987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relexplicit8.cmd_6886]
 RelativePath=JIT\Methodical\explicit\misc\_relexplicit8\_relexplicit8.cmd
 WorkingDir=JIT\Methodical\explicit\misc\_relexplicit8
@@ -47613,6 +52995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrotarg_double.cmd_6887]
 RelativePath=JIT\Methodical\explicit\rotate\_dbgrotarg_double\_dbgrotarg_double.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_dbgrotarg_double
@@ -47620,6 +53003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrotarg_float.cmd_6888]
 RelativePath=JIT\Methodical\explicit\rotate\_dbgrotarg_float\_dbgrotarg_float.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_dbgrotarg_float
@@ -47627,6 +53011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrotarg_objref.cmd_6889]
 RelativePath=JIT\Methodical\explicit\rotate\_dbgrotarg_objref\_dbgrotarg_objref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_dbgrotarg_objref
@@ -47634,6 +53019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrotarg_valref.cmd_6890]
 RelativePath=JIT\Methodical\explicit\rotate\_dbgrotarg_valref\_dbgrotarg_valref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_dbgrotarg_valref
@@ -47641,13 +53027,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrotarg_double.cmd_6891]
 RelativePath=JIT\Methodical\explicit\rotate\_il_dbgrotarg_double\_il_dbgrotarg_double.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_dbgrotarg_double
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;UNSTABLE
+Categories=Pri0;JIT;UNSTABLE;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrotarg_float.cmd_6892]
 RelativePath=JIT\Methodical\explicit\rotate\_il_dbgrotarg_float\_il_dbgrotarg_float.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_dbgrotarg_float
@@ -47655,6 +53043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrotarg_objref.cmd_6893]
 RelativePath=JIT\Methodical\explicit\rotate\_il_dbgrotarg_objref\_il_dbgrotarg_objref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_dbgrotarg_objref
@@ -47662,6 +53051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrotarg_valref.cmd_6894]
 RelativePath=JIT\Methodical\explicit\rotate\_il_dbgrotarg_valref\_il_dbgrotarg_valref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_dbgrotarg_valref
@@ -47669,6 +53059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrotate_i4.cmd_6895]
 RelativePath=JIT\Methodical\explicit\rotate\_il_dbgrotate_i4\_il_dbgrotate_i4.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_dbgrotate_i4
@@ -47676,6 +53067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrotate_u2.cmd_6896]
 RelativePath=JIT\Methodical\explicit\rotate\_il_dbgrotate_u2\_il_dbgrotate_u2.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_dbgrotate_u2
@@ -47683,6 +53075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrotarg_double.cmd_6897]
 RelativePath=JIT\Methodical\explicit\rotate\_il_relrotarg_double\_il_relrotarg_double.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_relrotarg_double
@@ -47690,13 +53083,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrotarg_float.cmd_6898]
 RelativePath=JIT\Methodical\explicit\rotate\_il_relrotarg_float\_il_relrotarg_float.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_relrotarg_float
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;REL_FAIL
+Categories=Pri0;JIT;REL_FAIL;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrotarg_objref.cmd_6899]
 RelativePath=JIT\Methodical\explicit\rotate\_il_relrotarg_objref\_il_relrotarg_objref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_relrotarg_objref
@@ -47704,6 +53099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrotarg_valref.cmd_6900]
 RelativePath=JIT\Methodical\explicit\rotate\_il_relrotarg_valref\_il_relrotarg_valref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_relrotarg_valref
@@ -47711,6 +53107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrotate_i4.cmd_6901]
 RelativePath=JIT\Methodical\explicit\rotate\_il_relrotate_i4\_il_relrotate_i4.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_relrotate_i4
@@ -47718,6 +53115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrotate_u2.cmd_6902]
 RelativePath=JIT\Methodical\explicit\rotate\_il_relrotate_u2\_il_relrotate_u2.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_il_relrotate_u2
@@ -47725,6 +53123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrotarg_double.cmd_6903]
 RelativePath=JIT\Methodical\explicit\rotate\_opt_dbgrotarg_double\_opt_dbgrotarg_double.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_opt_dbgrotarg_double
@@ -47732,6 +53131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrotarg_float.cmd_6904]
 RelativePath=JIT\Methodical\explicit\rotate\_opt_dbgrotarg_float\_opt_dbgrotarg_float.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_opt_dbgrotarg_float
@@ -47739,6 +53139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrotarg_objref.cmd_6905]
 RelativePath=JIT\Methodical\explicit\rotate\_opt_dbgrotarg_objref\_opt_dbgrotarg_objref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_opt_dbgrotarg_objref
@@ -47746,6 +53147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_dbgrotarg_valref.cmd_6906]
 RelativePath=JIT\Methodical\explicit\rotate\_opt_dbgrotarg_valref\_opt_dbgrotarg_valref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_opt_dbgrotarg_valref
@@ -47753,6 +53155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrotarg_double.cmd_6907]
 RelativePath=JIT\Methodical\explicit\rotate\_opt_relrotarg_double\_opt_relrotarg_double.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_opt_relrotarg_double
@@ -47760,6 +53163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrotarg_float.cmd_6908]
 RelativePath=JIT\Methodical\explicit\rotate\_opt_relrotarg_float\_opt_relrotarg_float.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_opt_relrotarg_float
@@ -47767,6 +53171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrotarg_objref.cmd_6909]
 RelativePath=JIT\Methodical\explicit\rotate\_opt_relrotarg_objref\_opt_relrotarg_objref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_opt_relrotarg_objref
@@ -47774,6 +53179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_opt_relrotarg_valref.cmd_6910]
 RelativePath=JIT\Methodical\explicit\rotate\_opt_relrotarg_valref\_opt_relrotarg_valref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_opt_relrotarg_valref
@@ -47781,6 +53187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relrotarg_double.cmd_6911]
 RelativePath=JIT\Methodical\explicit\rotate\_relrotarg_double\_relrotarg_double.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_relrotarg_double
@@ -47788,6 +53195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relrotarg_float.cmd_6912]
 RelativePath=JIT\Methodical\explicit\rotate\_relrotarg_float\_relrotarg_float.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_relrotarg_float
@@ -47795,6 +53203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relrotarg_objref.cmd_6913]
 RelativePath=JIT\Methodical\explicit\rotate\_relrotarg_objref\_relrotarg_objref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_relrotarg_objref
@@ -47802,6 +53211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relrotarg_valref.cmd_6914]
 RelativePath=JIT\Methodical\explicit\rotate\_relrotarg_valref\_relrotarg_valref.cmd
 WorkingDir=JIT\Methodical\explicit\rotate\_relrotarg_valref
@@ -47809,6 +53219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [intToByte.cmd_6915]
 RelativePath=JIT\Methodical\flowgraph\bug614098\intToByte\intToByte.cmd
 WorkingDir=JIT\Methodical\flowgraph\bug614098\intToByte
@@ -47816,6 +53227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ehCodeMotion.cmd_6916]
 RelativePath=JIT\Methodical\flowgraph\bug619534\ehCodeMotion\ehCodeMotion.cmd
 WorkingDir=JIT\Methodical\flowgraph\bug619534\ehCodeMotion
@@ -47823,6 +53235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [finallyclone.cmd_6917]
 RelativePath=JIT\Methodical\flowgraph\bug619534\finallyclone\finallyclone.cmd
 WorkingDir=JIT\Methodical\flowgraph\bug619534\finallyclone
@@ -47830,6 +53243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ILStackAllocRepro.cmd_6918]
 RelativePath=JIT\Methodical\flowgraph\bug619534\ILStackAllocRepro\ILStackAllocRepro.cmd
 WorkingDir=JIT\Methodical\flowgraph\bug619534\ILStackAllocRepro
@@ -47837,6 +53251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [moduleHandleCache.cmd_6919]
 RelativePath=JIT\Methodical\flowgraph\bug619534\moduleHandleCache\moduleHandleCache.cmd
 WorkingDir=JIT\Methodical\flowgraph\bug619534\moduleHandleCache
@@ -47844,6 +53259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [twoEndFinallys.cmd_6920]
 RelativePath=JIT\Methodical\flowgraph\bug619534\twoEndFinallys\twoEndFinallys.cmd
 WorkingDir=JIT\Methodical\flowgraph\bug619534\twoEndFinallys
@@ -47851,13 +53267,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [twoEndFinallys_il.cmd_6921]
 RelativePath=JIT\Methodical\flowgraph\bug619534\twoEndFinallys_il\twoEndFinallys_il.cmd
 WorkingDir=JIT\Methodical\flowgraph\bug619534\twoEndFinallys_il
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ptuple_lost.cmd_6922]
 RelativePath=JIT\Methodical\flowgraph\bug621705\ptuple_lost\ptuple_lost.cmd
 WorkingDir=JIT\Methodical\flowgraph\bug621705\ptuple_lost
@@ -47865,6 +53283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ssa_tuIsAddr.cmd_6923]
 RelativePath=JIT\Methodical\flowgraph\bug647189\ssa_tuIsAddr\ssa_tuIsAddr.cmd
 WorkingDir=JIT\Methodical\flowgraph\bug647189\ssa_tuIsAddr
@@ -47872,6 +53291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [GCMaskForGSCookie.cmd_6924]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug642944\GCMaskForGSCookie\GCMaskForGSCookie.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug642944\GCMaskForGSCookie
@@ -47879,6 +53299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arrayDim.cmd_6925]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug675304\arrayDim\arrayDim.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug675304\arrayDim
@@ -47886,6 +53307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [loopIV_init.cmd_6926]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug675304\loopIV_init\loopIV_init.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug675304\loopIV_init
@@ -47893,6 +53315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [osrAddovershot.cmd_6927]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug675304\osrAddovershot\osrAddovershot.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug675304\osrAddovershot
@@ -47900,6 +53323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [castClassEH.cmd_6928]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679008\castClassEH\castClassEH.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679008\castClassEH
@@ -47907,6 +53331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [dependentlifetimes.cmd_6929]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679008\dependentlifetimes\dependentlifetimes.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679008\dependentlifetimes
@@ -47914,6 +53339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [EHCopyProp.cmd_6930]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679008\EHCopyProp\EHCopyProp.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679008\EHCopyProp
@@ -47921,6 +53347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ehDescriptorPtrUpdate.cmd_6931]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679008\ehDescriptorPtrUpdate\ehDescriptorPtrUpdate.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679008\ehDescriptorPtrUpdate
@@ -47928,6 +53355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [fgloop.cmd_6932]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679008\fgloop\fgloop.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679008\fgloop
@@ -47935,6 +53363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [fgloop2.cmd_6933]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679008\fgloop2\fgloop2.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679008\fgloop2
@@ -47942,6 +53371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [GCOverReporting.cmd_6934]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679008\GCOverReporting\GCOverReporting.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679008\GCOverReporting
@@ -47949,6 +53379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [sealedCastVariance.cmd_6935]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679008\sealedCastVariance\sealedCastVariance.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679008\sealedCastVariance
@@ -47956,6 +53387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [singleRefField.cmd_6936]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679008\singleRefField\singleRefField.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679008\singleRefField
@@ -47963,6 +53395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [zeroInitStackSlot.cmd_6937]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679008\zeroInitStackSlot\zeroInitStackSlot.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679008\zeroInitStackSlot
@@ -47970,6 +53403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cpblkInt32.cmd_6938]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679053\cpblkInt32\cpblkInt32.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679053\cpblkInt32
@@ -47977,6 +53411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [flowgraph.cmd_6939]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679053\flowgraph\flowgraph.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679053\flowgraph
@@ -47984,6 +53419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [regionLive.cmd_6940]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679053\regionLive\regionLive.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679053\regionLive
@@ -47991,6 +53427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [indexMinusOne.cmd_6941]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679955\indexMinusOne\indexMinusOne.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679955\indexMinusOne
@@ -47998,6 +53435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [volatileLocal1.cmd_6942]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679955\volatileLocal1\volatileLocal1.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679955\volatileLocal1
@@ -48005,6 +53443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [volatileLocal2.cmd_6943]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug679955\volatileLocal2\volatileLocal2.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug679955\volatileLocal2
@@ -48012,6 +53451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [qMarkColon.cmd_6944]
 RelativePath=JIT\Methodical\flowgraph\dev10_bug723489\qMarkColon\qMarkColon.cmd
 WorkingDir=JIT\Methodical\flowgraph\dev10_bug723489\qMarkColon
@@ -48019,6 +53459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [bouncingball_cs_d.cmd_6945]
 RelativePath=JIT\Methodical\fp\apps\bouncingball_cs_d\bouncingball_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\apps\bouncingball_cs_d
@@ -48026,6 +53467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bouncingball_cs_do.cmd_6946]
 RelativePath=JIT\Methodical\fp\apps\bouncingball_cs_do\bouncingball_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\apps\bouncingball_cs_do
@@ -48033,6 +53475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bouncingball_cs_r.cmd_6947]
 RelativePath=JIT\Methodical\fp\apps\bouncingball_cs_r\bouncingball_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\apps\bouncingball_cs_r
@@ -48040,6 +53483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bouncingball_cs_ro.cmd_6948]
 RelativePath=JIT\Methodical\fp\apps\bouncingball_cs_ro\bouncingball_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\apps\bouncingball_cs_ro
@@ -48047,6 +53491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [1000w1d_cs_d.cmd_6949]
 RelativePath=JIT\Methodical\fp\exgen\1000w1d_cs_d\1000w1d_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\1000w1d_cs_d
@@ -48054,13 +53499,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [1000w1d_cs_do.cmd_6950]
 RelativePath=JIT\Methodical\fp\exgen\1000w1d_cs_do\1000w1d_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\1000w1d_cs_do
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_FAIL
+Categories=Pri0;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [1000w1d_cs_r.cmd_6951]
 RelativePath=JIT\Methodical\fp\exgen\1000w1d_cs_r\1000w1d_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\1000w1d_cs_r
@@ -48068,13 +53515,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [1000w1d_cs_ro.cmd_6952]
 RelativePath=JIT\Methodical\fp\exgen\1000w1d_cs_ro\1000w1d_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\1000w1d_cs_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_FAIL
+Categories=Pri0;NEW_PASS;EXPECTED_PASS
 HostStyle=0
+
 [10w250d_cs_d.cmd_6953]
 RelativePath=JIT\Methodical\fp\exgen\10w250d_cs_d\10w250d_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\10w250d_cs_d
@@ -48082,6 +53531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [10w250d_cs_do.cmd_6954]
 RelativePath=JIT\Methodical\fp\exgen\10w250d_cs_do\10w250d_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\10w250d_cs_do
@@ -48089,6 +53539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [10w250d_cs_r.cmd_6955]
 RelativePath=JIT\Methodical\fp\exgen\10w250d_cs_r\10w250d_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\10w250d_cs_r
@@ -48096,6 +53547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [10w250d_cs_ro.cmd_6956]
 RelativePath=JIT\Methodical\fp\exgen\10w250d_cs_ro\10w250d_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\10w250d_cs_ro
@@ -48103,6 +53555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [10w5d_cs_d.cmd_6957]
 RelativePath=JIT\Methodical\fp\exgen\10w5d_cs_d\10w5d_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\10w5d_cs_d
@@ -48110,6 +53563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [10w5d_cs_do.cmd_6958]
 RelativePath=JIT\Methodical\fp\exgen\10w5d_cs_do\10w5d_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\10w5d_cs_do
@@ -48117,6 +53571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [10w5d_cs_r.cmd_6959]
 RelativePath=JIT\Methodical\fp\exgen\10w5d_cs_r\10w5d_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\10w5d_cs_r
@@ -48124,6 +53579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [10w5d_cs_ro.cmd_6960]
 RelativePath=JIT\Methodical\fp\exgen\10w5d_cs_ro\10w5d_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\10w5d_cs_ro
@@ -48131,6 +53587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [200w1d-01_cs_d.cmd_6961]
 RelativePath=JIT\Methodical\fp\exgen\200w1d-01_cs_d\200w1d-01_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\200w1d-01_cs_d
@@ -48138,6 +53595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [200w1d-01_cs_do.cmd_6962]
 RelativePath=JIT\Methodical\fp\exgen\200w1d-01_cs_do\200w1d-01_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\200w1d-01_cs_do
@@ -48145,6 +53603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [200w1d-01_cs_r.cmd_6963]
 RelativePath=JIT\Methodical\fp\exgen\200w1d-01_cs_r\200w1d-01_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\200w1d-01_cs_r
@@ -48152,6 +53611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [200w1d-01_cs_ro.cmd_6964]
 RelativePath=JIT\Methodical\fp\exgen\200w1d-01_cs_ro\200w1d-01_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\200w1d-01_cs_ro
@@ -48159,6 +53619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [200w1d-02_cs_d.cmd_6965]
 RelativePath=JIT\Methodical\fp\exgen\200w1d-02_cs_d\200w1d-02_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\200w1d-02_cs_d
@@ -48166,6 +53627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [200w1d-02_cs_do.cmd_6966]
 RelativePath=JIT\Methodical\fp\exgen\200w1d-02_cs_do\200w1d-02_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\200w1d-02_cs_do
@@ -48173,6 +53635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [200w1d-02_cs_r.cmd_6967]
 RelativePath=JIT\Methodical\fp\exgen\200w1d-02_cs_r\200w1d-02_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\200w1d-02_cs_r
@@ -48180,6 +53643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [200w1d-02_cs_ro.cmd_6968]
 RelativePath=JIT\Methodical\fp\exgen\200w1d-02_cs_ro\200w1d-02_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\200w1d-02_cs_ro
@@ -48187,6 +53651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [3w1d-01_cs_d.cmd_6969]
 RelativePath=JIT\Methodical\fp\exgen\3w1d-01_cs_d\3w1d-01_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\3w1d-01_cs_d
@@ -48194,6 +53659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [3w1d-01_cs_do.cmd_6970]
 RelativePath=JIT\Methodical\fp\exgen\3w1d-01_cs_do\3w1d-01_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\3w1d-01_cs_do
@@ -48201,6 +53667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [3w1d-01_cs_r.cmd_6971]
 RelativePath=JIT\Methodical\fp\exgen\3w1d-01_cs_r\3w1d-01_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\3w1d-01_cs_r
@@ -48208,6 +53675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [3w1d-01_cs_ro.cmd_6972]
 RelativePath=JIT\Methodical\fp\exgen\3w1d-01_cs_ro\3w1d-01_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\3w1d-01_cs_ro
@@ -48215,6 +53683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [3w1d-02_cs_d.cmd_6973]
 RelativePath=JIT\Methodical\fp\exgen\3w1d-02_cs_d\3w1d-02_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\3w1d-02_cs_d
@@ -48222,6 +53691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [3w1d-02_cs_do.cmd_6974]
 RelativePath=JIT\Methodical\fp\exgen\3w1d-02_cs_do\3w1d-02_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\3w1d-02_cs_do
@@ -48229,6 +53699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [3w1d-02_cs_r.cmd_6975]
 RelativePath=JIT\Methodical\fp\exgen\3w1d-02_cs_r\3w1d-02_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\3w1d-02_cs_r
@@ -48236,6 +53707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [3w1d-02_cs_ro.cmd_6976]
 RelativePath=JIT\Methodical\fp\exgen\3w1d-02_cs_ro\3w1d-02_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\3w1d-02_cs_ro
@@ -48243,6 +53715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-01_cs_d.cmd_6977]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-01_cs_d\5w1d-01_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-01_cs_d
@@ -48250,6 +53723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-01_cs_do.cmd_6978]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-01_cs_do\5w1d-01_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-01_cs_do
@@ -48257,6 +53731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-01_cs_r.cmd_6979]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-01_cs_r\5w1d-01_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-01_cs_r
@@ -48264,6 +53739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-01_cs_ro.cmd_6980]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-01_cs_ro\5w1d-01_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-01_cs_ro
@@ -48271,6 +53747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-02_cs_d.cmd_6981]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-02_cs_d\5w1d-02_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-02_cs_d
@@ -48278,6 +53755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-02_cs_do.cmd_6982]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-02_cs_do\5w1d-02_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-02_cs_do
@@ -48285,6 +53763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-02_cs_r.cmd_6983]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-02_cs_r\5w1d-02_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-02_cs_r
@@ -48292,6 +53771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-02_cs_ro.cmd_6984]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-02_cs_ro\5w1d-02_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-02_cs_ro
@@ -48299,6 +53779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-03_cs_d.cmd_6985]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-03_cs_d\5w1d-03_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-03_cs_d
@@ -48306,6 +53787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-03_cs_do.cmd_6986]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-03_cs_do\5w1d-03_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-03_cs_do
@@ -48313,6 +53795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-03_cs_r.cmd_6987]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-03_cs_r\5w1d-03_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-03_cs_r
@@ -48320,6 +53803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-03_cs_ro.cmd_6988]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-03_cs_ro\5w1d-03_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-03_cs_ro
@@ -48327,6 +53811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-04_cs_d.cmd_6989]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-04_cs_d\5w1d-04_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-04_cs_d
@@ -48334,6 +53819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-04_cs_do.cmd_6990]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-04_cs_do\5w1d-04_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-04_cs_do
@@ -48341,6 +53827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-04_cs_r.cmd_6991]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-04_cs_r\5w1d-04_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-04_cs_r
@@ -48348,6 +53835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-04_cs_ro.cmd_6992]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-04_cs_ro\5w1d-04_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-04_cs_ro
@@ -48355,6 +53843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-05_cs_d.cmd_6993]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-05_cs_d\5w1d-05_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-05_cs_d
@@ -48362,6 +53851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-05_cs_do.cmd_6994]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-05_cs_do\5w1d-05_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-05_cs_do
@@ -48369,6 +53859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-05_cs_r.cmd_6995]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-05_cs_r\5w1d-05_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-05_cs_r
@@ -48376,6 +53867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-05_cs_ro.cmd_6996]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-05_cs_ro\5w1d-05_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-05_cs_ro
@@ -48383,6 +53875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-06_cs_d.cmd_6997]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-06_cs_d\5w1d-06_cs_d.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-06_cs_d
@@ -48390,6 +53883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-06_cs_do.cmd_6998]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-06_cs_do\5w1d-06_cs_do.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-06_cs_do
@@ -48397,6 +53891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-06_cs_r.cmd_6999]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-06_cs_r\5w1d-06_cs_r.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-06_cs_r
@@ -48404,6 +53899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [5w1d-06_cs_ro.cmd_7000]
 RelativePath=JIT\Methodical\fp\exgen\5w1d-06_cs_ro\5w1d-06_cs_ro.cmd
 WorkingDir=JIT\Methodical\fp\exgen\5w1d-06_cs_ro
@@ -48411,6 +53907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [convr4a_cs_d.cmd_7001]
 RelativePath=JIT\Methodical\FPtrunc\convr4a_cs_d\convr4a_cs_d.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr4a_cs_d
@@ -48418,6 +53915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convr4a_cs_do.cmd_7002]
 RelativePath=JIT\Methodical\FPtrunc\convr4a_cs_do\convr4a_cs_do.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr4a_cs_do
@@ -48425,6 +53923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convr4a_cs_r.cmd_7003]
 RelativePath=JIT\Methodical\FPtrunc\convr4a_cs_r\convr4a_cs_r.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr4a_cs_r
@@ -48432,6 +53931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convr4a_cs_ro.cmd_7004]
 RelativePath=JIT\Methodical\FPtrunc\convr4a_cs_ro\convr4a_cs_ro.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr4a_cs_ro
@@ -48439,6 +53939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convr4d_il_d.cmd_7005]
 RelativePath=JIT\Methodical\FPtrunc\convr4d_il_d\convr4d_il_d.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr4d_il_d
@@ -48446,6 +53947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convr4d_il_r.cmd_7006]
 RelativePath=JIT\Methodical\FPtrunc\convr4d_il_r\convr4d_il_r.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr4d_il_r
@@ -48453,6 +53955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convr8a_cs_d.cmd_7007]
 RelativePath=JIT\Methodical\FPtrunc\convr8a_cs_d\convr8a_cs_d.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr8a_cs_d
@@ -48460,6 +53963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convr8a_cs_do.cmd_7008]
 RelativePath=JIT\Methodical\FPtrunc\convr8a_cs_do\convr8a_cs_do.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr8a_cs_do
@@ -48467,6 +53971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convr8a_cs_r.cmd_7009]
 RelativePath=JIT\Methodical\FPtrunc\convr8a_cs_r\convr8a_cs_r.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr8a_cs_r
@@ -48474,6 +53979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convr8a_cs_ro.cmd_7010]
 RelativePath=JIT\Methodical\FPtrunc\convr8a_cs_ro\convr8a_cs_ro.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr8a_cs_ro
@@ -48481,6 +53987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convr8d_il_d.cmd_7011]
 RelativePath=JIT\Methodical\FPtrunc\convr8d_il_d\convr8d_il_d.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr8d_il_d
@@ -48488,6 +53995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convr8d_il_r.cmd_7012]
 RelativePath=JIT\Methodical\FPtrunc\convr8d_il_r\convr8d_il_r.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convr8d_il_r
@@ -48495,27 +54003,31 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [convx_il_d.cmd_7013]
 RelativePath=JIT\Methodical\FPtrunc\convx_il_d\convx_il_d.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convx_il_d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;NEED_UPDATE_TEST
+Categories=Pri0;EXPECTED_PASS;NEED_UPDATE_TEST
 HostStyle=0
+
 [convx_il_r.cmd_7014]
 RelativePath=JIT\Methodical\FPtrunc\convx_il_r\convx_il_r.cmd
 WorkingDir=JIT\Methodical\FPtrunc\convx_il_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;NEED_UPDATE_TEST
+Categories=Pri0;EXPECTED_PASS;NEED_UPDATE_TEST
 HostStyle=0
+
 [test.cmd_7015]
 RelativePath=JIT\Methodical\inlining\boolean\test\test.cmd
 WorkingDir=JIT\Methodical\inlining\boolean\test
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_7016]
 RelativePath=JIT\Methodical\inlining\bug505642\test\test.cmd
 WorkingDir=JIT\Methodical\inlining\bug505642\test
@@ -48523,6 +54035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [variancesmall.cmd_7017]
 RelativePath=JIT\Methodical\inlining\dev10_bug719093\variancesmall\variancesmall.cmd
 WorkingDir=JIT\Methodical\inlining\dev10_bug719093\variancesmall
@@ -48530,6 +54043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcs_long.cmd_7018]
 RelativePath=JIT\Methodical\int64\arrays\_dbglcs_long\_dbglcs_long.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_dbglcs_long
@@ -48537,6 +54051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcs_ulong.cmd_7019]
 RelativePath=JIT\Methodical\int64\arrays\_dbglcs_ulong\_dbglcs_ulong.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_dbglcs_ulong
@@ -48544,6 +54059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghugedim.cmd_7020]
 RelativePath=JIT\Methodical\int64\arrays\_il_dbghugedim\_il_dbghugedim.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_il_dbghugedim
@@ -48551,6 +54067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbglcs_long.cmd_7021]
 RelativePath=JIT\Methodical\int64\arrays\_il_dbglcs_long\_il_dbglcs_long.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_il_dbglcs_long
@@ -48558,6 +54075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbglcs_ulong.cmd_7022]
 RelativePath=JIT\Methodical\int64\arrays\_il_dbglcs_ulong\_il_dbglcs_ulong.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_il_dbglcs_ulong
@@ -48565,6 +54083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhugedim.cmd_7023]
 RelativePath=JIT\Methodical\int64\arrays\_il_relhugedim\_il_relhugedim.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_il_relhugedim
@@ -48572,6 +54091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rellcs_long.cmd_7024]
 RelativePath=JIT\Methodical\int64\arrays\_il_rellcs_long\_il_rellcs_long.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_il_rellcs_long
@@ -48579,6 +54099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rellcs_ulong.cmd_7025]
 RelativePath=JIT\Methodical\int64\arrays\_il_rellcs_ulong\_il_rellcs_ulong.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_il_rellcs_ulong
@@ -48586,6 +54107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rellcs_long.cmd_7026]
 RelativePath=JIT\Methodical\int64\arrays\_rellcs_long\_rellcs_long.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_rellcs_long
@@ -48593,6 +54115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rellcs_ulong.cmd_7027]
 RelativePath=JIT\Methodical\int64\arrays\_rellcs_ulong\_rellcs_ulong.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_rellcs_ulong
@@ -48600,6 +54123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcs_long.cmd_7028]
 RelativePath=JIT\Methodical\int64\arrays\_speed_dbglcs_long\_speed_dbglcs_long.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_speed_dbglcs_long
@@ -48607,6 +54131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcs_ulong.cmd_7029]
 RelativePath=JIT\Methodical\int64\arrays\_speed_dbglcs_ulong\_speed_dbglcs_ulong.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_speed_dbglcs_ulong
@@ -48614,6 +54139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcs_long.cmd_7030]
 RelativePath=JIT\Methodical\int64\arrays\_speed_rellcs_long\_speed_rellcs_long.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_speed_rellcs_long
@@ -48621,6 +54147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcs_ulong.cmd_7031]
 RelativePath=JIT\Methodical\int64\arrays\_speed_rellcs_ulong\_speed_rellcs_ulong.cmd
 WorkingDir=JIT\Methodical\int64\arrays\_speed_rellcs_ulong
@@ -48628,6 +54155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgbinop.cmd_7032]
 RelativePath=JIT\Methodical\int64\misc\_dbgbinop\_dbgbinop.cmd
 WorkingDir=JIT\Methodical\int64\misc\_dbgbinop
@@ -48635,6 +54163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgbox.cmd_7033]
 RelativePath=JIT\Methodical\int64\misc\_dbgbox\_dbgbox.cmd
 WorkingDir=JIT\Methodical\int64\misc\_dbgbox
@@ -48642,6 +54171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgbinop.cmd_7034]
 RelativePath=JIT\Methodical\int64\misc\_il_dbgbinop\_il_dbgbinop.cmd
 WorkingDir=JIT\Methodical\int64\misc\_il_dbgbinop
@@ -48649,6 +54179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgbox.cmd_7035]
 RelativePath=JIT\Methodical\int64\misc\_il_dbgbox\_il_dbgbox.cmd
 WorkingDir=JIT\Methodical\int64\misc\_il_dbgbox
@@ -48656,6 +54187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relbinop.cmd_7036]
 RelativePath=JIT\Methodical\int64\misc\_il_relbinop\_il_relbinop.cmd
 WorkingDir=JIT\Methodical\int64\misc\_il_relbinop
@@ -48663,6 +54195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relbox.cmd_7037]
 RelativePath=JIT\Methodical\int64\misc\_il_relbox\_il_relbox.cmd
 WorkingDir=JIT\Methodical\int64\misc\_il_relbox
@@ -48670,6 +54203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relbinop.cmd_7038]
 RelativePath=JIT\Methodical\int64\misc\_relbinop\_relbinop.cmd
 WorkingDir=JIT\Methodical\int64\misc\_relbinop
@@ -48677,6 +54211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relbox.cmd_7039]
 RelativePath=JIT\Methodical\int64\misc\_relbox\_relbox.cmd
 WorkingDir=JIT\Methodical\int64\misc\_relbox
@@ -48684,6 +54219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgbinop.cmd_7040]
 RelativePath=JIT\Methodical\int64\misc\_speed_dbgbinop\_speed_dbgbinop.cmd
 WorkingDir=JIT\Methodical\int64\misc\_speed_dbgbinop
@@ -48691,6 +54227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgbox.cmd_7041]
 RelativePath=JIT\Methodical\int64\misc\_speed_dbgbox\_speed_dbgbox.cmd
 WorkingDir=JIT\Methodical\int64\misc\_speed_dbgbox
@@ -48698,6 +54235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relbinop.cmd_7042]
 RelativePath=JIT\Methodical\int64\misc\_speed_relbinop\_speed_relbinop.cmd
 WorkingDir=JIT\Methodical\int64\misc\_speed_relbinop
@@ -48705,6 +54243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relbox.cmd_7043]
 RelativePath=JIT\Methodical\int64\misc\_speed_relbox\_speed_relbox.cmd
 WorkingDir=JIT\Methodical\int64\misc\_speed_relbox
@@ -48712,6 +54251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgs_addsub.cmd_7044]
 RelativePath=JIT\Methodical\int64\signed\_dbgs_addsub\_dbgs_addsub.cmd
 WorkingDir=JIT\Methodical\int64\signed\_dbgs_addsub
@@ -48719,6 +54259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgs_ldc_div.cmd_7045]
 RelativePath=JIT\Methodical\int64\signed\_dbgs_ldc_div\_dbgs_ldc_div.cmd
 WorkingDir=JIT\Methodical\int64\signed\_dbgs_ldc_div
@@ -48726,6 +54267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgs_ldc_mul.cmd_7046]
 RelativePath=JIT\Methodical\int64\signed\_dbgs_ldc_mul\_dbgs_ldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_dbgs_ldc_mul
@@ -48733,6 +54275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgs_ldc_mulovf.cmd_7047]
 RelativePath=JIT\Methodical\int64\signed\_dbgs_ldc_mulovf\_dbgs_ldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_dbgs_ldc_mulovf
@@ -48740,6 +54283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgs_ldfld_mul.cmd_7048]
 RelativePath=JIT\Methodical\int64\signed\_dbgs_ldfld_mul\_dbgs_ldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_dbgs_ldfld_mul
@@ -48747,6 +54291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgs_ldfld_mulovf.cmd_7049]
 RelativePath=JIT\Methodical\int64\signed\_dbgs_ldfld_mulovf\_dbgs_ldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_dbgs_ldfld_mulovf
@@ -48754,6 +54299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgs_ldsfld_mul.cmd_7050]
 RelativePath=JIT\Methodical\int64\signed\_dbgs_ldsfld_mul\_dbgs_ldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_dbgs_ldsfld_mul
@@ -48761,6 +54307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgs_ldsfld_mulovf.cmd_7051]
 RelativePath=JIT\Methodical\int64\signed\_dbgs_ldsfld_mulovf\_dbgs_ldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_dbgs_ldsfld_mulovf
@@ -48768,6 +54315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgs_muldiv.cmd_7052]
 RelativePath=JIT\Methodical\int64\signed\_dbgs_muldiv\_dbgs_muldiv.cmd
 WorkingDir=JIT\Methodical\int64\signed\_dbgs_muldiv
@@ -48775,6 +54323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgs_addsub.cmd_7053]
 RelativePath=JIT\Methodical\int64\signed\_il_dbgs_addsub\_il_dbgs_addsub.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_dbgs_addsub
@@ -48782,6 +54331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgs_ldc_div.cmd_7054]
 RelativePath=JIT\Methodical\int64\signed\_il_dbgs_ldc_div\_il_dbgs_ldc_div.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_dbgs_ldc_div
@@ -48789,6 +54339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgs_ldc_mul.cmd_7055]
 RelativePath=JIT\Methodical\int64\signed\_il_dbgs_ldc_mul\_il_dbgs_ldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_dbgs_ldc_mul
@@ -48796,6 +54347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgs_ldc_mulovf.cmd_7056]
 RelativePath=JIT\Methodical\int64\signed\_il_dbgs_ldc_mulovf\_il_dbgs_ldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_dbgs_ldc_mulovf
@@ -48803,6 +54355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgs_ldfld_mul.cmd_7057]
 RelativePath=JIT\Methodical\int64\signed\_il_dbgs_ldfld_mul\_il_dbgs_ldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_dbgs_ldfld_mul
@@ -48810,6 +54363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgs_ldfld_mulovf.cmd_7058]
 RelativePath=JIT\Methodical\int64\signed\_il_dbgs_ldfld_mulovf\_il_dbgs_ldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_dbgs_ldfld_mulovf
@@ -48817,6 +54371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgs_ldsfld_mul.cmd_7059]
 RelativePath=JIT\Methodical\int64\signed\_il_dbgs_ldsfld_mul\_il_dbgs_ldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_dbgs_ldsfld_mul
@@ -48824,6 +54379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgs_ldsfld_mulovf.cmd_7060]
 RelativePath=JIT\Methodical\int64\signed\_il_dbgs_ldsfld_mulovf\_il_dbgs_ldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_dbgs_ldsfld_mulovf
@@ -48831,6 +54387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgs_muldiv.cmd_7061]
 RelativePath=JIT\Methodical\int64\signed\_il_dbgs_muldiv\_il_dbgs_muldiv.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_dbgs_muldiv
@@ -48838,6 +54395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rels_addsub.cmd_7062]
 RelativePath=JIT\Methodical\int64\signed\_il_rels_addsub\_il_rels_addsub.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_rels_addsub
@@ -48845,6 +54403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rels_ldc_div.cmd_7063]
 RelativePath=JIT\Methodical\int64\signed\_il_rels_ldc_div\_il_rels_ldc_div.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_rels_ldc_div
@@ -48852,6 +54411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rels_ldc_mul.cmd_7064]
 RelativePath=JIT\Methodical\int64\signed\_il_rels_ldc_mul\_il_rels_ldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_rels_ldc_mul
@@ -48859,6 +54419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rels_ldc_mulovf.cmd_7065]
 RelativePath=JIT\Methodical\int64\signed\_il_rels_ldc_mulovf\_il_rels_ldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_rels_ldc_mulovf
@@ -48866,6 +54427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rels_ldfld_mul.cmd_7066]
 RelativePath=JIT\Methodical\int64\signed\_il_rels_ldfld_mul\_il_rels_ldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_rels_ldfld_mul
@@ -48873,6 +54435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rels_ldfld_mulovf.cmd_7067]
 RelativePath=JIT\Methodical\int64\signed\_il_rels_ldfld_mulovf\_il_rels_ldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_rels_ldfld_mulovf
@@ -48880,6 +54443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rels_ldsfld_mul.cmd_7068]
 RelativePath=JIT\Methodical\int64\signed\_il_rels_ldsfld_mul\_il_rels_ldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_rels_ldsfld_mul
@@ -48887,6 +54451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rels_ldsfld_mulovf.cmd_7069]
 RelativePath=JIT\Methodical\int64\signed\_il_rels_ldsfld_mulovf\_il_rels_ldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_rels_ldsfld_mulovf
@@ -48894,6 +54459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rels_muldiv.cmd_7070]
 RelativePath=JIT\Methodical\int64\signed\_il_rels_muldiv\_il_rels_muldiv.cmd
 WorkingDir=JIT\Methodical\int64\signed\_il_rels_muldiv
@@ -48901,6 +54467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rels_addsub.cmd_7071]
 RelativePath=JIT\Methodical\int64\signed\_rels_addsub\_rels_addsub.cmd
 WorkingDir=JIT\Methodical\int64\signed\_rels_addsub
@@ -48908,6 +54475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rels_ldc_div.cmd_7072]
 RelativePath=JIT\Methodical\int64\signed\_rels_ldc_div\_rels_ldc_div.cmd
 WorkingDir=JIT\Methodical\int64\signed\_rels_ldc_div
@@ -48915,6 +54483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rels_ldc_mul.cmd_7073]
 RelativePath=JIT\Methodical\int64\signed\_rels_ldc_mul\_rels_ldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_rels_ldc_mul
@@ -48922,6 +54491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rels_ldc_mulovf.cmd_7074]
 RelativePath=JIT\Methodical\int64\signed\_rels_ldc_mulovf\_rels_ldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_rels_ldc_mulovf
@@ -48929,6 +54499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rels_ldfld_mul.cmd_7075]
 RelativePath=JIT\Methodical\int64\signed\_rels_ldfld_mul\_rels_ldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_rels_ldfld_mul
@@ -48936,6 +54507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rels_ldfld_mulovf.cmd_7076]
 RelativePath=JIT\Methodical\int64\signed\_rels_ldfld_mulovf\_rels_ldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_rels_ldfld_mulovf
@@ -48943,6 +54515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rels_ldsfld_mul.cmd_7077]
 RelativePath=JIT\Methodical\int64\signed\_rels_ldsfld_mul\_rels_ldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_rels_ldsfld_mul
@@ -48950,6 +54523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rels_ldsfld_mulovf.cmd_7078]
 RelativePath=JIT\Methodical\int64\signed\_rels_ldsfld_mulovf\_rels_ldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_rels_ldsfld_mulovf
@@ -48957,6 +54531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rels_muldiv.cmd_7079]
 RelativePath=JIT\Methodical\int64\signed\_rels_muldiv\_rels_muldiv.cmd
 WorkingDir=JIT\Methodical\int64\signed\_rels_muldiv
@@ -48964,6 +54539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgs_addsub.cmd_7080]
 RelativePath=JIT\Methodical\int64\signed\_speed_dbgs_addsub\_speed_dbgs_addsub.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_dbgs_addsub
@@ -48971,6 +54547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgs_ldc_div.cmd_7081]
 RelativePath=JIT\Methodical\int64\signed\_speed_dbgs_ldc_div\_speed_dbgs_ldc_div.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_dbgs_ldc_div
@@ -48978,6 +54555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgs_ldc_mul.cmd_7082]
 RelativePath=JIT\Methodical\int64\signed\_speed_dbgs_ldc_mul\_speed_dbgs_ldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_dbgs_ldc_mul
@@ -48985,6 +54563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgs_ldc_mulovf.cmd_7083]
 RelativePath=JIT\Methodical\int64\signed\_speed_dbgs_ldc_mulovf\_speed_dbgs_ldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_dbgs_ldc_mulovf
@@ -48992,6 +54571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgs_ldfld_mul.cmd_7084]
 RelativePath=JIT\Methodical\int64\signed\_speed_dbgs_ldfld_mul\_speed_dbgs_ldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_dbgs_ldfld_mul
@@ -48999,6 +54579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgs_ldfld_mulovf.cmd_7085]
 RelativePath=JIT\Methodical\int64\signed\_speed_dbgs_ldfld_mulovf\_speed_dbgs_ldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_dbgs_ldfld_mulovf
@@ -49006,6 +54587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgs_ldsfld_mul.cmd_7086]
 RelativePath=JIT\Methodical\int64\signed\_speed_dbgs_ldsfld_mul\_speed_dbgs_ldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_dbgs_ldsfld_mul
@@ -49013,6 +54595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgs_ldsfld_mulovf.cmd_7087]
 RelativePath=JIT\Methodical\int64\signed\_speed_dbgs_ldsfld_mulovf\_speed_dbgs_ldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_dbgs_ldsfld_mulovf
@@ -49020,6 +54603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgs_muldiv.cmd_7088]
 RelativePath=JIT\Methodical\int64\signed\_speed_dbgs_muldiv\_speed_dbgs_muldiv.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_dbgs_muldiv
@@ -49027,6 +54611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rels_addsub.cmd_7089]
 RelativePath=JIT\Methodical\int64\signed\_speed_rels_addsub\_speed_rels_addsub.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_rels_addsub
@@ -49034,6 +54619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rels_ldc_div.cmd_7090]
 RelativePath=JIT\Methodical\int64\signed\_speed_rels_ldc_div\_speed_rels_ldc_div.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_rels_ldc_div
@@ -49041,6 +54627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rels_ldc_mul.cmd_7091]
 RelativePath=JIT\Methodical\int64\signed\_speed_rels_ldc_mul\_speed_rels_ldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_rels_ldc_mul
@@ -49048,6 +54635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rels_ldc_mulovf.cmd_7092]
 RelativePath=JIT\Methodical\int64\signed\_speed_rels_ldc_mulovf\_speed_rels_ldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_rels_ldc_mulovf
@@ -49055,6 +54643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rels_ldfld_mul.cmd_7093]
 RelativePath=JIT\Methodical\int64\signed\_speed_rels_ldfld_mul\_speed_rels_ldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_rels_ldfld_mul
@@ -49062,6 +54651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rels_ldfld_mulovf.cmd_7094]
 RelativePath=JIT\Methodical\int64\signed\_speed_rels_ldfld_mulovf\_speed_rels_ldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_rels_ldfld_mulovf
@@ -49069,6 +54659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rels_ldsfld_mul.cmd_7095]
 RelativePath=JIT\Methodical\int64\signed\_speed_rels_ldsfld_mul\_speed_rels_ldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_rels_ldsfld_mul
@@ -49076,6 +54667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rels_ldsfld_mulovf.cmd_7096]
 RelativePath=JIT\Methodical\int64\signed\_speed_rels_ldsfld_mulovf\_speed_rels_ldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_rels_ldsfld_mulovf
@@ -49083,6 +54675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rels_muldiv.cmd_7097]
 RelativePath=JIT\Methodical\int64\signed\_speed_rels_muldiv\_speed_rels_muldiv.cmd
 WorkingDir=JIT\Methodical\int64\signed\_speed_rels_muldiv
@@ -49090,6 +54683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgsuperlong.cmd_7098]
 RelativePath=JIT\Methodical\int64\superlong\_dbgsuperlong\_dbgsuperlong.cmd
 WorkingDir=JIT\Methodical\int64\superlong\_dbgsuperlong
@@ -49097,6 +54691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgsuperlong.cmd_7099]
 RelativePath=JIT\Methodical\int64\superlong\_il_dbgsuperlong\_il_dbgsuperlong.cmd
 WorkingDir=JIT\Methodical\int64\superlong\_il_dbgsuperlong
@@ -49104,6 +54699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relsuperlong.cmd_7100]
 RelativePath=JIT\Methodical\int64\superlong\_il_relsuperlong\_il_relsuperlong.cmd
 WorkingDir=JIT\Methodical\int64\superlong\_il_relsuperlong
@@ -49111,6 +54707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relsuperlong.cmd_7101]
 RelativePath=JIT\Methodical\int64\superlong\_relsuperlong\_relsuperlong.cmd
 WorkingDir=JIT\Methodical\int64\superlong\_relsuperlong
@@ -49118,6 +54715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgsuperlong.cmd_7102]
 RelativePath=JIT\Methodical\int64\superlong\_speed_dbgsuperlong\_speed_dbgsuperlong.cmd
 WorkingDir=JIT\Methodical\int64\superlong\_speed_dbgsuperlong
@@ -49125,6 +54723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relsuperlong.cmd_7103]
 RelativePath=JIT\Methodical\int64\superlong\_speed_relsuperlong\_speed_relsuperlong.cmd
 WorkingDir=JIT\Methodical\int64\superlong\_speed_relsuperlong
@@ -49132,6 +54731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgaddsub.cmd_7104]
 RelativePath=JIT\Methodical\int64\unsigned\_dbgaddsub\_dbgaddsub.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_dbgaddsub
@@ -49139,6 +54739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgldc_mul.cmd_7105]
 RelativePath=JIT\Methodical\int64\unsigned\_dbgldc_mul\_dbgldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_dbgldc_mul
@@ -49146,6 +54747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgldc_mulovf.cmd_7106]
 RelativePath=JIT\Methodical\int64\unsigned\_dbgldc_mulovf\_dbgldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_dbgldc_mulovf
@@ -49153,6 +54755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgldfld_mul.cmd_7107]
 RelativePath=JIT\Methodical\int64\unsigned\_dbgldfld_mul\_dbgldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_dbgldfld_mul
@@ -49160,6 +54763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgldfld_mulovf.cmd_7108]
 RelativePath=JIT\Methodical\int64\unsigned\_dbgldfld_mulovf\_dbgldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_dbgldfld_mulovf
@@ -49167,6 +54771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgldsfld_mul.cmd_7109]
 RelativePath=JIT\Methodical\int64\unsigned\_dbgldsfld_mul\_dbgldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_dbgldsfld_mul
@@ -49174,6 +54779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgldsfld_mulovf.cmd_7110]
 RelativePath=JIT\Methodical\int64\unsigned\_dbgldsfld_mulovf\_dbgldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_dbgldsfld_mulovf
@@ -49181,6 +54787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgmuldiv.cmd_7111]
 RelativePath=JIT\Methodical\int64\unsigned\_dbgmuldiv\_dbgmuldiv.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_dbgmuldiv
@@ -49188,6 +54795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgaddsub.cmd_7112]
 RelativePath=JIT\Methodical\int64\unsigned\_il_dbgaddsub\_il_dbgaddsub.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_dbgaddsub
@@ -49195,6 +54803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldc_mul.cmd_7113]
 RelativePath=JIT\Methodical\int64\unsigned\_il_dbgldc_mul\_il_dbgldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_dbgldc_mul
@@ -49202,6 +54811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldc_mulovf.cmd_7114]
 RelativePath=JIT\Methodical\int64\unsigned\_il_dbgldc_mulovf\_il_dbgldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_dbgldc_mulovf
@@ -49209,6 +54819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldfld_mul.cmd_7115]
 RelativePath=JIT\Methodical\int64\unsigned\_il_dbgldfld_mul\_il_dbgldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_dbgldfld_mul
@@ -49216,6 +54827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldfld_mulovf.cmd_7116]
 RelativePath=JIT\Methodical\int64\unsigned\_il_dbgldfld_mulovf\_il_dbgldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_dbgldfld_mulovf
@@ -49223,6 +54835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldsfld_mul.cmd_7117]
 RelativePath=JIT\Methodical\int64\unsigned\_il_dbgldsfld_mul\_il_dbgldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_dbgldsfld_mul
@@ -49230,6 +54843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldsfld_mulovf.cmd_7118]
 RelativePath=JIT\Methodical\int64\unsigned\_il_dbgldsfld_mulovf\_il_dbgldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_dbgldsfld_mulovf
@@ -49237,6 +54851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgmuldiv.cmd_7119]
 RelativePath=JIT\Methodical\int64\unsigned\_il_dbgmuldiv\_il_dbgmuldiv.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_dbgmuldiv
@@ -49244,6 +54859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reladdsub.cmd_7120]
 RelativePath=JIT\Methodical\int64\unsigned\_il_reladdsub\_il_reladdsub.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_reladdsub
@@ -49251,6 +54867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldc_mul.cmd_7121]
 RelativePath=JIT\Methodical\int64\unsigned\_il_relldc_mul\_il_relldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_relldc_mul
@@ -49258,6 +54875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldc_mulovf.cmd_7122]
 RelativePath=JIT\Methodical\int64\unsigned\_il_relldc_mulovf\_il_relldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_relldc_mulovf
@@ -49265,6 +54883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldfld_mul.cmd_7123]
 RelativePath=JIT\Methodical\int64\unsigned\_il_relldfld_mul\_il_relldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_relldfld_mul
@@ -49272,6 +54891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldfld_mulovf.cmd_7124]
 RelativePath=JIT\Methodical\int64\unsigned\_il_relldfld_mulovf\_il_relldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_relldfld_mulovf
@@ -49279,6 +54899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldsfld_mul.cmd_7125]
 RelativePath=JIT\Methodical\int64\unsigned\_il_relldsfld_mul\_il_relldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_relldsfld_mul
@@ -49286,6 +54907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldsfld_mulovf.cmd_7126]
 RelativePath=JIT\Methodical\int64\unsigned\_il_relldsfld_mulovf\_il_relldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_relldsfld_mulovf
@@ -49293,6 +54915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relmuldiv.cmd_7127]
 RelativePath=JIT\Methodical\int64\unsigned\_il_relmuldiv\_il_relmuldiv.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_il_relmuldiv
@@ -49300,6 +54923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_reladdsub.cmd_7128]
 RelativePath=JIT\Methodical\int64\unsigned\_reladdsub\_reladdsub.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_reladdsub
@@ -49307,6 +54931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relldc_mul.cmd_7129]
 RelativePath=JIT\Methodical\int64\unsigned\_relldc_mul\_relldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_relldc_mul
@@ -49314,6 +54939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relldc_mulovf.cmd_7130]
 RelativePath=JIT\Methodical\int64\unsigned\_relldc_mulovf\_relldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_relldc_mulovf
@@ -49321,6 +54947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relldfld_mul.cmd_7131]
 RelativePath=JIT\Methodical\int64\unsigned\_relldfld_mul\_relldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_relldfld_mul
@@ -49328,6 +54955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relldfld_mulovf.cmd_7132]
 RelativePath=JIT\Methodical\int64\unsigned\_relldfld_mulovf\_relldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_relldfld_mulovf
@@ -49335,6 +54963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relldsfld_mul.cmd_7133]
 RelativePath=JIT\Methodical\int64\unsigned\_relldsfld_mul\_relldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_relldsfld_mul
@@ -49342,6 +54971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relldsfld_mulovf.cmd_7134]
 RelativePath=JIT\Methodical\int64\unsigned\_relldsfld_mulovf\_relldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_relldsfld_mulovf
@@ -49349,6 +54979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relmuldiv.cmd_7135]
 RelativePath=JIT\Methodical\int64\unsigned\_relmuldiv\_relmuldiv.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_relmuldiv
@@ -49356,6 +54987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgaddsub.cmd_7136]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_dbgaddsub\_speed_dbgaddsub.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_dbgaddsub
@@ -49363,6 +54995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgldc_mul.cmd_7137]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_dbgldc_mul\_speed_dbgldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_dbgldc_mul
@@ -49370,6 +55003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgldc_mulovf.cmd_7138]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_dbgldc_mulovf\_speed_dbgldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_dbgldc_mulovf
@@ -49377,6 +55011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgldfld_mul.cmd_7139]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_dbgldfld_mul\_speed_dbgldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_dbgldfld_mul
@@ -49384,6 +55019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgldfld_mulovf.cmd_7140]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_dbgldfld_mulovf\_speed_dbgldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_dbgldfld_mulovf
@@ -49391,6 +55027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgldsfld_mul.cmd_7141]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_dbgldsfld_mul\_speed_dbgldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_dbgldsfld_mul
@@ -49398,6 +55035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgldsfld_mulovf.cmd_7142]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_dbgldsfld_mulovf\_speed_dbgldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_dbgldsfld_mulovf
@@ -49405,6 +55043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgmuldiv.cmd_7143]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_dbgmuldiv\_speed_dbgmuldiv.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_dbgmuldiv
@@ -49412,6 +55051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_reladdsub.cmd_7144]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_reladdsub\_speed_reladdsub.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_reladdsub
@@ -49419,6 +55059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relldc_mul.cmd_7145]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_relldc_mul\_speed_relldc_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_relldc_mul
@@ -49426,6 +55067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relldc_mulovf.cmd_7146]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_relldc_mulovf\_speed_relldc_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_relldc_mulovf
@@ -49433,6 +55075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relldfld_mul.cmd_7147]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_relldfld_mul\_speed_relldfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_relldfld_mul
@@ -49440,6 +55083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relldfld_mulovf.cmd_7148]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_relldfld_mulovf\_speed_relldfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_relldfld_mulovf
@@ -49447,6 +55091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relldsfld_mul.cmd_7149]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_relldsfld_mul\_speed_relldsfld_mul.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_relldsfld_mul
@@ -49454,6 +55099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relldsfld_mulovf.cmd_7150]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_relldsfld_mulovf\_speed_relldsfld_mulovf.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_relldsfld_mulovf
@@ -49461,6 +55107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relmuldiv.cmd_7151]
 RelativePath=JIT\Methodical\int64\unsigned\_speed_relmuldiv\_speed_relmuldiv.cmd
 WorkingDir=JIT\Methodical\int64\unsigned\_speed_relmuldiv
@@ -49468,6 +55115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param1a_cs_d.cmd_7152]
 RelativePath=JIT\Methodical\Invoke\25params\25param1a_cs_d\25param1a_cs_d.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param1a_cs_d
@@ -49475,6 +55123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param1a_cs_do.cmd_7153]
 RelativePath=JIT\Methodical\Invoke\25params\25param1a_cs_do\25param1a_cs_do.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param1a_cs_do
@@ -49482,6 +55131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param1a_cs_r.cmd_7154]
 RelativePath=JIT\Methodical\Invoke\25params\25param1a_cs_r\25param1a_cs_r.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param1a_cs_r
@@ -49489,6 +55139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param1a_cs_ro.cmd_7155]
 RelativePath=JIT\Methodical\Invoke\25params\25param1a_cs_ro\25param1a_cs_ro.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param1a_cs_ro
@@ -49496,6 +55147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param1b_il_d.cmd_7156]
 RelativePath=JIT\Methodical\Invoke\25params\25param1b_il_d\25param1b_il_d.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param1b_il_d
@@ -49503,6 +55155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param1b_il_r.cmd_7157]
 RelativePath=JIT\Methodical\Invoke\25params\25param1b_il_r\25param1b_il_r.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param1b_il_r
@@ -49510,6 +55163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param1c_il_d.cmd_7158]
 RelativePath=JIT\Methodical\Invoke\25params\25param1c_il_d\25param1c_il_d.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param1c_il_d
@@ -49517,6 +55171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param1c_il_r.cmd_7159]
 RelativePath=JIT\Methodical\Invoke\25params\25param1c_il_r\25param1c_il_r.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param1c_il_r
@@ -49524,6 +55179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param2a_cs_d.cmd_7160]
 RelativePath=JIT\Methodical\Invoke\25params\25param2a_cs_d\25param2a_cs_d.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param2a_cs_d
@@ -49531,6 +55187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param2a_cs_do.cmd_7161]
 RelativePath=JIT\Methodical\Invoke\25params\25param2a_cs_do\25param2a_cs_do.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param2a_cs_do
@@ -49538,6 +55195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param2a_cs_r.cmd_7162]
 RelativePath=JIT\Methodical\Invoke\25params\25param2a_cs_r\25param2a_cs_r.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param2a_cs_r
@@ -49545,6 +55203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param2a_cs_ro.cmd_7163]
 RelativePath=JIT\Methodical\Invoke\25params\25param2a_cs_ro\25param2a_cs_ro.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param2a_cs_ro
@@ -49552,6 +55211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param2b_il_d.cmd_7164]
 RelativePath=JIT\Methodical\Invoke\25params\25param2b_il_d\25param2b_il_d.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param2b_il_d
@@ -49559,6 +55219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [25param2b_il_r.cmd_7165]
 RelativePath=JIT\Methodical\Invoke\25params\25param2b_il_r\25param2b_il_r.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param2b_il_r
@@ -49566,6 +55227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [25param2c_il_d.cmd_7166]
 RelativePath=JIT\Methodical\Invoke\25params\25param2c_il_d\25param2c_il_d.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param2c_il_d
@@ -49573,6 +55235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [25param2c_il_r.cmd_7167]
 RelativePath=JIT\Methodical\Invoke\25params\25param2c_il_r\25param2c_il_r.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param2c_il_r
@@ -49580,6 +55243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [25param3a_cs_d.cmd_7168]
 RelativePath=JIT\Methodical\Invoke\25params\25param3a_cs_d\25param3a_cs_d.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param3a_cs_d
@@ -49587,6 +55251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param3a_cs_do.cmd_7169]
 RelativePath=JIT\Methodical\Invoke\25params\25param3a_cs_do\25param3a_cs_do.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param3a_cs_do
@@ -49594,6 +55259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param3a_cs_r.cmd_7170]
 RelativePath=JIT\Methodical\Invoke\25params\25param3a_cs_r\25param3a_cs_r.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param3a_cs_r
@@ -49601,6 +55267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param3a_cs_ro.cmd_7171]
 RelativePath=JIT\Methodical\Invoke\25params\25param3a_cs_ro\25param3a_cs_ro.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param3a_cs_ro
@@ -49608,6 +55275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param3b_il_d.cmd_7172]
 RelativePath=JIT\Methodical\Invoke\25params\25param3b_il_d\25param3b_il_d.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param3b_il_d
@@ -49615,6 +55283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param3b_il_r.cmd_7173]
 RelativePath=JIT\Methodical\Invoke\25params\25param3b_il_r\25param3b_il_r.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param3b_il_r
@@ -49622,6 +55291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param3c_il_d.cmd_7174]
 RelativePath=JIT\Methodical\Invoke\25params\25param3c_il_d\25param3c_il_d.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param3c_il_d
@@ -49629,6 +55299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25param3c_il_r.cmd_7175]
 RelativePath=JIT\Methodical\Invoke\25params\25param3c_il_r\25param3c_il_r.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25param3c_il_r
@@ -49636,6 +55307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25paramMixed_il_d.cmd_7176]
 RelativePath=JIT\Methodical\Invoke\25params\25paramMixed_il_d\25paramMixed_il_d.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25paramMixed_il_d
@@ -49643,6 +55315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [25paramMixed_il_r.cmd_7177]
 RelativePath=JIT\Methodical\Invoke\25params\25paramMixed_il_r\25paramMixed_il_r.cmd
 WorkingDir=JIT\Methodical\Invoke\25params\25paramMixed_il_r
@@ -49650,6 +55323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgtest1.cmd_7178]
 RelativePath=JIT\Methodical\Invoke\callvirt\_dbgtest1\_dbgtest1.cmd
 WorkingDir=JIT\Methodical\Invoke\callvirt\_dbgtest1
@@ -49657,6 +55331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest1.cmd_7179]
 RelativePath=JIT\Methodical\Invoke\callvirt\_il_dbgtest1\_il_dbgtest1.cmd
 WorkingDir=JIT\Methodical\Invoke\callvirt\_il_dbgtest1
@@ -49664,6 +55339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest2.cmd_7180]
 RelativePath=JIT\Methodical\Invoke\callvirt\_il_dbgtest2\_il_dbgtest2.cmd
 WorkingDir=JIT\Methodical\Invoke\callvirt\_il_dbgtest2
@@ -49671,6 +55347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest3.cmd_7181]
 RelativePath=JIT\Methodical\Invoke\callvirt\_il_dbgtest3\_il_dbgtest3.cmd
 WorkingDir=JIT\Methodical\Invoke\callvirt\_il_dbgtest3
@@ -49678,6 +55355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest1.cmd_7182]
 RelativePath=JIT\Methodical\Invoke\callvirt\_il_reltest1\_il_reltest1.cmd
 WorkingDir=JIT\Methodical\Invoke\callvirt\_il_reltest1
@@ -49685,6 +55363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest2.cmd_7183]
 RelativePath=JIT\Methodical\Invoke\callvirt\_il_reltest2\_il_reltest2.cmd
 WorkingDir=JIT\Methodical\Invoke\callvirt\_il_reltest2
@@ -49692,6 +55371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest3.cmd_7184]
 RelativePath=JIT\Methodical\Invoke\callvirt\_il_reltest3\_il_reltest3.cmd
 WorkingDir=JIT\Methodical\Invoke\callvirt\_il_reltest3
@@ -49699,6 +55379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_reltest1.cmd_7185]
 RelativePath=JIT\Methodical\Invoke\callvirt\_reltest1\_reltest1.cmd
 WorkingDir=JIT\Methodical\Invoke\callvirt\_reltest1
@@ -49706,6 +55387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgtest1.cmd_7186]
 RelativePath=JIT\Methodical\Invoke\callvirt\_speed_dbgtest1\_speed_dbgtest1.cmd
 WorkingDir=JIT\Methodical\Invoke\callvirt\_speed_dbgtest1
@@ -49713,6 +55395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_reltest1.cmd_7187]
 RelativePath=JIT\Methodical\Invoke\callvirt\_speed_reltest1\_speed_reltest1.cmd
 WorkingDir=JIT\Methodical\Invoke\callvirt\_speed_reltest1
@@ -49720,6 +55403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgval_ctor.cmd_7188]
 RelativePath=JIT\Methodical\Invoke\ctor\_dbgval_ctor\_dbgval_ctor.cmd
 WorkingDir=JIT\Methodical\Invoke\ctor\_dbgval_ctor
@@ -49727,6 +55411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgval_cctor.cmd_7189]
 RelativePath=JIT\Methodical\Invoke\ctor\_il_dbgval_cctor\_il_dbgval_cctor.cmd
 WorkingDir=JIT\Methodical\Invoke\ctor\_il_dbgval_cctor
@@ -49734,6 +55419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgval_ctor_newobj.cmd_7190]
 RelativePath=JIT\Methodical\Invoke\ctor\_il_dbgval_ctor_newobj\_il_dbgval_ctor_newobj.cmd
 WorkingDir=JIT\Methodical\Invoke\ctor\_il_dbgval_ctor_newobj
@@ -49741,6 +55427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relval_cctor.cmd_7191]
 RelativePath=JIT\Methodical\Invoke\ctor\_il_relval_cctor\_il_relval_cctor.cmd
 WorkingDir=JIT\Methodical\Invoke\ctor\_il_relval_cctor
@@ -49748,6 +55435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relval_ctor_newobj.cmd_7192]
 RelativePath=JIT\Methodical\Invoke\ctor\_il_relval_ctor_newobj\_il_relval_ctor_newobj.cmd
 WorkingDir=JIT\Methodical\Invoke\ctor\_il_relval_ctor_newobj
@@ -49755,6 +55443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relval_ctor.cmd_7193]
 RelativePath=JIT\Methodical\Invoke\ctor\_relval_ctor\_relval_ctor.cmd
 WorkingDir=JIT\Methodical\Invoke\ctor\_relval_ctor
@@ -49762,6 +55451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgval_ctor.cmd_7194]
 RelativePath=JIT\Methodical\Invoke\ctor\_speed_dbgval_ctor\_speed_dbgval_ctor.cmd
 WorkingDir=JIT\Methodical\Invoke\ctor\_speed_dbgval_ctor
@@ -49769,6 +55459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relval_ctor.cmd_7195]
 RelativePath=JIT\Methodical\Invoke\ctor\_speed_relval_ctor\_speed_relval_ctor.cmd
 WorkingDir=JIT\Methodical\Invoke\ctor\_speed_relval_ctor
@@ -49776,6 +55467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgdeep.cmd_7196]
 RelativePath=JIT\Methodical\Invoke\deep\_dbgdeep\_dbgdeep.cmd
 WorkingDir=JIT\Methodical\Invoke\deep\_dbgdeep
@@ -49783,6 +55475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgdeep1.cmd_7197]
 RelativePath=JIT\Methodical\Invoke\deep\_il_dbgdeep1\_il_dbgdeep1.cmd
 WorkingDir=JIT\Methodical\Invoke\deep\_il_dbgdeep1
@@ -49790,6 +55483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgdeep2.cmd_7198]
 RelativePath=JIT\Methodical\Invoke\deep\_il_dbgdeep2\_il_dbgdeep2.cmd
 WorkingDir=JIT\Methodical\Invoke\deep\_il_dbgdeep2
@@ -49797,6 +55491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reldeep1.cmd_7199]
 RelativePath=JIT\Methodical\Invoke\deep\_il_reldeep1\_il_reldeep1.cmd
 WorkingDir=JIT\Methodical\Invoke\deep\_il_reldeep1
@@ -49804,6 +55499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reldeep2.cmd_7200]
 RelativePath=JIT\Methodical\Invoke\deep\_il_reldeep2\_il_reldeep2.cmd
 WorkingDir=JIT\Methodical\Invoke\deep\_il_reldeep2
@@ -49811,6 +55507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_reldeep.cmd_7201]
 RelativePath=JIT\Methodical\Invoke\deep\_reldeep\_reldeep.cmd
 WorkingDir=JIT\Methodical\Invoke\deep\_reldeep
@@ -49818,6 +55515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgdeep.cmd_7202]
 RelativePath=JIT\Methodical\Invoke\deep\_speed_dbgdeep\_speed_dbgdeep.cmd
 WorkingDir=JIT\Methodical\Invoke\deep\_speed_dbgdeep
@@ -49825,6 +55523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_reldeep.cmd_7203]
 RelativePath=JIT\Methodical\Invoke\deep\_speed_reldeep\_speed_reldeep.cmd
 WorkingDir=JIT\Methodical\Invoke\deep\_speed_reldeep
@@ -49832,6 +55531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrecurse.cmd_7204]
 RelativePath=JIT\Methodical\Invoke\fptr\_dbgrecurse\_dbgrecurse.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_dbgrecurse
@@ -49839,6 +55539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgftn_t.cmd_7205]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbgftn_t\_il_dbgftn_t.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbgftn_t
@@ -49846,6 +55547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbginstftn.cmd_7206]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbginstftn\_il_dbginstftn.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbginstftn
@@ -49853,6 +55555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbginstftn_t.cmd_7207]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbginstftn_t\_il_dbginstftn_t.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbginstftn_t
@@ -49860,6 +55563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrecurse_calli.cmd_7208]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbgrecurse_calli\_il_dbgrecurse_calli.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbgrecurse_calli
@@ -49867,6 +55571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrecurse_jmp.cmd_7209]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbgrecurse_jmp\_il_dbgrecurse_jmp.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbgrecurse_jmp
@@ -49874,6 +55579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrecurse_jmpi.cmd_7210]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbgrecurse_jmpi\_il_dbgrecurse_jmpi.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbgrecurse_jmpi
@@ -49881,6 +55587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrecurse_tail_call.cmd_7211]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbgrecurse_tail_call\_il_dbgrecurse_tail_call.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbgrecurse_tail_call
@@ -49888,6 +55595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrecurse_tail_calli.cmd_7212]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbgrecurse_tail_calli\_il_dbgrecurse_tail_calli.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbgrecurse_tail_calli
@@ -49895,6 +55603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgvalftn.cmd_7213]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbgvalftn\_il_dbgvalftn.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbgvalftn
@@ -49902,6 +55611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgvalftn_t.cmd_7214]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbgvalftn_t\_il_dbgvalftn_t.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbgvalftn_t
@@ -49909,6 +55619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgvirtftn.cmd_7215]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbgvirtftn\_il_dbgvirtftn.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbgvirtftn
@@ -49916,6 +55627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgvirtftn_t.cmd_7216]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_dbgvirtftn_t\_il_dbgvirtftn_t.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_dbgvirtftn_t
@@ -49923,6 +55635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relftn_t.cmd_7217]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relftn_t\_il_relftn_t.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relftn_t
@@ -49930,6 +55643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relinstftn.cmd_7218]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relinstftn\_il_relinstftn.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relinstftn
@@ -49937,6 +55651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relinstftn_t.cmd_7219]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relinstftn_t\_il_relinstftn_t.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relinstftn_t
@@ -49944,6 +55659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrecurse_calli.cmd_7220]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relrecurse_calli\_il_relrecurse_calli.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relrecurse_calli
@@ -49951,6 +55667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrecurse_jmp.cmd_7221]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relrecurse_jmp\_il_relrecurse_jmp.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relrecurse_jmp
@@ -49958,6 +55675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrecurse_jmpi.cmd_7222]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relrecurse_jmpi\_il_relrecurse_jmpi.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relrecurse_jmpi
@@ -49965,6 +55683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrecurse_tail_call.cmd_7223]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relrecurse_tail_call\_il_relrecurse_tail_call.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relrecurse_tail_call
@@ -49972,6 +55691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrecurse_tail_calli.cmd_7224]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relrecurse_tail_calli\_il_relrecurse_tail_calli.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relrecurse_tail_calli
@@ -49979,6 +55699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relvalftn.cmd_7225]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relvalftn\_il_relvalftn.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relvalftn
@@ -49986,6 +55707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relvalftn_t.cmd_7226]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relvalftn_t\_il_relvalftn_t.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relvalftn_t
@@ -49993,6 +55715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relvirtftn.cmd_7227]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relvirtftn\_il_relvirtftn.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relvirtftn
@@ -50000,6 +55723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relvirtftn_t.cmd_7228]
 RelativePath=JIT\Methodical\Invoke\fptr\_il_relvirtftn_t\_il_relvirtftn_t.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_il_relvirtftn_t
@@ -50007,6 +55731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relrecurse.cmd_7229]
 RelativePath=JIT\Methodical\Invoke\fptr\_relrecurse\_relrecurse.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_relrecurse
@@ -50014,6 +55739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgrecurse.cmd_7230]
 RelativePath=JIT\Methodical\Invoke\fptr\_speed_dbgrecurse\_speed_dbgrecurse.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_speed_dbgrecurse
@@ -50021,6 +55747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relrecurse.cmd_7231]
 RelativePath=JIT\Methodical\Invoke\fptr\_speed_relrecurse\_speed_relrecurse.cmd
 WorkingDir=JIT\Methodical\Invoke\fptr\_speed_relrecurse
@@ -50028,6 +55755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgobj.cmd_7232]
 RelativePath=JIT\Methodical\Invoke\implicit\_dbgobj\_dbgobj.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_dbgobj
@@ -50035,6 +55763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgfr4.cmd_7233]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgfr4\_il_dbgfr4.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgfr4
@@ -50042,6 +55771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgfr8.cmd_7234]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgfr8\_il_dbgfr8.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgfr8
@@ -50049,6 +55779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi4i1.cmd_7235]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgi4i1\_il_dbgi4i1.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgi4i1
@@ -50056,6 +55787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi4i2.cmd_7236]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgi4i2\_il_dbgi4i2.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgi4i2
@@ -50063,6 +55795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi4u1.cmd_7237]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgi4u1\_il_dbgi4u1.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgi4u1
@@ -50070,6 +55803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi4u2.cmd_7238]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgi4u2\_il_dbgi4u2.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgi4u2
@@ -50077,6 +55811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi4u4.cmd_7239]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgi4u4\_il_dbgi4u4.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgi4u4
@@ -50084,6 +55819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgi8u8.cmd_7240]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgi8u8\_il_dbgi8u8.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgi8u8
@@ -50091,6 +55827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgii1.cmd_7241]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgii1\_il_dbgii1.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgii1
@@ -50098,6 +55835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgii2.cmd_7242]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgii2\_il_dbgii2.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgii2
@@ -50105,6 +55843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgii4.cmd_7243]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgii4\_il_dbgii4.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgii4
@@ -50112,6 +55851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgiu1.cmd_7244]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgiu1\_il_dbgiu1.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgiu1
@@ -50119,6 +55859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgiu2.cmd_7245]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgiu2\_il_dbgiu2.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgiu2
@@ -50126,6 +55867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgiu4.cmd_7246]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgiu4\_il_dbgiu4.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgiu4
@@ -50133,6 +55875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgobjref.cmd_7247]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_dbgobjref\_il_dbgobjref.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_dbgobjref
@@ -50140,6 +55883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relfr4.cmd_7248]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_relfr4\_il_relfr4.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_relfr4
@@ -50147,6 +55891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relfr8.cmd_7249]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_relfr8\_il_relfr8.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_relfr8
@@ -50154,6 +55899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli4i1.cmd_7250]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_reli4i1\_il_reli4i1.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_reli4i1
@@ -50161,6 +55907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli4i2.cmd_7251]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_reli4i2\_il_reli4i2.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_reli4i2
@@ -50168,6 +55915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli4u1.cmd_7252]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_reli4u1\_il_reli4u1.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_reli4u1
@@ -50175,6 +55923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli4u2.cmd_7253]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_reli4u2\_il_reli4u2.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_reli4u2
@@ -50182,6 +55931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli4u4.cmd_7254]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_reli4u4\_il_reli4u4.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_reli4u4
@@ -50189,6 +55939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reli8u8.cmd_7255]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_reli8u8\_il_reli8u8.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_reli8u8
@@ -50196,6 +55947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relii1.cmd_7256]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_relii1\_il_relii1.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_relii1
@@ -50203,6 +55955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relii2.cmd_7257]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_relii2\_il_relii2.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_relii2
@@ -50210,6 +55963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relii4.cmd_7258]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_relii4\_il_relii4.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_relii4
@@ -50217,6 +55971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reliu1.cmd_7259]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_reliu1\_il_reliu1.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_reliu1
@@ -50224,6 +55979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reliu2.cmd_7260]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_reliu2\_il_reliu2.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_reliu2
@@ -50231,6 +55987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reliu4.cmd_7261]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_reliu4\_il_reliu4.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_reliu4
@@ -50238,6 +55995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relobjref.cmd_7262]
 RelativePath=JIT\Methodical\Invoke\implicit\_il_relobjref\_il_relobjref.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_il_relobjref
@@ -50245,6 +56003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relobj.cmd_7263]
 RelativePath=JIT\Methodical\Invoke\implicit\_relobj\_relobj.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_relobj
@@ -50252,6 +56011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgobj.cmd_7264]
 RelativePath=JIT\Methodical\Invoke\implicit\_speed_dbgobj\_speed_dbgobj.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_speed_dbgobj
@@ -50259,6 +56019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relobj.cmd_7265]
 RelativePath=JIT\Methodical\Invoke\implicit\_speed_relobj\_speed_relobj.cmd
 WorkingDir=JIT\Methodical\Invoke\implicit\_speed_relobj
@@ -50266,6 +56027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgcatchfinally.cmd_7266]
 RelativePath=JIT\Methodical\Invoke\SEH\_dbgcatchfinally\_dbgcatchfinally.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_dbgcatchfinally
@@ -50273,6 +56035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgcatchfinally_tail.cmd_7267]
 RelativePath=JIT\Methodical\Invoke\SEH\_dbgcatchfinally_tail\_dbgcatchfinally_tail.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_dbgcatchfinally_tail
@@ -50280,6 +56043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcatchfault.cmd_7268]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_dbgcatchfault\_il_dbgcatchfault.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_dbgcatchfault
@@ -50287,6 +56051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcatchfault_jmp.cmd_7269]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_dbgcatchfault_jmp\_il_dbgcatchfault_jmp.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_dbgcatchfault_jmp
@@ -50294,6 +56059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcatchfault_tail.cmd_7270]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_dbgcatchfault_tail\_il_dbgcatchfault_tail.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_dbgcatchfault_tail
@@ -50301,6 +56067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcatchfinally_ind.cmd_7271]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_dbgcatchfinally_ind\_il_dbgcatchfinally_ind.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_dbgcatchfinally_ind
@@ -50308,6 +56075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcatchfinally_jmp.cmd_7272]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_dbgcatchfinally_jmp\_il_dbgcatchfinally_jmp.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_dbgcatchfinally_jmp
@@ -50315,6 +56083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcatchfinally_jmpind.cmd_7273]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_dbgcatchfinally_jmpind\_il_dbgcatchfinally_jmpind.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_dbgcatchfinally_jmpind
@@ -50322,6 +56091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcatchfinally_tail.cmd_7274]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_dbgcatchfinally_tail\_il_dbgcatchfinally_tail.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_dbgcatchfinally_tail
@@ -50329,6 +56099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcatchfault.cmd_7275]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_relcatchfault\_il_relcatchfault.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_relcatchfault
@@ -50336,6 +56107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcatchfault_jmp.cmd_7276]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_relcatchfault_jmp\_il_relcatchfault_jmp.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_relcatchfault_jmp
@@ -50343,6 +56115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcatchfault_tail.cmd_7277]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_relcatchfault_tail\_il_relcatchfault_tail.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_relcatchfault_tail
@@ -50350,6 +56123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcatchfinally_ind.cmd_7278]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_relcatchfinally_ind\_il_relcatchfinally_ind.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_relcatchfinally_ind
@@ -50357,6 +56131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcatchfinally_jmp.cmd_7279]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_relcatchfinally_jmp\_il_relcatchfinally_jmp.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_relcatchfinally_jmp
@@ -50364,6 +56139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcatchfinally_jmpind.cmd_7280]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_relcatchfinally_jmpind\_il_relcatchfinally_jmpind.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_relcatchfinally_jmpind
@@ -50371,6 +56147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcatchfinally_tail.cmd_7281]
 RelativePath=JIT\Methodical\Invoke\SEH\_il_relcatchfinally_tail\_il_relcatchfinally_tail.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_il_relcatchfinally_tail
@@ -50378,6 +56155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relcatchfinally.cmd_7282]
 RelativePath=JIT\Methodical\Invoke\SEH\_relcatchfinally\_relcatchfinally.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_relcatchfinally
@@ -50385,6 +56163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relcatchfinally_tail.cmd_7283]
 RelativePath=JIT\Methodical\Invoke\SEH\_relcatchfinally_tail\_relcatchfinally_tail.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_relcatchfinally_tail
@@ -50392,6 +56171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgcatchfinally.cmd_7284]
 RelativePath=JIT\Methodical\Invoke\SEH\_speed_dbgcatchfinally\_speed_dbgcatchfinally.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_speed_dbgcatchfinally
@@ -50399,6 +56179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgcatchfinally_tail.cmd_7285]
 RelativePath=JIT\Methodical\Invoke\SEH\_speed_dbgcatchfinally_tail\_speed_dbgcatchfinally_tail.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_speed_dbgcatchfinally_tail
@@ -50406,6 +56187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relcatchfinally.cmd_7286]
 RelativePath=JIT\Methodical\Invoke\SEH\_speed_relcatchfinally\_speed_relcatchfinally.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_speed_relcatchfinally
@@ -50413,6 +56195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relcatchfinally_tail.cmd_7287]
 RelativePath=JIT\Methodical\Invoke\SEH\_speed_relcatchfinally_tail\_speed_relcatchfinally_tail.cmd
 WorkingDir=JIT\Methodical\Invoke\SEH\_speed_relcatchfinally_tail
@@ -50420,6 +56203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgthisnull.cmd_7288]
 RelativePath=JIT\Methodical\Invoke\thiscall\_dbgthisnull\_dbgthisnull.cmd
 WorkingDir=JIT\Methodical\Invoke\thiscall\_dbgthisnull
@@ -50427,6 +56211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relthisnull.cmd_7289]
 RelativePath=JIT\Methodical\Invoke\thiscall\_relthisnull\_relthisnull.cmd
 WorkingDir=JIT\Methodical\Invoke\thiscall\_relthisnull
@@ -50434,6 +56219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgthisnull.cmd_7290]
 RelativePath=JIT\Methodical\Invoke\thiscall\_speed_dbgthisnull\_speed_dbgthisnull.cmd
 WorkingDir=JIT\Methodical\Invoke\thiscall\_speed_dbgthisnull
@@ -50441,6 +56227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relthisnull.cmd_7291]
 RelativePath=JIT\Methodical\Invoke\thiscall\_speed_relthisnull\_speed_relthisnull.cmd
 WorkingDir=JIT\Methodical\Invoke\thiscall\_speed_relthisnull
@@ -50448,6 +56235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [bug603649.cmd_7292]
 RelativePath=JIT\Methodical\jitinterface\bug603649\bug603649.cmd
 WorkingDir=JIT\Methodical\jitinterface\bug603649
@@ -50455,6 +56243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldtoken.cmd_7293]
 RelativePath=JIT\Methodical\ldtoken\_il_dbgldtoken\_il_dbgldtoken.cmd
 WorkingDir=JIT\Methodical\ldtoken\_il_dbgldtoken
@@ -50462,6 +56251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldtokena.cmd_7294]
 RelativePath=JIT\Methodical\ldtoken\_il_dbgldtokena\_il_dbgldtokena.cmd
 WorkingDir=JIT\Methodical\ldtoken\_il_dbgldtokena
@@ -50469,6 +56259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgptr_types.cmd_7295]
 RelativePath=JIT\Methodical\ldtoken\_il_dbgptr_types\_il_dbgptr_types.cmd
 WorkingDir=JIT\Methodical\ldtoken\_il_dbgptr_types
@@ -50476,6 +56267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtypes.cmd_7296]
 RelativePath=JIT\Methodical\ldtoken\_il_dbgtypes\_il_dbgtypes.cmd
 WorkingDir=JIT\Methodical\ldtoken\_il_dbgtypes
@@ -50483,6 +56275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldtoken.cmd_7297]
 RelativePath=JIT\Methodical\ldtoken\_il_relldtoken\_il_relldtoken.cmd
 WorkingDir=JIT\Methodical\ldtoken\_il_relldtoken
@@ -50490,6 +56283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldtokena.cmd_7298]
 RelativePath=JIT\Methodical\ldtoken\_il_relldtokena\_il_relldtokena.cmd
 WorkingDir=JIT\Methodical\ldtoken\_il_relldtokena
@@ -50497,6 +56291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relptr_types.cmd_7299]
 RelativePath=JIT\Methodical\ldtoken\_il_relptr_types\_il_relptr_types.cmd
 WorkingDir=JIT\Methodical\ldtoken\_il_relptr_types
@@ -50504,6 +56299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltypes.cmd_7300]
 RelativePath=JIT\Methodical\ldtoken\_il_reltypes\_il_reltypes.cmd
 WorkingDir=JIT\Methodical\ldtoken\_il_reltypes
@@ -50511,6 +56307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [call01_small.cmd_7301]
 RelativePath=JIT\Methodical\localloc\call\call01_small\call01_small.cmd
 WorkingDir=JIT\Methodical\localloc\call\call01_small
@@ -50518,6 +56315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [verify01_dynamic.cmd_7302]
 RelativePath=JIT\Methodical\localloc\verify\verify01_dynamic\verify01_dynamic.cmd
 WorkingDir=JIT\Methodical\localloc\verify\verify01_dynamic
@@ -50525,6 +56323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [verify01_large.cmd_7303]
 RelativePath=JIT\Methodical\localloc\verify\verify01_large\verify01_large.cmd
 WorkingDir=JIT\Methodical\localloc\verify\verify01_large
@@ -50532,6 +56331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [verify01_small.cmd_7304]
 RelativePath=JIT\Methodical\localloc\verify\verify01_small\verify01_small.cmd
 WorkingDir=JIT\Methodical\localloc\verify\verify01_small
@@ -50539,6 +56339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [zeroInit01_large.cmd_7305]
 RelativePath=JIT\Methodical\localloc\zeroinit\zeroInit01_large\zeroInit01_large.cmd
 WorkingDir=JIT\Methodical\localloc\zeroinit\zeroInit01_large
@@ -50546,6 +56347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [zeroinit01_small.cmd_7306]
 RelativePath=JIT\Methodical\localloc\zeroinit\zeroinit01_small\zeroinit01_small.cmd
 WorkingDir=JIT\Methodical\localloc\zeroinit\zeroinit01_small
@@ -50553,6 +56355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classarr_cs_d.cmd_7307]
 RelativePath=JIT\Methodical\MDArray\basics\classarr_cs_d\classarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\classarr_cs_d
@@ -50560,6 +56363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [classarr_cs_do.cmd_7308]
 RelativePath=JIT\Methodical\MDArray\basics\classarr_cs_do\classarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\classarr_cs_do
@@ -50567,6 +56371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classarr_cs_r.cmd_7309]
 RelativePath=JIT\Methodical\MDArray\basics\classarr_cs_r\classarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\classarr_cs_r
@@ -50574,6 +56379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [classarr_cs_ro.cmd_7310]
 RelativePath=JIT\Methodical\MDArray\basics\classarr_cs_ro\classarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\classarr_cs_ro
@@ -50581,6 +56387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [doublearr_cs_d.cmd_7311]
 RelativePath=JIT\Methodical\MDArray\basics\doublearr_cs_d\doublearr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\doublearr_cs_d
@@ -50588,6 +56395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [doublearr_cs_do.cmd_7312]
 RelativePath=JIT\Methodical\MDArray\basics\doublearr_cs_do\doublearr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\doublearr_cs_do
@@ -50595,6 +56403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [doublearr_cs_r.cmd_7313]
 RelativePath=JIT\Methodical\MDArray\basics\doublearr_cs_r\doublearr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\doublearr_cs_r
@@ -50602,6 +56411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [doublearr_cs_ro.cmd_7314]
 RelativePath=JIT\Methodical\MDArray\basics\doublearr_cs_ro\doublearr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\doublearr_cs_ro
@@ -50609,6 +56419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jaggedarr_cs_d.cmd_7315]
 RelativePath=JIT\Methodical\MDArray\basics\jaggedarr_cs_d\jaggedarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\jaggedarr_cs_d
@@ -50616,6 +56427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [jaggedarr_cs_do.cmd_7316]
 RelativePath=JIT\Methodical\MDArray\basics\jaggedarr_cs_do\jaggedarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\jaggedarr_cs_do
@@ -50623,6 +56435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jaggedarr_cs_r.cmd_7317]
 RelativePath=JIT\Methodical\MDArray\basics\jaggedarr_cs_r\jaggedarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\jaggedarr_cs_r
@@ -50630,6 +56443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [jaggedarr_cs_ro.cmd_7318]
 RelativePath=JIT\Methodical\MDArray\basics\jaggedarr_cs_ro\jaggedarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\jaggedarr_cs_ro
@@ -50637,6 +56451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stringarr_cs_d.cmd_7319]
 RelativePath=JIT\Methodical\MDArray\basics\stringarr_cs_d\stringarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\stringarr_cs_d
@@ -50644,6 +56459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [stringarr_cs_do.cmd_7320]
 RelativePath=JIT\Methodical\MDArray\basics\stringarr_cs_do\stringarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\stringarr_cs_do
@@ -50651,6 +56467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stringarr_cs_r.cmd_7321]
 RelativePath=JIT\Methodical\MDArray\basics\stringarr_cs_r\stringarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\stringarr_cs_r
@@ -50658,6 +56475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [stringarr_cs_ro.cmd_7322]
 RelativePath=JIT\Methodical\MDArray\basics\stringarr_cs_ro\stringarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\stringarr_cs_ro
@@ -50665,6 +56483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structarr_cs_d.cmd_7323]
 RelativePath=JIT\Methodical\MDArray\basics\structarr_cs_d\structarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\structarr_cs_d
@@ -50672,6 +56491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [structarr_cs_do.cmd_7324]
 RelativePath=JIT\Methodical\MDArray\basics\structarr_cs_do\structarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\structarr_cs_do
@@ -50679,6 +56499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structarr_cs_r.cmd_7325]
 RelativePath=JIT\Methodical\MDArray\basics\structarr_cs_r\structarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\structarr_cs_r
@@ -50686,6 +56507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [structarr_cs_ro.cmd_7326]
 RelativePath=JIT\Methodical\MDArray\basics\structarr_cs_ro\structarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\basics\structarr_cs_ro
@@ -50693,6 +56515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [bool_cs_d.cmd_7327]
 RelativePath=JIT\Methodical\MDArray\DataTypes\bool_cs_d\bool_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\bool_cs_d
@@ -50700,6 +56523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [bool_cs_do.cmd_7328]
 RelativePath=JIT\Methodical\MDArray\DataTypes\bool_cs_do\bool_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\bool_cs_do
@@ -50707,6 +56531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [bool_cs_r.cmd_7329]
 RelativePath=JIT\Methodical\MDArray\DataTypes\bool_cs_r\bool_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\bool_cs_r
@@ -50714,6 +56539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [bool_cs_ro.cmd_7330]
 RelativePath=JIT\Methodical\MDArray\DataTypes\bool_cs_ro\bool_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\bool_cs_ro
@@ -50721,6 +56547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [byte_cs_d.cmd_7331]
 RelativePath=JIT\Methodical\MDArray\DataTypes\byte_cs_d\byte_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\byte_cs_d
@@ -50728,6 +56555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [byte_cs_do.cmd_7332]
 RelativePath=JIT\Methodical\MDArray\DataTypes\byte_cs_do\byte_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\byte_cs_do
@@ -50735,6 +56563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [byte_cs_r.cmd_7333]
 RelativePath=JIT\Methodical\MDArray\DataTypes\byte_cs_r\byte_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\byte_cs_r
@@ -50742,6 +56571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [byte_cs_ro.cmd_7334]
 RelativePath=JIT\Methodical\MDArray\DataTypes\byte_cs_ro\byte_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\byte_cs_ro
@@ -50749,6 +56579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [char_cs_d.cmd_7335]
 RelativePath=JIT\Methodical\MDArray\DataTypes\char_cs_d\char_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\char_cs_d
@@ -50756,6 +56587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [char_cs_do.cmd_7336]
 RelativePath=JIT\Methodical\MDArray\DataTypes\char_cs_do\char_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\char_cs_do
@@ -50763,6 +56595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [char_cs_r.cmd_7337]
 RelativePath=JIT\Methodical\MDArray\DataTypes\char_cs_r\char_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\char_cs_r
@@ -50770,6 +56603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [char_cs_ro.cmd_7338]
 RelativePath=JIT\Methodical\MDArray\DataTypes\char_cs_ro\char_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\char_cs_ro
@@ -50777,6 +56611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [decimal_cs_d.cmd_7339]
 RelativePath=JIT\Methodical\MDArray\DataTypes\decimal_cs_d\decimal_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\decimal_cs_d
@@ -50784,6 +56619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [decimal_cs_do.cmd_7340]
 RelativePath=JIT\Methodical\MDArray\DataTypes\decimal_cs_do\decimal_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\decimal_cs_do
@@ -50791,6 +56627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [decimal_cs_r.cmd_7341]
 RelativePath=JIT\Methodical\MDArray\DataTypes\decimal_cs_r\decimal_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\decimal_cs_r
@@ -50798,6 +56635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [decimal_cs_ro.cmd_7342]
 RelativePath=JIT\Methodical\MDArray\DataTypes\decimal_cs_ro\decimal_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\decimal_cs_ro
@@ -50805,6 +56643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [double_cs_d.cmd_7343]
 RelativePath=JIT\Methodical\MDArray\DataTypes\double_cs_d\double_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\double_cs_d
@@ -50812,6 +56651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [double_cs_do.cmd_7344]
 RelativePath=JIT\Methodical\MDArray\DataTypes\double_cs_do\double_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\double_cs_do
@@ -50819,6 +56659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [double_cs_r.cmd_7345]
 RelativePath=JIT\Methodical\MDArray\DataTypes\double_cs_r\double_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\double_cs_r
@@ -50826,6 +56667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [double_cs_ro.cmd_7346]
 RelativePath=JIT\Methodical\MDArray\DataTypes\double_cs_ro\double_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\double_cs_ro
@@ -50833,6 +56675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [float_cs_d.cmd_7347]
 RelativePath=JIT\Methodical\MDArray\DataTypes\float_cs_d\float_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\float_cs_d
@@ -50840,6 +56683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [float_cs_do.cmd_7348]
 RelativePath=JIT\Methodical\MDArray\DataTypes\float_cs_do\float_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\float_cs_do
@@ -50847,6 +56691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [float_cs_r.cmd_7349]
 RelativePath=JIT\Methodical\MDArray\DataTypes\float_cs_r\float_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\float_cs_r
@@ -50854,6 +56699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [float_cs_ro.cmd_7350]
 RelativePath=JIT\Methodical\MDArray\DataTypes\float_cs_ro\float_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\float_cs_ro
@@ -50861,6 +56707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int_cs_d.cmd_7351]
 RelativePath=JIT\Methodical\MDArray\DataTypes\int_cs_d\int_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\int_cs_d
@@ -50868,6 +56715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int_cs_do.cmd_7352]
 RelativePath=JIT\Methodical\MDArray\DataTypes\int_cs_do\int_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\int_cs_do
@@ -50875,6 +56723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int_cs_r.cmd_7353]
 RelativePath=JIT\Methodical\MDArray\DataTypes\int_cs_r\int_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\int_cs_r
@@ -50882,6 +56731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [int_cs_ro.cmd_7354]
 RelativePath=JIT\Methodical\MDArray\DataTypes\int_cs_ro\int_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\int_cs_ro
@@ -50889,6 +56739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [long_cs_d.cmd_7355]
 RelativePath=JIT\Methodical\MDArray\DataTypes\long_cs_d\long_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\long_cs_d
@@ -50896,6 +56747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [long_cs_do.cmd_7356]
 RelativePath=JIT\Methodical\MDArray\DataTypes\long_cs_do\long_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\long_cs_do
@@ -50903,6 +56755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [long_cs_r.cmd_7357]
 RelativePath=JIT\Methodical\MDArray\DataTypes\long_cs_r\long_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\long_cs_r
@@ -50910,6 +56763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [long_cs_ro.cmd_7358]
 RelativePath=JIT\Methodical\MDArray\DataTypes\long_cs_ro\long_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\long_cs_ro
@@ -50917,6 +56771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [sbyte_cs_d.cmd_7359]
 RelativePath=JIT\Methodical\MDArray\DataTypes\sbyte_cs_d\sbyte_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\sbyte_cs_d
@@ -50924,6 +56779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [sbyte_cs_do.cmd_7360]
 RelativePath=JIT\Methodical\MDArray\DataTypes\sbyte_cs_do\sbyte_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\sbyte_cs_do
@@ -50931,6 +56787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [sbyte_cs_r.cmd_7361]
 RelativePath=JIT\Methodical\MDArray\DataTypes\sbyte_cs_r\sbyte_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\sbyte_cs_r
@@ -50938,6 +56795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [sbyte_cs_ro.cmd_7362]
 RelativePath=JIT\Methodical\MDArray\DataTypes\sbyte_cs_ro\sbyte_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\sbyte_cs_ro
@@ -50945,6 +56803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [short_cs_d.cmd_7363]
 RelativePath=JIT\Methodical\MDArray\DataTypes\short_cs_d\short_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\short_cs_d
@@ -50952,6 +56811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [short_cs_do.cmd_7364]
 RelativePath=JIT\Methodical\MDArray\DataTypes\short_cs_do\short_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\short_cs_do
@@ -50959,6 +56819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [short_cs_r.cmd_7365]
 RelativePath=JIT\Methodical\MDArray\DataTypes\short_cs_r\short_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\short_cs_r
@@ -50966,6 +56827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [short_cs_ro.cmd_7366]
 RelativePath=JIT\Methodical\MDArray\DataTypes\short_cs_ro\short_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\short_cs_ro
@@ -50973,6 +56835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint_cs_d.cmd_7367]
 RelativePath=JIT\Methodical\MDArray\DataTypes\uint_cs_d\uint_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\uint_cs_d
@@ -50980,6 +56843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint_cs_do.cmd_7368]
 RelativePath=JIT\Methodical\MDArray\DataTypes\uint_cs_do\uint_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\uint_cs_do
@@ -50987,6 +56851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint_cs_r.cmd_7369]
 RelativePath=JIT\Methodical\MDArray\DataTypes\uint_cs_r\uint_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\uint_cs_r
@@ -50994,6 +56859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [uint_cs_ro.cmd_7370]
 RelativePath=JIT\Methodical\MDArray\DataTypes\uint_cs_ro\uint_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\uint_cs_ro
@@ -51001,6 +56867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ulong_cs_d.cmd_7371]
 RelativePath=JIT\Methodical\MDArray\DataTypes\ulong_cs_d\ulong_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\ulong_cs_d
@@ -51008,6 +56875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ulong_cs_do.cmd_7372]
 RelativePath=JIT\Methodical\MDArray\DataTypes\ulong_cs_do\ulong_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\ulong_cs_do
@@ -51015,6 +56883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ulong_cs_r.cmd_7373]
 RelativePath=JIT\Methodical\MDArray\DataTypes\ulong_cs_r\ulong_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\ulong_cs_r
@@ -51022,6 +56891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ulong_cs_ro.cmd_7374]
 RelativePath=JIT\Methodical\MDArray\DataTypes\ulong_cs_ro\ulong_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\ulong_cs_ro
@@ -51029,6 +56899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ushort_cs_d.cmd_7375]
 RelativePath=JIT\Methodical\MDArray\DataTypes\ushort_cs_d\ushort_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\ushort_cs_d
@@ -51036,6 +56907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ushort_cs_do.cmd_7376]
 RelativePath=JIT\Methodical\MDArray\DataTypes\ushort_cs_do\ushort_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\ushort_cs_do
@@ -51043,6 +56915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ushort_cs_r.cmd_7377]
 RelativePath=JIT\Methodical\MDArray\DataTypes\ushort_cs_r\ushort_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\ushort_cs_r
@@ -51050,6 +56923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ushort_cs_ro.cmd_7378]
 RelativePath=JIT\Methodical\MDArray\DataTypes\ushort_cs_ro\ushort_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\DataTypes\ushort_cs_ro
@@ -51057,6 +56931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classarr_cs_d.cmd_7379]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\classarr_cs_d\classarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\classarr_cs_d
@@ -51064,6 +56939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classarr_cs_do.cmd_7380]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\classarr_cs_do\classarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\classarr_cs_do
@@ -51071,6 +56947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classarr_cs_r.cmd_7381]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\classarr_cs_r\classarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\classarr_cs_r
@@ -51078,6 +56955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classarr_cs_ro.cmd_7382]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\classarr_cs_ro\classarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\classarr_cs_ro
@@ -51085,6 +56963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jaggedarr_cs_d.cmd_7383]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\jaggedarr_cs_d\jaggedarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\jaggedarr_cs_d
@@ -51092,6 +56971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jaggedarr_cs_do.cmd_7384]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\jaggedarr_cs_do\jaggedarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\jaggedarr_cs_do
@@ -51099,6 +56979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jaggedarr_cs_r.cmd_7385]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\jaggedarr_cs_r\jaggedarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\jaggedarr_cs_r
@@ -51106,6 +56987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jaggedarr_cs_ro.cmd_7386]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\jaggedarr_cs_ro\jaggedarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\jaggedarr_cs_ro
@@ -51113,6 +56995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [plainarr_cs_d.cmd_7387]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\plainarr_cs_d\plainarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\plainarr_cs_d
@@ -51120,6 +57003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [plainarr_cs_do.cmd_7388]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\plainarr_cs_do\plainarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\plainarr_cs_do
@@ -51127,6 +57011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [plainarr_cs_r.cmd_7389]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\plainarr_cs_r\plainarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\plainarr_cs_r
@@ -51134,6 +57019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [plainarr_cs_ro.cmd_7390]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\plainarr_cs_ro\plainarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\plainarr_cs_ro
@@ -51141,6 +57027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structarr_cs_d.cmd_7391]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\structarr_cs_d\structarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\structarr_cs_d
@@ -51148,6 +57035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structarr_cs_do.cmd_7392]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\structarr_cs_do\structarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\structarr_cs_do
@@ -51155,6 +57043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structarr_cs_r.cmd_7393]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\structarr_cs_r\structarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\structarr_cs_r
@@ -51162,6 +57051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structarr_cs_ro.cmd_7394]
 RelativePath=JIT\Methodical\MDArray\GaussJordan\structarr_cs_ro\structarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\GaussJordan\structarr_cs_ro
@@ -51169,6 +57059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classarr_cs_d.cmd_7395]
 RelativePath=JIT\Methodical\MDArray\InnerProd\classarr_cs_d\classarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\classarr_cs_d
@@ -51176,6 +57067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classarr_cs_do.cmd_7396]
 RelativePath=JIT\Methodical\MDArray\InnerProd\classarr_cs_do\classarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\classarr_cs_do
@@ -51183,6 +57075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classarr_cs_r.cmd_7397]
 RelativePath=JIT\Methodical\MDArray\InnerProd\classarr_cs_r\classarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\classarr_cs_r
@@ -51190,6 +57083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classarr_cs_ro.cmd_7398]
 RelativePath=JIT\Methodical\MDArray\InnerProd\classarr_cs_ro\classarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\classarr_cs_ro
@@ -51197,6 +57091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [doublearr_cs_d.cmd_7399]
 RelativePath=JIT\Methodical\MDArray\InnerProd\doublearr_cs_d\doublearr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\doublearr_cs_d
@@ -51204,6 +57099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [doublearr_cs_do.cmd_7400]
 RelativePath=JIT\Methodical\MDArray\InnerProd\doublearr_cs_do\doublearr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\doublearr_cs_do
@@ -51211,6 +57107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [doublearr_cs_r.cmd_7401]
 RelativePath=JIT\Methodical\MDArray\InnerProd\doublearr_cs_r\doublearr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\doublearr_cs_r
@@ -51218,6 +57115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [doublearr_cs_ro.cmd_7402]
 RelativePath=JIT\Methodical\MDArray\InnerProd\doublearr_cs_ro\doublearr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\doublearr_cs_ro
@@ -51225,6 +57123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [intarr_cs_d.cmd_7403]
 RelativePath=JIT\Methodical\MDArray\InnerProd\intarr_cs_d\intarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\intarr_cs_d
@@ -51232,6 +57131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [intarr_cs_do.cmd_7404]
 RelativePath=JIT\Methodical\MDArray\InnerProd\intarr_cs_do\intarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\intarr_cs_do
@@ -51239,6 +57139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [intarr_cs_r.cmd_7405]
 RelativePath=JIT\Methodical\MDArray\InnerProd\intarr_cs_r\intarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\intarr_cs_r
@@ -51246,6 +57147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [intarr_cs_ro.cmd_7406]
 RelativePath=JIT\Methodical\MDArray\InnerProd\intarr_cs_ro\intarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\intarr_cs_ro
@@ -51253,6 +57155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jaggedarr_cs_d.cmd_7407]
 RelativePath=JIT\Methodical\MDArray\InnerProd\jaggedarr_cs_d\jaggedarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\jaggedarr_cs_d
@@ -51260,6 +57163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jaggedarr_cs_do.cmd_7408]
 RelativePath=JIT\Methodical\MDArray\InnerProd\jaggedarr_cs_do\jaggedarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\jaggedarr_cs_do
@@ -51267,6 +57171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jaggedarr_cs_r.cmd_7409]
 RelativePath=JIT\Methodical\MDArray\InnerProd\jaggedarr_cs_r\jaggedarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\jaggedarr_cs_r
@@ -51274,6 +57179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [jaggedarr_cs_ro.cmd_7410]
 RelativePath=JIT\Methodical\MDArray\InnerProd\jaggedarr_cs_ro\jaggedarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\jaggedarr_cs_ro
@@ -51281,6 +57187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stringarr_cs_d.cmd_7411]
 RelativePath=JIT\Methodical\MDArray\InnerProd\stringarr_cs_d\stringarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\stringarr_cs_d
@@ -51288,6 +57195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stringarr_cs_do.cmd_7412]
 RelativePath=JIT\Methodical\MDArray\InnerProd\stringarr_cs_do\stringarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\stringarr_cs_do
@@ -51295,6 +57203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stringarr_cs_r.cmd_7413]
 RelativePath=JIT\Methodical\MDArray\InnerProd\stringarr_cs_r\stringarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\stringarr_cs_r
@@ -51302,6 +57211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [stringarr_cs_ro.cmd_7414]
 RelativePath=JIT\Methodical\MDArray\InnerProd\stringarr_cs_ro\stringarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\stringarr_cs_ro
@@ -51309,6 +57219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structarr_cs_d.cmd_7415]
 RelativePath=JIT\Methodical\MDArray\InnerProd\structarr_cs_d\structarr_cs_d.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\structarr_cs_d
@@ -51316,6 +57227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structarr_cs_do.cmd_7416]
 RelativePath=JIT\Methodical\MDArray\InnerProd\structarr_cs_do\structarr_cs_do.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\structarr_cs_do
@@ -51323,6 +57235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structarr_cs_r.cmd_7417]
 RelativePath=JIT\Methodical\MDArray\InnerProd\structarr_cs_r\structarr_cs_r.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\structarr_cs_r
@@ -51330,6 +57243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [structarr_cs_ro.cmd_7418]
 RelativePath=JIT\Methodical\MDArray\InnerProd\structarr_cs_ro\structarr_cs_ro.cmd
 WorkingDir=JIT\Methodical\MDArray\InnerProd\structarr_cs_ro
@@ -51337,6 +57251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm32_cs_d.cmd_7419]
 RelativePath=JIT\Methodical\NaN\arithm32_cs_d\arithm32_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\arithm32_cs_d
@@ -51344,6 +57259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm32_cs_do.cmd_7420]
 RelativePath=JIT\Methodical\NaN\arithm32_cs_do\arithm32_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\arithm32_cs_do
@@ -51351,6 +57267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm32_cs_r.cmd_7421]
 RelativePath=JIT\Methodical\NaN\arithm32_cs_r\arithm32_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\arithm32_cs_r
@@ -51358,6 +57275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm32_cs_ro.cmd_7422]
 RelativePath=JIT\Methodical\NaN\arithm32_cs_ro\arithm32_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\arithm32_cs_ro
@@ -51365,6 +57283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm32_d.cmd_7423]
 RelativePath=JIT\Methodical\NaN\arithm32_d\arithm32_d.cmd
 WorkingDir=JIT\Methodical\NaN\arithm32_d
@@ -51372,6 +57291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm32_do.cmd_7424]
 RelativePath=JIT\Methodical\NaN\arithm32_do\arithm32_do.cmd
 WorkingDir=JIT\Methodical\NaN\arithm32_do
@@ -51379,6 +57299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm32_r.cmd_7425]
 RelativePath=JIT\Methodical\NaN\arithm32_r\arithm32_r.cmd
 WorkingDir=JIT\Methodical\NaN\arithm32_r
@@ -51386,6 +57307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm32_ro.cmd_7426]
 RelativePath=JIT\Methodical\NaN\arithm32_ro\arithm32_ro.cmd
 WorkingDir=JIT\Methodical\NaN\arithm32_ro
@@ -51393,6 +57315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm64_cs_d.cmd_7427]
 RelativePath=JIT\Methodical\NaN\arithm64_cs_d\arithm64_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\arithm64_cs_d
@@ -51400,6 +57323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm64_cs_do.cmd_7428]
 RelativePath=JIT\Methodical\NaN\arithm64_cs_do\arithm64_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\arithm64_cs_do
@@ -51407,6 +57331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm64_cs_r.cmd_7429]
 RelativePath=JIT\Methodical\NaN\arithm64_cs_r\arithm64_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\arithm64_cs_r
@@ -51414,6 +57339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm64_cs_ro.cmd_7430]
 RelativePath=JIT\Methodical\NaN\arithm64_cs_ro\arithm64_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\arithm64_cs_ro
@@ -51421,6 +57347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm64_d.cmd_7431]
 RelativePath=JIT\Methodical\NaN\arithm64_d\arithm64_d.cmd
 WorkingDir=JIT\Methodical\NaN\arithm64_d
@@ -51428,6 +57355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm64_do.cmd_7432]
 RelativePath=JIT\Methodical\NaN\arithm64_do\arithm64_do.cmd
 WorkingDir=JIT\Methodical\NaN\arithm64_do
@@ -51435,6 +57363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm64_r.cmd_7433]
 RelativePath=JIT\Methodical\NaN\arithm64_r\arithm64_r.cmd
 WorkingDir=JIT\Methodical\NaN\arithm64_r
@@ -51442,6 +57371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [arithm64_ro.cmd_7434]
 RelativePath=JIT\Methodical\NaN\arithm64_ro\arithm64_ro.cmd
 WorkingDir=JIT\Methodical\NaN\arithm64_ro
@@ -51449,6 +57379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [comp32_il_d.cmd_7435]
 RelativePath=JIT\Methodical\NaN\comp32_il_d\comp32_il_d.cmd
 WorkingDir=JIT\Methodical\NaN\comp32_il_d
@@ -51456,6 +57387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [comp32_il_r.cmd_7436]
 RelativePath=JIT\Methodical\NaN\comp32_il_r\comp32_il_r.cmd
 WorkingDir=JIT\Methodical\NaN\comp32_il_r
@@ -51463,6 +57395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [comp64_il_d.cmd_7437]
 RelativePath=JIT\Methodical\NaN\comp64_il_d\comp64_il_d.cmd
 WorkingDir=JIT\Methodical\NaN\comp64_il_d
@@ -51470,6 +57403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [comp64_il_r.cmd_7438]
 RelativePath=JIT\Methodical\NaN\comp64_il_r\comp64_il_r.cmd
 WorkingDir=JIT\Methodical\NaN\comp64_il_r
@@ -51477,6 +57411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cond32_il_d.cmd_7439]
 RelativePath=JIT\Methodical\NaN\cond32_il_d\cond32_il_d.cmd
 WorkingDir=JIT\Methodical\NaN\cond32_il_d
@@ -51484,6 +57419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cond32_il_r.cmd_7440]
 RelativePath=JIT\Methodical\NaN\cond32_il_r\cond32_il_r.cmd
 WorkingDir=JIT\Methodical\NaN\cond32_il_r
@@ -51491,6 +57427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cond64_il_d.cmd_7441]
 RelativePath=JIT\Methodical\NaN\cond64_il_d\cond64_il_d.cmd
 WorkingDir=JIT\Methodical\NaN\cond64_il_d
@@ -51498,6 +57435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cond64_il_r.cmd_7442]
 RelativePath=JIT\Methodical\NaN\cond64_il_r\cond64_il_r.cmd
 WorkingDir=JIT\Methodical\NaN\cond64_il_r
@@ -51505,6 +57443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [intrinsic_cs_d.cmd_7443]
 RelativePath=JIT\Methodical\NaN\intrinsic_cs_d\intrinsic_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\intrinsic_cs_d
@@ -51512,6 +57451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [intrinsic_cs_do.cmd_7444]
 RelativePath=JIT\Methodical\NaN\intrinsic_cs_do\intrinsic_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\intrinsic_cs_do
@@ -51519,6 +57459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [intrinsic_cs_r.cmd_7445]
 RelativePath=JIT\Methodical\NaN\intrinsic_cs_r\intrinsic_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\intrinsic_cs_r
@@ -51526,6 +57467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [intrinsic_cs_ro.cmd_7446]
 RelativePath=JIT\Methodical\NaN\intrinsic_cs_ro\intrinsic_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\intrinsic_cs_ro
@@ -51533,6 +57475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [intrinsic_nonf_il_d.cmd_7447]
 RelativePath=JIT\Methodical\NaN\intrinsic_nonf_il_d\intrinsic_nonf_il_d.cmd
 WorkingDir=JIT\Methodical\NaN\intrinsic_nonf_il_d
@@ -51540,6 +57483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [intrinsic_nonf_il_r.cmd_7448]
 RelativePath=JIT\Methodical\NaN\intrinsic_nonf_il_r\intrinsic_nonf_il_r.cmd
 WorkingDir=JIT\Methodical\NaN\intrinsic_nonf_il_r
@@ -51547,6 +57491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNadd_cs_d.cmd_7449]
 RelativePath=JIT\Methodical\NaN\r4NaNadd_cs_d\r4NaNadd_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNadd_cs_d
@@ -51554,6 +57499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNadd_cs_do.cmd_7450]
 RelativePath=JIT\Methodical\NaN\r4NaNadd_cs_do\r4NaNadd_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNadd_cs_do
@@ -51561,6 +57507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNadd_cs_r.cmd_7451]
 RelativePath=JIT\Methodical\NaN\r4NaNadd_cs_r\r4NaNadd_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNadd_cs_r
@@ -51568,6 +57515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNadd_cs_ro.cmd_7452]
 RelativePath=JIT\Methodical\NaN\r4NaNadd_cs_ro\r4NaNadd_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNadd_cs_ro
@@ -51575,6 +57523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4nanconv_il_d.cmd_7453]
 RelativePath=JIT\Methodical\NaN\r4nanconv_il_d\r4nanconv_il_d.cmd
 WorkingDir=JIT\Methodical\NaN\r4nanconv_il_d
@@ -51582,6 +57531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [r4nanconv_il_r.cmd_7454]
 RelativePath=JIT\Methodical\NaN\r4nanconv_il_r\r4nanconv_il_r.cmd
 WorkingDir=JIT\Methodical\NaN\r4nanconv_il_r
@@ -51589,6 +57539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNdiv_cs_d.cmd_7455]
 RelativePath=JIT\Methodical\NaN\r4NaNdiv_cs_d\r4NaNdiv_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNdiv_cs_d
@@ -51596,6 +57547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNdiv_cs_do.cmd_7456]
 RelativePath=JIT\Methodical\NaN\r4NaNdiv_cs_do\r4NaNdiv_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNdiv_cs_do
@@ -51603,6 +57555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNdiv_cs_r.cmd_7457]
 RelativePath=JIT\Methodical\NaN\r4NaNdiv_cs_r\r4NaNdiv_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNdiv_cs_r
@@ -51610,6 +57563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNdiv_cs_ro.cmd_7458]
 RelativePath=JIT\Methodical\NaN\r4NaNdiv_cs_ro\r4NaNdiv_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNdiv_cs_ro
@@ -51617,6 +57571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNmul_cs_d.cmd_7459]
 RelativePath=JIT\Methodical\NaN\r4NaNmul_cs_d\r4NaNmul_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNmul_cs_d
@@ -51624,6 +57579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNmul_cs_do.cmd_7460]
 RelativePath=JIT\Methodical\NaN\r4NaNmul_cs_do\r4NaNmul_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNmul_cs_do
@@ -51631,6 +57587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNmul_cs_r.cmd_7461]
 RelativePath=JIT\Methodical\NaN\r4NaNmul_cs_r\r4NaNmul_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNmul_cs_r
@@ -51638,6 +57595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNmul_cs_ro.cmd_7462]
 RelativePath=JIT\Methodical\NaN\r4NaNmul_cs_ro\r4NaNmul_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNmul_cs_ro
@@ -51645,6 +57603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNrem_cs_d.cmd_7463]
 RelativePath=JIT\Methodical\NaN\r4NaNrem_cs_d\r4NaNrem_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNrem_cs_d
@@ -51652,6 +57611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNrem_cs_do.cmd_7464]
 RelativePath=JIT\Methodical\NaN\r4NaNrem_cs_do\r4NaNrem_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNrem_cs_do
@@ -51659,6 +57619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNrem_cs_r.cmd_7465]
 RelativePath=JIT\Methodical\NaN\r4NaNrem_cs_r\r4NaNrem_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNrem_cs_r
@@ -51666,6 +57627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNrem_cs_ro.cmd_7466]
 RelativePath=JIT\Methodical\NaN\r4NaNrem_cs_ro\r4NaNrem_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNrem_cs_ro
@@ -51673,6 +57635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNsub_cs_d.cmd_7467]
 RelativePath=JIT\Methodical\NaN\r4NaNsub_cs_d\r4NaNsub_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNsub_cs_d
@@ -51680,6 +57643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNsub_cs_do.cmd_7468]
 RelativePath=JIT\Methodical\NaN\r4NaNsub_cs_do\r4NaNsub_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNsub_cs_do
@@ -51687,6 +57651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNsub_cs_r.cmd_7469]
 RelativePath=JIT\Methodical\NaN\r4NaNsub_cs_r\r4NaNsub_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNsub_cs_r
@@ -51694,6 +57659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r4NaNsub_cs_ro.cmd_7470]
 RelativePath=JIT\Methodical\NaN\r4NaNsub_cs_ro\r4NaNsub_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\r4NaNsub_cs_ro
@@ -51701,6 +57667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNadd_cs_d.cmd_7471]
 RelativePath=JIT\Methodical\NaN\r8NaNadd_cs_d\r8NaNadd_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNadd_cs_d
@@ -51708,6 +57675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNadd_cs_do.cmd_7472]
 RelativePath=JIT\Methodical\NaN\r8NaNadd_cs_do\r8NaNadd_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNadd_cs_do
@@ -51715,6 +57683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNadd_cs_r.cmd_7473]
 RelativePath=JIT\Methodical\NaN\r8NaNadd_cs_r\r8NaNadd_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNadd_cs_r
@@ -51722,6 +57691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNadd_cs_ro.cmd_7474]
 RelativePath=JIT\Methodical\NaN\r8NaNadd_cs_ro\r8NaNadd_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNadd_cs_ro
@@ -51729,6 +57699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8nanconv_il_d.cmd_7475]
 RelativePath=JIT\Methodical\NaN\r8nanconv_il_d\r8nanconv_il_d.cmd
 WorkingDir=JIT\Methodical\NaN\r8nanconv_il_d
@@ -51736,6 +57707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [r8nanconv_il_r.cmd_7476]
 RelativePath=JIT\Methodical\NaN\r8nanconv_il_r\r8nanconv_il_r.cmd
 WorkingDir=JIT\Methodical\NaN\r8nanconv_il_r
@@ -51743,6 +57715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNdiv_cs_d.cmd_7477]
 RelativePath=JIT\Methodical\NaN\r8NaNdiv_cs_d\r8NaNdiv_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNdiv_cs_d
@@ -51750,6 +57723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNdiv_cs_do.cmd_7478]
 RelativePath=JIT\Methodical\NaN\r8NaNdiv_cs_do\r8NaNdiv_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNdiv_cs_do
@@ -51757,6 +57731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNdiv_cs_r.cmd_7479]
 RelativePath=JIT\Methodical\NaN\r8NaNdiv_cs_r\r8NaNdiv_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNdiv_cs_r
@@ -51764,6 +57739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNdiv_cs_ro.cmd_7480]
 RelativePath=JIT\Methodical\NaN\r8NaNdiv_cs_ro\r8NaNdiv_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNdiv_cs_ro
@@ -51771,6 +57747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNmul_cs_d.cmd_7481]
 RelativePath=JIT\Methodical\NaN\r8NaNmul_cs_d\r8NaNmul_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNmul_cs_d
@@ -51778,6 +57755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNmul_cs_do.cmd_7482]
 RelativePath=JIT\Methodical\NaN\r8NaNmul_cs_do\r8NaNmul_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNmul_cs_do
@@ -51785,6 +57763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNmul_cs_r.cmd_7483]
 RelativePath=JIT\Methodical\NaN\r8NaNmul_cs_r\r8NaNmul_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNmul_cs_r
@@ -51792,6 +57771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNmul_cs_ro.cmd_7484]
 RelativePath=JIT\Methodical\NaN\r8NaNmul_cs_ro\r8NaNmul_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNmul_cs_ro
@@ -51799,6 +57779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNrem_cs_d.cmd_7485]
 RelativePath=JIT\Methodical\NaN\r8NaNrem_cs_d\r8NaNrem_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNrem_cs_d
@@ -51806,6 +57787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNrem_cs_do.cmd_7486]
 RelativePath=JIT\Methodical\NaN\r8NaNrem_cs_do\r8NaNrem_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNrem_cs_do
@@ -51813,6 +57795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNrem_cs_r.cmd_7487]
 RelativePath=JIT\Methodical\NaN\r8NaNrem_cs_r\r8NaNrem_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNrem_cs_r
@@ -51820,6 +57803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNrem_cs_ro.cmd_7488]
 RelativePath=JIT\Methodical\NaN\r8NaNrem_cs_ro\r8NaNrem_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNrem_cs_ro
@@ -51827,6 +57811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNsub_cs_d.cmd_7489]
 RelativePath=JIT\Methodical\NaN\r8NaNsub_cs_d\r8NaNsub_cs_d.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNsub_cs_d
@@ -51834,6 +57819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNsub_cs_do.cmd_7490]
 RelativePath=JIT\Methodical\NaN\r8NaNsub_cs_do\r8NaNsub_cs_do.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNsub_cs_do
@@ -51841,6 +57827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNsub_cs_r.cmd_7491]
 RelativePath=JIT\Methodical\NaN\r8NaNsub_cs_r\r8NaNsub_cs_r.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNsub_cs_r
@@ -51848,6 +57835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [r8NaNsub_cs_ro.cmd_7492]
 RelativePath=JIT\Methodical\NaN\r8NaNsub_cs_ro\r8NaNsub_cs_ro.cmd
 WorkingDir=JIT\Methodical\NaN\r8NaNsub_cs_ro
@@ -51855,6 +57843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classic.cmd_7493]
 RelativePath=JIT\Methodical\nonvirtualcall\classic\classic.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\classic
@@ -51862,6 +57851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [classic_d.cmd_7494]
 RelativePath=JIT\Methodical\nonvirtualcall\classic_d\classic_d.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\classic_d
@@ -51869,6 +57859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [classic_r.cmd_7495]
 RelativePath=JIT\Methodical\nonvirtualcall\classic_r\classic_r.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\classic_r
@@ -51876,6 +57867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [delegate.cmd_7496]
 RelativePath=JIT\Methodical\nonvirtualcall\delegate\delegate.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\delegate
@@ -51883,6 +57875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [delegate_d.cmd_7497]
 RelativePath=JIT\Methodical\nonvirtualcall\delegate_d\delegate_d.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\delegate_d
@@ -51890,6 +57883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [delegate_r.cmd_7498]
 RelativePath=JIT\Methodical\nonvirtualcall\delegate_r\delegate_r.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\delegate_r
@@ -51897,6 +57891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [generics.cmd_7499]
 RelativePath=JIT\Methodical\nonvirtualcall\generics\generics.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\generics
@@ -51904,6 +57899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [generics2.cmd_7500]
 RelativePath=JIT\Methodical\nonvirtualcall\generics2\generics2.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\generics2
@@ -51911,6 +57907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [generics2_d.cmd_7501]
 RelativePath=JIT\Methodical\nonvirtualcall\generics2_d\generics2_d.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\generics2_d
@@ -51918,6 +57915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [generics2_r.cmd_7502]
 RelativePath=JIT\Methodical\nonvirtualcall\generics2_r\generics2_r.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\generics2_r
@@ -51925,6 +57923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [generics_d.cmd_7503]
 RelativePath=JIT\Methodical\nonvirtualcall\generics_d\generics_d.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\generics_d
@@ -51932,6 +57931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [generics_r.cmd_7504]
 RelativePath=JIT\Methodical\nonvirtualcall\generics_r\generics_r.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\generics_r
@@ -51939,6 +57939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [tailcall.cmd_7505]
 RelativePath=JIT\Methodical\nonvirtualcall\tailcall\tailcall.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\tailcall
@@ -51946,6 +57947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [tailcall_d.cmd_7506]
 RelativePath=JIT\Methodical\nonvirtualcall\tailcall_d\tailcall_d.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\tailcall_d
@@ -51953,6 +57955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [tailcall_r.cmd_7507]
 RelativePath=JIT\Methodical\nonvirtualcall\tailcall_r\tailcall_r.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\tailcall_r
@@ -51960,6 +57963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [valuetype.cmd_7508]
 RelativePath=JIT\Methodical\nonvirtualcall\valuetype\valuetype.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\valuetype
@@ -51967,6 +57971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [valuetype_d.cmd_7509]
 RelativePath=JIT\Methodical\nonvirtualcall\valuetype_d\valuetype_d.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\valuetype_d
@@ -51974,6 +57979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [valuetype_r.cmd_7510]
 RelativePath=JIT\Methodical\nonvirtualcall\valuetype_r\valuetype_r.cmd
 WorkingDir=JIT\Methodical\nonvirtualcall\valuetype_r
@@ -51981,6 +57987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FloatInfinitiesToInt_d.cmd_7511]
 RelativePath=JIT\Methodical\Overflow\FloatInfinitiesToInt_d\FloatInfinitiesToInt_d.cmd
 WorkingDir=JIT\Methodical\Overflow\FloatInfinitiesToInt_d
@@ -51988,6 +57995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FloatInfinitiesToInt_do.cmd_7512]
 RelativePath=JIT\Methodical\Overflow\FloatInfinitiesToInt_do\FloatInfinitiesToInt_do.cmd
 WorkingDir=JIT\Methodical\Overflow\FloatInfinitiesToInt_do
@@ -51995,6 +58003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FloatInfinitiesToInt_r.cmd_7513]
 RelativePath=JIT\Methodical\Overflow\FloatInfinitiesToInt_r\FloatInfinitiesToInt_r.cmd
 WorkingDir=JIT\Methodical\Overflow\FloatInfinitiesToInt_r
@@ -52002,6 +58011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FloatInfinitiesToInt_ro.cmd_7514]
 RelativePath=JIT\Methodical\Overflow\FloatInfinitiesToInt_ro\FloatInfinitiesToInt_ro.cmd
 WorkingDir=JIT\Methodical\Overflow\FloatInfinitiesToInt_ro
@@ -52009,6 +58019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FloatOvfToInt2_d.cmd_7515]
 RelativePath=JIT\Methodical\Overflow\FloatOvfToInt2_d\FloatOvfToInt2_d.cmd
 WorkingDir=JIT\Methodical\Overflow\FloatOvfToInt2_d
@@ -52016,6 +58027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FloatOvfToInt2_do.cmd_7516]
 RelativePath=JIT\Methodical\Overflow\FloatOvfToInt2_do\FloatOvfToInt2_do.cmd
 WorkingDir=JIT\Methodical\Overflow\FloatOvfToInt2_do
@@ -52023,6 +58035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FloatOvfToInt2_r.cmd_7517]
 RelativePath=JIT\Methodical\Overflow\FloatOvfToInt2_r\FloatOvfToInt2_r.cmd
 WorkingDir=JIT\Methodical\Overflow\FloatOvfToInt2_r
@@ -52030,6 +58043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [FloatOvfToInt2_ro.cmd_7518]
 RelativePath=JIT\Methodical\Overflow\FloatOvfToInt2_ro\FloatOvfToInt2_ro.cmd
 WorkingDir=JIT\Methodical\Overflow\FloatOvfToInt2_ro
@@ -52037,6 +58051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [array1.cmd_7519]
 RelativePath=JIT\Methodical\refany\array1\array1.cmd
 WorkingDir=JIT\Methodical\refany\array1
@@ -52044,6 +58059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [array2.cmd_7520]
 RelativePath=JIT\Methodical\refany\array2\array2.cmd
 WorkingDir=JIT\Methodical\refany\array2
@@ -52051,6 +58067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [format.cmd_7521]
 RelativePath=JIT\Methodical\refany\format\format.cmd
 WorkingDir=JIT\Methodical\refany\format
@@ -52058,6 +58075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [gcreport.cmd_7522]
 RelativePath=JIT\Methodical\refany\gcreport\gcreport.cmd
 WorkingDir=JIT\Methodical\refany\gcreport
@@ -52065,6 +58083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [lcs.cmd_7523]
 RelativePath=JIT\Methodical\refany\lcs\lcs.cmd
 WorkingDir=JIT\Methodical\refany\lcs
@@ -52072,6 +58091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [native.cmd_7524]
 RelativePath=JIT\Methodical\refany\native\native.cmd
 WorkingDir=JIT\Methodical\refany\native
@@ -52079,6 +58099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [virtcall.cmd_7525]
 RelativePath=JIT\Methodical\refany\virtcall\virtcall.cmd
 WorkingDir=JIT\Methodical\refany\virtcall
@@ -52086,6 +58107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbggcreport.cmd_7526]
 RelativePath=JIT\Methodical\refany\_dbggcreport\_dbggcreport.cmd
 WorkingDir=JIT\Methodical\refany\_dbggcreport
@@ -52093,6 +58115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgnative.cmd_7527]
 RelativePath=JIT\Methodical\refany\_dbgnative\_dbgnative.cmd
 WorkingDir=JIT\Methodical\refany\_dbgnative
@@ -52100,6 +58123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgstress1.cmd_7528]
 RelativePath=JIT\Methodical\refany\_dbgstress1\_dbgstress1.cmd
 WorkingDir=JIT\Methodical\refany\_dbgstress1
@@ -52107,6 +58131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgstress3.cmd_7529]
 RelativePath=JIT\Methodical\refany\_dbgstress3\_dbgstress3.cmd
 WorkingDir=JIT\Methodical\refany\_dbgstress3
@@ -52114,6 +58139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgvirtcall.cmd_7530]
 RelativePath=JIT\Methodical\refany\_dbgvirtcall\_dbgvirtcall.cmd
 WorkingDir=JIT\Methodical\refany\_dbgvirtcall
@@ -52121,6 +58147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgarray1.cmd_7531]
 RelativePath=JIT\Methodical\refany\_il_dbgarray1\_il_dbgarray1.cmd
 WorkingDir=JIT\Methodical\refany\_il_dbgarray1
@@ -52128,6 +58155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgarray2.cmd_7532]
 RelativePath=JIT\Methodical\refany\_il_dbgarray2\_il_dbgarray2.cmd
 WorkingDir=JIT\Methodical\refany\_il_dbgarray2
@@ -52135,6 +58163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgarray3.cmd_7533]
 RelativePath=JIT\Methodical\refany\_il_dbgarray3\_il_dbgarray3.cmd
 WorkingDir=JIT\Methodical\refany\_il_dbgarray3
@@ -52142,6 +58171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgformat.cmd_7534]
 RelativePath=JIT\Methodical\refany\_il_dbgformat\_il_dbgformat.cmd
 WorkingDir=JIT\Methodical\refany\_il_dbgformat
@@ -52149,6 +58179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgindcall.cmd_7535]
 RelativePath=JIT\Methodical\refany\_il_dbgindcall\_il_dbgindcall.cmd
 WorkingDir=JIT\Methodical\refany\_il_dbgindcall
@@ -52156,6 +58187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbglcs.cmd_7536]
 RelativePath=JIT\Methodical\refany\_il_dbglcs\_il_dbglcs.cmd
 WorkingDir=JIT\Methodical\refany\_il_dbglcs
@@ -52163,6 +58195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbglongsig.cmd_7537]
 RelativePath=JIT\Methodical\refany\_il_dbglongsig\_il_dbglongsig.cmd
 WorkingDir=JIT\Methodical\refany\_il_dbglongsig
@@ -52170,6 +58203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgnative.cmd_7538]
 RelativePath=JIT\Methodical\refany\_il_dbgnative\_il_dbgnative.cmd
 WorkingDir=JIT\Methodical\refany\_il_dbgnative
@@ -52177,6 +58211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgshortsig.cmd_7540]
 RelativePath=JIT\Methodical\refany\_il_dbgshortsig\_il_dbgshortsig.cmd
 WorkingDir=JIT\Methodical\refany\_il_dbgshortsig
@@ -52184,6 +58219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgstress2.cmd_7541]
 RelativePath=JIT\Methodical\refany\_il_dbgstress2\_il_dbgstress2.cmd
 WorkingDir=JIT\Methodical\refany\_il_dbgstress2
@@ -52191,6 +58227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgu_native.cmd_7542]
 RelativePath=JIT\Methodical\refany\_il_dbgu_native\_il_dbgu_native.cmd
 WorkingDir=JIT\Methodical\refany\_il_dbgu_native
@@ -52198,6 +58235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relarray1.cmd_7543]
 RelativePath=JIT\Methodical\refany\_il_relarray1\_il_relarray1.cmd
 WorkingDir=JIT\Methodical\refany\_il_relarray1
@@ -52205,6 +58243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relarray2.cmd_7544]
 RelativePath=JIT\Methodical\refany\_il_relarray2\_il_relarray2.cmd
 WorkingDir=JIT\Methodical\refany\_il_relarray2
@@ -52212,6 +58251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relarray3.cmd_7545]
 RelativePath=JIT\Methodical\refany\_il_relarray3\_il_relarray3.cmd
 WorkingDir=JIT\Methodical\refany\_il_relarray3
@@ -52219,6 +58259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relformat.cmd_7546]
 RelativePath=JIT\Methodical\refany\_il_relformat\_il_relformat.cmd
 WorkingDir=JIT\Methodical\refany\_il_relformat
@@ -52226,6 +58267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relindcall.cmd_7547]
 RelativePath=JIT\Methodical\refany\_il_relindcall\_il_relindcall.cmd
 WorkingDir=JIT\Methodical\refany\_il_relindcall
@@ -52233,6 +58275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_rellcs.cmd_7548]
 RelativePath=JIT\Methodical\refany\_il_rellcs\_il_rellcs.cmd
 WorkingDir=JIT\Methodical\refany\_il_rellcs
@@ -52240,6 +58283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_rellongsig.cmd_7549]
 RelativePath=JIT\Methodical\refany\_il_rellongsig\_il_rellongsig.cmd
 WorkingDir=JIT\Methodical\refany\_il_rellongsig
@@ -52247,6 +58291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relnative.cmd_7550]
 RelativePath=JIT\Methodical\refany\_il_relnative\_il_relnative.cmd
 WorkingDir=JIT\Methodical\refany\_il_relnative
@@ -52254,6 +58299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relshortsig.cmd_7552]
 RelativePath=JIT\Methodical\refany\_il_relshortsig\_il_relshortsig.cmd
 WorkingDir=JIT\Methodical\refany\_il_relshortsig
@@ -52261,6 +58307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relstress2.cmd_7553]
 RelativePath=JIT\Methodical\refany\_il_relstress2\_il_relstress2.cmd
 WorkingDir=JIT\Methodical\refany\_il_relstress2
@@ -52268,6 +58315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relu_native.cmd_7554]
 RelativePath=JIT\Methodical\refany\_il_relu_native\_il_relu_native.cmd
 WorkingDir=JIT\Methodical\refany\_il_relu_native
@@ -52275,6 +58323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relgcreport.cmd_7555]
 RelativePath=JIT\Methodical\refany\_relgcreport\_relgcreport.cmd
 WorkingDir=JIT\Methodical\refany\_relgcreport
@@ -52282,6 +58331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relnative.cmd_7556]
 RelativePath=JIT\Methodical\refany\_relnative\_relnative.cmd
 WorkingDir=JIT\Methodical\refany\_relnative
@@ -52289,6 +58339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relstress1.cmd_7557]
 RelativePath=JIT\Methodical\refany\_relstress1\_relstress1.cmd
 WorkingDir=JIT\Methodical\refany\_relstress1
@@ -52296,6 +58347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relstress3.cmd_7558]
 RelativePath=JIT\Methodical\refany\_relstress3\_relstress3.cmd
 WorkingDir=JIT\Methodical\refany\_relstress3
@@ -52303,6 +58355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relvirtcall.cmd_7559]
 RelativePath=JIT\Methodical\refany\_relvirtcall\_relvirtcall.cmd
 WorkingDir=JIT\Methodical\refany\_relvirtcall
@@ -52310,6 +58363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbggcreport.cmd_7560]
 RelativePath=JIT\Methodical\refany\_speed_dbggcreport\_speed_dbggcreport.cmd
 WorkingDir=JIT\Methodical\refany\_speed_dbggcreport
@@ -52317,6 +58371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgnative.cmd_7561]
 RelativePath=JIT\Methodical\refany\_speed_dbgnative\_speed_dbgnative.cmd
 WorkingDir=JIT\Methodical\refany\_speed_dbgnative
@@ -52324,6 +58379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgstress1.cmd_7562]
 RelativePath=JIT\Methodical\refany\_speed_dbgstress1\_speed_dbgstress1.cmd
 WorkingDir=JIT\Methodical\refany\_speed_dbgstress1
@@ -52331,6 +58387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgstress3.cmd_7563]
 RelativePath=JIT\Methodical\refany\_speed_dbgstress3\_speed_dbgstress3.cmd
 WorkingDir=JIT\Methodical\refany\_speed_dbgstress3
@@ -52338,6 +58395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgvirtcall.cmd_7564]
 RelativePath=JIT\Methodical\refany\_speed_dbgvirtcall\_speed_dbgvirtcall.cmd
 WorkingDir=JIT\Methodical\refany\_speed_dbgvirtcall
@@ -52345,6 +58403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relgcreport.cmd_7565]
 RelativePath=JIT\Methodical\refany\_speed_relgcreport\_speed_relgcreport.cmd
 WorkingDir=JIT\Methodical\refany\_speed_relgcreport
@@ -52352,6 +58411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relnative.cmd_7566]
 RelativePath=JIT\Methodical\refany\_speed_relnative\_speed_relnative.cmd
 WorkingDir=JIT\Methodical\refany\_speed_relnative
@@ -52359,6 +58419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relstress1.cmd_7567]
 RelativePath=JIT\Methodical\refany\_speed_relstress1\_speed_relstress1.cmd
 WorkingDir=JIT\Methodical\refany\_speed_relstress1
@@ -52366,6 +58427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relstress3.cmd_7568]
 RelativePath=JIT\Methodical\refany\_speed_relstress3\_speed_relstress3.cmd
 WorkingDir=JIT\Methodical\refany\_speed_relstress3
@@ -52373,6 +58435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relvirtcall.cmd_7569]
 RelativePath=JIT\Methodical\refany\_speed_relvirtcall\_speed_relvirtcall.cmd
 WorkingDir=JIT\Methodical\refany\_speed_relvirtcall
@@ -52380,6 +58443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [test1-xassem.cmd_7570]
 RelativePath=JIT\Methodical\stringintern\test1-xassem\test1-xassem.cmd
 WorkingDir=JIT\Methodical\stringintern\test1-xassem
@@ -52387,6 +58451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [test2-xassem.cmd_7571]
 RelativePath=JIT\Methodical\stringintern\test2-xassem\test2-xassem.cmd
 WorkingDir=JIT\Methodical\stringintern\test2-xassem
@@ -52394,6 +58459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [test4-xassem.cmd_7572]
 RelativePath=JIT\Methodical\stringintern\test4-xassem\test4-xassem.cmd
 WorkingDir=JIT\Methodical\stringintern\test4-xassem
@@ -52401,6 +58467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_Simpleb207621.cmd_7573]
 RelativePath=JIT\Methodical\stringintern\_Simpleb207621\_Simpleb207621.cmd
 WorkingDir=JIT\Methodical\stringintern\_Simpleb207621
@@ -52408,6 +58475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_Simpletest1.cmd_7574]
 RelativePath=JIT\Methodical\stringintern\_Simpletest1\_Simpletest1.cmd
 WorkingDir=JIT\Methodical\stringintern\_Simpletest1
@@ -52415,6 +58483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_Simpletest2.cmd_7575]
 RelativePath=JIT\Methodical\stringintern\_Simpletest2\_Simpletest2.cmd
 WorkingDir=JIT\Methodical\stringintern\_Simpletest2
@@ -52422,6 +58491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_Simpletest4.cmd_7576]
 RelativePath=JIT\Methodical\stringintern\_Simpletest4\_Simpletest4.cmd
 WorkingDir=JIT\Methodical\stringintern\_Simpletest4
@@ -52429,6 +58499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_XAssemblytest1-xassem.cmd_7577]
 RelativePath=JIT\Methodical\stringintern\_XAssemblytest1-xassem\_XAssemblytest1-xassem.cmd
 WorkingDir=JIT\Methodical\stringintern\_XAssemblytest1-xassem
@@ -52436,6 +58507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_XAssemblytest2-xassem.cmd_7578]
 RelativePath=JIT\Methodical\stringintern\_XAssemblytest2-xassem\_XAssemblytest2-xassem.cmd
 WorkingDir=JIT\Methodical\stringintern\_XAssemblytest2-xassem
@@ -52443,6 +58515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_XAssemblytest4-xassem.cmd_7579]
 RelativePath=JIT\Methodical\stringintern\_XAssemblytest4-xassem\_XAssemblytest4-xassem.cmd
 WorkingDir=JIT\Methodical\stringintern\_XAssemblytest4-xassem
@@ -52450,6 +58523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_XModuletest1-xmod.cmd_7580]
 RelativePath=JIT\Methodical\stringintern\_XModuletest1-xmod\_XModuletest1-xmod.cmd
 WorkingDir=JIT\Methodical\stringintern\_XModuletest1-xmod
@@ -52457,6 +58531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_XModuletest2-xmod.cmd_7581]
 RelativePath=JIT\Methodical\stringintern\_XModuletest2-xmod\_XModuletest2-xmod.cmd
 WorkingDir=JIT\Methodical\stringintern\_XModuletest2-xmod
@@ -52464,13 +58539,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_XModuletest4-xmod.cmd_7582]
 RelativePath=JIT\Methodical\stringintern\_XModuletest4-xmod\_XModuletest4-xmod.cmd
 WorkingDir=JIT\Methodical\stringintern\_XModuletest4-xmod
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS
+Categories=Pri0;EXPECTED_PASSPASSPASSPASS;EXPECTED_PASS
 HostStyle=0
+
 [structinregs.cmd_7583]
 RelativePath=JIT\Methodical\structs\systemvbringup\structinregs\structinregs.cmd
 WorkingDir=JIT\Methodical\structs\systemvbringup\structinregs
@@ -52478,90 +58555,103 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [switch1.cmd_7584]
 RelativePath=JIT\Methodical\switch\switch1\switch1.cmd
 WorkingDir=JIT\Methodical\switch\switch1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [switch10.cmd_7585]
 RelativePath=JIT\Methodical\switch\switch10\switch10.cmd
 WorkingDir=JIT\Methodical\switch\switch10
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [switch11.cmd_7586]
 RelativePath=JIT\Methodical\switch\switch11\switch11.cmd
 WorkingDir=JIT\Methodical\switch\switch11
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [switch2.cmd_7587]
 RelativePath=JIT\Methodical\switch\switch2\switch2.cmd
 WorkingDir=JIT\Methodical\switch\switch2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [switch3.cmd_7588]
 RelativePath=JIT\Methodical\switch\switch3\switch3.cmd
 WorkingDir=JIT\Methodical\switch\switch3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [switch4.cmd_7589]
 RelativePath=JIT\Methodical\switch\switch4\switch4.cmd
 WorkingDir=JIT\Methodical\switch\switch4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [switch5.cmd_7590]
 RelativePath=JIT\Methodical\switch\switch5\switch5.cmd
 WorkingDir=JIT\Methodical\switch\switch5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [switch6.cmd_7591]
 RelativePath=JIT\Methodical\switch\switch6\switch6.cmd
 WorkingDir=JIT\Methodical\switch\switch6
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [switch7.cmd_7592]
 RelativePath=JIT\Methodical\switch\switch7\switch7.cmd
 WorkingDir=JIT\Methodical\switch\switch7
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [switch8.cmd_7593]
 RelativePath=JIT\Methodical\switch\switch8\switch8.cmd
 WorkingDir=JIT\Methodical\switch\switch8
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [switch9.cmd_7594]
 RelativePath=JIT\Methodical\switch\switch9\switch9.cmd
 WorkingDir=JIT\Methodical\switch\switch9
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_il_relthread-race.cmd_7595]
 RelativePath=JIT\Methodical\tailcall\Desktop\_il_relthread-race\_il_relthread-race.cmd
 WorkingDir=JIT\Methodical\tailcall\Desktop\_il_relthread-race
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_FAIL
+Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcompat_enum.cmd_7596]
 RelativePath=JIT\Methodical\tailcall\_il_dbgcompat_enum\_il_dbgcompat_enum.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgcompat_enum
@@ -52569,6 +58659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcompat_i2_bool.cmd_7597]
 RelativePath=JIT\Methodical\tailcall\_il_dbgcompat_i2_bool\_il_dbgcompat_i2_bool.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgcompat_i2_bool
@@ -52576,6 +58667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcompat_i4_i1.cmd_7598]
 RelativePath=JIT\Methodical\tailcall\_il_dbgcompat_i4_i1\_il_dbgcompat_i4_i1.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgcompat_i4_i1
@@ -52583,6 +58675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcompat_i4_u.cmd_7599]
 RelativePath=JIT\Methodical\tailcall\_il_dbgcompat_i4_u\_il_dbgcompat_i4_u.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgcompat_i4_u
@@ -52590,6 +58683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcompat_i_u2.cmd_7600]
 RelativePath=JIT\Methodical\tailcall\_il_dbgcompat_i_u2\_il_dbgcompat_i_u2.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgcompat_i_u2
@@ -52597,6 +58691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcompat_obj.cmd_7601]
 RelativePath=JIT\Methodical\tailcall\_il_dbgcompat_obj\_il_dbgcompat_obj.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgcompat_obj
@@ -52604,6 +58699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcompat_r4_r8.cmd_7602]
 RelativePath=JIT\Methodical\tailcall\_il_dbgcompat_r4_r8\_il_dbgcompat_r4_r8.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgcompat_r4_r8
@@ -52611,6 +58707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcompat_r4_r8_inl.cmd_7603]
 RelativePath=JIT\Methodical\tailcall\_il_dbgcompat_r4_r8_inl\_il_dbgcompat_r4_r8_inl.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgcompat_r4_r8_inl
@@ -52618,6 +58715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcompat_r8_r4.cmd_7604]
 RelativePath=JIT\Methodical\tailcall\_il_dbgcompat_r8_r4\_il_dbgcompat_r8_r4.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgcompat_r8_r4
@@ -52625,6 +58723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcompat_r8_r4_inl.cmd_7605]
 RelativePath=JIT\Methodical\tailcall\_il_dbgcompat_r8_r4_inl\_il_dbgcompat_r8_r4_inl.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgcompat_r8_r4_inl
@@ -52632,6 +58731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcompat_v.cmd_7606]
 RelativePath=JIT\Methodical\tailcall\_il_dbgcompat_v\_il_dbgcompat_v.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgcompat_v
@@ -52639,6 +58739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgdeep_array.cmd_7607]
 RelativePath=JIT\Methodical\tailcall\_il_dbgdeep_array\_il_dbgdeep_array.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgdeep_array
@@ -52646,6 +58747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgdeep_array_nz.cmd_7608]
 RelativePath=JIT\Methodical\tailcall\_il_dbgdeep_array_nz\_il_dbgdeep_array_nz.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgdeep_array_nz
@@ -52653,6 +58755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgdeep_gc.cmd_7609]
 RelativePath=JIT\Methodical\tailcall\_il_dbgdeep_gc\_il_dbgdeep_gc.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgdeep_gc
@@ -52660,6 +58763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgdeep_inst.cmd_7610]
 RelativePath=JIT\Methodical\tailcall\_il_dbgdeep_inst\_il_dbgdeep_inst.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgdeep_inst
@@ -52667,6 +58771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgdeep_value.cmd_7611]
 RelativePath=JIT\Methodical\tailcall\_il_dbgdeep_value\_il_dbgdeep_value.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgdeep_value
@@ -52674,6 +58779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgdeep_virt.cmd_7612]
 RelativePath=JIT\Methodical\tailcall\_il_dbgdeep_virt\_il_dbgdeep_virt.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgdeep_virt
@@ -52681,6 +58787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbggcval.cmd_7613]
 RelativePath=JIT\Methodical\tailcall\_il_dbggcval\_il_dbggcval.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbggcval
@@ -52688,6 +58795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbggcval_nested.cmd_7614]
 RelativePath=JIT\Methodical\tailcall\_il_dbggcval_nested\_il_dbggcval_nested.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbggcval_nested
@@ -52695,6 +58803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbggcval_sideeffect.cmd_7615]
 RelativePath=JIT\Methodical\tailcall\_il_dbggcval_sideeffect\_il_dbggcval_sideeffect.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbggcval_sideeffect
@@ -52702,6 +58811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrecurse_ep.cmd_7618]
 RelativePath=JIT\Methodical\tailcall\_il_dbgrecurse_ep\_il_dbgrecurse_ep.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgrecurse_ep
@@ -52709,13 +58819,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrecurse_ep_void.cmd_7619]
 RelativePath=JIT\Methodical\tailcall\_il_dbgrecurse_ep_void\_il_dbgrecurse_ep_void.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgrecurse_ep_void
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgreference_i.cmd_7620]
 RelativePath=JIT\Methodical\tailcall\_il_dbgreference_i\_il_dbgreference_i.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgreference_i
@@ -52723,6 +58835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest_2a.cmd_7621]
 RelativePath=JIT\Methodical\tailcall\_il_dbgtest_2a\_il_dbgtest_2a.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgtest_2a
@@ -52730,6 +58843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest_2b.cmd_7622]
 RelativePath=JIT\Methodical\tailcall\_il_dbgtest_2b\_il_dbgtest_2b.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgtest_2b
@@ -52737,6 +58851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest_2c.cmd_7623]
 RelativePath=JIT\Methodical\tailcall\_il_dbgtest_2c\_il_dbgtest_2c.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgtest_2c
@@ -52744,6 +58859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest_3b.cmd_7624]
 RelativePath=JIT\Methodical\tailcall\_il_dbgtest_3b\_il_dbgtest_3b.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgtest_3b
@@ -52751,6 +58867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest_implicit.cmd_7625]
 RelativePath=JIT\Methodical\tailcall\_il_dbgtest_implicit\_il_dbgtest_implicit.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgtest_implicit
@@ -52758,6 +58875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest_mutual_rec.cmd_7626]
 RelativePath=JIT\Methodical\tailcall\_il_dbgtest_mutual_rec\_il_dbgtest_mutual_rec.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgtest_mutual_rec
@@ -52765,6 +58883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest_switch.cmd_7627]
 RelativePath=JIT\Methodical\tailcall\_il_dbgtest_switch\_il_dbgtest_switch.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgtest_switch
@@ -52772,6 +58891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest_virt.cmd_7628]
 RelativePath=JIT\Methodical\tailcall\_il_dbgtest_virt\_il_dbgtest_virt.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgtest_virt
@@ -52779,13 +58899,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgtest_void.cmd_7629]
 RelativePath=JIT\Methodical\tailcall\_il_dbgtest_void\_il_dbgtest_void.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_dbgtest_void
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_il_relcompat_enum.cmd_7630]
 RelativePath=JIT\Methodical\tailcall\_il_relcompat_enum\_il_relcompat_enum.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relcompat_enum
@@ -52793,6 +58915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcompat_i2_bool.cmd_7631]
 RelativePath=JIT\Methodical\tailcall\_il_relcompat_i2_bool\_il_relcompat_i2_bool.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relcompat_i2_bool
@@ -52800,6 +58923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcompat_i4_i1.cmd_7632]
 RelativePath=JIT\Methodical\tailcall\_il_relcompat_i4_i1\_il_relcompat_i4_i1.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relcompat_i4_i1
@@ -52807,6 +58931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcompat_i4_u.cmd_7633]
 RelativePath=JIT\Methodical\tailcall\_il_relcompat_i4_u\_il_relcompat_i4_u.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relcompat_i4_u
@@ -52814,6 +58939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcompat_i_u2.cmd_7634]
 RelativePath=JIT\Methodical\tailcall\_il_relcompat_i_u2\_il_relcompat_i_u2.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relcompat_i_u2
@@ -52821,6 +58947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcompat_obj.cmd_7635]
 RelativePath=JIT\Methodical\tailcall\_il_relcompat_obj\_il_relcompat_obj.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relcompat_obj
@@ -52828,6 +58955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcompat_r4_r8.cmd_7636]
 RelativePath=JIT\Methodical\tailcall\_il_relcompat_r4_r8\_il_relcompat_r4_r8.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relcompat_r4_r8
@@ -52835,6 +58963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcompat_r4_r8_inl.cmd_7637]
 RelativePath=JIT\Methodical\tailcall\_il_relcompat_r4_r8_inl\_il_relcompat_r4_r8_inl.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relcompat_r4_r8_inl
@@ -52842,6 +58971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcompat_r8_r4.cmd_7638]
 RelativePath=JIT\Methodical\tailcall\_il_relcompat_r8_r4\_il_relcompat_r8_r4.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relcompat_r8_r4
@@ -52849,6 +58979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcompat_r8_r4_inl.cmd_7639]
 RelativePath=JIT\Methodical\tailcall\_il_relcompat_r8_r4_inl\_il_relcompat_r8_r4_inl.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relcompat_r8_r4_inl
@@ -52856,6 +58987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcompat_v.cmd_7640]
 RelativePath=JIT\Methodical\tailcall\_il_relcompat_v\_il_relcompat_v.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relcompat_v
@@ -52863,6 +58995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reldeep_array.cmd_7641]
 RelativePath=JIT\Methodical\tailcall\_il_reldeep_array\_il_reldeep_array.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reldeep_array
@@ -52870,6 +59003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reldeep_array_nz.cmd_7642]
 RelativePath=JIT\Methodical\tailcall\_il_reldeep_array_nz\_il_reldeep_array_nz.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reldeep_array_nz
@@ -52877,6 +59011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reldeep_gc.cmd_7643]
 RelativePath=JIT\Methodical\tailcall\_il_reldeep_gc\_il_reldeep_gc.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reldeep_gc
@@ -52884,6 +59019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reldeep_inst.cmd_7644]
 RelativePath=JIT\Methodical\tailcall\_il_reldeep_inst\_il_reldeep_inst.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reldeep_inst
@@ -52891,6 +59027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reldeep_value.cmd_7645]
 RelativePath=JIT\Methodical\tailcall\_il_reldeep_value\_il_reldeep_value.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reldeep_value
@@ -52898,6 +59035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reldeep_virt.cmd_7646]
 RelativePath=JIT\Methodical\tailcall\_il_reldeep_virt\_il_reldeep_virt.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reldeep_virt
@@ -52905,6 +59043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relgcval.cmd_7647]
 RelativePath=JIT\Methodical\tailcall\_il_relgcval\_il_relgcval.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relgcval
@@ -52912,6 +59051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relgcval_nested.cmd_7648]
 RelativePath=JIT\Methodical\tailcall\_il_relgcval_nested\_il_relgcval_nested.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relgcval_nested
@@ -52919,6 +59059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relgcval_sideeffect.cmd_7649]
 RelativePath=JIT\Methodical\tailcall\_il_relgcval_sideeffect\_il_relgcval_sideeffect.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relgcval_sideeffect
@@ -52926,6 +59067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrecurse_ep.cmd_7652]
 RelativePath=JIT\Methodical\tailcall\_il_relrecurse_ep\_il_relrecurse_ep.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relrecurse_ep
@@ -52933,13 +59075,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrecurse_ep_void.cmd_7653]
 RelativePath=JIT\Methodical\tailcall\_il_relrecurse_ep_void\_il_relrecurse_ep_void.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relrecurse_ep_void
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_il_relreference_i.cmd_7654]
 RelativePath=JIT\Methodical\tailcall\_il_relreference_i\_il_relreference_i.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_relreference_i
@@ -52947,6 +59091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest_2a.cmd_7655]
 RelativePath=JIT\Methodical\tailcall\_il_reltest_2a\_il_reltest_2a.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reltest_2a
@@ -52954,6 +59099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest_2b.cmd_7656]
 RelativePath=JIT\Methodical\tailcall\_il_reltest_2b\_il_reltest_2b.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reltest_2b
@@ -52961,6 +59107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest_2c.cmd_7657]
 RelativePath=JIT\Methodical\tailcall\_il_reltest_2c\_il_reltest_2c.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reltest_2c
@@ -52968,6 +59115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest_3b.cmd_7658]
 RelativePath=JIT\Methodical\tailcall\_il_reltest_3b\_il_reltest_3b.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reltest_3b
@@ -52975,6 +59123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest_implicit.cmd_7659]
 RelativePath=JIT\Methodical\tailcall\_il_reltest_implicit\_il_reltest_implicit.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reltest_implicit
@@ -52982,6 +59131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest_mutual_rec.cmd_7660]
 RelativePath=JIT\Methodical\tailcall\_il_reltest_mutual_rec\_il_reltest_mutual_rec.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reltest_mutual_rec
@@ -52989,6 +59139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest_switch.cmd_7661]
 RelativePath=JIT\Methodical\tailcall\_il_reltest_switch\_il_reltest_switch.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reltest_switch
@@ -52996,6 +59147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest_virt.cmd_7662]
 RelativePath=JIT\Methodical\tailcall\_il_reltest_virt\_il_reltest_virt.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reltest_virt
@@ -53003,13 +59155,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reltest_void.cmd_7663]
 RelativePath=JIT\Methodical\tailcall\_il_reltest_void\_il_reltest_void.cmd
 WorkingDir=JIT\Methodical\tailcall\_il_reltest_void
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [delegateParamCallTarget.cmd_7664]
 RelativePath=JIT\Methodical\tailcall_v4\delegateParamCallTarget\delegateParamCallTarget.cmd
 WorkingDir=JIT\Methodical\tailcall_v4\delegateParamCallTarget
@@ -53017,6 +59171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [delegatetail.cmd_7665]
 RelativePath=JIT\Methodical\tailcall_v4\delegatetail\delegatetail.cmd
 WorkingDir=JIT\Methodical\tailcall_v4\delegatetail
@@ -53024,20 +59179,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [hijacking.cmd_7666]
 RelativePath=JIT\Methodical\tailcall_v4\hijacking\hijacking.cmd
 WorkingDir=JIT\Methodical\tailcall_v4\hijacking
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_FAIL;ISSUE_4122;LONG_RUNNING
+Categories=Pri0;EXPECTED_FAIL;4122;LONG_RUNNING
 HostStyle=0
+
 [smallFrame.cmd_7667]
 RelativePath=JIT\Methodical\tailcall_v4\smallFrame\smallFrame.cmd
 WorkingDir=JIT\Methodical\tailcall_v4\smallFrame
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_FAIL;ISSUE_6881
+Categories=Pri0;JIT;9462;EXPECTED_FAIL;6881
 HostStyle=0
+
 [tailcall_AV.cmd_7668]
 RelativePath=JIT\Methodical\tailcall_v4\tailcall_AV\tailcall_AV.cmd
 WorkingDir=JIT\Methodical\tailcall_v4\tailcall_AV
@@ -53045,6 +59203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgunsafe-0.cmd_7669]
 RelativePath=JIT\Methodical\unsafecsharp\_dbgunsafe-0\_dbgunsafe-0.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_dbgunsafe-0
@@ -53052,6 +59211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgunsafe-1.cmd_7670]
 RelativePath=JIT\Methodical\unsafecsharp\_dbgunsafe-1\_dbgunsafe-1.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_dbgunsafe-1
@@ -53059,6 +59219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgunsafe-2.cmd_7671]
 RelativePath=JIT\Methodical\unsafecsharp\_dbgunsafe-2\_dbgunsafe-2.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_dbgunsafe-2
@@ -53066,6 +59227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgunsafe-3.cmd_7672]
 RelativePath=JIT\Methodical\unsafecsharp\_dbgunsafe-3\_dbgunsafe-3.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_dbgunsafe-3
@@ -53073,6 +59235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgunsafe-4.cmd_7673]
 RelativePath=JIT\Methodical\unsafecsharp\_dbgunsafe-4\_dbgunsafe-4.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_dbgunsafe-4
@@ -53080,6 +59243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgunsafe-5.cmd_7674]
 RelativePath=JIT\Methodical\unsafecsharp\_dbgunsafe-5\_dbgunsafe-5.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_dbgunsafe-5
@@ -53087,6 +59251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgunsafe-6.cmd_7675]
 RelativePath=JIT\Methodical\unsafecsharp\_dbgunsafe-6\_dbgunsafe-6.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_dbgunsafe-6
@@ -53094,6 +59259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relunsafe-0.cmd_7676]
 RelativePath=JIT\Methodical\unsafecsharp\_relunsafe-0\_relunsafe-0.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_relunsafe-0
@@ -53101,6 +59267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relunsafe-1.cmd_7677]
 RelativePath=JIT\Methodical\unsafecsharp\_relunsafe-1\_relunsafe-1.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_relunsafe-1
@@ -53108,6 +59275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relunsafe-2.cmd_7678]
 RelativePath=JIT\Methodical\unsafecsharp\_relunsafe-2\_relunsafe-2.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_relunsafe-2
@@ -53115,6 +59283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relunsafe-3.cmd_7679]
 RelativePath=JIT\Methodical\unsafecsharp\_relunsafe-3\_relunsafe-3.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_relunsafe-3
@@ -53122,6 +59291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relunsafe-4.cmd_7680]
 RelativePath=JIT\Methodical\unsafecsharp\_relunsafe-4\_relunsafe-4.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_relunsafe-4
@@ -53129,6 +59299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relunsafe-5.cmd_7681]
 RelativePath=JIT\Methodical\unsafecsharp\_relunsafe-5\_relunsafe-5.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_relunsafe-5
@@ -53136,6 +59307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relunsafe-6.cmd_7682]
 RelativePath=JIT\Methodical\unsafecsharp\_relunsafe-6\_relunsafe-6.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_relunsafe-6
@@ -53143,6 +59315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgunsafe-0.cmd_7683]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-0\_speed_dbgunsafe-0.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-0
@@ -53150,6 +59323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgunsafe-1.cmd_7684]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-1\_speed_dbgunsafe-1.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-1
@@ -53157,6 +59331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgunsafe-2.cmd_7685]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-2\_speed_dbgunsafe-2.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-2
@@ -53164,6 +59339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgunsafe-3.cmd_7686]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-3\_speed_dbgunsafe-3.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-3
@@ -53171,6 +59347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgunsafe-4.cmd_7687]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-4\_speed_dbgunsafe-4.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-4
@@ -53178,6 +59355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgunsafe-5.cmd_7688]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-5\_speed_dbgunsafe-5.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-5
@@ -53185,6 +59363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgunsafe-6.cmd_7689]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-6\_speed_dbgunsafe-6.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_dbgunsafe-6
@@ -53192,6 +59371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relunsafe-0.cmd_7690]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_relunsafe-0\_speed_relunsafe-0.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_relunsafe-0
@@ -53199,6 +59379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relunsafe-1.cmd_7691]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_relunsafe-1\_speed_relunsafe-1.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_relunsafe-1
@@ -53206,6 +59387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relunsafe-2.cmd_7692]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_relunsafe-2\_speed_relunsafe-2.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_relunsafe-2
@@ -53213,6 +59395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relunsafe-3.cmd_7693]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_relunsafe-3\_speed_relunsafe-3.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_relunsafe-3
@@ -53220,6 +59403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relunsafe-4.cmd_7694]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_relunsafe-4\_speed_relunsafe-4.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_relunsafe-4
@@ -53227,6 +59411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relunsafe-5.cmd_7695]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_relunsafe-5\_speed_relunsafe-5.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_relunsafe-5
@@ -53234,6 +59419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relunsafe-6.cmd_7696]
 RelativePath=JIT\Methodical\unsafecsharp\_speed_relunsafe-6\_speed_relunsafe-6.cmd
 WorkingDir=JIT\Methodical\unsafecsharp\_speed_relunsafe-6
@@ -53241,6 +59427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgcall.cmd_7697]
 RelativePath=JIT\Methodical\VT\callconv\_dbgcall\_dbgcall.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_dbgcall
@@ -53248,6 +59435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgjumper.cmd_7698]
 RelativePath=JIT\Methodical\VT\callconv\_dbgjumper\_dbgjumper.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_dbgjumper
@@ -53255,6 +59443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgjumps.cmd_7699]
 RelativePath=JIT\Methodical\VT\callconv\_dbgjumps\_dbgjumps.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_dbgjumps
@@ -53262,6 +59451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgvtret.cmd_7700]
 RelativePath=JIT\Methodical\VT\callconv\_dbgvtret\_dbgvtret.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_dbgvtret
@@ -53269,6 +59459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgaa.cmd_7701]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgaa\_il_dbgaa.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgaa
@@ -53276,6 +59467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgcalli.cmd_7702]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgcalli\_il_dbgcalli.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgcalli
@@ -53283,6 +59475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgdd.cmd_7703]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgdd\_il_dbgdd.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgdd
@@ -53290,6 +59483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgee.cmd_7704]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgee\_il_dbgee.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgee
@@ -53297,6 +59491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgjumper1.cmd_7705]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgjumper1\_il_dbgjumper1.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgjumper1
@@ -53304,6 +59499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgjumper2.cmd_7706]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgjumper2\_il_dbgjumper2.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgjumper2
@@ -53311,6 +59507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgjumper3.cmd_7707]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgjumper3\_il_dbgjumper3.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgjumper3
@@ -53318,6 +59515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgjumper4.cmd_7708]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgjumper4\_il_dbgjumper4.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgjumper4
@@ -53325,6 +59523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgjumper5.cmd_7709]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgjumper5\_il_dbgjumper5.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgjumper5
@@ -53332,6 +59531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgjumps1.cmd_7710]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgjumps1\_il_dbgjumps1.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgjumps1
@@ -53339,6 +59539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgjumps2.cmd_7711]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgjumps2\_il_dbgjumps2.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgjumps2
@@ -53346,6 +59547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgjumps3.cmd_7712]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgjumps3\_il_dbgjumps3.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgjumps3
@@ -53353,6 +59555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgjumps4.cmd_7713]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgjumps4\_il_dbgjumps4.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgjumps4
@@ -53360,6 +59563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgjumps5.cmd_7714]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgjumps5\_il_dbgjumps5.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgjumps5
@@ -53367,6 +59571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgvtret.cmd_7715]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgvtret\_il_dbgvtret.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgvtret
@@ -53374,6 +59579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgvtret2.cmd_7716]
 RelativePath=JIT\Methodical\VT\callconv\_il_dbgvtret2\_il_dbgvtret2.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_dbgvtret2
@@ -53381,6 +59587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relaa.cmd_7717]
 RelativePath=JIT\Methodical\VT\callconv\_il_relaa\_il_relaa.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_relaa
@@ -53388,6 +59595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relcalli.cmd_7718]
 RelativePath=JIT\Methodical\VT\callconv\_il_relcalli\_il_relcalli.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_relcalli
@@ -53395,6 +59603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reldd.cmd_7719]
 RelativePath=JIT\Methodical\VT\callconv\_il_reldd\_il_reldd.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_reldd
@@ -53402,6 +59611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relee.cmd_7720]
 RelativePath=JIT\Methodical\VT\callconv\_il_relee\_il_relee.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_relee
@@ -53409,6 +59619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reljumper1.cmd_7721]
 RelativePath=JIT\Methodical\VT\callconv\_il_reljumper1\_il_reljumper1.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_reljumper1
@@ -53416,6 +59627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reljumper2.cmd_7722]
 RelativePath=JIT\Methodical\VT\callconv\_il_reljumper2\_il_reljumper2.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_reljumper2
@@ -53423,6 +59635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reljumper3.cmd_7723]
 RelativePath=JIT\Methodical\VT\callconv\_il_reljumper3\_il_reljumper3.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_reljumper3
@@ -53430,6 +59643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reljumper4.cmd_7724]
 RelativePath=JIT\Methodical\VT\callconv\_il_reljumper4\_il_reljumper4.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_reljumper4
@@ -53437,6 +59651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reljumper5.cmd_7725]
 RelativePath=JIT\Methodical\VT\callconv\_il_reljumper5\_il_reljumper5.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_reljumper5
@@ -53444,6 +59659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_reljumps1.cmd_7726]
 RelativePath=JIT\Methodical\VT\callconv\_il_reljumps1\_il_reljumps1.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_reljumps1
@@ -53451,6 +59667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reljumps2.cmd_7727]
 RelativePath=JIT\Methodical\VT\callconv\_il_reljumps2\_il_reljumps2.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_reljumps2
@@ -53458,6 +59675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reljumps3.cmd_7728]
 RelativePath=JIT\Methodical\VT\callconv\_il_reljumps3\_il_reljumps3.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_reljumps3
@@ -53465,6 +59683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reljumps4.cmd_7729]
 RelativePath=JIT\Methodical\VT\callconv\_il_reljumps4\_il_reljumps4.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_reljumps4
@@ -53472,6 +59691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_reljumps5.cmd_7730]
 RelativePath=JIT\Methodical\VT\callconv\_il_reljumps5\_il_reljumps5.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_reljumps5
@@ -53479,6 +59699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relvtret.cmd_7731]
 RelativePath=JIT\Methodical\VT\callconv\_il_relvtret\_il_relvtret.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_relvtret
@@ -53486,6 +59707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relvtret2.cmd_7732]
 RelativePath=JIT\Methodical\VT\callconv\_il_relvtret2\_il_relvtret2.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_il_relvtret2
@@ -53493,6 +59715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relcall.cmd_7733]
 RelativePath=JIT\Methodical\VT\callconv\_relcall\_relcall.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_relcall
@@ -53500,6 +59723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_reljumper.cmd_7734]
 RelativePath=JIT\Methodical\VT\callconv\_reljumper\_reljumper.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_reljumper
@@ -53507,6 +59731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_reljumps.cmd_7735]
 RelativePath=JIT\Methodical\VT\callconv\_reljumps\_reljumps.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_reljumps
@@ -53514,6 +59739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relvtret.cmd_7736]
 RelativePath=JIT\Methodical\VT\callconv\_relvtret\_relvtret.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_relvtret
@@ -53521,6 +59747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgcall.cmd_7737]
 RelativePath=JIT\Methodical\VT\callconv\_speed_dbgcall\_speed_dbgcall.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_speed_dbgcall
@@ -53528,6 +59755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgjumper.cmd_7738]
 RelativePath=JIT\Methodical\VT\callconv\_speed_dbgjumper\_speed_dbgjumper.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_speed_dbgjumper
@@ -53535,6 +59763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgjumps.cmd_7739]
 RelativePath=JIT\Methodical\VT\callconv\_speed_dbgjumps\_speed_dbgjumps.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_speed_dbgjumps
@@ -53542,6 +59771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgvtret.cmd_7740]
 RelativePath=JIT\Methodical\VT\callconv\_speed_dbgvtret\_speed_dbgvtret.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_speed_dbgvtret
@@ -53549,6 +59779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relcall.cmd_7741]
 RelativePath=JIT\Methodical\VT\callconv\_speed_relcall\_speed_relcall.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_speed_relcall
@@ -53556,6 +59787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_reljumper.cmd_7742]
 RelativePath=JIT\Methodical\VT\callconv\_speed_reljumper\_speed_reljumper.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_speed_reljumper
@@ -53563,6 +59795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_reljumps.cmd_7743]
 RelativePath=JIT\Methodical\VT\callconv\_speed_reljumps\_speed_reljumps.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_speed_reljumps
@@ -53570,6 +59803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relvtret.cmd_7744]
 RelativePath=JIT\Methodical\VT\callconv\_speed_relvtret\_speed_relvtret.cmd
 WorkingDir=JIT\Methodical\VT\callconv\_speed_relvtret
@@ -53577,6 +59811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [gc_nested.cmd_7745]
 RelativePath=JIT\Methodical\VT\etc\gc_nested\gc_nested.cmd
 WorkingDir=JIT\Methodical\VT\etc\gc_nested
@@ -53584,6 +59819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [nested.cmd_7746]
 RelativePath=JIT\Methodical\VT\etc\nested\nested.cmd
 WorkingDir=JIT\Methodical\VT\etc\nested
@@ -53591,6 +59827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgctor_recurse.cmd_7747]
 RelativePath=JIT\Methodical\VT\etc\_dbgctor_recurse\_dbgctor_recurse.cmd
 WorkingDir=JIT\Methodical\VT\etc\_dbgctor_recurse
@@ -53598,6 +59835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbggc_nested.cmd_7748]
 RelativePath=JIT\Methodical\VT\etc\_dbggc_nested\_dbggc_nested.cmd
 WorkingDir=JIT\Methodical\VT\etc\_dbggc_nested
@@ -53605,6 +59843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbghan2.cmd_7749]
 RelativePath=JIT\Methodical\VT\etc\_dbghan2\_dbghan2.cmd
 WorkingDir=JIT\Methodical\VT\etc\_dbghan2
@@ -53612,6 +59851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbghan3.cmd_7750]
 RelativePath=JIT\Methodical\VT\etc\_dbghan3\_dbghan3.cmd
 WorkingDir=JIT\Methodical\VT\etc\_dbghan3
@@ -53619,6 +59859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbghan3_ctor.cmd_7751]
 RelativePath=JIT\Methodical\VT\etc\_dbghan3_ctor\_dbghan3_ctor.cmd
 WorkingDir=JIT\Methodical\VT\etc\_dbghan3_ctor
@@ -53626,6 +59867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbghan3_ref.cmd_7752]
 RelativePath=JIT\Methodical\VT\etc\_dbghan3_ref\_dbghan3_ref.cmd
 WorkingDir=JIT\Methodical\VT\etc\_dbghan3_ref
@@ -53633,6 +59875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbghanoi.cmd_7753]
 RelativePath=JIT\Methodical\VT\etc\_dbghanoi\_dbghanoi.cmd
 WorkingDir=JIT\Methodical\VT\etc\_dbghanoi
@@ -53640,6 +59883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgknight.cmd_7754]
 RelativePath=JIT\Methodical\VT\etc\_dbgknight\_dbgknight.cmd
 WorkingDir=JIT\Methodical\VT\etc\_dbgknight
@@ -53647,6 +59891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgnested.cmd_7755]
 RelativePath=JIT\Methodical\VT\etc\_dbgnested\_dbgnested.cmd
 WorkingDir=JIT\Methodical\VT\etc\_dbgnested
@@ -53654,6 +59899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghan3.cmd_7756]
 RelativePath=JIT\Methodical\VT\etc\_il_dbghan3\_il_dbghan3.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_dbghan3
@@ -53661,6 +59907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghan3_ctor.cmd_7757]
 RelativePath=JIT\Methodical\VT\etc\_il_dbghan3_ctor\_il_dbghan3_ctor.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_dbghan3_ctor
@@ -53668,6 +59915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghan3_ref.cmd_7758]
 RelativePath=JIT\Methodical\VT\etc\_il_dbghan3_ref\_il_dbghan3_ref.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_dbghan3_ref
@@ -53675,6 +59923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghanoi.cmd_7759]
 RelativePath=JIT\Methodical\VT\etc\_il_dbghanoi\_il_dbghanoi.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_dbghanoi
@@ -53682,6 +59931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghanoi2.cmd_7760]
 RelativePath=JIT\Methodical\VT\etc\_il_dbghanoi2\_il_dbghanoi2.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_dbghanoi2
@@ -53689,6 +59939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgknight.cmd_7761]
 RelativePath=JIT\Methodical\VT\etc\_il_dbgknight\_il_dbgknight.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_dbgknight
@@ -53696,6 +59947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgnested.cmd_7762]
 RelativePath=JIT\Methodical\VT\etc\_il_dbgnested\_il_dbgnested.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_dbgnested
@@ -53703,6 +59955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhan3.cmd_7763]
 RelativePath=JIT\Methodical\VT\etc\_il_relhan3\_il_relhan3.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_relhan3
@@ -53710,6 +59963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhan3_ctor.cmd_7764]
 RelativePath=JIT\Methodical\VT\etc\_il_relhan3_ctor\_il_relhan3_ctor.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_relhan3_ctor
@@ -53717,6 +59971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhan3_ref.cmd_7765]
 RelativePath=JIT\Methodical\VT\etc\_il_relhan3_ref\_il_relhan3_ref.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_relhan3_ref
@@ -53724,6 +59979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhanoi.cmd_7766]
 RelativePath=JIT\Methodical\VT\etc\_il_relhanoi\_il_relhanoi.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_relhanoi
@@ -53731,6 +59987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhanoi2.cmd_7767]
 RelativePath=JIT\Methodical\VT\etc\_il_relhanoi2\_il_relhanoi2.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_relhanoi2
@@ -53738,6 +59995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relknight.cmd_7768]
 RelativePath=JIT\Methodical\VT\etc\_il_relknight\_il_relknight.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_relknight
@@ -53745,6 +60003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relnested.cmd_7769]
 RelativePath=JIT\Methodical\VT\etc\_il_relnested\_il_relnested.cmd
 WorkingDir=JIT\Methodical\VT\etc\_il_relnested
@@ -53752,6 +60011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relctor_recurse.cmd_7770]
 RelativePath=JIT\Methodical\VT\etc\_relctor_recurse\_relctor_recurse.cmd
 WorkingDir=JIT\Methodical\VT\etc\_relctor_recurse
@@ -53759,6 +60019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relgc_nested.cmd_7771]
 RelativePath=JIT\Methodical\VT\etc\_relgc_nested\_relgc_nested.cmd
 WorkingDir=JIT\Methodical\VT\etc\_relgc_nested
@@ -53766,6 +60027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relhan2.cmd_7772]
 RelativePath=JIT\Methodical\VT\etc\_relhan2\_relhan2.cmd
 WorkingDir=JIT\Methodical\VT\etc\_relhan2
@@ -53773,6 +60035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relhan3.cmd_7773]
 RelativePath=JIT\Methodical\VT\etc\_relhan3\_relhan3.cmd
 WorkingDir=JIT\Methodical\VT\etc\_relhan3
@@ -53780,6 +60043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relhan3_ctor.cmd_7774]
 RelativePath=JIT\Methodical\VT\etc\_relhan3_ctor\_relhan3_ctor.cmd
 WorkingDir=JIT\Methodical\VT\etc\_relhan3_ctor
@@ -53787,6 +60051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relhan3_ref.cmd_7775]
 RelativePath=JIT\Methodical\VT\etc\_relhan3_ref\_relhan3_ref.cmd
 WorkingDir=JIT\Methodical\VT\etc\_relhan3_ref
@@ -53794,6 +60059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relhanoi.cmd_7776]
 RelativePath=JIT\Methodical\VT\etc\_relhanoi\_relhanoi.cmd
 WorkingDir=JIT\Methodical\VT\etc\_relhanoi
@@ -53801,6 +60067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relknight.cmd_7777]
 RelativePath=JIT\Methodical\VT\etc\_relknight\_relknight.cmd
 WorkingDir=JIT\Methodical\VT\etc\_relknight
@@ -53808,6 +60075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relnested.cmd_7778]
 RelativePath=JIT\Methodical\VT\etc\_relnested\_relnested.cmd
 WorkingDir=JIT\Methodical\VT\etc\_relnested
@@ -53815,6 +60083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgctor_recurse.cmd_7779]
 RelativePath=JIT\Methodical\VT\etc\_speed_dbgctor_recurse\_speed_dbgctor_recurse.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_dbgctor_recurse
@@ -53822,6 +60091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbggc_nested.cmd_7780]
 RelativePath=JIT\Methodical\VT\etc\_speed_dbggc_nested\_speed_dbggc_nested.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_dbggc_nested
@@ -53829,6 +60099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbghan2.cmd_7781]
 RelativePath=JIT\Methodical\VT\etc\_speed_dbghan2\_speed_dbghan2.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_dbghan2
@@ -53836,6 +60107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbghan3.cmd_7782]
 RelativePath=JIT\Methodical\VT\etc\_speed_dbghan3\_speed_dbghan3.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_dbghan3
@@ -53843,6 +60115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbghan3_ctor.cmd_7783]
 RelativePath=JIT\Methodical\VT\etc\_speed_dbghan3_ctor\_speed_dbghan3_ctor.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_dbghan3_ctor
@@ -53850,6 +60123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbghan3_ref.cmd_7784]
 RelativePath=JIT\Methodical\VT\etc\_speed_dbghan3_ref\_speed_dbghan3_ref.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_dbghan3_ref
@@ -53857,6 +60131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbghanoi.cmd_7785]
 RelativePath=JIT\Methodical\VT\etc\_speed_dbghanoi\_speed_dbghanoi.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_dbghanoi
@@ -53864,6 +60139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgknight.cmd_7786]
 RelativePath=JIT\Methodical\VT\etc\_speed_dbgknight\_speed_dbgknight.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_dbgknight
@@ -53871,6 +60147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgnested.cmd_7787]
 RelativePath=JIT\Methodical\VT\etc\_speed_dbgnested\_speed_dbgnested.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_dbgnested
@@ -53878,6 +60155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relctor_recurse.cmd_7788]
 RelativePath=JIT\Methodical\VT\etc\_speed_relctor_recurse\_speed_relctor_recurse.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_relctor_recurse
@@ -53885,6 +60163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relgc_nested.cmd_7789]
 RelativePath=JIT\Methodical\VT\etc\_speed_relgc_nested\_speed_relgc_nested.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_relgc_nested
@@ -53892,6 +60171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relhan2.cmd_7790]
 RelativePath=JIT\Methodical\VT\etc\_speed_relhan2\_speed_relhan2.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_relhan2
@@ -53899,6 +60179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relhan3.cmd_7791]
 RelativePath=JIT\Methodical\VT\etc\_speed_relhan3\_speed_relhan3.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_relhan3
@@ -53906,6 +60187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relhan3_ctor.cmd_7792]
 RelativePath=JIT\Methodical\VT\etc\_speed_relhan3_ctor\_speed_relhan3_ctor.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_relhan3_ctor
@@ -53913,6 +60195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relhan3_ref.cmd_7793]
 RelativePath=JIT\Methodical\VT\etc\_speed_relhan3_ref\_speed_relhan3_ref.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_relhan3_ref
@@ -53920,6 +60203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relhanoi.cmd_7794]
 RelativePath=JIT\Methodical\VT\etc\_speed_relhanoi\_speed_relhanoi.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_relhanoi
@@ -53927,6 +60211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relknight.cmd_7795]
 RelativePath=JIT\Methodical\VT\etc\_speed_relknight\_speed_relknight.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_relknight
@@ -53934,6 +60219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relnested.cmd_7796]
 RelativePath=JIT\Methodical\VT\etc\_speed_relnested\_speed_relnested.cmd
 WorkingDir=JIT\Methodical\VT\etc\_speed_relnested
@@ -53941,6 +60227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgaccum.cmd_7797]
 RelativePath=JIT\Methodical\VT\identity\_dbgaccum\_dbgaccum.cmd
 WorkingDir=JIT\Methodical\VT\identity\_dbgaccum
@@ -53948,6 +60235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgvcall.cmd_7798]
 RelativePath=JIT\Methodical\VT\identity\_dbgvcall\_dbgvcall.cmd
 WorkingDir=JIT\Methodical\VT\identity\_dbgvcall
@@ -53955,6 +60243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgaccum.cmd_7799]
 RelativePath=JIT\Methodical\VT\identity\_il_dbgaccum\_il_dbgaccum.cmd
 WorkingDir=JIT\Methodical\VT\identity\_il_dbgaccum
@@ -53962,6 +60251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbglivecall.cmd_7800]
 RelativePath=JIT\Methodical\VT\identity\_il_dbglivecall\_il_dbglivecall.cmd
 WorkingDir=JIT\Methodical\VT\identity\_il_dbglivecall
@@ -53969,6 +60259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgvolatile.cmd_7801]
 RelativePath=JIT\Methodical\VT\identity\_il_dbgvolatile\_il_dbgvolatile.cmd
 WorkingDir=JIT\Methodical\VT\identity\_il_dbgvolatile
@@ -53976,6 +60267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relaccum.cmd_7802]
 RelativePath=JIT\Methodical\VT\identity\_il_relaccum\_il_relaccum.cmd
 WorkingDir=JIT\Methodical\VT\identity\_il_relaccum
@@ -53983,6 +60275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_rellivecall.cmd_7803]
 RelativePath=JIT\Methodical\VT\identity\_il_rellivecall\_il_rellivecall.cmd
 WorkingDir=JIT\Methodical\VT\identity\_il_rellivecall
@@ -53990,6 +60283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relvolatile.cmd_7804]
 RelativePath=JIT\Methodical\VT\identity\_il_relvolatile\_il_relvolatile.cmd
 WorkingDir=JIT\Methodical\VT\identity\_il_relvolatile
@@ -53997,6 +60291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relaccum.cmd_7805]
 RelativePath=JIT\Methodical\VT\identity\_relaccum\_relaccum.cmd
 WorkingDir=JIT\Methodical\VT\identity\_relaccum
@@ -54004,6 +60299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relvcall.cmd_7806]
 RelativePath=JIT\Methodical\VT\identity\_relvcall\_relvcall.cmd
 WorkingDir=JIT\Methodical\VT\identity\_relvcall
@@ -54011,6 +60307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgaccum.cmd_7807]
 RelativePath=JIT\Methodical\VT\identity\_speed_dbgaccum\_speed_dbgaccum.cmd
 WorkingDir=JIT\Methodical\VT\identity\_speed_dbgaccum
@@ -54018,6 +60315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgvcall.cmd_7808]
 RelativePath=JIT\Methodical\VT\identity\_speed_dbgvcall\_speed_dbgvcall.cmd
 WorkingDir=JIT\Methodical\VT\identity\_speed_dbgvcall
@@ -54025,6 +60323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relaccum.cmd_7809]
 RelativePath=JIT\Methodical\VT\identity\_speed_relaccum\_speed_relaccum.cmd
 WorkingDir=JIT\Methodical\VT\identity\_speed_relaccum
@@ -54032,6 +60331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relvcall.cmd_7810]
 RelativePath=JIT\Methodical\VT\identity\_speed_relvcall\_speed_relvcall.cmd
 WorkingDir=JIT\Methodical\VT\identity\_speed_relvcall
@@ -54039,6 +60339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcs.cmd_7811]
 RelativePath=JIT\Methodical\VT\port\_dbglcs\_dbglcs.cmd
 WorkingDir=JIT\Methodical\VT\port\_dbglcs
@@ -54046,6 +60347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbglcs_gcref.cmd_7812]
 RelativePath=JIT\Methodical\VT\port\_dbglcs_gcref\_dbglcs_gcref.cmd
 WorkingDir=JIT\Methodical\VT\port\_dbglcs_gcref
@@ -54053,6 +60355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbghuge_gcref.cmd_7813]
 RelativePath=JIT\Methodical\VT\port\_il_dbghuge_gcref\_il_dbghuge_gcref.cmd
 WorkingDir=JIT\Methodical\VT\port\_il_dbghuge_gcref
@@ -54060,6 +60363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relhuge_gcref.cmd_7814]
 RelativePath=JIT\Methodical\VT\port\_il_relhuge_gcref\_il_relhuge_gcref.cmd
 WorkingDir=JIT\Methodical\VT\port\_il_relhuge_gcref
@@ -54067,6 +60371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_rellcs.cmd_7815]
 RelativePath=JIT\Methodical\VT\port\_rellcs\_rellcs.cmd
 WorkingDir=JIT\Methodical\VT\port\_rellcs
@@ -54074,6 +60379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_rellcs_gcref.cmd_7816]
 RelativePath=JIT\Methodical\VT\port\_rellcs_gcref\_rellcs_gcref.cmd
 WorkingDir=JIT\Methodical\VT\port\_rellcs_gcref
@@ -54081,6 +60387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcs.cmd_7817]
 RelativePath=JIT\Methodical\VT\port\_speed_dbglcs\_speed_dbglcs.cmd
 WorkingDir=JIT\Methodical\VT\port\_speed_dbglcs
@@ -54088,6 +60395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbglcs_gcref.cmd_7818]
 RelativePath=JIT\Methodical\VT\port\_speed_dbglcs_gcref\_speed_dbglcs_gcref.cmd
 WorkingDir=JIT\Methodical\VT\port\_speed_dbglcs_gcref
@@ -54095,6 +60403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcs.cmd_7819]
 RelativePath=JIT\Methodical\VT\port\_speed_rellcs\_speed_rellcs.cmd
 WorkingDir=JIT\Methodical\VT\port\_speed_rellcs
@@ -54102,6 +60411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_rellcs_gcref.cmd_7820]
 RelativePath=JIT\Methodical\VT\port\_speed_rellcs_gcref\_speed_rellcs_gcref.cmd
 WorkingDir=JIT\Methodical\VT\port\_speed_rellcs_gcref
@@ -54109,6 +60419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cpblk3_il_d.cmd_7821]
 RelativePath=JIT\Methodical\xxblk\cpblk3_il_d\cpblk3_il_d.cmd
 WorkingDir=JIT\Methodical\xxblk\cpblk3_il_d
@@ -54116,6 +60427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [cpblk3_il_r.cmd_7822]
 RelativePath=JIT\Methodical\xxblk\cpblk3_il_r\cpblk3_il_r.cmd
 WorkingDir=JIT\Methodical\xxblk\cpblk3_il_r
@@ -54123,6 +60435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [initblk3_il_d.cmd_7823]
 RelativePath=JIT\Methodical\xxblk\initblk3_il_d\initblk3_il_d.cmd
 WorkingDir=JIT\Methodical\xxblk\initblk3_il_d
@@ -54130,6 +60443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [initblk3_il_r.cmd_7824]
 RelativePath=JIT\Methodical\xxblk\initblk3_il_r\initblk3_il_r.cmd
 WorkingDir=JIT\Methodical\xxblk\initblk3_il_r
@@ -54137,6 +60451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldobj_I.cmd_7825]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_I\_il_dbgldobj_I.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_I
@@ -54144,6 +60459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldobj_I8.cmd_7826]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_I8\_il_dbgldobj_I8.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_I8
@@ -54151,6 +60467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldobj_R4.cmd_7827]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_R4\_il_dbgldobj_R4.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_R4
@@ -54158,6 +60475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldobj_R8.cmd_7828]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_R8\_il_dbgldobj_R8.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_R8
@@ -54165,6 +60483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldobj_U2.cmd_7829]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_U2\_il_dbgldobj_U2.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_U2
@@ -54172,6 +60491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldobj_V.cmd_7830]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_V\_il_dbgldobj_V.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_dbgldobj_V
@@ -54179,6 +60499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldobj_I.cmd_7831]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_relldobj_I\_il_relldobj_I.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_relldobj_I
@@ -54186,6 +60507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldobj_I8.cmd_7832]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_relldobj_I8\_il_relldobj_I8.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_relldobj_I8
@@ -54193,6 +60515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldobj_R4.cmd_7833]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_relldobj_R4\_il_relldobj_R4.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_relldobj_R4
@@ -54200,6 +60523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldobj_R8.cmd_7834]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_relldobj_R8\_il_relldobj_R8.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_relldobj_R8
@@ -54207,6 +60531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldobj_U2.cmd_7835]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_relldobj_U2\_il_relldobj_U2.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_relldobj_U2
@@ -54214,6 +60539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldobj_V.cmd_7836]
 RelativePath=JIT\Methodical\xxobj\ldobj\_il_relldobj_V\_il_relldobj_V.cmd
 WorkingDir=JIT\Methodical\xxobj\ldobj\_il_relldobj_V
@@ -54221,6 +60547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [refanyval.cmd_7837]
 RelativePath=JIT\Methodical\xxobj\operand\refanyval\refanyval.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\refanyval
@@ -54228,6 +60555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgrefanyval.cmd_7838]
 RelativePath=JIT\Methodical\xxobj\operand\_dbgrefanyval\_dbgrefanyval.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_dbgrefanyval
@@ -54235,6 +60563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgunbox.cmd_7839]
 RelativePath=JIT\Methodical\xxobj\operand\_dbgunbox\_dbgunbox.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_dbgunbox
@@ -54242,6 +60571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgconst.cmd_7840]
 RelativePath=JIT\Methodical\xxobj\operand\_il_dbgconst\_il_dbgconst.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_il_dbgconst
@@ -54249,6 +60579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgldelema.cmd_7841]
 RelativePath=JIT\Methodical\xxobj\operand\_il_dbgldelema\_il_dbgldelema.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_il_dbgldelema
@@ -54256,6 +60587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgmdarray.cmd_7843]
 RelativePath=JIT\Methodical\xxobj\operand\_il_dbgmdarray\_il_dbgmdarray.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_il_dbgmdarray
@@ -54263,6 +60595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgrefanyval.cmd_7844]
 RelativePath=JIT\Methodical\xxobj\operand\_il_dbgrefanyval\_il_dbgrefanyval.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_il_dbgrefanyval
@@ -54270,6 +60603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgunbox.cmd_7845]
 RelativePath=JIT\Methodical\xxobj\operand\_il_dbgunbox\_il_dbgunbox.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_il_dbgunbox
@@ -54277,6 +60611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relconst.cmd_7846]
 RelativePath=JIT\Methodical\xxobj\operand\_il_relconst\_il_relconst.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_il_relconst
@@ -54284,6 +60619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relldelema.cmd_7847]
 RelativePath=JIT\Methodical\xxobj\operand\_il_relldelema\_il_relldelema.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_il_relldelema
@@ -54291,6 +60627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relmdarray.cmd_7849]
 RelativePath=JIT\Methodical\xxobj\operand\_il_relmdarray\_il_relmdarray.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_il_relmdarray
@@ -54298,6 +60635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relrefanyval.cmd_7850]
 RelativePath=JIT\Methodical\xxobj\operand\_il_relrefanyval\_il_relrefanyval.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_il_relrefanyval
@@ -54305,6 +60643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_il_relunbox.cmd_7851]
 RelativePath=JIT\Methodical\xxobj\operand\_il_relunbox\_il_relunbox.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_il_relunbox
@@ -54312,6 +60651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_relrefanyval.cmd_7852]
 RelativePath=JIT\Methodical\xxobj\operand\_relrefanyval\_relrefanyval.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_relrefanyval
@@ -54319,6 +60659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relunbox.cmd_7853]
 RelativePath=JIT\Methodical\xxobj\operand\_relunbox\_relunbox.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_relunbox
@@ -54326,6 +60667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgrefanyval.cmd_7854]
 RelativePath=JIT\Methodical\xxobj\operand\_speed_dbgrefanyval\_speed_dbgrefanyval.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_speed_dbgrefanyval
@@ -54333,6 +60675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgunbox.cmd_7855]
 RelativePath=JIT\Methodical\xxobj\operand\_speed_dbgunbox\_speed_dbgunbox.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_speed_dbgunbox
@@ -54340,6 +60683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relrefanyval.cmd_7856]
 RelativePath=JIT\Methodical\xxobj\operand\_speed_relrefanyval\_speed_relrefanyval.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_speed_relrefanyval
@@ -54347,6 +60691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relunbox.cmd_7857]
 RelativePath=JIT\Methodical\xxobj\operand\_speed_relunbox\_speed_relunbox.cmd
 WorkingDir=JIT\Methodical\xxobj\operand\_speed_relunbox
@@ -54354,13 +60699,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [_dbgsizeof.cmd_7858]
 RelativePath=JIT\Methodical\xxobj\sizeof\_dbgsizeof\_dbgsizeof.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_dbgsizeof
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_dbgsizeof32.cmd_7859]
 RelativePath=JIT\Methodical\xxobj\sizeof\_dbgsizeof32\_dbgsizeof32.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_dbgsizeof32
@@ -54368,6 +60715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_dbgsizeof64.cmd_7860]
 RelativePath=JIT\Methodical\xxobj\sizeof\_dbgsizeof64\_dbgsizeof64.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_dbgsizeof64
@@ -54375,6 +60723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgsizeof.cmd_7861]
 RelativePath=JIT\Methodical\xxobj\sizeof\_il_dbgsizeof\_il_dbgsizeof.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_il_dbgsizeof
@@ -54382,6 +60731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgsizeof32.cmd_7862]
 RelativePath=JIT\Methodical\xxobj\sizeof\_il_dbgsizeof32\_il_dbgsizeof32.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_il_dbgsizeof32
@@ -54389,6 +60739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_dbgsizeof64.cmd_7863]
 RelativePath=JIT\Methodical\xxobj\sizeof\_il_dbgsizeof64\_il_dbgsizeof64.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_il_dbgsizeof64
@@ -54396,6 +60747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relsizeof.cmd_7864]
 RelativePath=JIT\Methodical\xxobj\sizeof\_il_relsizeof\_il_relsizeof.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_il_relsizeof
@@ -54403,6 +60755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relsizeof32.cmd_7865]
 RelativePath=JIT\Methodical\xxobj\sizeof\_il_relsizeof32\_il_relsizeof32.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_il_relsizeof32
@@ -54410,6 +60763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_il_relsizeof64.cmd_7866]
 RelativePath=JIT\Methodical\xxobj\sizeof\_il_relsizeof64\_il_relsizeof64.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_il_relsizeof64
@@ -54417,13 +60771,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relsizeof.cmd_7867]
 RelativePath=JIT\Methodical\xxobj\sizeof\_relsizeof\_relsizeof.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_relsizeof
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_relsizeof32.cmd_7868]
 RelativePath=JIT\Methodical\xxobj\sizeof\_relsizeof32\_relsizeof32.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_relsizeof32
@@ -54431,6 +60787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_relsizeof64.cmd_7869]
 RelativePath=JIT\Methodical\xxobj\sizeof\_relsizeof64\_relsizeof64.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_relsizeof64
@@ -54438,13 +60795,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgsizeof.cmd_7870]
 RelativePath=JIT\Methodical\xxobj\sizeof\_speed_dbgsizeof\_speed_dbgsizeof.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_speed_dbgsizeof
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgsizeof32.cmd_7871]
 RelativePath=JIT\Methodical\xxobj\sizeof\_speed_dbgsizeof32\_speed_dbgsizeof32.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_speed_dbgsizeof32
@@ -54452,6 +60811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_dbgsizeof64.cmd_7872]
 RelativePath=JIT\Methodical\xxobj\sizeof\_speed_dbgsizeof64\_speed_dbgsizeof64.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_speed_dbgsizeof64
@@ -54459,13 +60819,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relsizeof.cmd_7873]
 RelativePath=JIT\Methodical\xxobj\sizeof\_speed_relsizeof\_speed_relsizeof.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_speed_relsizeof
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [_speed_relsizeof32.cmd_7874]
 RelativePath=JIT\Methodical\xxobj\sizeof\_speed_relsizeof32\_speed_relsizeof32.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_speed_relsizeof32
@@ -54473,6 +60835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_speed_relsizeof64.cmd_7875]
 RelativePath=JIT\Methodical\xxobj\sizeof\_speed_relsizeof64\_speed_relsizeof64.cmd
 WorkingDir=JIT\Methodical\xxobj\sizeof\_speed_relsizeof64
@@ -54480,6 +60843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ConstantProp.cmd_7876]
 RelativePath=JIT\opt\AssertionPropagation\ConstantProp\ConstantProp.cmd
 WorkingDir=JIT\opt\AssertionPropagation\ConstantProp
@@ -54487,6 +60851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CopyProp.cmd_7877]
 RelativePath=JIT\opt\AssertionPropagation\CopyProp\CopyProp.cmd
 WorkingDir=JIT\opt\AssertionPropagation\CopyProp
@@ -54494,6 +60859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CPropOverflow.cmd_7878]
 RelativePath=JIT\opt\AssertionPropagation\CPropOverflow\CPropOverflow.cmd
 WorkingDir=JIT\opt\AssertionPropagation\CPropOverflow
@@ -54501,6 +60867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [NullCheckAssertion1.cmd_7879]
 RelativePath=JIT\opt\AssertionPropagation\NullCheckAssertion1\NullCheckAssertion1.cmd
 WorkingDir=JIT\opt\AssertionPropagation\NullCheckAssertion1
@@ -54508,6 +60875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [NullCheckAssertion2.cmd_7880]
 RelativePath=JIT\opt\AssertionPropagation\NullCheckAssertion2\NullCheckAssertion2.cmd
 WorkingDir=JIT\opt\AssertionPropagation\NullCheckAssertion2
@@ -54515,6 +60883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [NullCheckAssertion3.cmd_7881]
 RelativePath=JIT\opt\AssertionPropagation\NullCheckAssertion3\NullCheckAssertion3.cmd
 WorkingDir=JIT\opt\AssertionPropagation\NullCheckAssertion3
@@ -54522,6 +60891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [NullCheckAssertion4.cmd_7882]
 RelativePath=JIT\opt\AssertionPropagation\NullCheckAssertion4\NullCheckAssertion4.cmd
 WorkingDir=JIT\opt\AssertionPropagation\NullCheckAssertion4
@@ -54529,6 +60899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [NullCheckAssertion5.cmd_7883]
 RelativePath=JIT\opt\AssertionPropagation\NullCheckAssertion5\NullCheckAssertion5.cmd
 WorkingDir=JIT\opt\AssertionPropagation\NullCheckAssertion5
@@ -54536,6 +60907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [NullCheckAssertion6.cmd_7884]
 RelativePath=JIT\opt\AssertionPropagation\NullCheckAssertion6\NullCheckAssertion6.cmd
 WorkingDir=JIT\opt\AssertionPropagation\NullCheckAssertion6
@@ -54543,6 +60915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [NullCheckAssertion7.cmd_7885]
 RelativePath=JIT\opt\AssertionPropagation\NullCheckAssertion7\NullCheckAssertion7.cmd
 WorkingDir=JIT\opt\AssertionPropagation\NullCheckAssertion7
@@ -54550,6 +60923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bug573840.cmd_7886]
 RelativePath=JIT\opt\AssertionPropagation\regression\dev10\bug573840\bug573840\bug573840.cmd
 WorkingDir=JIT\opt\AssertionPropagation\regression\dev10\bug573840\bug573840
@@ -54557,6 +60931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [TypeOfAssertion.cmd_7887]
 RelativePath=JIT\opt\AssertionPropagation\TypeOfAssertion\TypeOfAssertion.cmd
 WorkingDir=JIT\opt\AssertionPropagation\TypeOfAssertion
@@ -54564,6 +60939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BBCnt1.cmd_7888]
 RelativePath=JIT\opt\DumpDisasm\JitMinOpts\BBCnt1\BBCnt1.cmd
 WorkingDir=JIT\opt\DumpDisasm\JitMinOpts\BBCnt1
@@ -54571,6 +60947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CodeSize1.cmd_7889]
 RelativePath=JIT\opt\DumpDisasm\JitMinOpts\CodeSize1\CodeSize1.cmd
 WorkingDir=JIT\opt\DumpDisasm\JitMinOpts\CodeSize1
@@ -54578,6 +60955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [InstrCnt1.cmd_7890]
 RelativePath=JIT\opt\DumpDisasm\JitMinOpts\InstrCnt1\InstrCnt1.cmd
 WorkingDir=JIT\opt\DumpDisasm\JitMinOpts\InstrCnt1
@@ -54585,6 +60963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [LVNumCnt1.cmd_7891]
 RelativePath=JIT\opt\DumpDisasm\JitMinOpts\LVNumCnt1\LVNumCnt1.cmd
 WorkingDir=JIT\opt\DumpDisasm\JitMinOpts\LVNumCnt1
@@ -54592,6 +60971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [LVRefCnt1.cmd_7892]
 RelativePath=JIT\opt\DumpDisasm\JitMinOpts\LVRefCnt1\LVRefCnt1.cmd
 WorkingDir=JIT\opt\DumpDisasm\JitMinOpts\LVRefCnt1
@@ -54599,13 +60979,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [TailCallCases.cmd_7893]
 RelativePath=JIT\opt\ETW\TailCallCases\TailCallCases.cmd
 WorkingDir=JIT\opt\ETW\TailCallCases
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;REL_PASS
+Categories=Pri0;JIT;REL_PASS;EXPECTED_PASS
 HostStyle=0
+
 [badcallee.cmd_7894]
 RelativePath=JIT\opt\Inline\regression\badcallee\badcallee\badcallee.cmd
 WorkingDir=JIT\opt\Inline\regression\badcallee\badcallee
@@ -54613,6 +60995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [inliningVars.cmd_7895]
 RelativePath=JIT\opt\Inline\regression\bug584219\inliningVars\inliningVars.cmd
 WorkingDir=JIT\opt\Inline\regression\bug584219\inliningVars
@@ -54620,6 +61003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bug595776.cmd_7896]
 RelativePath=JIT\opt\Inline\regression\bug595776\bug595776\bug595776.cmd
 WorkingDir=JIT\opt\Inline\regression\bug595776\bug595776
@@ -54627,6 +61011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mismatch32.cmd_7897]
 RelativePath=JIT\opt\Inline\regression\mismatch32\mismatch32\mismatch32.cmd
 WorkingDir=JIT\opt\Inline\regression\mismatch32\mismatch32
@@ -54634,6 +61019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mismatch64.cmd_7898]
 RelativePath=JIT\opt\Inline\regression\mismatch64\mismatch64\mismatch64.cmd
 WorkingDir=JIT\opt\Inline\regression\mismatch64\mismatch64
@@ -54641,6 +61027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [args1.cmd_7899]
 RelativePath=JIT\opt\Inline\tests\args1\args1.cmd
 WorkingDir=JIT\opt\Inline\tests\args1
@@ -54648,6 +61035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [args2.cmd_7900]
 RelativePath=JIT\opt\Inline\tests\args2\args2.cmd
 WorkingDir=JIT\opt\Inline\tests\args2
@@ -54655,6 +61043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [args3.cmd_7901]
 RelativePath=JIT\opt\Inline\tests\args3\args3.cmd
 WorkingDir=JIT\opt\Inline\tests\args3
@@ -54662,6 +61051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [array.cmd_7902]
 RelativePath=JIT\opt\Inline\tests\array\array.cmd
 WorkingDir=JIT\opt\Inline\tests\array
@@ -54669,6 +61059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ArrayOfStructs.cmd_7903]
 RelativePath=JIT\opt\Inline\tests\ArrayOfStructs\ArrayOfStructs.cmd
 WorkingDir=JIT\opt\Inline\tests\ArrayOfStructs
@@ -54676,6 +61067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [debug.cmd_7904]
 RelativePath=JIT\opt\Inline\tests\debug\debug.cmd
 WorkingDir=JIT\opt\Inline\tests\debug
@@ -54683,6 +61075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [deepcall.cmd_7905]
 RelativePath=JIT\opt\Inline\tests\deepcall\deepcall.cmd
 WorkingDir=JIT\opt\Inline\tests\deepcall
@@ -54690,6 +61083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DelegInstanceFtn.cmd_7906]
 RelativePath=JIT\opt\Inline\tests\DelegInstanceFtn\DelegInstanceFtn.cmd
 WorkingDir=JIT\opt\Inline\tests\DelegInstanceFtn
@@ -54697,6 +61091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DelegStaticFtn.cmd_7907]
 RelativePath=JIT\opt\Inline\tests\DelegStaticFtn\DelegStaticFtn.cmd
 WorkingDir=JIT\opt\Inline\tests\DelegStaticFtn
@@ -54704,6 +61099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [fact.cmd_7908]
 RelativePath=JIT\opt\Inline\tests\fact\fact.cmd
 WorkingDir=JIT\opt\Inline\tests\fact
@@ -54711,6 +61107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [GenericStructs.cmd_7909]
 RelativePath=JIT\opt\Inline\tests\GenericStructs\GenericStructs.cmd
 WorkingDir=JIT\opt\Inline\tests\GenericStructs
@@ -54718,6 +61115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ifelse.cmd_7910]
 RelativePath=JIT\opt\Inline\tests\ifelse\ifelse.cmd
 WorkingDir=JIT\opt\Inline\tests\ifelse
@@ -54725,6 +61123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [indexer.cmd_7911]
 RelativePath=JIT\opt\Inline\tests\indexer\indexer.cmd
 WorkingDir=JIT\opt\Inline\tests\indexer
@@ -54732,6 +61131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline.cmd_7912]
 RelativePath=JIT\opt\Inline\tests\Inline\Inline.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline
@@ -54739,6 +61139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [InlineThrow.cmd_7913]
 RelativePath=JIT\opt\Inline\tests\InlineThrow\InlineThrow.cmd
 WorkingDir=JIT\opt\Inline\tests\InlineThrow
@@ -54746,6 +61147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_DelegateStruct.cmd_7914]
 RelativePath=JIT\opt\Inline\tests\Inline_DelegateStruct\Inline_DelegateStruct.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_DelegateStruct
@@ -54753,6 +61155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_GenericMethods.cmd_7915]
 RelativePath=JIT\opt\Inline\tests\Inline_GenericMethods\Inline_GenericMethods.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_GenericMethods
@@ -54760,6 +61163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_handler.cmd_7916]
 RelativePath=JIT\opt\Inline\tests\Inline_handler\Inline_handler.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_handler
@@ -54767,6 +61171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_Many.cmd_7917]
 RelativePath=JIT\opt\Inline\tests\Inline_Many\Inline_Many.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_Many
@@ -54774,6 +61179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_MultipleReturn.cmd_7918]
 RelativePath=JIT\opt\Inline\tests\Inline_MultipleReturn\Inline_MultipleReturn.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_MultipleReturn
@@ -54781,6 +61187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_NewObj.cmd_7919]
 RelativePath=JIT\opt\Inline\tests\Inline_NewObj\Inline_NewObj.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_NewObj
@@ -54788,6 +61195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_NormalizeStack.cmd_7920]
 RelativePath=JIT\opt\Inline\tests\Inline_NormalizeStack\Inline_NormalizeStack.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_NormalizeStack
@@ -54795,6 +61203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_Recursion.cmd_7921]
 RelativePath=JIT\opt\Inline\tests\Inline_Recursion\Inline_Recursion.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_Recursion
@@ -54802,6 +61211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_RecursiveMethod.cmd_7922]
 RelativePath=JIT\opt\Inline\tests\Inline_RecursiveMethod\Inline_RecursiveMethod.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_RecursiveMethod
@@ -54809,6 +61219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_RecursiveMethod21.cmd_7923]
 RelativePath=JIT\opt\Inline\tests\Inline_RecursiveMethod21\Inline_RecursiveMethod21.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_RecursiveMethod21
@@ -54816,6 +61227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_SideAffects.cmd_7924]
 RelativePath=JIT\opt\Inline\tests\Inline_SideAffects\Inline_SideAffects.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_SideAffects
@@ -54823,6 +61235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_STARG.cmd_7925]
 RelativePath=JIT\opt\Inline\tests\Inline_STARG\Inline_STARG.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_STARG
@@ -54830,6 +61243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Inline_Vars.cmd_7926]
 RelativePath=JIT\opt\Inline\tests\Inline_Vars\Inline_Vars.cmd
 WorkingDir=JIT\opt\Inline\tests\Inline_Vars
@@ -54837,6 +61251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [interfaceCall.cmd_7927]
 RelativePath=JIT\opt\Inline\tests\interfaceCall\interfaceCall.cmd
 WorkingDir=JIT\opt\Inline\tests\interfaceCall
@@ -54844,6 +61259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [interfaceproperty.cmd_7928]
 RelativePath=JIT\opt\Inline\tests\interfaceproperty\interfaceproperty.cmd
 WorkingDir=JIT\opt\Inline\tests\interfaceproperty
@@ -54851,13 +61267,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [LotsOfInlines.cmd_7929]
 RelativePath=JIT\opt\Inline\tests\LotsOfInlines\LotsOfInlines.cmd
 WorkingDir=JIT\opt\Inline\tests\LotsOfInlines
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [mathfunc.cmd_7930]
 RelativePath=JIT\opt\Inline\tests\mathfunc\mathfunc.cmd
 WorkingDir=JIT\opt\Inline\tests\mathfunc
@@ -54865,6 +61283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mthdimpl.cmd_7931]
 RelativePath=JIT\opt\Inline\tests\mthdimpl\mthdimpl.cmd
 WorkingDir=JIT\opt\Inline\tests\mthdimpl
@@ -54872,6 +61291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [property.cmd_7932]
 RelativePath=JIT\opt\Inline\tests\property\property.cmd
 WorkingDir=JIT\opt\Inline\tests\property
@@ -54879,6 +61299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ReturnStruct_Method.cmd_7933]
 RelativePath=JIT\opt\Inline\tests\ReturnStruct_Method\ReturnStruct_Method.cmd
 WorkingDir=JIT\opt\Inline\tests\ReturnStruct_Method
@@ -54886,6 +61307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [size.cmd_7934]
 RelativePath=JIT\opt\Inline\tests\size\size.cmd
 WorkingDir=JIT\opt\Inline\tests\size
@@ -54893,6 +61315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [StructAsParam_Method.cmd_7935]
 RelativePath=JIT\opt\Inline\tests\StructAsParam_Method\StructAsParam_Method.cmd
 WorkingDir=JIT\opt\Inline\tests\StructAsParam_Method
@@ -54900,6 +61323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [StructInClass.cmd_7936]
 RelativePath=JIT\opt\Inline\tests\StructInClass\StructInClass.cmd
 WorkingDir=JIT\opt\Inline\tests\StructInClass
@@ -54907,6 +61331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [struct_opcodes.cmd_7937]
 RelativePath=JIT\opt\Inline\tests\struct_opcodes\struct_opcodes.cmd
 WorkingDir=JIT\opt\Inline\tests\struct_opcodes
@@ -54914,6 +61339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [throwtest.cmd_7938]
 RelativePath=JIT\opt\Inline\tests\throwtest\throwtest.cmd
 WorkingDir=JIT\opt\Inline\tests\throwtest
@@ -54921,6 +61347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [trycatch.cmd_7939]
 RelativePath=JIT\opt\Inline\tests\trycatch\trycatch.cmd
 WorkingDir=JIT\opt\Inline\tests\trycatch
@@ -54928,13 +61355,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [UnsafeBlockCopy.cmd_7940]
 RelativePath=JIT\opt\Inline\tests\UnsafeBlockCopy\UnsafeBlockCopy.cmd
 WorkingDir=JIT\opt\Inline\tests\UnsafeBlockCopy
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [BBCnt0.cmd_7941]
 RelativePath=JIT\opt\JitMinOpts\Perf\BBCnt0\BBCnt0.cmd
 WorkingDir=JIT\opt\JitMinOpts\Perf\BBCnt0
@@ -54942,6 +61371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [BBCnt1.cmd_7942]
 RelativePath=JIT\opt\JitMinOpts\Perf\BBCnt1\BBCnt1.cmd
 WorkingDir=JIT\opt\JitMinOpts\Perf\BBCnt1
@@ -54949,6 +61379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CodeSize0.cmd_7943]
 RelativePath=JIT\opt\JitMinOpts\Perf\CodeSize0\CodeSize0.cmd
 WorkingDir=JIT\opt\JitMinOpts\Perf\CodeSize0
@@ -54956,6 +61387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CodeSize1.cmd_7944]
 RelativePath=JIT\opt\JitMinOpts\Perf\CodeSize1\CodeSize1.cmd
 WorkingDir=JIT\opt\JitMinOpts\Perf\CodeSize1
@@ -54963,6 +61395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [InstrCnt0.cmd_7945]
 RelativePath=JIT\opt\JitMinOpts\Perf\InstrCnt0\InstrCnt0.cmd
 WorkingDir=JIT\opt\JitMinOpts\Perf\InstrCnt0
@@ -54970,6 +61403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [InstrCnt1.cmd_7946]
 RelativePath=JIT\opt\JitMinOpts\Perf\InstrCnt1\InstrCnt1.cmd
 WorkingDir=JIT\opt\JitMinOpts\Perf\InstrCnt1
@@ -54977,6 +61411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [LVNumCnt0.cmd_7947]
 RelativePath=JIT\opt\JitMinOpts\Perf\LVNumCnt0\LVNumCnt0.cmd
 WorkingDir=JIT\opt\JitMinOpts\Perf\LVNumCnt0
@@ -54984,6 +61419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [LVNumCnt1.cmd_7948]
 RelativePath=JIT\opt\JitMinOpts\Perf\LVNumCnt1\LVNumCnt1.cmd
 WorkingDir=JIT\opt\JitMinOpts\Perf\LVNumCnt1
@@ -54991,6 +61427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [LVRefCnt0.cmd_7949]
 RelativePath=JIT\opt\JitMinOpts\Perf\LVRefCnt0\LVRefCnt0.cmd
 WorkingDir=JIT\opt\JitMinOpts\Perf\LVRefCnt0
@@ -54998,6 +61435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [LVRefCnt1.cmd_7950]
 RelativePath=JIT\opt\JitMinOpts\Perf\LVRefCnt1\LVRefCnt1.cmd
 WorkingDir=JIT\opt\JitMinOpts\Perf\LVRefCnt1
@@ -55005,6 +61443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Arrays.cmd_7951]
 RelativePath=JIT\opt\perf\doublealign\Arrays\Arrays.cmd
 WorkingDir=JIT\opt\perf\doublealign\Arrays
@@ -55012,13 +61451,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Locals.cmd_7952]
 RelativePath=JIT\opt\perf\doublealign\Locals\Locals.cmd
 WorkingDir=JIT\opt\perf\doublealign\Locals
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS
+Categories=Pri0;EXPECTED_FAIL;8418
 HostStyle=0
+
 [objects.cmd_7953]
 RelativePath=JIT\opt\perf\doublealign\objects\objects.cmd
 WorkingDir=JIT\opt\perf\doublealign\objects
@@ -55026,6 +61467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bigvtbl_cs_d.cmd_7955]
 RelativePath=JIT\opt\virtualstubdispatch\bigvtbl\bigvtbl_cs_d\bigvtbl_cs_d.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\bigvtbl\bigvtbl_cs_d
@@ -55033,6 +61475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bigvtbl_cs_do.cmd_7956]
 RelativePath=JIT\opt\virtualstubdispatch\bigvtbl\bigvtbl_cs_do\bigvtbl_cs_do.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\bigvtbl\bigvtbl_cs_do
@@ -55040,6 +61483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bigvtbl_cs_r.cmd_7957]
 RelativePath=JIT\opt\virtualstubdispatch\bigvtbl\bigvtbl_cs_r\bigvtbl_cs_r.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\bigvtbl\bigvtbl_cs_r
@@ -55047,6 +61491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [bigvtbl_cs_ro.cmd_7958]
 RelativePath=JIT\opt\virtualstubdispatch\bigvtbl\bigvtbl_cs_ro\bigvtbl_cs_ro.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\bigvtbl\bigvtbl_cs_ro
@@ -55054,6 +61499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ctest1_cs_d.cmd_7959]
 RelativePath=JIT\opt\virtualstubdispatch\hashcode\ctest1_cs_d\ctest1_cs_d.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\hashcode\ctest1_cs_d
@@ -55061,6 +61507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ctest1_cs_do.cmd_7960]
 RelativePath=JIT\opt\virtualstubdispatch\hashcode\ctest1_cs_do\ctest1_cs_do.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\hashcode\ctest1_cs_do
@@ -55068,6 +61515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ctest1_cs_r.cmd_7961]
 RelativePath=JIT\opt\virtualstubdispatch\hashcode\ctest1_cs_r\ctest1_cs_r.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\hashcode\ctest1_cs_r
@@ -55075,6 +61523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ctest1_cs_ro.cmd_7962]
 RelativePath=JIT\opt\virtualstubdispatch\hashcode\ctest1_cs_ro\ctest1_cs_ro.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\hashcode\ctest1_cs_ro
@@ -55082,6 +61531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ctest_cs_d.cmd_7963]
 RelativePath=JIT\opt\virtualstubdispatch\manyintf\ctest_cs_d\ctest_cs_d.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\manyintf\ctest_cs_d
@@ -55089,6 +61539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ctest_cs_do.cmd_7964]
 RelativePath=JIT\opt\virtualstubdispatch\manyintf\ctest_cs_do\ctest_cs_do.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\manyintf\ctest_cs_do
@@ -55096,6 +61547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ctest_cs_r.cmd_7965]
 RelativePath=JIT\opt\virtualstubdispatch\manyintf\ctest_cs_r\ctest_cs_r.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\manyintf\ctest_cs_r
@@ -55103,6 +61555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ctest_cs_ro.cmd_7966]
 RelativePath=JIT\opt\virtualstubdispatch\manyintf\ctest_cs_ro\ctest_cs_ro.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\manyintf\ctest_cs_ro
@@ -55110,6 +61563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed_cs_d.cmd_7967]
 RelativePath=JIT\opt\virtualstubdispatch\mixed\mixed_cs_d\mixed_cs_d.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\mixed\mixed_cs_d
@@ -55117,6 +61571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed_cs_do.cmd_7968]
 RelativePath=JIT\opt\virtualstubdispatch\mixed\mixed_cs_do\mixed_cs_do.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\mixed\mixed_cs_do
@@ -55124,6 +61579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed_cs_r.cmd_7969]
 RelativePath=JIT\opt\virtualstubdispatch\mixed\mixed_cs_r\mixed_cs_r.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\mixed\mixed_cs_r
@@ -55131,6 +61587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [mixed_cs_ro.cmd_7970]
 RelativePath=JIT\opt\virtualstubdispatch\mixed\mixed_cs_ro\mixed_cs_ro.cmd
 WorkingDir=JIT\opt\virtualstubdispatch\mixed\mixed_cs_ro
@@ -55138,6 +61595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Adams.cmd_7971]
 RelativePath=JIT\Performance\CodeQuality\BenchF\Adams\Adams\Adams.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\Adams\Adams
@@ -55145,6 +61603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BenchMk2.cmd_7972]
 RelativePath=JIT\Performance\CodeQuality\BenchF\BenchMk2\BenchMk2\BenchMk2.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\BenchMk2\BenchMk2
@@ -55152,6 +61611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BenchMrk.cmd_7973]
 RelativePath=JIT\Performance\CodeQuality\BenchF\BenchMrk\BenchMrk\BenchMrk.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\BenchMrk\BenchMrk
@@ -55159,6 +61619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Bisect.cmd_7974]
 RelativePath=JIT\Performance\CodeQuality\BenchF\Bisect\Bisect\Bisect.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\Bisect\Bisect
@@ -55166,6 +61627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DMath.cmd_7975]
 RelativePath=JIT\Performance\CodeQuality\BenchF\DMath\DMath\DMath.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\DMath\DMath
@@ -55173,6 +61635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [FFT.cmd_7976]
 RelativePath=JIT\Performance\CodeQuality\BenchF\FFT\FFT\FFT.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\FFT\FFT
@@ -55180,6 +61643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [InProd.cmd_7977]
 RelativePath=JIT\Performance\CodeQuality\BenchF\InProd\InProd\InProd.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\InProd\InProd
@@ -55187,6 +61651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [InvMt.cmd_7978]
 RelativePath=JIT\Performance\CodeQuality\BenchF\InvMt\InvMt\InvMt.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\InvMt\InvMt
@@ -55194,6 +61659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [LLoops.cmd_7979]
 RelativePath=JIT\Performance\CodeQuality\BenchF\LLoops\LLoops\LLoops.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\LLoops\LLoops
@@ -55201,6 +61667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Lorenz.cmd_7980]
 RelativePath=JIT\Performance\CodeQuality\BenchF\Lorenz\Lorenz\Lorenz.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\Lorenz\Lorenz
@@ -55208,6 +61675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [MatInv4.cmd_7981]
 RelativePath=JIT\Performance\CodeQuality\BenchF\MatInv4\MatInv4\MatInv4.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\MatInv4\MatInv4
@@ -55215,6 +61683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [NewtE.cmd_7982]
 RelativePath=JIT\Performance\CodeQuality\BenchF\NewtE\NewtE\NewtE.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\NewtE\NewtE
@@ -55222,6 +61691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [NewtR.cmd_7983]
 RelativePath=JIT\Performance\CodeQuality\BenchF\NewtR\NewtR\NewtR.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\NewtR\NewtR
@@ -55229,6 +61699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Regula.cmd_7984]
 RelativePath=JIT\Performance\CodeQuality\BenchF\Regula\Regula\Regula.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\Regula\Regula
@@ -55236,6 +61707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Romber.cmd_7985]
 RelativePath=JIT\Performance\CodeQuality\BenchF\Romber\Romber\Romber.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\Romber\Romber
@@ -55243,6 +61715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Secant.cmd_7986]
 RelativePath=JIT\Performance\CodeQuality\BenchF\Secant\Secant\Secant.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\Secant\Secant
@@ -55250,6 +61723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Simpsn.cmd_7987]
 RelativePath=JIT\Performance\CodeQuality\BenchF\Simpsn\Simpsn\Simpsn.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\Simpsn\Simpsn
@@ -55257,6 +61731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [SqMtx.cmd_7988]
 RelativePath=JIT\Performance\CodeQuality\BenchF\SqMtx\SqMtx\SqMtx.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\SqMtx\SqMtx
@@ -55264,6 +61739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Trap.cmd_7989]
 RelativePath=JIT\Performance\CodeQuality\BenchF\Trap\Trap\Trap.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\Trap\Trap
@@ -55271,6 +61747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Whetsto.cmd_7990]
 RelativePath=JIT\Performance\CodeQuality\BenchF\Whetsto\Whetsto\Whetsto.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchF\Whetsto\Whetsto
@@ -55278,6 +61755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [8Queens.cmd_7991]
 RelativePath=JIT\Performance\CodeQuality\BenchI\8Queens\8Queens\8Queens.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\8Queens\8Queens
@@ -55285,6 +61763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Ackermann.cmd_7992]
 RelativePath=JIT\Performance\CodeQuality\BenchI\Ackermann\Ackermann\Ackermann.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\Ackermann\Ackermann
@@ -55292,6 +61771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AddArray.cmd_7993]
 RelativePath=JIT\Performance\CodeQuality\BenchI\AddArray\AddArray\AddArray.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\AddArray\AddArray
@@ -55299,6 +61779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AddArray2.cmd_7994]
 RelativePath=JIT\Performance\CodeQuality\BenchI\AddArray2\AddArray2\AddArray2.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\AddArray2\AddArray2
@@ -55306,6 +61787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Array1.cmd_7995]
 RelativePath=JIT\Performance\CodeQuality\BenchI\Array1\Array1\Array1.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\Array1\Array1
@@ -55313,6 +61795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Array2.cmd_7996]
 RelativePath=JIT\Performance\CodeQuality\BenchI\Array2\Array2\Array2.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\Array2\Array2
@@ -55320,6 +61803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BenchE.cmd_7997]
 RelativePath=JIT\Performance\CodeQuality\BenchI\BenchE\BenchE\BenchE.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\BenchE\BenchE
@@ -55327,6 +61811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BubbleSort.cmd_7998]
 RelativePath=JIT\Performance\CodeQuality\BenchI\BubbleSort\BubbleSort\BubbleSort.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\BubbleSort\BubbleSort
@@ -55334,6 +61819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BubbleSort2.cmd_7999]
 RelativePath=JIT\Performance\CodeQuality\BenchI\BubbleSort2\BubbleSort2\BubbleSort2.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\BubbleSort2\BubbleSort2
@@ -55341,6 +61827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CSieve.cmd_8000]
 RelativePath=JIT\Performance\CodeQuality\BenchI\CSieve\CSieve\CSieve.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\CSieve\CSieve
@@ -55348,6 +61835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Fib.cmd_8001]
 RelativePath=JIT\Performance\CodeQuality\BenchI\Fib\Fib\Fib.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\Fib\Fib
@@ -55355,6 +61843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [HeapSort.cmd_8002]
 RelativePath=JIT\Performance\CodeQuality\BenchI\HeapSort\HeapSort\HeapSort.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\HeapSort\HeapSort
@@ -55362,6 +61851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [IniArray.cmd_8003]
 RelativePath=JIT\Performance\CodeQuality\BenchI\IniArray\IniArray\IniArray.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\IniArray\IniArray
@@ -55369,6 +61859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [LogicArray.cmd_8004]
 RelativePath=JIT\Performance\CodeQuality\BenchI\LogicArray\LogicArray\LogicArray.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\LogicArray\LogicArray
@@ -55376,6 +61867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Midpoint.cmd_8005]
 RelativePath=JIT\Performance\CodeQuality\BenchI\Midpoint\Midpoint\Midpoint.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\Midpoint\Midpoint
@@ -55383,6 +61875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [MulMatrix.cmd_8006]
 RelativePath=JIT\Performance\CodeQuality\BenchI\MulMatrix\MulMatrix\MulMatrix.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\MulMatrix\MulMatrix
@@ -55390,6 +61883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [NDhrystone.cmd_8007]
 RelativePath=JIT\Performance\CodeQuality\BenchI\NDhrystone\NDhrystone\NDhrystone.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\NDhrystone\NDhrystone
@@ -55397,6 +61891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Permutate.cmd_8008]
 RelativePath=JIT\Performance\CodeQuality\BenchI\Permutate\Permutate\Permutate.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\Permutate\Permutate
@@ -55404,6 +61899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Pi.cmd_8009]
 RelativePath=JIT\Performance\CodeQuality\BenchI\Pi\Pi\Pi.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\Pi\Pi
@@ -55411,6 +61907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Puzzle.cmd_8010]
 RelativePath=JIT\Performance\CodeQuality\BenchI\Puzzle\Puzzle\Puzzle.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\Puzzle\Puzzle
@@ -55418,6 +61915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [QuickSort.cmd_8011]
 RelativePath=JIT\Performance\CodeQuality\BenchI\QuickSort\QuickSort\QuickSort.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\QuickSort\QuickSort
@@ -55425,6 +61923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [TreeInsert.cmd_8012]
 RelativePath=JIT\Performance\CodeQuality\BenchI\TreeInsert\TreeInsert\TreeInsert.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\TreeInsert\TreeInsert
@@ -55432,6 +61931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [TreeSort.cmd_8013]
 RelativePath=JIT\Performance\CodeQuality\BenchI\TreeSort\TreeSort\TreeSort.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\TreeSort\TreeSort
@@ -55439,6 +61939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [XposMatrix.cmd_8014]
 RelativePath=JIT\Performance\CodeQuality\BenchI\XposMatrix\XposMatrix\XposMatrix.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchI\XposMatrix\XposMatrix
@@ -55446,13 +61947,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [binarytrees.cmd_8015]
 RelativePath=JIT\Performance\CodeQuality\BenchmarksGame\binarytrees\binarytrees\binarytrees.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchmarksGame\binarytrees\binarytrees
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;LONG_RUNNING;GCSTRESS_FAIL;ISSUE_6065
+Categories=GCSTRESS_FAIL;Pri0;LONG_RUNNING;ISSUE_6065;EXPECTED_PASS
 HostStyle=0
+
 [fasta.cmd_8016]
 RelativePath=JIT\Performance\CodeQuality\BenchmarksGame\fasta\fasta\fasta.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchmarksGame\fasta\fasta
@@ -55460,6 +61963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [fastaredux.cmd_8017]
 RelativePath=JIT\Performance\CodeQuality\BenchmarksGame\fastaredux\fastaredux\fastaredux.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchmarksGame\fastaredux\fastaredux
@@ -55467,6 +61971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [nbody.cmd_8018]
 RelativePath=JIT\Performance\CodeQuality\BenchmarksGame\nbody\nbody\nbody.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchmarksGame\nbody\nbody
@@ -55474,6 +61979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [pi-digits.cmd_8019]
 RelativePath=JIT\Performance\CodeQuality\BenchmarksGame\pidigits\pi-digits\pi-digits.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchmarksGame\pidigits\pi-digits
@@ -55481,6 +61987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [spectralnorm.cmd_8020]
 RelativePath=JIT\Performance\CodeQuality\BenchmarksGame\spectralnorm\spectralnorm\spectralnorm.cmd
 WorkingDir=JIT\Performance\CodeQuality\BenchmarksGame\spectralnorm\spectralnorm
@@ -55488,6 +61995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Burgers.cmd_8021]
 RelativePath=JIT\Performance\CodeQuality\Burgers\Burgers\Burgers.cmd
 WorkingDir=JIT\Performance\CodeQuality\Burgers\Burgers
@@ -55495,13 +62003,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Bytemark.cmd_8022]
 RelativePath=JIT\Performance\CodeQuality\Bytemark\Bytemark\Bytemark.cmd
 WorkingDir=JIT\Performance\CodeQuality\Bytemark\Bytemark
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri0;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [FractalPerf.cmd_8023]
 RelativePath=JIT\Performance\CodeQuality\FractalPerf\FractalPerf\FractalPerf.cmd
 WorkingDir=JIT\Performance\CodeQuality\FractalPerf\FractalPerf
@@ -55509,6 +62019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Linq.cmd_8024]
 RelativePath=JIT\Performance\CodeQuality\Linq\Linq\Linq.cmd
 WorkingDir=JIT\Performance\CodeQuality\Linq\Linq
@@ -55516,20 +62027,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Functions.cmd_8025]
 RelativePath=JIT\Performance\CodeQuality\Math\Functions\Functions\Functions.cmd
 WorkingDir=JIT\Performance\CodeQuality\Math\Functions\Functions
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CscBench.cmd_8026]
 RelativePath=JIT\Performance\CodeQuality\Roslyn\CscBench\CscBench.cmd
 WorkingDir=JIT\Performance\CodeQuality\Roslyn\CscBench
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri0;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [SciMark.cmd_8027]
 RelativePath=JIT\Performance\CodeQuality\SciMark\SciMark\SciMark.cmd
 WorkingDir=JIT\Performance\CodeQuality\SciMark\SciMark
@@ -55537,6 +62051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Deserialize.cmd_8028]
 RelativePath=JIT\Performance\CodeQuality\Serialization\Deserialize\Deserialize.cmd
 WorkingDir=JIT\Performance\CodeQuality\Serialization\Deserialize
@@ -55544,6 +62059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Serialize.cmd_8029]
 RelativePath=JIT\Performance\CodeQuality\Serialization\Serialize\Serialize.cmd
 WorkingDir=JIT\Performance\CodeQuality\Serialization\Serialize
@@ -55551,6 +62067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ConsoleMandel.cmd_8030]
 RelativePath=JIT\Performance\CodeQuality\SIMD\ConsoleMandel\ConsoleMandel\ConsoleMandel.cmd
 WorkingDir=JIT\Performance\CodeQuality\SIMD\ConsoleMandel\ConsoleMandel
@@ -55558,6 +62075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [RayTracer.cmd_8031]
 RelativePath=JIT\Performance\CodeQuality\SIMD\RayTracer\RayTracer\RayTracer.cmd
 WorkingDir=JIT\Performance\CodeQuality\SIMD\RayTracer\RayTracer
@@ -55565,6 +62083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Crypto.cmd_8032]
 RelativePath=JIT\Performance\CodeQuality\V8\Crypto\Crypto\Crypto.cmd
 WorkingDir=JIT\Performance\CodeQuality\V8\Crypto\Crypto
@@ -55572,13 +62091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
-[DeltaBlue.cmd_8033]
-RelativePath=JIT\Performance\CodeQuality\V8\DeltaBlue\DeltaBlue\DeltaBlue.cmd
-WorkingDir=JIT\Performance\CodeQuality\V8\DeltaBlue\DeltaBlue
-Expected=0
-MaxAllowedDurationSeconds=1000
-Categories=Pri0;EXPECTED_PASS;LONG_RUNNING;GCSTRESS_FAIL;ISSUE_6065
-HostStyle=0
+
 [Richards.cmd_8034]
 RelativePath=JIT\Performance\CodeQuality\V8\Richards\Richards\Richards.cmd
 WorkingDir=JIT\Performance\CodeQuality\V8\Richards\Richards
@@ -55586,13 +62099,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [RunBenchmarks.cmd_8035]
 RelativePath=JIT\Performance\RunBenchmarks\RunBenchmarks\RunBenchmarks.cmd
 WorkingDir=JIT\Performance\RunBenchmarks\RunBenchmarks
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b173569.cmd_8036]
 RelativePath=JIT\Regression\clr-x64-JIT\v2.1\b173569\b173569\b173569.cmd
 WorkingDir=JIT\Regression\clr-x64-JIT\v2.1\b173569\b173569
@@ -55600,6 +62115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b601838.cmd_8037]
 RelativePath=JIT\Regression\clr-x64-JIT\v2.1\b601838\b601838\b601838.cmd
 WorkingDir=JIT\Regression\clr-x64-JIT\v2.1\b601838\b601838
@@ -55607,6 +62123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b602182.cmd_8038]
 RelativePath=JIT\Regression\clr-x64-JIT\v4.0\b602182\b602182\b602182.cmd
 WorkingDir=JIT\Regression\clr-x64-JIT\v4.0\b602182\b602182
@@ -55614,6 +62131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [overRepLocalOpt.cmd_8039]
 RelativePath=JIT\Regression\clr-x64-JIT\v4.0\DevDiv34372\overRepLocalOpt\overRepLocalOpt.cmd
 WorkingDir=JIT\Regression\clr-x64-JIT\v4.0\DevDiv34372\overRepLocalOpt
@@ -55621,13 +62139,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_374539.cmd_8040]
 RelativePath=JIT\Regression\clr-x64-JIT\v4.0\devdiv374539\DevDiv_374539\DevDiv_374539.cmd
 WorkingDir=JIT\Regression\clr-x64-JIT\v4.0\devdiv374539\DevDiv_374539
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri1;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [b12008.cmd_8041]
 RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M09.5-PDC\b12008\b12008\b12008.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M09.5-PDC\b12008\b12008
@@ -55635,13 +62155,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14426.cmd_8042]
 RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M09.5-PDC\b14426\b14426\b14426.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M09.5-PDC\b14426\b14426
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b16935.cmd_8043]
 RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M09.5-PDC\b16935\b16935\b16935.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M09.5-PDC\b16935\b16935
@@ -55649,6 +62171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b02353.cmd_8044]
 RelativePath=JIT\Regression\CLR-x86-EJIT\v1-m10\b02353\b02353\b02353.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\v1-m10\b02353\b02353
@@ -55656,6 +62179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b40089.cmd_8046]
 RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M11-Beta1\b40089\b40089\b40089.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M11-Beta1\b40089\b40089
@@ -55663,6 +62187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40138.cmd_8047]
 RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M11-Beta1\b40138\b40138\b40138.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M11-Beta1\b40138\b40138
@@ -55670,6 +62195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44018.cmd_8048]
 RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M11-Beta1\b44018\b44018\b44018.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M11-Beta1\b44018\b44018
@@ -55677,6 +62203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45046.cmd_8049]
 RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M11-Beta1\b45046\b45046\b45046.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M11-Beta1\b45046\b45046
@@ -55684,6 +62211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45679.cmd_8050]
 RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M11-Beta1\b45679\b45679\b45679.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M11-Beta1\b45679\b45679
@@ -55691,6 +62219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b35455.cmd_8052]
 RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b35455\b35455\b35455.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b35455\b35455
@@ -55698,6 +62227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b46847.cmd_8053]
 RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b46847\b46847\b46847.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b46847\b46847
@@ -55705,6 +62235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b47392.cmd_8054]
 RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b47392\b47392\b47392.cmd
 WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b47392\b47392
@@ -55712,6 +62243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b392262.cmd_8055]
 RelativePath=JIT\Regression\CLR-x86-JIT\dev10\b392262\b392262\b392262.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\dev10\b392262\b392262
@@ -55719,6 +62251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b393481.cmd_8056]
 RelativePath=JIT\Regression\CLR-x86-JIT\dev10\b393481\b393481\b393481.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\dev10\b393481\b393481
@@ -55726,6 +62259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [_b400971b400971.cmd_8057]
 RelativePath=JIT\Regression\CLR-x86-JIT\dev10\b400791\_b400971b400971\_b400971b400971.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\dev10\b400791\_b400971b400971
@@ -55733,6 +62267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b402658.cmd_8058]
 RelativePath=JIT\Regression\CLR-x86-JIT\dev10\b402658\b402658\b402658.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\dev10\b402658\b402658
@@ -55740,6 +62275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b402701.cmd_8059]
 RelativePath=JIT\Regression\CLR-x86-JIT\dev10\b402701\b402701\b402701.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\dev10\b402701\b402701
@@ -55747,6 +62283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b404051.cmd_8060]
 RelativePath=JIT\Regression\CLR-x86-JIT\dev10\b404051\b404051\b404051.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\dev10\b404051\b404051
@@ -55754,6 +62291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b440158.cmd_8061]
 RelativePath=JIT\Regression\CLR-x86-JIT\dev10\b440158\b440158\b440158.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\dev10\b440158\b440158
@@ -55761,6 +62299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b464149.cmd_8062]
 RelativePath=JIT\Regression\CLR-x86-JIT\dev10\b464149\b464149\b464149.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\dev10\b464149\b464149
@@ -55768,6 +62307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_376412.cmd_8063]
 RelativePath=JIT\Regression\CLR-x86-JIT\dev11\DevDiv_376412\DevDiv_376412\DevDiv_376412.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\dev11\DevDiv_376412\DevDiv_376412
@@ -55775,6 +62315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12668.cmd_8064]
 RelativePath=JIT\Regression\CLR-x86-JIT\v1-m08\b12668\b12668\b12668.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v1-m08\b12668\b12668
@@ -55782,6 +62323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b13170.cmd_8065]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b13170\b13170\b13170.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b13170\b13170
@@ -55789,6 +62331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b13178.cmd_8066]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b13178\b13178\b13178.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b13178\b13178
@@ -55796,13 +62339,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b13621.cmd_8067]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b13621\b13621\b13621.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b13621\b13621
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b13647.cmd_8068]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b13647\b13647\b13647.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b13647\b13647
@@ -55810,6 +62355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b13944.cmd_8069]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b13944\b13944\b13944.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b13944\b13944
@@ -55817,6 +62363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b14057.cmd_8070]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14057\b14057\b14057.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14057\b14057
@@ -55824,6 +62371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14059.cmd_8071]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14059\b14059\b14059.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14059\b14059
@@ -55831,6 +62379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14228.cmd_8072]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14228\b14228\b14228.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14228\b14228
@@ -55838,6 +62387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b14277.cmd_8073]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14277\b14277\b14277.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14277\b14277
@@ -55845,6 +62395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14314.cmd_8074]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14314\b14314\b14314.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14314\b14314
@@ -55852,6 +62403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14323.cmd_8075]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14323\b14323\b14323.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14323\b14323
@@ -55859,6 +62411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b14367.cmd_8076]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14367\b14367\b14367.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14367\b14367
@@ -55866,6 +62419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14396.cmd_8077]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14396\b14396\b14396.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14396\b14396
@@ -55873,6 +62427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14422.cmd_8078]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14422\b14422\b14422.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14422\b14422
@@ -55880,6 +62435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14428.cmd_8079]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14428\b14428\b14428.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14428\b14428
@@ -55887,6 +62443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14443.cmd_8080]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14443\b14443\b14443.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14443\b14443
@@ -55894,6 +62451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14475.cmd_8081]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14475\b14475\b14475.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14475\b14475
@@ -55901,6 +62459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b14616.cmd_8082]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14616\b14616\b14616.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14616\b14616
@@ -55908,6 +62467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14624.cmd_8083]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14624\b14624\b14624.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14624\b14624
@@ -55915,6 +62475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14640.cmd_8084]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14640\b14640\b14640.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14640\b14640
@@ -55922,6 +62483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14673.cmd_8085]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14673\b14673\b14673.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14673\b14673
@@ -55929,6 +62491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14779.cmd_8086]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b14779\b14779\b14779.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b14779\b14779
@@ -55936,6 +62499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b15155.cmd_8087]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b15155\b15155\b15155.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b15155\b15155
@@ -55943,13 +62507,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15307.cmd_8088]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b15307\b15307\b15307.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b15307\b15307
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b15468.cmd_8089]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b15468\b15468\b15468.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b15468\b15468
@@ -55957,6 +62523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15526.cmd_8090]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b15526\b15526\b15526.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b15526\b15526
@@ -55964,6 +62531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15783.cmd_8091]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b15783\b15783\b15783.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b15783\b15783
@@ -55971,6 +62539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15786.cmd_8092]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b15786\b15786\b15786.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b15786\b15786
@@ -55978,6 +62547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15797.cmd_8093]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b15797\b15797\b15797.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b15797\b15797
@@ -55985,6 +62555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15864.cmd_8094]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b15864\b15864\b15864.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b15864\b15864
@@ -55992,6 +62563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16054.cmd_8095]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b16054\b16054\b16054.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b16054\b16054
@@ -55999,13 +62571,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b16102.cmd_8096]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b16102\b16102\b16102.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b16102\b16102
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b16294.cmd_8097]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09\b16294\b16294\b16294.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09\b16294\b16294
@@ -56013,6 +62587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06440a.cmd_8098]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b06440\b06440a\b06440a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b06440\b06440a
@@ -56020,6 +62595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06440b.cmd_8099]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b06440\b06440b\b06440b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b06440\b06440b
@@ -56027,6 +62603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06440c.cmd_8100]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b06440\b06440c\b06440c.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b06440\b06440c
@@ -56034,6 +62611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b07341.cmd_8101]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b07341\b07341\b07341.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b07341\b07341
@@ -56041,6 +62619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b09495.cmd_8102]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b09495\b09495\b09495.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b09495\b09495
@@ -56048,6 +62627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10665.cmd_8103]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10665\b10665\b10665.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10665\b10665
@@ -56055,6 +62635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10666.cmd_8104]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10666\b10666\b10666.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10666\b10666
@@ -56062,6 +62643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10894.cmd_8105]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10894\b10894\b10894.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10894\b10894
@@ -56069,6 +62651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10897.cmd_8106]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10897\b10897\b10897.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10897\b10897
@@ -56076,6 +62659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10939.cmd_8107]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10939\b10939\b10939.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10939\b10939
@@ -56083,6 +62667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10940a.cmd_8108]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10940\b10940a\b10940a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10940\b10940a
@@ -56090,6 +62675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10940b.cmd_8109]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10940\b10940b\b10940b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b10940\b10940b
@@ -56097,6 +62683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b11021.cmd_8110]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b11021\b11021\b11021.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b11021\b11021
@@ -56104,6 +62691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b11413.cmd_8111]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b11413\b11413\b11413.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b11413\b11413
@@ -56111,6 +62699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b11490.cmd_8112]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b11490\b11490\b11490.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b11490\b11490
@@ -56118,6 +62707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b11949.cmd_8113]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b11949\b11949\b11949.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b11949\b11949
@@ -56125,6 +62715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12053.cmd_8114]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12053\b12053\b12053.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12053\b12053
@@ -56132,6 +62723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b12274.cmd_8115]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12274\b12274\b12274.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12274\b12274
@@ -56139,6 +62731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12399.cmd_8116]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12399\b12399\b12399.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12399\b12399
@@ -56146,6 +62739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12487.cmd_8117]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12487\b12487\b12487.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12487\b12487
@@ -56153,6 +62747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12624.cmd_8118]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12624\b12624\b12624.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12624\b12624
@@ -56160,6 +62755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12795.cmd_8119]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12795\b12795\b12795.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b12795\b12795
@@ -56167,6 +62763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b13509.cmd_8120]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b13509\b13509\b13509.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b13509\b13509
@@ -56174,6 +62771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b13522.cmd_8121]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b13522\b13522\b13522.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b13522\b13522
@@ -56181,6 +62779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b13569.cmd_8122]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b13569\b13569\b13569.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b13569\b13569
@@ -56188,6 +62787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b13586.cmd_8123]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b13586\b13586\b13586.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b13586\b13586
@@ -56195,6 +62795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b13738.cmd_8124]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b13738\b13738\b13738.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b13738\b13738
@@ -56202,6 +62803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14066.cmd_8125]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14066\b14066\b14066.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14066\b14066
@@ -56209,6 +62811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b14067a.cmd_8126]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14067\b14067a\b14067a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14067\b14067a
@@ -56216,6 +62819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14067b.cmd_8127]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14067\b14067b\b14067b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14067\b14067b
@@ -56223,6 +62827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14068.cmd_8128]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14068\b14068\b14068.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14068\b14068
@@ -56230,6 +62835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14070.cmd_8129]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14070\b14070\b14070.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14070\b14070
@@ -56237,6 +62843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14077.cmd_8130]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14077\b14077\b14077.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14077\b14077
@@ -56244,6 +62851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b14135.cmd_8131]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14135\b14135\b14135.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14135\b14135
@@ -56251,6 +62859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14197.cmd_8132]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14197\b14197\b14197.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14197\b14197
@@ -56258,6 +62867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14199.cmd_8133]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14199\b14199\b14199.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14199\b14199
@@ -56265,6 +62875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14202.cmd_8134]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14202\b14202\b14202.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14202\b14202
@@ -56272,6 +62883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14264.cmd_8135]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14264\b14264\b14264.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14264\b14264
@@ -56279,6 +62891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14294.cmd_8136]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14294\b14294\b14294.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14294\b14294
@@ -56286,6 +62899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14325.cmd_8137]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14325\b14325\b14325.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14325\b14325
@@ -56293,6 +62907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14326.cmd_8138]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14326\b14326\b14326.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14326\b14326
@@ -56300,6 +62915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14329.cmd_8139]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14329\b14329\b14329.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14329\b14329
@@ -56307,6 +62923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14350.cmd_8140]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14350\b14350\b14350.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14350\b14350
@@ -56314,6 +62931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14431.cmd_8141]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14431\b14431\b14431.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14431\b14431
@@ -56321,6 +62939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14591.cmd_8142]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14591\b14591\b14591.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14591\b14591
@@ -56328,6 +62947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14716.cmd_8143]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14716\b14716\b14716.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14716\b14716
@@ -56335,6 +62955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14769.cmd_8144]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14769\b14769\b14769.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14769\b14769
@@ -56342,6 +62963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14770.cmd_8145]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14770\b14770\b14770.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14770\b14770
@@ -56349,6 +62971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14777.cmd_8146]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14777\b14777\b14777.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14777\b14777
@@ -56356,6 +62979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14927.cmd_8147]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14927\b14927\b14927.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14927\b14927
@@ -56363,6 +62987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14928.cmd_8148]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14928\b14928\b14928.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b14928\b14928
@@ -56370,6 +62995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15203.cmd_8149]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b15203\b15203\b15203.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b15203\b15203
@@ -56377,6 +63003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b15222.cmd_8150]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b15222\b15222\b15222.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b15222\b15222
@@ -56384,6 +63011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15244.cmd_8151]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b15244\b15244\b15244.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b15244\b15244
@@ -56391,6 +63019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15299.cmd_8152]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b15299\b15299\b15299.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b15299\b15299
@@ -56398,6 +63027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15728.cmd_8153]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b15728\b15728\b15728.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b15728\b15728
@@ -56405,6 +63035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16039.cmd_8154]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16039\b16039\b16039.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16039\b16039
@@ -56412,6 +63043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16049.cmd_8155]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16049\b16049\b16049.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16049\b16049
@@ -56419,6 +63051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16071.cmd_8156]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16071\b16071\b16071.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16071\b16071
@@ -56426,6 +63059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16238.cmd_8157]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16238\b16238\b16238.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16238\b16238
@@ -56433,6 +63067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16295.cmd_8158]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16295\b16295\b16295.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16295\b16295
@@ -56440,6 +63075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16328.cmd_8159]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16328\b16328\b16328.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16328\b16328
@@ -56447,6 +63083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16335.cmd_8160]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16335\b16335\b16335.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16335\b16335
@@ -56454,6 +63091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16345.cmd_8161]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16345\b16345\b16345.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16345\b16345
@@ -56461,6 +63099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b16498.cmd_8163]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16498\b16498\b16498.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16498\b16498
@@ -56468,6 +63107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16499a.cmd_8164]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16499\b16499a\b16499a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16499\b16499a
@@ -56475,6 +63115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16499b.cmd_8165]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16499\b16499b\b16499b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16499\b16499b
@@ -56482,6 +63123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16500.cmd_8166]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16500\b16500\b16500.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16500\b16500
@@ -56489,6 +63131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16503.cmd_8167]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16503\b16503\b16503.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16503\b16503
@@ -56496,6 +63139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16554.cmd_8168]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16554\b16554\b16554.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16554\b16554
@@ -56503,6 +63147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16881a.cmd_8169]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16881\b16881a\b16881a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16881\b16881a
@@ -56510,6 +63155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16881b.cmd_8170]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16881\b16881b\b16881b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16881\b16881b
@@ -56517,6 +63163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16886.cmd_8171]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16886\b16886\b16886.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16886\b16886
@@ -56524,6 +63171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16895.cmd_8172]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16895\b16895\b16895.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16895\b16895
@@ -56531,6 +63179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16896.cmd_8173]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16896\b16896\b16896.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16896\b16896
@@ -56538,6 +63187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16922.cmd_8174]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16922\b16922\b16922.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16922\b16922
@@ -56545,6 +63195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16928.cmd_8175]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16928\b16928\b16928.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16928\b16928
@@ -56552,6 +63203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b18852.cmd_8176]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b18852\b18852\b18852.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b18852\b18852
@@ -56559,6 +63211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b20079.cmd_8177]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b20079\b20079\b20079.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b20079\b20079
@@ -56566,6 +63219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b20217.cmd_8178]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b20217\b20217\b20217.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b20217\b20217
@@ -56573,6 +63227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b20249.cmd_8179]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b20249\b20249\b20249.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b20249\b20249
@@ -56580,6 +63235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b20913.cmd_8180]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b20913\b20913\b20913.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b20913\b20913
@@ -56587,6 +63243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b22290.cmd_8181]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b22290\b22290\b22290.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b22290\b22290
@@ -56594,6 +63251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b24727.cmd_8182]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b24727\b24727\b24727.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b24727\b24727
@@ -56601,6 +63259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b24728.cmd_8183]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b24728\b24728\b24728.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b24728\b24728
@@ -56608,6 +63267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25458.cmd_8184]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25458\b25458\b25458.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25458\b25458
@@ -56615,6 +63275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25459.cmd_8185]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25459\b25459\b25459.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25459\b25459
@@ -56622,6 +63283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25463.cmd_8186]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25463\b25463\b25463.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25463\b25463
@@ -56629,6 +63291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25468.cmd_8187]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25468\b25468\b25468.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25468\b25468
@@ -56636,6 +63299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25474.cmd_8188]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25474\b25474\b25474.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25474\b25474
@@ -56643,6 +63307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25491.cmd_8189]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25491\b25491\b25491.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25491\b25491
@@ -56650,6 +63315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25507.cmd_8190]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25507\b25507\b25507.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25507\b25507
@@ -56657,6 +63323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25647.cmd_8191]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25647\b25647\b25647.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25647\b25647
@@ -56664,6 +63331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25701.cmd_8192]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25701\b25701\b25701.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25701\b25701
@@ -56671,6 +63339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25739.cmd_8193]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25739\b25739\b25739.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25739\b25739
@@ -56678,6 +63347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25813.cmd_8194]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25813\b25813\b25813.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25813\b25813
@@ -56685,6 +63355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25815.cmd_8195]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25815\b25815\b25815.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25815\b25815
@@ -56692,6 +63363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25833.cmd_8196]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25833\b25833\b25833.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25833\b25833
@@ -56699,6 +63371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25835.cmd_8197]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25835\b25835\b25835.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25835\b25835
@@ -56706,6 +63379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b25882.cmd_8198]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25882\b25882\b25882.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b25882\b25882
@@ -56713,6 +63387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b26020.cmd_8199]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26020\b26020\b26020.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26020\b26020
@@ -56720,6 +63395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26153.cmd_8200]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26153\b26153\b26153.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26153\b26153
@@ -56727,6 +63403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26155.cmd_8201]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26155\b26155\b26155.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26155\b26155
@@ -56734,6 +63411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26332.cmd_8204]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26332\b26332\b26332.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26332\b26332
@@ -56741,6 +63419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26512.cmd_8205]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26512\b26512\b26512.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26512\b26512
@@ -56748,6 +63427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26558.cmd_8206]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26558\b26558\b26558.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26558\b26558
@@ -56755,6 +63435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26560.cmd_8207]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26560\b26560\b26560.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26560\b26560
@@ -56762,6 +63443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26732.cmd_8208]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26732\b26732\b26732.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26732\b26732
@@ -56769,6 +63451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26748.cmd_8209]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26748\b26748\b26748.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26748\b26748
@@ -56776,6 +63459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26863.cmd_8210]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26863\b26863\b26863.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26863\b26863
@@ -56783,6 +63467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26888.cmd_8211]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26888\b26888\b26888.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26888\b26888
@@ -56790,6 +63475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26957.cmd_8212]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26957\b26957\b26957.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26957\b26957
@@ -56797,6 +63483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27535.cmd_8213]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27535\b27535\b27535.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27535\b27535
@@ -56804,6 +63491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27538.cmd_8214]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27538\b27538\b27538.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27538\b27538
@@ -56811,6 +63499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27564.cmd_8215]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27564\b27564\b27564.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27564\b27564
@@ -56818,6 +63507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27657.cmd_8216]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27657\b27657\b27657.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27657\b27657
@@ -56825,6 +63515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27658.cmd_8217]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27658\b27658\b27658.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27658\b27658
@@ -56832,6 +63523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27811.cmd_8218]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27811\b27811\b27811.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27811\b27811
@@ -56839,6 +63531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27819.cmd_8219]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27819\b27819\b27819.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27819\b27819
@@ -56846,6 +63539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27824.cmd_8220]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27824\b27824\b27824.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27824\b27824
@@ -56853,6 +63547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27880.cmd_8221]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27880\b27880\b27880.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27880\b27880
@@ -56860,6 +63555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27883.cmd_8222]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27883\b27883\b27883.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27883\b27883
@@ -56867,6 +63563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27917.cmd_8223]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27917\b27917\b27917.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b27917\b27917
@@ -56874,6 +63571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28037.cmd_8224]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28037\b28037\b28037.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28037\b28037
@@ -56881,6 +63579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28042.cmd_8225]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28042\b28042\b28042.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28042\b28042
@@ -56888,6 +63587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28080.cmd_8226]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28080\b28080\b28080.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28080\b28080
@@ -56895,6 +63595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28522.cmd_8227]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28522\b28522\b28522.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28522\b28522
@@ -56902,6 +63603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28594.cmd_8228]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28594\b28594\b28594.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28594\b28594
@@ -56909,6 +63611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28595.cmd_8229]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28595\b28595\b28595.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28595\b28595
@@ -56916,6 +63619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28596.cmd_8230]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28596\b28596\b28596.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28596\b28596
@@ -56923,6 +63627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28597.cmd_8231]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28597\b28597\b28597.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28597\b28597
@@ -56930,6 +63635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28776.cmd_8232]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28776\b28776\b28776.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28776\b28776
@@ -56937,6 +63643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28787.cmd_8233]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28787\b28787\b28787.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28787\b28787
@@ -56944,6 +63651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28790.cmd_8234]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28790\b28790\b28790.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28790\b28790
@@ -56951,6 +63659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28805.cmd_8235]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28805\b28805\b28805.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28805\b28805
@@ -56958,6 +63667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28806.cmd_8236]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28806\b28806\b28806.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28806\b28806
@@ -56965,6 +63675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28927.cmd_8238]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28927\b28927\b28927.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28927\b28927
@@ -56972,6 +63683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b29068.cmd_8239]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b29068\b29068\b29068.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b29068\b29068
@@ -56979,6 +63691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b29456.cmd_8240]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b29456\b29456\b29456.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b29456\b29456
@@ -56986,6 +63699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b29583.cmd_8241]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b29583\b29583\b29583.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b29583\b29583
@@ -56993,6 +63707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30125.cmd_8242]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30125\b30125\b30125.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30125\b30125
@@ -57000,6 +63715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30126.cmd_8243]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30126\b30126\b30126.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30126\b30126
@@ -57007,6 +63723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30128.cmd_8244]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30128\b30128\b30128.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30128\b30128
@@ -57014,6 +63731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30630.cmd_8245]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30630\b30630\b30630.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30630\b30630
@@ -57021,6 +63739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30792.cmd_8246]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30792\b30792\b30792.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30792\b30792
@@ -57028,6 +63747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30799.cmd_8247]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30799\b30799\b30799.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30799\b30799
@@ -57035,6 +63755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30862.cmd_8249]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30862\b30862\b30862.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30862\b30862
@@ -57042,6 +63763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30869.cmd_8251]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30869\b30869\b30869.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30869\b30869
@@ -57049,6 +63771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30892.cmd_8252]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30892\b30892\b30892.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30892\b30892
@@ -57056,6 +63779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30905.cmd_8253]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30905\b30905\b30905.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30905\b30905
@@ -57063,6 +63787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b31102.cmd_8254]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31102\b31102\b31102.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31102\b31102
@@ -57070,6 +63795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31150.cmd_8255]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31150\b31150\b31150.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31150\b31150
@@ -57077,6 +63803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b31273.cmd_8256]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31273\b31273\b31273.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31273\b31273
@@ -57084,6 +63811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31321.cmd_8257]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31321\b31321\b31321.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31321\b31321
@@ -57091,6 +63819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31343.cmd_8258]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31343\b31343\b31343.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31343\b31343
@@ -57098,6 +63827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31448.cmd_8259]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31448\b31448\b31448.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31448\b31448
@@ -57105,6 +63835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31732.cmd_8260]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31732\b31732\b31732.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31732\b31732
@@ -57112,6 +63843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31748.cmd_8261]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31748\b31748\b31748.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31748\b31748
@@ -57119,6 +63851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31749.cmd_8262]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31749\b31749\b31749.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31749\b31749
@@ -57126,6 +63859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31763.cmd_8263]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31763\b31763\b31763.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31763\b31763
@@ -57133,6 +63867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31912.cmd_8264]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31912\b31912\b31912.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b31912\b31912
@@ -57140,6 +63875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b32093.cmd_8265]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32093\b32093\b32093.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32093\b32093
@@ -57147,6 +63883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b32303.cmd_8266]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32303\b32303\b32303.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32303\b32303
@@ -57154,6 +63891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b32345.cmd_8267]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32345\b32345\b32345.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32345\b32345
@@ -57161,6 +63899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b32551a.cmd_8269]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32551\b32551a\b32551a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32551\b32551a
@@ -57168,6 +63907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b32551b.cmd_8270]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32551\b32551b\b32551b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32551\b32551b
@@ -57175,6 +63915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b32560.cmd_8271]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32560\b32560\b32560.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32560\b32560
@@ -57182,6 +63923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b32801.cmd_8272]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32801\b32801\b32801.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32801\b32801
@@ -57189,6 +63931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b32879.cmd_8273]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32879\b32879\b32879.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32879\b32879
@@ -57196,6 +63939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b34423.cmd_8274]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b34423\b34423\b34423.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b34423\b34423
@@ -57203,6 +63947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b02043.cmd_8275]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b02043\b02043\b02043.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b02043\b02043
@@ -57210,6 +63955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b02051.cmd_8276]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b02051\b02051\b02051.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b02051\b02051
@@ -57217,6 +63963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b02062.cmd_8277]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b02062\b02062\b02062.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b02062\b02062
@@ -57224,6 +63971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b02076.cmd_8278]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b02076\b02076\b02076.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b02076\b02076
@@ -57231,6 +63979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b02352.cmd_8279]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b02352\b02352\b02352.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b02352\b02352
@@ -57238,6 +63987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b03995.cmd_8280]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b03995\b03995\b03995.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b03995\b03995
@@ -57245,6 +63995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04083.cmd_8281]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04083\b04083\b04083.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04083\b04083
@@ -57252,6 +64003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04250.cmd_8282]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04250\b04250\b04250.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04250\b04250
@@ -57259,6 +64011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04257.cmd_8283]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04257\b04257\b04257.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04257\b04257
@@ -57266,6 +64019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04306.cmd_8284]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04306\b04306\b04306.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04306\b04306
@@ -57273,6 +64027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [B04345.cmd_8285]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04345\B04345\B04345.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04345\B04345
@@ -57280,6 +64035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04384.cmd_8286]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04384\b04384\b04384.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04384\b04384
@@ -57287,6 +64043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04538.cmd_8287]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04538\b04538\b04538.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04538\b04538
@@ -57294,6 +64051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04574.cmd_8288]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04574\b04574\b04574.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04574\b04574
@@ -57301,6 +64059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04583.cmd_8289]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04583\b04583\b04583.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04583\b04583
@@ -57308,6 +64067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04612.cmd_8290]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04612\b04612\b04612.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04612\b04612
@@ -57315,6 +64075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04639.cmd_8291]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04639\b04639\b04639.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04639\b04639
@@ -57322,6 +64083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04726.cmd_8292]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04726\b04726\b04726.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04726\b04726
@@ -57329,13 +64091,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b04914.cmd_8293]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b04914\b04914\b04914.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b04914\b04914
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b05214.cmd_8294]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05214\b05214\b05214.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05214\b05214
@@ -57343,6 +64107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05477.cmd_8295]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05477\b05477\b05477.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05477\b05477
@@ -57350,6 +64115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05617.cmd_8296]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05617\b05617\b05617.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05617\b05617
@@ -57357,6 +64123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05619.cmd_8297]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05619\b05619\b05619.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05619\b05619
@@ -57364,6 +64131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05621.cmd_8298]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05621\b05621\b05621.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05621\b05621
@@ -57371,6 +64139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05622.cmd_8299]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05622\b05622\b05622.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05622\b05622
@@ -57378,6 +64147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05637.cmd_8300]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05637\b05637\b05637.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05637\b05637
@@ -57385,6 +64155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05639.cmd_8301]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05639\b05639\b05639.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05639\b05639
@@ -57392,6 +64163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05737.cmd_8302]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05737\b05737\b05737.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05737\b05737
@@ -57399,6 +64171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05740.cmd_8303]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05740\b05740\b05740.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05740\b05740
@@ -57406,6 +64179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05773.cmd_8304]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05773\b05773\b05773.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05773\b05773
@@ -57413,6 +64187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05780.cmd_8305]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05780\b05780\b05780.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05780\b05780
@@ -57420,6 +64195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05784.cmd_8306]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05784\b05784\b05784.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05784\b05784
@@ -57427,6 +64203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b05933.cmd_8307]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b05933\b05933\b05933.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b05933\b05933
@@ -57434,6 +64211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06436.cmd_8308]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b06436\b06436\b06436.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b06436\b06436
@@ -57441,6 +64219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06464.cmd_8309]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b06464\b06464\b06464.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b06464\b06464
@@ -57448,6 +64227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06595.cmd_8310]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b06595\b06595\b06595.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b06595\b06595
@@ -57455,6 +64235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06680.cmd_8311]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b06680\b06680\b06680.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b06680\b06680
@@ -57462,6 +64243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06730.cmd_8312]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b06730\b06730\b06730.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b06730\b06730
@@ -57469,6 +64251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06754.cmd_8313]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b06754\b06754\b06754.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b06754\b06754
@@ -57476,6 +64259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06811.cmd_8314]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b06811\b06811\b06811.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b06811\b06811
@@ -57483,6 +64267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b06812.cmd_8315]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b06812\b06812\b06812.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b06812\b06812
@@ -57490,6 +64275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b06859.cmd_8316]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b06859\b06859\b06859.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b06859\b06859
@@ -57497,6 +64283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06924.cmd_8317]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b06924\b06924\b06924.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b06924\b06924
@@ -57504,6 +64291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b07082.cmd_8318]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b07082\b07082\b07082.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b07082\b07082
@@ -57511,6 +64299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b07411.cmd_8319]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b07411\b07411\b07411.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b07411\b07411
@@ -57518,6 +64307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b07458.cmd_8320]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b07458\b07458\b07458.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b07458\b07458
@@ -57525,6 +64315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b07483.cmd_8321]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b07483\b07483\b07483.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b07483\b07483
@@ -57532,6 +64323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b07704.cmd_8322]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b07704\b07704\b07704.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b07704\b07704
@@ -57539,6 +64331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b08109.cmd_8324]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b08109\b08109\b08109.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b08109\b08109
@@ -57546,6 +64339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b08172.cmd_8325]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b08172\b08172\b08172.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b08172\b08172
@@ -57553,6 +64347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b08672.cmd_8326]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b08672\b08672\b08672.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b08672\b08672
@@ -57560,6 +64355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b08797.cmd_8327]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b08797\b08797\b08797.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b08797\b08797
@@ -57567,6 +64363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b08944a.cmd_8328]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b08944\b08944a\b08944a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b08944\b08944a
@@ -57574,6 +64371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b08944b.cmd_8329]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b08944\b08944b\b08944b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b08944\b08944b
@@ -57581,6 +64379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b09246.cmd_8330]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b09246\b09246\b09246.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b09246\b09246
@@ -57588,6 +64387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b09254.cmd_8331]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b09254\b09254\b09254.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b09254\b09254
@@ -57595,6 +64395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b09287.cmd_8332]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b09287\b09287\b09287.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b09287\b09287
@@ -57602,6 +64403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b09452.cmd_8333]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b09452\b09452\b09452.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b09452\b09452
@@ -57609,6 +64411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b13330.cmd_8334]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b13330\b13330\b13330.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b13330\b13330
@@ -57616,6 +64419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b13466.cmd_8335]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M10\b13466\b13466\b13466.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M10\b13466\b13466
@@ -57623,6 +64427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27873.cmd_8336]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b27873\b27873\b27873.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b27873\b27873
@@ -57630,6 +64435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b29351.cmd_8337]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b29351\b29351\b29351.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b29351\b29351
@@ -57637,6 +64443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30586.cmd_8338]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b30586\b30586\b30586.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b30586\b30586
@@ -57644,6 +64451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31878.cmd_8339]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b31878\b31878\b31878.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b31878\b31878
@@ -57651,6 +64459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33759.cmd_8340]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b33759\b33759\b33759.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b33759\b33759
@@ -57658,6 +64467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33792.cmd_8341]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b33792\b33792\b33792.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b33792\b33792
@@ -57665,6 +64475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33888.cmd_8342]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b33888\b33888\b33888.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b33888\b33888
@@ -57672,6 +64483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33922.cmd_8343]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b33922\b33922\b33922.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b33922\b33922
@@ -57679,6 +64491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33928.cmd_8344]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b33928\b33928\b33928.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b33928\b33928
@@ -57686,6 +64499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b34945.cmd_8345]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b34945\b34945\b34945.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b34945\b34945
@@ -57693,6 +64507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b36030.cmd_8347]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36030\b36030\b36030.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36030\b36030
@@ -57700,6 +64515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b36274.cmd_8348]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36274\b36274\b36274.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36274\b36274
@@ -57707,6 +64523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b36332.cmd_8349]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36332\b36332\b36332.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36332\b36332
@@ -57714,6 +64531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b36470.cmd_8350]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36470\b36470\b36470.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36470\b36470
@@ -57721,6 +64539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b36471.cmd_8351]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36471\b36471\b36471.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36471\b36471
@@ -57728,6 +64547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b37131.cmd_8353]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37131\b37131\b37131.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37131\b37131
@@ -57735,6 +64555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b37608.cmd_8355]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37608\b37608\b37608.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37608\b37608
@@ -57742,6 +64563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b37636.cmd_8356]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37636\b37636\b37636.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37636\b37636
@@ -57749,6 +64571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b38403.cmd_8357]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b38403\b38403\b38403.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b38403\b38403
@@ -57756,6 +64579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b38556.cmd_8358]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b38556\b38556\b38556.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b38556\b38556
@@ -57763,6 +64587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b39217.cmd_8359]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39217\b39217\b39217.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39217\b39217
@@ -57770,6 +64595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b39224.cmd_8360]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39224\b39224\b39224.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39224\b39224
@@ -57777,6 +64603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b39381.cmd_8361]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39381\b39381\b39381.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39381\b39381
@@ -57784,6 +64611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b39397.cmd_8362]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39397\b39397\b39397.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39397\b39397
@@ -57791,6 +64619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b39417.cmd_8363]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39417\b39417\b39417.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39417\b39417
@@ -57798,6 +64627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b39455.cmd_8364]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39455\b39455\b39455.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39455\b39455
@@ -57805,6 +64635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b39946.cmd_8365]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39946\b39946\b39946.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39946\b39946
@@ -57812,6 +64643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b39951.cmd_8366]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39951\b39951\b39951.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b39951\b39951
@@ -57819,6 +64651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40141.cmd_8367]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40141\b40141\b40141.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40141\b40141
@@ -57826,6 +64659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40174.cmd_8368]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40174\b40174\b40174.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40174\b40174
@@ -57833,6 +64667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40199.cmd_8369]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40199\b40199\b40199.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40199\b40199
@@ -57840,6 +64675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40216.cmd_8370]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40216\b40216\b40216.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40216\b40216
@@ -57847,6 +64683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40221.cmd_8371]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40221\b40221\b40221.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40221\b40221
@@ -57854,6 +64691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40269.cmd_8372]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40269\b40269\b40269.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40269\b40269
@@ -57861,6 +64699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40347.cmd_8373]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40347\b40347\b40347.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40347\b40347
@@ -57868,6 +64707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40380.cmd_8374]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40380\b40380\b40380.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40380\b40380
@@ -57875,6 +64715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40411.cmd_8375]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40411\b40411\b40411.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40411\b40411
@@ -57882,6 +64723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40496.cmd_8376]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40496\b40496\b40496.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40496\b40496
@@ -57889,6 +64731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40521.cmd_8377]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40521\b40521\b40521.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40521\b40521
@@ -57896,20 +64739,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40721.cmd_8378]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40721\b40721\b40721.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40721\b40721
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;ISSUE_2990
+Categories=ISSUE_2990;Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40725.cmd_8379]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40725\b40725\b40725.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b40725\b40725
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;UNSTABLE
+Categories=Pri0;JIT;UNSTABLE;EXPECTED_PASS
 HostStyle=0
+
 [b41002.cmd_8380]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41002\b41002\b41002.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41002\b41002
@@ -57917,6 +64763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41063.cmd_8381]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41063\b41063\b41063.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41063\b41063
@@ -57924,6 +64771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41126.cmd_8382]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41126\b41126\b41126.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41126\b41126
@@ -57931,6 +64779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41129.cmd_8383]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41129\b41129\b41129.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41129\b41129
@@ -57938,6 +64787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41149.cmd_8384]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41149\b41149\b41149.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41149\b41149
@@ -57945,6 +64795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41164.cmd_8385]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41164\b41164\b41164.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41164\b41164
@@ -57952,6 +64803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41234.cmd_8386]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41234\b41234\b41234.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41234\b41234
@@ -57959,6 +64811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41262.cmd_8387]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41262\b41262\b41262.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41262\b41262
@@ -57966,6 +64819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41278.cmd_8388]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41278\b41278\b41278.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41278\b41278
@@ -57973,6 +64827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41470.cmd_8390]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41470\b41470\b41470.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41470\b41470
@@ -57980,6 +64835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41488.cmd_8391]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41488\b41488\b41488.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41488\b41488
@@ -57987,6 +64843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41495.cmd_8392]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41495\b41495\b41495.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41495\b41495
@@ -57994,6 +64851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41621.cmd_8393]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41621\b41621\b41621.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41621\b41621
@@ -58001,6 +64859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41627.cmd_8394]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41627\b41627\b41627.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41627\b41627
@@ -58008,6 +64867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41918.cmd_8395]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41918\b41918\b41918.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41918\b41918
@@ -58015,6 +64875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b41990.cmd_8396]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41990\b41990\b41990.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41990\b41990
@@ -58022,6 +64883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b42009.cmd_8397]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42009\b42009\b42009.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42009\b42009
@@ -58029,6 +64891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b42013.cmd_8398]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42013\b42013\b42013.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42013\b42013
@@ -58036,6 +64899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b42387.cmd_8399]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42387\b42387\b42387.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42387\b42387
@@ -58043,6 +64907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b42732.cmd_8400]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42732\b42732\b42732.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42732\b42732
@@ -58050,6 +64915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b42918.cmd_8401]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42918\b42918\b42918.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42918\b42918
@@ -58057,6 +64923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b42929.cmd_8402]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42929\b42929\b42929.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b42929\b42929
@@ -58064,6 +64931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43010.cmd_8403]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43010\b43010\b43010.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43010\b43010
@@ -58071,6 +64939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43033.cmd_8404]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43033\b43033\b43033.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43033\b43033
@@ -58078,6 +64947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43040.cmd_8405]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43040\b43040\b43040.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43040\b43040
@@ -58085,6 +64955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43069.cmd_8406]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43069\b43069\b43069.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43069\b43069
@@ -58092,6 +64963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43115.cmd_8407]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43115\b43115\b43115.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43115\b43115
@@ -58099,6 +64971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43121.cmd_8408]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43121\b43121\b43121.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43121\b43121
@@ -58106,6 +64979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43160.cmd_8409]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43160\b43160\b43160.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43160\b43160
@@ -58113,6 +64987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43313.cmd_8410]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43313\b43313\b43313.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43313\b43313
@@ -58120,6 +64995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43313.cmd_8411]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43313\Desktop\b43313\b43313.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43313\Desktop\b43313
@@ -58127,6 +65003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b43378.cmd_8412]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43378\b43378\b43378.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43378\b43378
@@ -58134,6 +65011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43714.cmd_8413]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43714\b43714\b43714.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43714\b43714
@@ -58141,6 +65019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43719.cmd_8414]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43719\b43719\b43719.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43719\b43719
@@ -58148,6 +65027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43958.cmd_8415]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43958\b43958\b43958.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43958\b43958
@@ -58155,6 +65035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43963.cmd_8416]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43963\b43963\b43963.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43963\b43963
@@ -58162,6 +65043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43994.cmd_8417]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43994\b43994\b43994.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43994\b43994
@@ -58169,6 +65051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44020.cmd_8418]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44020\b44020\b44020.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44020\b44020
@@ -58176,6 +65059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44193.cmd_8419]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44193\b44193\b44193.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44193\b44193
@@ -58183,6 +65067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44204.cmd_8420]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44204\b44204\b44204.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44204\b44204
@@ -58190,6 +65075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44224.cmd_8421]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44224\b44224\b44224.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44224\b44224
@@ -58197,6 +65083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44297.cmd_8422]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44297\b44297\b44297.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44297\b44297
@@ -58204,6 +65091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44410.cmd_8423]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44410\b44410\b44410.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44410\b44410
@@ -58211,6 +65099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44657.cmd_8424]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44657\b44657\b44657.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44657\b44657
@@ -58218,6 +65107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44723.cmd_8425]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44723\b44723\b44723.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44723\b44723
@@ -58225,6 +65115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44724.cmd_8426]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44724\b44724\b44724.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44724\b44724
@@ -58232,6 +65123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44861.cmd_8427]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44861\b44861\b44861.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44861\b44861
@@ -58239,6 +65131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44879.cmd_8428]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44879\b44879\b44879.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44879\b44879
@@ -58246,6 +65139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44946.cmd_8429]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44946\b44946\b44946.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44946\b44946
@@ -58253,6 +65147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44983.cmd_8430]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44983\b44983\b44983.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44983\b44983
@@ -58260,6 +65155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44984.cmd_8431]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44984\b44984\b44984.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44984\b44984
@@ -58267,6 +65163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b44985.cmd_8432]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44985\b44985\b44985.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b44985\b44985
@@ -58274,6 +65171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45015.cmd_8433]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45015\b45015\b45015.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45015\b45015
@@ -58281,6 +65179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45259.cmd_8434]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45259\b45259\b45259.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45259\b45259
@@ -58288,6 +65187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45270.cmd_8435]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45270\b45270\b45270.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45270\b45270
@@ -58295,6 +65195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45439.cmd_8436]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45439\b45439\b45439.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45439\b45439
@@ -58302,6 +65203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45458.cmd_8437]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45458\b45458\b45458.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45458\b45458
@@ -58309,6 +65211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45535.cmd_8438]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45535\b45535\b45535.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45535\b45535
@@ -58316,6 +65219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45541.cmd_8439]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45541\b45541\b45541.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45541\b45541
@@ -58323,6 +65227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45956.cmd_8440]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45956\b45956\b45956.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45956\b45956
@@ -58330,6 +65235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45984.cmd_8441]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45984\b45984\b45984.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45984\b45984
@@ -58337,6 +65243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b45985.cmd_8442]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45985\b45985\b45985.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b45985\b45985
@@ -58344,6 +65251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b46170.cmd_8443]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46170\b46170\b46170.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46170\b46170
@@ -58351,6 +65259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b46292.cmd_8444]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46292\b46292\b46292.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46292\b46292
@@ -58358,6 +65267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b46569.cmd_8445]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46569\b46569\b46569.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46569\b46569
@@ -58365,6 +65275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b46576.cmd_8446]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46576\b46576\b46576.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46576\b46576
@@ -58372,6 +65283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b46583.cmd_8447]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46583\b46583\b46583.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46583\b46583
@@ -58379,6 +65291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b46629.cmd_8448]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46629\b46629\b46629.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46629\b46629
@@ -58386,6 +65299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b46641.cmd_8449]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46641\b46641\b46641.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46641\b46641
@@ -58393,6 +65307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b46649.cmd_8450]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46649\b46649\b46649.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46649\b46649
@@ -58400,6 +65315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b46897.cmd_8452]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46897\b46897\b46897.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46897\b46897
@@ -58407,6 +65323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b47022.cmd_8453]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47022\b47022\b47022.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47022\b47022
@@ -58414,6 +65331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b47047.cmd_8454]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47047\b47047\b47047.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47047\b47047
@@ -58421,6 +65339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b47080.cmd_8455]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47080\b47080\b47080.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47080\b47080
@@ -58428,6 +65347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b47093.cmd_8456]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47093\b47093\b47093.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47093\b47093
@@ -58435,6 +65355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b47610.cmd_8457]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47610\b47610\b47610.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47610\b47610
@@ -58442,6 +65363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b47885.cmd_8458]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47885\b47885\b47885.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47885\b47885
@@ -58449,6 +65371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b47906.cmd_8459]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47906\b47906\b47906.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b47906\b47906
@@ -58456,6 +65379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48248.cmd_8460]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48248\b48248\b48248.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48248\b48248
@@ -58463,6 +65387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48350.cmd_8461]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48350\b48350\b48350.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48350\b48350
@@ -58470,6 +65395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48554a.cmd_8462]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48554\b48554a\b48554a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48554\b48554a
@@ -58477,6 +65403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48554b.cmd_8463]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48554\b48554b\b48554b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48554\b48554b
@@ -58484,6 +65411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48614.cmd_8464]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48614\b48614\b48614.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48614\b48614
@@ -58491,6 +65419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48797.cmd_8465]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48797\b48797\b48797.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48797\b48797
@@ -58498,6 +65427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48805.cmd_8466]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48805\b48805\b48805.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48805\b48805
@@ -58505,6 +65435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48864.cmd_8467]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48864\b48864\b48864.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48864\b48864
@@ -58512,6 +65443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48872.cmd_8468]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48872\b48872\b48872.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48872\b48872
@@ -58519,6 +65451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48990a.cmd_8469]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48990\b48990a\b48990a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48990\b48990a
@@ -58526,6 +65459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48990b.cmd_8470]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48990\b48990b\b48990b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b48990\b48990b
@@ -58533,6 +65467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b49101.cmd_8471]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49101\b49101\b49101.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49101\b49101
@@ -58540,6 +65475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b49318.cmd_8472]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49318\b49318\b49318.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49318\b49318
@@ -58547,6 +65483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b49322.cmd_8473]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49322\b49322\b49322.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49322\b49322
@@ -58554,6 +65491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b49717.cmd_8475]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49717\b49717\b49717.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49717\b49717
@@ -58561,6 +65499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b49984.cmd_8476]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49984\b49984\b49984.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49984\b49984
@@ -58568,6 +65507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b11553.cmd_8477]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b11553\b11553\b11553.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b11553\b11553
@@ -58575,6 +65515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b16122.cmd_8478]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b16122\b16122\b16122.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b16122\b16122
@@ -58582,6 +65523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b18857.cmd_8479]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b18857\b18857\b18857.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b18857\b18857
@@ -58589,6 +65531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28598.cmd_8480]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b28598\b28598\b28598.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b28598\b28598
@@ -58596,6 +65539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b30868.cmd_8481]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b30868\b30868\b30868.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b30868\b30868
@@ -58603,6 +65547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31182.cmd_8482]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31182\b31182\b31182.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31182\b31182
@@ -58610,6 +65555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31283.cmd_8483]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31283\b31283\b31283.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31283\b31283
@@ -58617,6 +65563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31289.cmd_8484]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31289\b31289\b31289.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31289\b31289
@@ -58624,6 +65571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31292.cmd_8485]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31292\b31292\b31292.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31292\b31292
@@ -58631,6 +65579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31423.cmd_8486]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31423\b31423\b31423.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31423\b31423
@@ -58638,6 +65587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31452.cmd_8487]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31452\b31452\b31452.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31452\b31452
@@ -58645,6 +65595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31493.cmd_8488]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31493\b31493\b31493.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31493\b31493
@@ -58652,6 +65603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31547.cmd_8489]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31547\b31547\b31547.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31547\b31547
@@ -58659,6 +65611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31762.cmd_8492]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31762\b31762\b31762.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31762\b31762
@@ -58666,6 +65619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31780.cmd_8493]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31780\b31780\b31780.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31780\b31780
@@ -58673,6 +65627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31784.cmd_8494]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31784\b31784\b31784.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31784\b31784
@@ -58680,6 +65635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31903.cmd_8495]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31903\b31903\b31903.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31903\b31903
@@ -58687,6 +65643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31917.cmd_8496]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31917\b31917\b31917.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31917\b31917
@@ -58694,6 +65651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b32613.cmd_8497]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b32613\b32613\b32613.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b32613\b32613
@@ -58701,6 +65659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b32614.cmd_8498]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b32614\b32614\b32614.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b32614\b32614
@@ -58708,6 +65667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33125.cmd_8499]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33125\b33125\b33125.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33125\b33125
@@ -58715,6 +65675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33131.cmd_8500]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33131\b33131\b33131.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33131\b33131
@@ -58722,6 +65683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33135.cmd_8501]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33135\b33135\b33135.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33135\b33135
@@ -58729,6 +65691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33335.cmd_8502]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33335\b33335\b33335.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33335\b33335
@@ -58736,6 +65699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33361.cmd_8503]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33361\b33361\b33361.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33361\b33361
@@ -58743,6 +65707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33362.cmd_8504]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33362\b33362\b33362.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33362\b33362
@@ -58750,6 +65715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33388.cmd_8505]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33388\b33388\b33388.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33388\b33388
@@ -58757,6 +65723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33585.cmd_8506]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33585\b33585\b33585.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33585\b33585
@@ -58764,6 +65731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b33586.cmd_8507]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33586\b33586\b33586.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b33586\b33586
@@ -58771,6 +65739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b34951.cmd_8508]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b34951\b34951\b34951.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b34951\b34951
@@ -58778,6 +65747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b34952.cmd_8509]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b34952\b34952\b34952.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b34952\b34952
@@ -58785,6 +65755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b34953.cmd_8510]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b34953\b34953\b34953.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b34953\b34953
@@ -58792,6 +65763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b35315.cmd_8511]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35315\b35315\b35315.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35315\b35315
@@ -58799,6 +65771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b35344.cmd_8512]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35344\b35344\b35344.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35344\b35344
@@ -58806,6 +65779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b35348.cmd_8513]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35348\b35348\b35348.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35348\b35348
@@ -58813,6 +65787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b35351.cmd_8514]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35351\b35351\b35351.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35351\b35351
@@ -58820,6 +65795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b35354.cmd_8515]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35354\b35354\b35354.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35354\b35354
@@ -58827,6 +65803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b35366.cmd_8516]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35366\b35366\b35366.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35366\b35366
@@ -58834,6 +65811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b35486.cmd_8517]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35486\b35486\b35486.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35486\b35486
@@ -58841,6 +65819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b35635.cmd_8518]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35635\b35635\b35635.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35635\b35635
@@ -58848,6 +65827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b35779.cmd_8519]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35779\b35779\b35779.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b35779\b35779
@@ -58855,6 +65835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b36301.cmd_8520]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b36301\b36301\b36301.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b36301\b36301
@@ -58862,6 +65843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b36302.cmd_8521]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b36302\b36302\b36302.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b36302\b36302
@@ -58869,6 +65851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b36304.cmd_8522]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b36304\b36304\b36304.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b36304\b36304
@@ -58876,6 +65859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b36975.cmd_8523]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b36975\b36975\b36975.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b36975\b36975
@@ -58883,6 +65867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b37214.cmd_8524]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37214\b37214\b37214.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37214\b37214
@@ -58890,6 +65875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b37215.cmd_8525]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37215\b37215\b37215.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37215\b37215
@@ -58897,6 +65883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b37238.cmd_8526]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37238\b37238\b37238.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37238\b37238
@@ -58904,6 +65891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b37256.cmd_8527]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37256\b37256\b37256.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37256\b37256
@@ -58911,6 +65899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b37578.cmd_8528]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37578\b37578\b37578.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37578\b37578
@@ -58918,6 +65907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b37830.cmd_8530]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37830\b37830\b37830.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37830\b37830
@@ -58925,6 +65915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b38269.cmd_8531]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b38269\b38269\b38269.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b38269\b38269
@@ -58932,6 +65923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40006.cmd_8532]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b40006\b40006\b40006.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b40006\b40006
@@ -58939,6 +65931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b40347.cmd_8533]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b40347\b40347\b40347.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b40347\b40347
@@ -58946,6 +65939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b43693.cmd_8535]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b43693\b43693\b43693.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b43693\b43693
@@ -58953,6 +65947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b43694.cmd_8536]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b43694\b43694\b43694.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b43694\b43694
@@ -58960,6 +65955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b46566.cmd_8537]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b46566\b46566\b46566.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b46566\b46566
@@ -58967,6 +65963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b47471.cmd_8538]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b47471\b47471\b47471.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b47471\b47471
@@ -58974,6 +65971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b47886.cmd_8539]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b47886\b47886\b47886.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b47886\b47886
@@ -58981,6 +65979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b47975.cmd_8540]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b47975\b47975\b47975.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b47975\b47975
@@ -58988,6 +65987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48929.cmd_8541]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b48929\b48929\b48929.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b48929\b48929
@@ -58995,6 +65995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b49104.cmd_8542]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b49104\b49104\b49104.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b49104\b49104
@@ -59002,6 +66003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b49142.cmd_8543]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b49142\b49142\b49142.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b49142\b49142
@@ -59009,6 +66011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b49335.cmd_8544]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b49335\b49335\b49335.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b49335\b49335
@@ -59016,6 +66019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b49435.cmd_8545]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b49435\b49435\b49435.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b49435\b49435
@@ -59023,6 +66027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b49809.cmd_8546]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b49809\b49809\b49809.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b49809\b49809
@@ -59030,6 +66035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b50026.cmd_8547]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50026\b50026\b50026.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50026\b50026
@@ -59037,13 +66043,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b50027.cmd_8548]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50027\b50027\b50027.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50027\b50027
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;ISSUE_2990
+Categories=ISSUE_2990;Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b50033.cmd_8549]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50033\b50033\b50033.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50033\b50033
@@ -59051,6 +66059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b50042.cmd_8550]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50042\b50042\b50042.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50042\b50042
@@ -59058,6 +66067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b50145.cmd_8551]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50145\b50145\b50145.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50145\b50145
@@ -59065,6 +66075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b50145a.cmd_8552]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50145\b50145a\b50145a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50145\b50145a
@@ -59072,6 +66083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b50145b.cmd_8553]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50145\b50145b\b50145b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50145\b50145b
@@ -59079,6 +66091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b50145c.cmd_8554]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50145\b50145c\b50145c.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50145\b50145c
@@ -59086,6 +66099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b50535.cmd_8555]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50535\b50535\b50535.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b50535\b50535
@@ -59093,13 +66107,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b51420.cmd_8556]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51420\b51420\b51420.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51420\b51420
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;ISSUE_2990
+Categories=ISSUE_2990;Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b51463.cmd_8557]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51463\b51463\b51463.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51463\b51463
@@ -59107,6 +66123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b51469.cmd_8558]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51469\b51469\b51469.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51469\b51469
@@ -59114,6 +66131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b51515.cmd_8559]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51515\b51515\b51515.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51515\b51515
@@ -59121,6 +66139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b51565.cmd_8560]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51565\b51565\b51565.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51565\b51565
@@ -59128,6 +66147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b51575.cmd_8561]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51575\b51575\b51575.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51575\b51575
@@ -59135,6 +66155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b51817.cmd_8562]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51817\b51817\b51817.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51817\b51817
@@ -59142,6 +66163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b51870.cmd_8563]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51870\b51870\b51870.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51870\b51870
@@ -59149,6 +66171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b51875.cmd_8564]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51875\b51875\b51875.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51875\b51875
@@ -59156,6 +66179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b51875.cmd_8565]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51875\Desktop\b51875\b51875.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51875\Desktop\b51875
@@ -59163,6 +66187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b52572.cmd_8566]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52572\b52572\b52572.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52572\b52572
@@ -59170,6 +66195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b52578.cmd_8567]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52578\b52578\b52578.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52578\b52578
@@ -59177,6 +66203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b52593.cmd_8568]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52593\b52593\b52593.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52593\b52593
@@ -59184,6 +66211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b52733.cmd_8569]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52733\b52733\b52733.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52733\b52733
@@ -59191,6 +66219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b52746.cmd_8570]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52746\b52746\b52746.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52746\b52746
@@ -59198,6 +66227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b52760.cmd_8571]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52760\b52760\b52760.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52760\b52760
@@ -59205,6 +66235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b52838.cmd_8572]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52838\b52838\b52838.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52838\b52838
@@ -59212,6 +66243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b52839.cmd_8573]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52839\b52839\b52839.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52839\b52839
@@ -59219,6 +66251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b52840.cmd_8574]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52840\b52840\b52840.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b52840\b52840
@@ -59226,6 +66259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b53226a.cmd_8575]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53226\b53226a\b53226a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53226\b53226a
@@ -59233,6 +66267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b53226b.cmd_8576]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53226\b53226b\b53226b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53226\b53226b
@@ -59240,6 +66275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b53547.cmd_8577]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53547\b53547\b53547.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53547\b53547
@@ -59247,6 +66283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b53650.cmd_8578]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53650\b53650\b53650.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53650\b53650
@@ -59254,6 +66291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b53662.cmd_8579]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53662\b53662\b53662.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53662\b53662
@@ -59261,6 +66299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b53878.cmd_8580]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53878\b53878\b53878.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53878\b53878
@@ -59268,6 +66307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b53884.cmd_8581]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53884\b53884\b53884.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53884\b53884
@@ -59275,6 +66315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b53942a.cmd_8582]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53942\b53942a\b53942a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53942\b53942a
@@ -59282,6 +66323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b53942b.cmd_8583]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53942\b53942b\b53942b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53942\b53942b
@@ -59289,6 +66331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b53958.cmd_8584]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53958\b53958\b53958.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53958\b53958
@@ -59296,6 +66339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b53977.cmd_8585]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53977\b53977\b53977.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53977\b53977
@@ -59303,6 +66347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b53980.cmd_8586]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53980\b53980\b53980.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53980\b53980
@@ -59310,6 +66355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b53994.cmd_8587]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53994\b53994\b53994.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53994\b53994
@@ -59317,6 +66363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b53995.cmd_8588]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53995\b53995\b53995.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b53995\b53995
@@ -59324,6 +66371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b54006.cmd_8589]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54006\b54006\b54006.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54006\b54006
@@ -59331,6 +66379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b54565.cmd_8590]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54565\b54565\b54565.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54565\b54565
@@ -59338,6 +66387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b54566.cmd_8591]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54566\b54566\b54566.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54566\b54566
@@ -59345,6 +66395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b54611.cmd_8592]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54611\b54611\b54611.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54611\b54611
@@ -59352,6 +66403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b54667.cmd_8593]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54667\b54667\b54667.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54667\b54667
@@ -59359,6 +66411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b54971.cmd_8594]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54971\b54971\b54971.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b54971\b54971
@@ -59366,6 +66419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b55197.cmd_8595]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55197\b55197\b55197.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55197\b55197
@@ -59373,6 +66427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [b55197.cmd_8596]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55197\Desktop\b55197\b55197.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55197\Desktop\b55197
@@ -59380,6 +66435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b55216.cmd_8597]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55216\b55216\b55216.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55216\b55216
@@ -59387,6 +66443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b55875.cmd_8598]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55875\b55875\b55875.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55875\b55875
@@ -59394,6 +66451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b55923.cmd_8599]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55923\b55923\b55923.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55923\b55923
@@ -59401,6 +66459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b56066.cmd_8600]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56066\b56066\b56066.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56066\b56066
@@ -59408,6 +66467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b56068.cmd_8601]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56068\b56068\b56068.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56068\b56068
@@ -59415,6 +66475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b56149.cmd_8602]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56149\b56149\b56149.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56149\b56149
@@ -59422,6 +66483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b56154.cmd_8603]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56154\b56154\b56154.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56154\b56154
@@ -59429,6 +66491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b56159.cmd_8604]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56159\b56159\b56159.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56159\b56159
@@ -59436,6 +66499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b56174.cmd_8605]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56174\b56174\b56174.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56174\b56174
@@ -59443,6 +66507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b56349.cmd_8606]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56349\b56349\b56349.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56349\b56349
@@ -59450,6 +66515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b56772.cmd_8607]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56772\b56772\b56772.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56772\b56772
@@ -59457,6 +66523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b56780.cmd_8608]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56780\b56780\b56780.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b56780\b56780
@@ -59464,6 +66531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b57492.cmd_8609]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57492\b57492\b57492.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57492\b57492
@@ -59471,6 +66539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b57493.cmd_8610]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57493\b57493\b57493.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57493\b57493
@@ -59478,6 +66547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b57516.cmd_8611]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57516\b57516\b57516.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57516\b57516
@@ -59485,6 +66555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b57518.cmd_8612]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57518\b57518\b57518.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57518\b57518
@@ -59492,6 +66563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b57952.cmd_8613]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57952\b57952\b57952.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57952\b57952
@@ -59499,6 +66571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b58358.cmd_8614]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b58358\b58358\b58358.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b58358\b58358
@@ -59506,6 +66579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b58360.cmd_8615]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b58360\b58360\b58360.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b58360\b58360
@@ -59513,6 +66587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b58689.cmd_8616]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b58689\b58689\b58689.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b58689\b58689
@@ -59520,6 +66595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b58690.cmd_8617]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b58690\b58690\b58690.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b58690\b58690
@@ -59527,6 +66603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b58866.cmd_8618]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b58866\b58866\b58866.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b58866\b58866
@@ -59534,6 +66611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59297.cmd_8619]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59297\b59297\b59297.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59297\b59297
@@ -59541,6 +66619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59319.cmd_8620]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59319\b59319\b59319.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59319\b59319
@@ -59548,6 +66627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59320.cmd_8621]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59320\b59320\b59320.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59320\b59320
@@ -59555,6 +66635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59337.cmd_8622]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59337\b59337\b59337.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59337\b59337
@@ -59562,6 +66643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59477.cmd_8623]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59477\b59477\b59477.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59477\b59477
@@ -59569,6 +66651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59478.cmd_8624]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59478\b59478\b59478.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59478\b59478
@@ -59576,6 +66659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59508.cmd_8625]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59508\b59508\b59508.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59508\b59508
@@ -59583,6 +66667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59546.cmd_8626]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59546\b59546\b59546.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59546\b59546
@@ -59590,6 +66675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b59554.cmd_8627]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59554\b59554\b59554.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59554\b59554
@@ -59597,6 +66683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59647.cmd_8628]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59647\b59647\b59647.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59647\b59647
@@ -59604,6 +66691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59678.cmd_8629]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59678\b59678\b59678.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59678\b59678
@@ -59611,6 +66699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b59782.cmd_8630]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59782\b59782\b59782.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59782\b59782
@@ -59618,6 +66707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59822.cmd_8631]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59822\b59822\b59822.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59822\b59822
@@ -59625,6 +66715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59857.cmd_8632]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59857\b59857\b59857.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59857\b59857
@@ -59632,6 +66723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59858.cmd_8633]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59858\b59858\b59858.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59858\b59858
@@ -59639,6 +66731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59899.cmd_8634]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59899\b59899\b59899.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59899\b59899
@@ -59646,6 +66739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b59947.cmd_8635]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59947\b59947\b59947.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59947\b59947
@@ -59653,6 +66747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59948.cmd_8636]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59948\b59948\b59948.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59948\b59948
@@ -59660,6 +66755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59949.cmd_8637]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59949\b59949\b59949.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59949\b59949
@@ -59667,6 +66763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59952.cmd_8638]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59952\b59952\b59952.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59952\b59952
@@ -59674,6 +66771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b59953.cmd_8639]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59953\b59953\b59953.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b59953\b59953
@@ -59681,6 +66779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b60127.cmd_8640]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b60127\b60127\b60127.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b60127\b60127
@@ -59688,6 +66787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b60142.cmd_8641]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b60142\b60142\b60142.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b60142\b60142
@@ -59695,6 +66795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b60194.cmd_8642]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b60194\b60194\b60194.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b60194\b60194
@@ -59702,6 +66803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b60600.cmd_8643]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b60600\b60600\b60600.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b60600\b60600
@@ -59709,6 +66811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b60723.cmd_8644]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b60723\b60723\b60723.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b60723\b60723
@@ -59716,6 +66819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b61025.cmd_8645]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61025\b61025\b61025.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61025\b61025
@@ -59723,6 +66827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b61028.cmd_8646]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61028\b61028\b61028.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61028\b61028
@@ -59730,6 +66835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b61185.cmd_8647]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61185\b61185\b61185.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61185\b61185
@@ -59737,6 +66843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b61215.cmd_8648]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61215\b61215\b61215.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61215\b61215
@@ -59744,6 +66851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b61515.cmd_8649]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61515\b61515\b61515.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61515\b61515
@@ -59751,6 +66859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b61640.cmd_8650]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61640\b61640\b61640.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b61640\b61640
@@ -59758,6 +66867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b62145.cmd_8651]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b62145\b62145\b62145.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b62145\b62145
@@ -59765,6 +66875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b62498.cmd_8652]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b62498\b62498\b62498.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b62498\b62498
@@ -59772,6 +66883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b62555.cmd_8653]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b62555\b62555\b62555.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b62555\b62555
@@ -59779,6 +66891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b62892.cmd_8654]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b62892\b62892\b62892.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b62892\b62892
@@ -59786,6 +66899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b63183.cmd_8655]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63183\b63183\b63183.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63183\b63183
@@ -59793,6 +66907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b63552.cmd_8656]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63552\b63552\b63552.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63552\b63552
@@ -59800,6 +66915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b63725.cmd_8657]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63725\b63725\b63725.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63725\b63725
@@ -59807,6 +66923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b63726.cmd_8658]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63726\b63726\b63726.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63726\b63726
@@ -59814,6 +66931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b63730.cmd_8659]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63730\b63730\b63730.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63730\b63730
@@ -59821,6 +66939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b63732.cmd_8660]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63732\b63732\b63732.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63732\b63732
@@ -59828,6 +66947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b63743.cmd_8661]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63743\b63743\b63743.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63743\b63743
@@ -59835,6 +66955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b63823.cmd_8662]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63823\b63823\b63823.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b63823\b63823
@@ -59842,6 +66963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b64026.cmd_8663]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b64026\b64026\b64026.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b64026\b64026
@@ -59849,6 +66971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b64560.cmd_8664]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b64560\b64560\b64560.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b64560\b64560
@@ -59856,6 +66979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b64579.cmd_8665]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b64579\b64579\b64579.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b64579\b64579
@@ -59863,6 +66987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b65087.cmd_8666]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b65087\b65087\b65087.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b65087\b65087
@@ -59870,6 +66995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b65176.cmd_8667]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b65176\b65176\b65176.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b65176\b65176
@@ -59877,6 +67003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b65407.cmd_8668]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b65407\b65407\b65407.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b65407\b65407
@@ -59884,13 +67011,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b65423.cmd_8669]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b65423\b65423\b65423.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b65423\b65423
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b66226.cmd_8670]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66226\b66226\b66226.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66226\b66226
@@ -59898,6 +67027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b66425.cmd_8671]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66425\b66425\b66425.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66425\b66425
@@ -59905,6 +67035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b66533.cmd_8672]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66533\b66533\b66533.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66533\b66533
@@ -59912,6 +67043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b66583.cmd_8673]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66583\b66583\b66583.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66583\b66583
@@ -59919,6 +67051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b66620.cmd_8674]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66620\b66620\b66620.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66620\b66620
@@ -59926,6 +67059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b66679.cmd_8675]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66679\b66679\b66679.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b66679\b66679
@@ -59933,6 +67067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b67351.cmd_8676]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67351\b67351\b67351.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67351\b67351
@@ -59940,6 +67075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b67414.cmd_8677]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67414\b67414\b67414.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67414\b67414
@@ -59947,6 +67083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b67744.cmd_8678]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67744\b67744\b67744.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67744\b67744
@@ -59954,6 +67091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b67819.cmd_8679]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67819\b67819\b67819.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67819\b67819
@@ -59961,6 +67099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b67987.cmd_8680]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67987\b67987\b67987.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67987\b67987
@@ -59968,6 +67107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b68028.cmd_8681]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68028\b68028\b68028.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68028\b68028
@@ -59975,6 +67115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b68045.cmd_8682]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68045\b68045\b68045.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68045\b68045
@@ -59982,6 +67123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b68361.cmd_8683]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68361\b68361\b68361.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68361\b68361
@@ -59989,6 +67131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b68634.cmd_8684]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68634\b68634\b68634.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68634\b68634
@@ -59996,6 +67139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b68757.cmd_8685]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68757\b68757\b68757.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68757\b68757
@@ -60003,6 +67147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b68872.cmd_8686]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68872\b68872\b68872.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b68872\b68872
@@ -60010,6 +67155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b69225.cmd_8687]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b69225\b69225\b69225.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b69225\b69225
@@ -60017,6 +67163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b69227.cmd_8688]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b69227\b69227\b69227.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b69227\b69227
@@ -60024,6 +67171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b69512.cmd_8689]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b69512\b69512\b69512.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b69512\b69512
@@ -60031,6 +67179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b69528.cmd_8690]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b69528\b69528\b69528.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b69528\b69528
@@ -60038,6 +67187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b69848.cmd_8691]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b69848\b69848\b69848.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b69848\b69848
@@ -60045,6 +67195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b70267.cmd_8692]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70267\b70267\b70267.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70267\b70267
@@ -60052,6 +67203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b70289.cmd_8693]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70289\b70289\b70289.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70289\b70289
@@ -60059,6 +67211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b70335.cmd_8694]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70335\b70335\b70335.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70335\b70335
@@ -60066,6 +67219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b70354.cmd_8695]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70354\b70354\b70354.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70354\b70354
@@ -60073,6 +67227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b70808.cmd_8696]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70808\b70808\b70808.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70808\b70808
@@ -60080,6 +67235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b70909.cmd_8697]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70909\b70909\b70909.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70909\b70909
@@ -60087,6 +67243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b70964.cmd_8698]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70964\b70964\b70964.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70964\b70964
@@ -60094,6 +67251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b70967.cmd_8699]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70967\b70967\b70967.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70967\b70967
@@ -60101,6 +67259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b70992.cmd_8700]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70992\b70992\b70992.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70992\b70992
@@ -60108,6 +67267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b70994.cmd_8701]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70994\b70994\b70994.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b70994\b70994
@@ -60115,6 +67275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71003.cmd_8702]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71003\b71003\b71003.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71003\b71003
@@ -60122,6 +67283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71005.cmd_8703]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71005\b71005\b71005.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71005\b71005
@@ -60129,6 +67291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b71093.cmd_8704]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71093\b71093\b71093.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71093\b71093
@@ -60136,6 +67299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b71099.cmd_8705]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71099\b71099\b71099.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71099\b71099
@@ -60143,6 +67307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71120.cmd_8706]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71120\b71120\b71120.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71120\b71120
@@ -60150,6 +67315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71135.cmd_8707]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71135\b71135\b71135.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71135\b71135
@@ -60157,6 +67323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71155.cmd_8708]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71155\b71155\b71155.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71155\b71155
@@ -60164,6 +67331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71179.cmd_8709]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71179\b71179\b71179.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71179\b71179
@@ -60171,6 +67339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71231.cmd_8710]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71231\b71231\b71231.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71231\b71231
@@ -60178,6 +67347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71318.cmd_8711]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71318\b71318\b71318.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71318\b71318
@@ -60185,6 +67355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71722.cmd_8712]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71722\b71722\b71722.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71722\b71722
@@ -60192,6 +67363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71831.cmd_8713]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71831\b71831\b71831.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71831\b71831
@@ -60199,6 +67371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71869.cmd_8714]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71869\b71869\b71869.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71869\b71869
@@ -60206,6 +67379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b71999.cmd_8715]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71999\b71999\b71999.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b71999\b71999
@@ -60213,6 +67387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b72136.cmd_8716]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72136\b72136\b72136.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72136\b72136
@@ -60220,6 +67395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b72160.cmd_8717]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72160\b72160\b72160.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72160\b72160
@@ -60227,6 +67403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b72161.cmd_8718]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72161\b72161\b72161.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72161\b72161
@@ -60234,6 +67411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b72164.cmd_8719]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72164\b72164\b72164.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72164\b72164
@@ -60241,6 +67419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b72422.cmd_8720]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72422\b72422\b72422.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72422\b72422
@@ -60248,6 +67427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b72518.cmd_8721]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72518\b72518\b72518.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72518\b72518
@@ -60255,6 +67435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b72522.cmd_8722]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72522\b72522\b72522.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72522\b72522
@@ -60262,6 +67443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b72687.cmd_8723]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72687\b72687\b72687.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72687\b72687
@@ -60269,6 +67451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b72699.cmd_8724]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72699\b72699\b72699.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72699\b72699
@@ -60276,6 +67459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b72828.cmd_8725]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72828\b72828\b72828.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72828\b72828
@@ -60283,6 +67467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b72932.cmd_8726]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72932\b72932\b72932.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72932\b72932
@@ -60290,6 +67475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b72986.cmd_8727]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72986\b72986\b72986.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72986\b72986
@@ -60297,6 +67483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b72996.cmd_8728]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72996\b72996\b72996.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b72996\b72996
@@ -60304,6 +67491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b73079.cmd_8729]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b73079\b73079\b73079.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b73079\b73079
@@ -60311,6 +67499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b73207.cmd_8730]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b73207\b73207\b73207.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b73207\b73207
@@ -60318,6 +67507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b73283.cmd_8731]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b73283\b73283\b73283.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b73283\b73283
@@ -60325,6 +67515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b73786.cmd_8732]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b73786\b73786\b73786.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b73786\b73786
@@ -60332,6 +67523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b73921.cmd_8733]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b73921\b73921\b73921.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b73921\b73921
@@ -60339,6 +67531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b74182.cmd_8734]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b74182\b74182\b74182.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b74182\b74182
@@ -60346,6 +67539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b74608.cmd_8735]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b74608\b74608\b74608.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b74608\b74608
@@ -60353,6 +67547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b74937.cmd_8736]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b74937\b74937\b74937.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b74937\b74937
@@ -60360,6 +67555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b74939.cmd_8737]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b74939\b74939\b74939.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b74939\b74939
@@ -60367,6 +67563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b74976.cmd_8738]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b74976\b74976\b74976.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b74976\b74976
@@ -60374,6 +67571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b75250.cmd_8739]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75250\b75250\b75250.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75250\b75250
@@ -60381,6 +67579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b75509.cmd_8740]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75509\b75509\b75509.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75509\b75509
@@ -60388,6 +67587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b75888.cmd_8741]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75888\b75888\b75888.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75888\b75888
@@ -60395,6 +67595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b75890.cmd_8742]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75890\b75890\b75890.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75890\b75890
@@ -60402,6 +67603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b75944.cmd_8743]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75944\b75944\b75944.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75944\b75944
@@ -60409,6 +67611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b75945.cmd_8744]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75945\b75945\b75945.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75945\b75945
@@ -60416,6 +67619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b75988.cmd_8745]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75988\b75988\b75988.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b75988\b75988
@@ -60423,6 +67627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b76267.cmd_8746]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b76267\b76267\b76267.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b76267\b76267
@@ -60430,6 +67635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b76511.cmd_8747]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b76511\b76511\b76511.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b76511\b76511
@@ -60437,6 +67643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b76590.cmd_8748]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b76590\b76590\b76590.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b76590\b76590
@@ -60444,6 +67651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b76717.cmd_8749]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b76717\b76717\b76717.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b76717\b76717
@@ -60451,6 +67659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b77304.cmd_8750]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b77304\b77304\b77304.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b77304\b77304
@@ -60458,6 +67667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b77707.cmd_8751]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b77707\b77707\b77707.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b77707\b77707
@@ -60465,6 +67675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b77713.cmd_8752]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b77713\b77713\b77713.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b77713\b77713
@@ -60472,6 +67683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b77806.cmd_8753]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b77806\b77806\b77806.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b77806\b77806
@@ -60479,6 +67691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b77950.cmd_8754]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b77950\b77950\b77950.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b77950\b77950
@@ -60486,6 +67699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b78392.cmd_8755]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b78392\b78392\b78392.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b78392\b78392
@@ -60493,6 +67707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b78694.cmd_8756]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b78694\b78694\b78694.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b78694\b78694
@@ -60500,6 +67715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b79250.cmd_8757]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b79250\b79250\b79250.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b79250\b79250
@@ -60507,6 +67723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b79418.cmd_8758]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b79418\b79418\b79418.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b79418\b79418
@@ -60514,6 +67731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b79642.cmd_8759]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b79642\b79642\b79642.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b79642\b79642
@@ -60521,6 +67739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b80043.cmd_8760]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b80043\b80043\b80043.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b80043\b80043
@@ -60528,6 +67747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b80045.cmd_8761]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b80045\b80045\b80045.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b80045\b80045
@@ -60535,6 +67755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b80764.cmd_8762]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b80764\b80764\b80764.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b80764\b80764
@@ -60542,6 +67763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b80824.cmd_8763]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b80824\b80824\b80824.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b80824\b80824
@@ -60549,6 +67771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b81618.cmd_8764]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b81618\b81618\b81618.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b81618\b81618
@@ -60556,6 +67779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b81938.cmd_8765]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b81938\b81938\b81938.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b81938\b81938
@@ -60563,6 +67787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b82048.cmd_8766]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82048\b82048\b82048.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82048\b82048
@@ -60570,6 +67795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b82160.cmd_8767]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82160\b82160\b82160.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82160\b82160
@@ -60577,6 +67803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b82247.cmd_8768]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82247\b82247\b82247.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82247\b82247
@@ -60584,6 +67811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b82249.cmd_8769]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82249\b82249\b82249.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82249\b82249
@@ -60591,6 +67819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b82715.cmd_8770]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82715\b82715\b82715.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82715\b82715
@@ -60598,6 +67827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b82866.cmd_8771]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82866\b82866\b82866.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b82866\b82866
@@ -60605,6 +67835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b83690.cmd_8772]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b83690\b83690\b83690.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b83690\b83690
@@ -60612,6 +67843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b83702.cmd_8773]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b83702\b83702\b83702.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b83702\b83702
@@ -60619,6 +67851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b84836.cmd_8774]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b84836\b84836\b84836.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b84836\b84836
@@ -60626,6 +67859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84909.cmd_8775]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b84909\b84909\b84909.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b84909\b84909
@@ -60633,6 +67867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84916.cmd_8776]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b84916\b84916\b84916.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b84916\b84916
@@ -60640,6 +67875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84971.cmd_8777]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b84971\b84971\b84971.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b84971\b84971
@@ -60647,6 +67883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b85316.cmd_8778]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b85316\b85316\b85316.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b85316\b85316
@@ -60654,6 +67891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91377.cmd_8779]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b91377\b91377\b91377.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b91377\b91377
@@ -60661,6 +67899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b101147.cmd_8780]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b101147\b101147\b101147.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b101147\b101147
@@ -60668,6 +67907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b113239.cmd_8781]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b113239\b113239\b113239.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b113239\b113239
@@ -60675,6 +67915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b85477.cmd_8782]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b85477\b85477\b85477.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b85477\b85477
@@ -60682,6 +67923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b86139.cmd_8783]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b86139\b86139\b86139.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b86139\b86139
@@ -60689,6 +67931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b87284.cmd_8784]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b87284\b87284\b87284.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b87284\b87284
@@ -60696,6 +67939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b87285.cmd_8785]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b87285\b87285\b87285.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b87285\b87285
@@ -60703,6 +67947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b88712.cmd_8786]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88712\b88712\b88712.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88712\b88712
@@ -60710,6 +67955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b88797.cmd_8788]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88797\b88797\b88797.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88797\b88797
@@ -60717,6 +67963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b89277.cmd_8789]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89277\b89277\b89277.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89277\b89277
@@ -60724,6 +67971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b89279.cmd_8790]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89279\b89279\b89279.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89279\b89279
@@ -60731,6 +67979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b89409.cmd_8791]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89409\b89409\b89409.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89409\b89409
@@ -60738,6 +67987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b89506.cmd_8792]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89506\b89506\b89506.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89506\b89506
@@ -60745,6 +67995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b89546.cmd_8793]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89546\b89546\b89546.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89546\b89546
@@ -60752,6 +68003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b89600.cmd_8794]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89600\b89600\b89600.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89600\b89600
@@ -60759,6 +68011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b89797.cmd_8795]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89797\b89797\b89797.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89797\b89797
@@ -60766,6 +68019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b89946.cmd_8796]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89946\b89946\b89946.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b89946\b89946
@@ -60773,6 +68027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b90129.cmd_8797]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b90129\b90129\b90129.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b90129\b90129
@@ -60780,6 +68035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91021.cmd_8798]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91021\b91021\b91021.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91021\b91021
@@ -60787,6 +68043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91189.cmd_8799]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91189\b91189\b91189.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91189\b91189
@@ -60794,6 +68051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91203.cmd_8800]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91203\b91203\b91203.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91203\b91203
@@ -60801,6 +68059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91223.cmd_8801]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91223\b91223\b91223.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91223\b91223
@@ -60808,6 +68067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91230.cmd_8802]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91230\b91230\b91230.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91230\b91230
@@ -60815,6 +68075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91359.cmd_8804]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91359\b91359\b91359.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91359\b91359
@@ -60822,6 +68083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91855.cmd_8805]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91855\b91855\b91855.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91855\b91855
@@ -60829,6 +68091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91859.cmd_8806]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91859\b91859\b91859.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91859\b91859
@@ -60836,6 +68099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91867.cmd_8807]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91867\b91867\b91867.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91867\b91867
@@ -60843,6 +68107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91917.cmd_8808]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91917\b91917\b91917.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91917\b91917
@@ -60850,6 +68115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b92066.cmd_8809]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92066\b92066\b92066.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92066\b92066
@@ -60857,6 +68123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b92073.cmd_8810]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92073\b92073\b92073.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92073\b92073
@@ -60864,6 +68131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b92289.cmd_8811]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92289\b92289\b92289.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92289\b92289
@@ -60871,6 +68139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b92568.cmd_8812]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92568\b92568\b92568.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92568\b92568
@@ -60878,6 +68147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b92614.cmd_8813]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92614\b92614\b92614.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92614\b92614
@@ -60885,6 +68155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b92693.cmd_8814]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92693\b92693\b92693.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92693\b92693
@@ -60892,6 +68163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b92714.cmd_8815]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92714\b92714\b92714.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92714\b92714
@@ -60899,6 +68171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b92736.cmd_8816]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92736\b92736\b92736.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b92736\b92736
@@ -60906,6 +68179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b93027.cmd_8817]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b93027\b93027\b93027.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b93027\b93027
@@ -60913,6 +68187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b93635.cmd_8818]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b93635\b93635\b93635.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b93635\b93635
@@ -60920,6 +68195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b94306.cmd_8819]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b94306\b94306\b94306.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b94306\b94306
@@ -60927,6 +68203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [b98958.cmd_8820]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b98958\b98958\b98958.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b98958\b98958
@@ -60934,6 +68211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b99222.cmd_8821]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b99222\b99222\b99222.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b99222\b99222
@@ -60941,6 +68219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b99235.cmd_8822]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b99235\b99235\b99235.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b99235\b99235
@@ -60948,6 +68227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b99667.cmd_8823]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b99667\b99667\b99667.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b99667\b99667
@@ -60955,6 +68235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b99969.cmd_8824]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b99969\b99969\b99969.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b99969\b99969
@@ -60962,6 +68243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b119538a.cmd_8825]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M14-SP1\b119538\b119538a\b119538a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M14-SP1\b119538\b119538a
@@ -60969,6 +68251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b119538b.cmd_8826]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-M14-SP1\b119538\b119538b\b119538b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M14-SP1\b119538\b119538b
@@ -60976,6 +68259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b147814_il.cmd_8827]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b147814\b147814_il\b147814_il.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b147814\b147814_il
@@ -60983,6 +68267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b147816.cmd_8828]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b147816\b147816\b147816.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b147816\b147816
@@ -60990,6 +68275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b148815.cmd_8829]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b148815\b148815\b148815.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b148815\b148815
@@ -60997,6 +68283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [params-mixed.cmd_8830]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\params-mixed\params-mixed.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\params-mixed
@@ -61004,6 +68291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [params-none.cmd_8831]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\params-none\params-none.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\params-none
@@ -61011,6 +68299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [params-object.cmd_8832]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\params-object\params-object.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\params-object
@@ -61018,6 +68307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [params-value.cmd_8833]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\params-value\params-value.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\params-value
@@ -61025,6 +68315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [params-varargs.cmd_8834]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\params-varargs\params-varargs.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\params-varargs
@@ -61032,6 +68323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static-mixed.cmd_8835]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\static-mixed\static-mixed.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\static-mixed
@@ -61039,6 +68331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static-none.cmd_8836]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\static-none\static-none.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\static-none
@@ -61046,6 +68339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [static-object.cmd_8837]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\static-object\static-object.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\static-object
@@ -61053,6 +68347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [static-ref.cmd_8838]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\static-ref\static-ref.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1-QFE\b151440\static-ref
@@ -61060,6 +68355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b119294.cmd_8839]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b119294\b119294\b119294.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b119294\b119294
@@ -61067,6 +68363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b130333.cmd_8840]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b130333\b130333\b130333.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b130333\b130333
@@ -61074,6 +68371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b139895.cmd_8841]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b139895\b139895\b139895.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b139895\b139895
@@ -61081,6 +68379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b140118.cmd_8842]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b140118\b140118\b140118.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b140118\b140118
@@ -61088,6 +68387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b140711.cmd_8843]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b140711\b140711\b140711.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b140711\b140711
@@ -61095,6 +68395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b140902.cmd_8844]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b140902\b140902\b140902.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b140902\b140902
@@ -61102,6 +68403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b143840.cmd_8845]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b143840\b143840\b143840.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.1-M1-Beta1\b143840\b143840
@@ -61109,6 +68411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b102879.cmd_8847]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102879\b102879\b102879.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102879\b102879
@@ -61116,6 +68419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b103058.cmd_8848]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b103058\b103058\b103058.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b103058\b103058
@@ -61123,6 +68427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b124232.cmd_8849]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b124232\b124232\b124232.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b124232\b124232
@@ -61130,6 +68435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b147147.cmd_8850]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b147147\b147147\b147147.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b147147\b147147
@@ -61137,6 +68443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b147924.cmd_8851]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b147924\b147924\b147924.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b147924\b147924
@@ -61144,6 +68451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b169333.cmd_8852]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b169333\b169333\b169333.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b169333\b169333
@@ -61151,6 +68459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b178119.cmd_8853]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b178119\b178119\b178119.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b178119\b178119
@@ -61158,6 +68467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [b178128.cmd_8854]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b178128\b178128\b178128.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b178128\b178128
@@ -61165,6 +68475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [b180381a.cmd_8855]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b180381\b180381a\b180381a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b180381\b180381a
@@ -61172,6 +68483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b180381b.cmd_8856]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b180381\b180381b\b180381b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b180381\b180381b
@@ -61179,13 +68491,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b191926.cmd_8857]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b191926\b191926\b191926.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b191926\b191926
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;DBG_FAIL
+Categories=Pri0;JIT;DBG_FAIL;EXPECTED_PASS
 HostStyle=0
+
 [csharptester.cmd_8858]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b210352\csharptester\csharptester.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b210352\csharptester
@@ -61193,6 +68507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b213516.cmd_8859]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b213516\b213516\b213516.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b213516\b213516
@@ -61200,6 +68515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b219940.cmd_8860]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b219940\b219940\b219940.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b219940\b219940
@@ -61207,6 +68523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b220968.cmd_8861]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b220968\b220968\b220968.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b220968\b220968
@@ -61214,6 +68531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b223924.cmd_8862]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b223924\b223924\b223924.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b223924\b223924
@@ -61221,6 +68539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b223932.cmd_8863]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b223932\b223932\b223932.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b223932\b223932
@@ -61228,6 +68547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b223936.cmd_8864]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b223936\b223936\b223936.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b223936\b223936
@@ -61235,6 +68555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b00722.cmd_8865]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b00722\b00722\b00722.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b00722\b00722
@@ -61242,6 +68563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b00735.cmd_8866]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b00735\b00735\b00735.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b00735\b00735
@@ -61249,6 +68571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b02345.cmd_8867]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b02345\b02345\b02345.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b02345\b02345
@@ -61256,13 +68579,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b02762.cmd_8868]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b02762\b02762\b02762.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b02762\b02762
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;NEED_TRIAGE
+Categories=Pri0;NEED_TRIAGE;EXPECTED_PASS
 HostStyle=0
+
 [b04319.cmd_8870]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b04319\b04319\b04319.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b04319\b04319
@@ -61270,6 +68595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b06020.cmd_8871]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b06020\b06020\b06020.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b06020\b06020
@@ -61277,6 +68603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b07211.cmd_8872]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b07211\b07211\b07211.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b07211\b07211
@@ -61284,6 +68611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b07369.cmd_8873]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b07369\b07369\b07369.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b07369\b07369
@@ -61291,6 +68619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b07383.cmd_8874]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b07383\b07383\b07383.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b07383\b07383
@@ -61298,6 +68627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b07900.cmd_8875]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b07900\b07900\b07900.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b07900\b07900
@@ -61305,6 +68635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b07947.cmd_8876]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b07947\b07947\b07947.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b07947\b07947
@@ -61312,6 +68643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b08020.cmd_8877]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b08020\b08020\b08020.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b08020\b08020
@@ -61319,6 +68651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b11762.cmd_8879]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b11762\b11762\b11762.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b11762\b11762
@@ -61326,6 +68659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b13452.cmd_8880]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b13452\b13452\b13452.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b13452\b13452
@@ -61333,6 +68667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14617.cmd_8881]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b14617\b14617\b14617.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b14617\b14617
@@ -61340,6 +68675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15617.cmd_8882]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b15617\b15617\b15617.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b15617\b15617
@@ -61347,6 +68683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16378.cmd_8883]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16378\b16378\b16378.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16378\b16378
@@ -61354,6 +68691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b16382.cmd_8884]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16382\b16382\b16382.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16382\b16382
@@ -61361,6 +68699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b16386.cmd_8885]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16386\b16386\b16386.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16386\b16386
@@ -61368,6 +68707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16399.cmd_8886]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16399\b16399\b16399.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16399\b16399
@@ -61375,6 +68715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16473.cmd_8887]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16473\b16473\b16473.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16473\b16473
@@ -61382,6 +68723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b16570.cmd_8888]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16570\b16570\b16570.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b16570\b16570
@@ -61389,6 +68731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b18049.cmd_8889]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b18049\b18049\b18049.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b18049\b18049
@@ -61396,6 +68739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b00719.cmd_8890]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b00719\b00719\b00719.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b00719\b00719
@@ -61403,6 +68747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b102962a.cmd_8891]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b102962\b102962a\b102962a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b102962\b102962a
@@ -61410,6 +68755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102962b.cmd_8892]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b102962\b102962b\b102962b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b102962\b102962b
@@ -61417,6 +68763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102962c.cmd_8893]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b102962\b102962c\b102962c.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b102962\b102962c
@@ -61424,6 +68771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b115932a.cmd_8894]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b115932\b115932a\b115932a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b115932\b115932a
@@ -61431,6 +68779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b115932b.cmd_8895]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b115932\b115932b\b115932b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b115932\b115932b
@@ -61438,6 +68787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b118260.cmd_8896]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b118260\b118260\b118260.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b118260\b118260
@@ -61445,6 +68795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b138117.cmd_8897]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b138117\b138117\b138117.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b138117\b138117
@@ -61452,6 +68803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b19171.cmd_8898]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b19171\b19171\b19171.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b19171\b19171
@@ -61459,6 +68811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b21296.cmd_8899]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b21296\b21296\b21296.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b21296\b21296
@@ -61466,6 +68819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b30251.cmd_8900]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b30251\b30251\b30251.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b30251\b30251
@@ -61473,6 +68827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b31398.cmd_8901]
 RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M02\b31398\b31398\b31398.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M02\b31398\b31398
@@ -61480,6 +68835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b091942.cmd_8902]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b091942\b091942\b091942.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b091942\b091942
@@ -61487,6 +68843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102533.cmd_8903]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b102533\b102533\b102533.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b102533\b102533
@@ -61494,6 +68851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b125091.cmd_8904]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b125091\b125091\b125091.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b125091\b125091
@@ -61501,6 +68859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b268908.cmd_8905]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b268908\b268908\b268908.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b268908\b268908
@@ -61508,6 +68867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b309555.cmd_8906]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b309555\b309555\b309555.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b309555\b309555
@@ -61515,6 +68875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b320147.cmd_8907]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b320147\b320147\b320147.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b320147\b320147
@@ -61522,6 +68883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b321799.cmd_8908]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b321799\b321799\b321799.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b321799\b321799
@@ -61529,6 +68891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b323557-dbg.cmd_8909]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b323557\b323557-dbg\b323557-dbg.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b323557\b323557-dbg
@@ -61536,6 +68899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b323557-ret.cmd_8910]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b323557\b323557-ret\b323557-ret.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b323557\b323557-ret
@@ -61543,6 +68907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b338014.cmd_8911]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b338014\b338014\b338014.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b338014\b338014
@@ -61550,6 +68915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b353858.cmd_8912]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b353858\b353858\b353858.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b353858\b353858
@@ -61557,6 +68923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b359564.cmd_8913]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b359564\b359564\b359564.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b359564\b359564
@@ -61564,6 +68931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b374944.cmd_8914]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b374944\b374944\b374944.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b374944\b374944
@@ -61571,20 +68939,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b399444a.cmd_8915]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b399444\b399444a\b399444a.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b399444\b399444a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b399444b.cmd_8916]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b399444\b399444b\b399444b.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b399444\b399444b
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_PASS;LONG_RUNNING
+Categories=Pri0;LONG_RUNNING;EXPECTED_PASS
 HostStyle=0
+
 [b405223.cmd_8917]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b405223\b405223\b405223.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b405223\b405223
@@ -61592,6 +68963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b409617.cmd_8918]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b409617\b409617\b409617.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b409617\b409617
@@ -61599,6 +68971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b415164.cmd_8920]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b415164\b415164\b415164.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b415164\b415164
@@ -61606,6 +68979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b416667.cmd_8921]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b416667\b416667\b416667.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b416667\b416667
@@ -61613,6 +68987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b423721.cmd_8922]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b423721\b423721\b423721.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b423721\b423721
@@ -61620,6 +68995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b423755.cmd_8923]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b423755\b423755\b423755.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b423755\b423755
@@ -61627,6 +69003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b423755.cmd_8924]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b423755\Desktop\b423755\b423755.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b423755\Desktop\b423755
@@ -61634,13 +69011,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b425314.cmd_8925]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b425314\b425314\b425314.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b425314\b425314
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;EXPECTED_FAIL;REGRESS;LONG_RUNNING
+Categories=REGRESS;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b426654.cmd_8926]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b426654\b426654\b426654.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b426654\b426654
@@ -61648,6 +69027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b441487.cmd_8927]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b441487\b441487\b441487.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b441487\b441487
@@ -61655,6 +69035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b448208.cmd_8928]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b448208\Desktop\b448208\b448208.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b448208\Desktop\b448208
@@ -61662,6 +69043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b449827.cmd_8929]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b449827\b449827\b449827.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b449827\b449827
@@ -61669,6 +69051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b369916.cmd_8930]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b369916\b369916\b369916.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b369916\b369916
@@ -61676,6 +69059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b471305.cmd_8931]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b471305\b471305\b471305.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b471305\b471305
@@ -61683,13 +69067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
-[b475589.cmd_8932]
-RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b475589\b475589\b475589.cmd
-WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b475589\b475589
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS
-HostStyle=0
+
 [b487364.cmd_8933]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b487364\b487364\b487364.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b487364\b487364
@@ -61697,6 +69075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b487372.cmd_8934]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b487372\b487372\b487372.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b487372\b487372
@@ -61704,6 +69083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b489329.cmd_8935]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b489329\b489329\b489329.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b489329\b489329
@@ -61711,6 +69091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b491215.cmd_8936]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b491215\b491215\b491215.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b491215\b491215
@@ -61718,6 +69099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b518440.cmd_8937]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b518440\b518440\b518440.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b518440\b518440
@@ -61725,6 +69107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b530694.cmd_8938]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b530694\b530694\b530694.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b530694\b530694
@@ -61732,6 +69115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_8939]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b598031\test\test.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b598031\test
@@ -61739,6 +69123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [test2.cmd_8940]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b598031\test2\test2.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b598031\test2
@@ -61746,6 +69131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b604247.cmd_8941]
 RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b604247\b604247\b604247.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-RTM\b604247\b604247
@@ -61753,6 +69139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b106272.cmd_8942]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b106272\b106272\b106272.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b106272\b106272
@@ -61760,6 +69147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b152292.cmd_8943]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b152292\b152292\b152292.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b152292\b152292
@@ -61767,6 +69155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b173313.cmd_8944]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b173313\b173313\b173313.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b173313\b173313
@@ -61774,6 +69163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b193264.cmd_8945]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b193264\b193264\b193264.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b193264\b193264
@@ -61781,6 +69171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b48850.cmd_8946]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b48850\b48850\b48850.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b48850\b48850
@@ -61788,6 +69179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b561129.cmd_8947]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b561129\b561129\b561129.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b561129\b561129
@@ -61795,6 +69187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b565808.cmd_8948]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b565808\b565808\b565808.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b565808\b565808
@@ -61802,6 +69195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b569942.cmd_8949]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b569942\b569942\b569942.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b569942\b569942
@@ -61809,6 +69203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b589202.cmd_8950]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b589202\b589202\b589202.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b589202\b589202
@@ -61816,6 +69211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b598034.cmd_8951]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b598034\b598034\b598034.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b598034\b598034
@@ -61823,6 +69219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b598649.cmd_8952]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b598649\b598649\b598649.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b598649\b598649
@@ -61830,6 +69227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b602004.cmd_8953]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b602004\b602004\b602004.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b602004\b602004
@@ -61837,6 +69235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b608066.cmd_8954]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b608066\b608066\b608066.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b608066\b608066
@@ -61844,6 +69243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [b608198.cmd_8955]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b608198\b608198\b608198.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b608198\b608198
@@ -61851,6 +69251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b609280.cmd_8956]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b609280\b609280\b609280.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b609280\b609280
@@ -61858,6 +69259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b609988.cmd_8957]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b609988\b609988\b609988.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b609988\b609988
@@ -61865,6 +69267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b609988.cmd_8958]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b609988\Desktop\b609988\b609988.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b609988\Desktop\b609988
@@ -61872,6 +69275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b610562.cmd_8959]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b610562\b610562\b610562.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b610562\b610562
@@ -61879,6 +69283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b610750.cmd_8960]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b610750\b610750\b610750.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b610750\b610750
@@ -61886,6 +69291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b610750_32vs64.cmd_8961]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b610750\b610750_32vs64\b610750_32vs64.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b610750\b610750_32vs64
@@ -61893,6 +69299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b611219.cmd_8962]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b611219\b611219\b611219.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b611219\b611219
@@ -61900,6 +69307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b72218.cmd_8963]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\b72218\b72218\b72218.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\b72218\b72218
@@ -61907,6 +69315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [ConstToString.cmd_8964]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b121938\ConstToString\ConstToString.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b121938\ConstToString
@@ -61914,6 +69323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b151497.cmd_8965]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b151497\b151497\b151497.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b151497\b151497
@@ -61921,6 +69331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b158861.cmd_8966]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b158861\b158861\b158861.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b158861\b158861
@@ -61928,6 +69339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b163200.cmd_8967]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b163200\b163200\b163200.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b163200\b163200
@@ -61935,13 +69347,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [LdfldaHack.cmd_8968]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\B168384\LdfldaHack\LdfldaHack.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\B168384\LdfldaHack
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;DBG_FAIL
+Categories=Pri0;JIT;DBG_FAIL;EXPECTED_PASS
 HostStyle=0
+
 [b170362.cmd_8969]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b170362\b170362\b170362.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b170362\b170362
@@ -61949,13 +69363,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b170362_il.cmd_8970]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b170362\b170362_il\b170362_il.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b170362\b170362_il
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b174294.cmd_8971]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b174294\b174294\b174294.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b174294\b174294
@@ -61963,6 +69379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b175679.cmd_8972]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b175679\b175679\b175679.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b175679\b175679
@@ -61970,6 +69387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b176032.cmd_8973]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b176032\b176032\b176032.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b176032\b176032
@@ -61977,6 +69395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b188478.cmd_8974]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b188478\b188478\b188478.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b188478\b188478
@@ -61984,6 +69403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b19679.cmd_8975]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b19679\b19679\b19679.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b19679\b19679
@@ -61991,6 +69411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b202743.cmd_8976]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b202743\b202743\b202743.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b202743\b202743
@@ -61998,6 +69419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b33183.cmd_8977]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b33183\b33183\b33183.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b33183\b33183
@@ -62005,6 +69427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b49778.cmd_8978]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b49778\b49778\b49778.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.1\DDB\b49778\b49778
@@ -62012,6 +69435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [b429039.cmd_8979]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.2\ddb\b429039\b429039\b429039.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.2\ddb\b429039\b429039
@@ -62019,6 +69443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DDB188478.cmd_8980]
 RelativePath=JIT\Regression\CLR-x86-JIT\v2.2\ddb\ddb188478\DDB188478\DDB188478.cmd
 WorkingDir=JIT\Regression\CLR-x86-JIT\v2.2\ddb\ddb188478\DDB188478
@@ -62026,6 +69451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [loopvt.cmd_8982]
 RelativePath=JIT\Regression\Dev11\dev10_94677\loopvt\loopvt.cmd
 WorkingDir=JIT\Regression\Dev11\dev10_94677\loopvt
@@ -62033,6 +69459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [conv_ovf_i4.cmd_8983]
 RelativePath=JIT\Regression\Dev11\dev11_10427\conv_ovf_i4\conv_ovf_i4.cmd
 WorkingDir=JIT\Regression\Dev11\dev11_10427\conv_ovf_i4
@@ -62040,6 +69467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dev11_13912.cmd_8984]
 RelativePath=JIT\Regression\Dev11\dev11_13912\dev11_13912\dev11_13912.cmd
 WorkingDir=JIT\Regression\Dev11\dev11_13912\dev11_13912
@@ -62047,6 +69475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [seqpts.cmd_8985]
 RelativePath=JIT\Regression\Dev11\dev11_165544\seqpts\seqpts.cmd
 WorkingDir=JIT\Regression\Dev11\dev11_165544\seqpts
@@ -62054,6 +69483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [dev11_20929_d.cmd_8986]
 RelativePath=JIT\Regression\Dev11\dev11_20929\dev11_20929_d\dev11_20929_d.cmd
 WorkingDir=JIT\Regression\Dev11\dev11_20929\dev11_20929_d
@@ -62061,6 +69491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dev11_20929_do.cmd_8987]
 RelativePath=JIT\Regression\Dev11\dev11_20929\dev11_20929_do\dev11_20929_do.cmd
 WorkingDir=JIT\Regression\Dev11\dev11_20929\dev11_20929_do
@@ -62068,6 +69499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dev11_20929_r.cmd_8988]
 RelativePath=JIT\Regression\Dev11\dev11_20929\dev11_20929_r\dev11_20929_r.cmd
 WorkingDir=JIT\Regression\Dev11\dev11_20929\dev11_20929_r
@@ -62075,6 +69507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [dev11_20929_ro.cmd_8989]
 RelativePath=JIT\Regression\Dev11\dev11_20929\dev11_20929_ro\dev11_20929_ro.cmd
 WorkingDir=JIT\Regression\Dev11\dev11_20929\dev11_20929_ro
@@ -62082,6 +69515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Dev11_4421.cmd_8990]
 RelativePath=JIT\Regression\Dev11\dev11_4421\Dev11_4421\Dev11_4421.cmd
 WorkingDir=JIT\Regression\Dev11\dev11_4421\Dev11_4421
@@ -62089,6 +69523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Dev11_457559.cmd_8991]
 RelativePath=JIT\Regression\Dev11\Dev11_457559\Dev11_457559\Dev11_457559.cmd
 WorkingDir=JIT\Regression\Dev11\Dev11_457559\Dev11_457559
@@ -62096,6 +69531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Test_HndIndex_10_Plain.cmd_8992]
 RelativePath=JIT\Regression\Dev11\Dev11_468598\Test_HndIndex_10_Plain\Test_HndIndex_10_Plain.cmd
 WorkingDir=JIT\Regression\Dev11\Dev11_468598\Test_HndIndex_10_Plain
@@ -62103,6 +69539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Test_HndIndex_10_Reordered.cmd_8993]
 RelativePath=JIT\Regression\Dev11\Dev11_468598\Test_HndIndex_10_Reordered\Test_HndIndex_10_Reordered.cmd
 WorkingDir=JIT\Regression\Dev11\Dev11_468598\Test_HndIndex_10_Reordered
@@ -62110,6 +69547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Dev11_5437.cmd_8994]
 RelativePath=JIT\Regression\Dev11\Dev11_5437\Dev11_5437\Dev11_5437.cmd
 WorkingDir=JIT\Regression\Dev11\Dev11_5437\Dev11_5437
@@ -62117,6 +69555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Dev11_617302.cmd_8995]
 RelativePath=JIT\Regression\Dev11\Dev11_617302\Dev11_617302\Dev11_617302.cmd
 WorkingDir=JIT\Regression\Dev11\Dev11_617302\Dev11_617302
@@ -62124,6 +69563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Dev11_646049.cmd_8996]
 RelativePath=JIT\Regression\Dev11\Dev11_646049\Dev11_646049\Dev11_646049.cmd
 WorkingDir=JIT\Regression\Dev11\Dev11_646049\Dev11_646049
@@ -62131,6 +69571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [Dev11_76013.cmd_8997]
 RelativePath=JIT\Regression\Dev11\dev11_76013\Dev11_76013\Dev11_76013.cmd
 WorkingDir=JIT\Regression\Dev11\dev11_76013\Dev11_76013
@@ -62138,6 +69579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b473131.cmd_8998]
 RelativePath=JIT\Regression\Dev11\Dev11_b473131\b473131\b473131.cmd
 WorkingDir=JIT\Regression\Dev11\Dev11_b473131\b473131
@@ -62145,6 +69587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b473131_byte.cmd_8999]
 RelativePath=JIT\Regression\Dev11\Dev11_b473131\b473131_byte\b473131_byte.cmd
 WorkingDir=JIT\Regression\Dev11\Dev11_b473131\b473131_byte
@@ -62152,6 +69595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b473131_fld.cmd_9000]
 RelativePath=JIT\Regression\Dev11\Dev11_b473131\b473131_fld\b473131_fld.cmd
 WorkingDir=JIT\Regression\Dev11\Dev11_b473131\b473131_fld
@@ -62159,6 +69603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b473131_intptr.cmd_9001]
 RelativePath=JIT\Regression\Dev11\Dev11_b473131\b473131_intptr\b473131_intptr.cmd
 WorkingDir=JIT\Regression\Dev11\Dev11_b473131\b473131_intptr
@@ -62166,6 +69611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b473131_struct.cmd_9002]
 RelativePath=JIT\Regression\Dev11\Dev11_b473131\b473131_struct\b473131_struct.cmd
 WorkingDir=JIT\Regression\Dev11\Dev11_b473131\b473131_struct
@@ -62173,6 +69619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv2_10623.cmd_9003]
 RelativePath=JIT\Regression\Dev11\DevDiv2_10623\DevDiv2_10623\DevDiv2_10623.cmd
 WorkingDir=JIT\Regression\Dev11\DevDiv2_10623\DevDiv2_10623
@@ -62180,6 +69627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv2_11321.cmd_9004]
 RelativePath=JIT\Regression\Dev11\DevDiv2_11321\DevDiv2_11321\DevDiv2_11321.cmd
 WorkingDir=JIT\Regression\Dev11\DevDiv2_11321\DevDiv2_11321
@@ -62187,6 +69635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv2_8863.cmd_9005]
 RelativePath=JIT\Regression\Dev11\DevDiv2_8863\DevDiv2_8863\DevDiv2_8863.cmd
 WorkingDir=JIT\Regression\Dev11\DevDiv2_8863\DevDiv2_8863
@@ -62194,6 +69643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [BadMax1.cmd_9006]
 RelativePath=JIT\Regression\Dev11\External\dev11_111914\BadMax1\BadMax1.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_111914\BadMax1
@@ -62201,6 +69651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BadBox1.cmd_9007]
 RelativePath=JIT\Regression\Dev11\External\dev11_131317\BadBox1\BadBox1.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_131317\BadBox1
@@ -62208,6 +69659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CSharpPart.cmd_9008]
 RelativePath=JIT\Regression\Dev11\External\dev11_132534\CSharpPart\CSharpPart.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_132534\CSharpPart
@@ -62215,6 +69667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [R3Trasher1.cmd_9009]
 RelativePath=JIT\Regression\Dev11\External\dev11_135245\R3Trasher1\R3Trasher1.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_135245\R3Trasher1
@@ -62222,6 +69675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ReflectOnField.cmd_9010]
 RelativePath=JIT\Regression\Dev11\External\dev11_13748\ReflectOnField\ReflectOnField.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_13748\ReflectOnField
@@ -62229,6 +69683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorForwarder.cmd_9011]
 RelativePath=JIT\Regression\Dev11\External\Dev11_14131\VectorForwarder\VectorForwarder.cmd
 WorkingDir=JIT\Regression\Dev11\External\Dev11_14131\VectorForwarder
@@ -62236,6 +69691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [CSharpPart.cmd_9012]
 RelativePath=JIT\Regression\Dev11\External\dev11_145295\CSharpPart\CSharpPart.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_145295\CSharpPart
@@ -62243,6 +69699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [GCHole1.cmd_9013]
 RelativePath=JIT\Regression\Dev11\External\dev11_149090\GCHole1\GCHole1.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_149090\GCHole1
@@ -62250,6 +69707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DynamicStaticAlignment.cmd_9014]
 RelativePath=JIT\Regression\Dev11\External\dev11_154899\DynamicStaticAlignment\DynamicStaticAlignment.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_154899\DynamicStaticAlignment
@@ -62257,6 +69715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ShowLocallocAlignment.cmd_9015]
 RelativePath=JIT\Regression\Dev11\External\dev11_239804\ShowLocallocAlignment\ShowLocallocAlignment.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_239804\ShowLocallocAlignment
@@ -62264,6 +69723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [app.cmd_9016]
 RelativePath=JIT\Regression\Dev11\External\Dev11_243742\app\app.cmd
 WorkingDir=JIT\Regression\Dev11\External\Dev11_243742\app
@@ -62271,6 +69731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [UninitializedHighWord.cmd_9017]
 RelativePath=JIT\Regression\Dev11\External\dev11_27971\UninitializedHighWord\UninitializedHighWord.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_27971\UninitializedHighWord
@@ -62278,6 +69739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [R3Contention.cmd_9018]
 RelativePath=JIT\Regression\Dev11\External\dev11_28763\R3Contention\R3Contention.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_28763\R3Contention
@@ -62285,6 +69747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BadCheckedAdd1.cmd_9019]
 RelativePath=JIT\Regression\Dev11\External\dev11_77709\BadCheckedAdd1\BadCheckedAdd1.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_77709\BadCheckedAdd1
@@ -62292,6 +69755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [UseUnalignedDouble.cmd_9020]
 RelativePath=JIT\Regression\Dev11\External\Dev11_90434\UseUnalignedDouble\UseUnalignedDouble.cmd
 WorkingDir=JIT\Regression\Dev11\External\Dev11_90434\UseUnalignedDouble
@@ -62299,6 +69763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [UseTrashedVfp1.cmd_9021]
 RelativePath=JIT\Regression\Dev11\External\dev11_91048\UseTrashedVfp1\UseTrashedVfp1.cmd
 WorkingDir=JIT\Regression\Dev11\External\dev11_91048\UseTrashedVfp1
@@ -62306,6 +69771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_876169_d.cmd_9022]
 RelativePath=JIT\Regression\Dev14\DevDiv_876169\DevDiv_876169_d\DevDiv_876169_d.cmd
 WorkingDir=JIT\Regression\Dev14\DevDiv_876169\DevDiv_876169_d
@@ -62313,6 +69779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_876169_do.cmd_9023]
 RelativePath=JIT\Regression\Dev14\DevDiv_876169\DevDiv_876169_do\DevDiv_876169_do.cmd
 WorkingDir=JIT\Regression\Dev14\DevDiv_876169\DevDiv_876169_do
@@ -62320,6 +69787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_876169_r.cmd_9024]
 RelativePath=JIT\Regression\Dev14\DevDiv_876169\DevDiv_876169_r\DevDiv_876169_r.cmd
 WorkingDir=JIT\Regression\Dev14\DevDiv_876169\DevDiv_876169_r
@@ -62327,6 +69795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_876169_ro.cmd_9025]
 RelativePath=JIT\Regression\Dev14\DevDiv_876169\DevDiv_876169_ro\DevDiv_876169_ro.cmd
 WorkingDir=JIT\Regression\Dev14\DevDiv_876169\DevDiv_876169_ro
@@ -62334,20 +69803,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_150265.cmd_9026]
 RelativePath=JIT\Regression\JitBlue\DevDiv_150265\DevDiv_150265\DevDiv_150265.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_150265\DevDiv_150265
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_150586.cmd_9027]
 RelativePath=JIT\Regression\JitBlue\DevDiv_150586\DevDiv_150586\DevDiv_150586.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_150586\DevDiv_150586
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_168744.cmd_9028]
 RelativePath=JIT\Regression\JitBlue\DevDiv_168744\DevDiv_168744\DevDiv_168744.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_168744\DevDiv_168744
@@ -62355,6 +69827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [devdiv_174983.cmd_9029]
 RelativePath=JIT\Regression\JitBlue\devdiv_174983\devdiv_174983\devdiv_174983.cmd
 WorkingDir=JIT\Regression\JitBlue\devdiv_174983\devdiv_174983
@@ -62362,6 +69835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [devdiv_180411.cmd_9030]
 RelativePath=JIT\Regression\JitBlue\devdiv_180411\devdiv_180411\devdiv_180411.cmd
 WorkingDir=JIT\Regression\JitBlue\devdiv_180411\devdiv_180411
@@ -62369,34 +69843,39 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_199169.cmd_9031]
 RelativePath=JIT\Regression\JitBlue\DevDiv_199169\DevDiv_199169\DevDiv_199169.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_199169\DevDiv_199169
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_200492.cmd_9032]
 RelativePath=JIT\Regression\JitBlue\DevDiv_200492\DevDiv_200492\DevDiv_200492.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_200492\DevDiv_200492
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [starg0.cmd_9033]
 RelativePath=JIT\Regression\JitBlue\DevDiv_205323\starg0\starg0.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_205323\starg0
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [handleMath.cmd_9034]
 RelativePath=JIT\Regression\JitBlue\DevDiv_206786\handleMath\handleMath.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_206786\handleMath
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_794115_d.cmd_9035]
 RelativePath=JIT\Regression\JitBlue\DevDiv_794115\DevDiv_794115_d\DevDiv_794115_d.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_794115\DevDiv_794115_d
@@ -62404,6 +69883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_794115_do.cmd_9036]
 RelativePath=JIT\Regression\JitBlue\DevDiv_794115\DevDiv_794115_do\DevDiv_794115_do.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_794115\DevDiv_794115_do
@@ -62411,6 +69891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_794115_r.cmd_9037]
 RelativePath=JIT\Regression\JitBlue\DevDiv_794115\DevDiv_794115_r\DevDiv_794115_r.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_794115\DevDiv_794115_r
@@ -62418,6 +69899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_794115_ro.cmd_9038]
 RelativePath=JIT\Regression\JitBlue\DevDiv_794115\DevDiv_794115_ro\DevDiv_794115_ro.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_794115\DevDiv_794115_ro
@@ -62425,6 +69907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_794631_d.cmd_9039]
 RelativePath=JIT\Regression\JitBlue\DevDiv_794631\DevDiv_794631_d\DevDiv_794631_d.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_794631\DevDiv_794631_d
@@ -62432,6 +69915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_794631_do.cmd_9040]
 RelativePath=JIT\Regression\JitBlue\DevDiv_794631\DevDiv_794631_do\DevDiv_794631_do.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_794631\DevDiv_794631_do
@@ -62439,6 +69923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_794631_r.cmd_9041]
 RelativePath=JIT\Regression\JitBlue\DevDiv_794631\DevDiv_794631_r\DevDiv_794631_r.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_794631\DevDiv_794631_r
@@ -62446,6 +69931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_794631_ro.cmd_9042]
 RelativePath=JIT\Regression\JitBlue\DevDiv_794631\DevDiv_794631_ro\DevDiv_794631_ro.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_794631\DevDiv_794631_ro
@@ -62453,6 +69939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_815940_d.cmd_9043]
 RelativePath=JIT\Regression\JitBlue\DevDiv_815940\DevDiv_815940_d\DevDiv_815940_d.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_815940\DevDiv_815940_d
@@ -62460,6 +69947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_815940_do.cmd_9044]
 RelativePath=JIT\Regression\JitBlue\DevDiv_815940\DevDiv_815940_do\DevDiv_815940_do.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_815940\DevDiv_815940_do
@@ -62467,6 +69955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_815940_r.cmd_9045]
 RelativePath=JIT\Regression\JitBlue\DevDiv_815940\DevDiv_815940_r\DevDiv_815940_r.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_815940\DevDiv_815940_r
@@ -62474,6 +69963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_815940_ro.cmd_9046]
 RelativePath=JIT\Regression\JitBlue\DevDiv_815940\DevDiv_815940_ro\DevDiv_815940_ro.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_815940\DevDiv_815940_ro
@@ -62481,6 +69971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [devdiv_815941.cmd_9047]
 RelativePath=JIT\Regression\JitBlue\devdiv_815941\devdiv_815941\devdiv_815941.cmd
 WorkingDir=JIT\Regression\JitBlue\devdiv_815941\devdiv_815941
@@ -62488,6 +69979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [devdiv_815942.cmd_9048]
 RelativePath=JIT\Regression\JitBlue\devdiv_815942\devdiv_815942\devdiv_815942.cmd
 WorkingDir=JIT\Regression\JitBlue\devdiv_815942\devdiv_815942
@@ -62495,6 +69987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_816617_d.cmd_9049]
 RelativePath=JIT\Regression\JitBlue\DevDiv_816617\DevDiv_816617_d\DevDiv_816617_d.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_816617\DevDiv_816617_d
@@ -62502,6 +69995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_816617_do.cmd_9050]
 RelativePath=JIT\Regression\JitBlue\DevDiv_816617\DevDiv_816617_do\DevDiv_816617_do.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_816617\DevDiv_816617_do
@@ -62509,6 +70003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_816617_r.cmd_9051]
 RelativePath=JIT\Regression\JitBlue\DevDiv_816617\DevDiv_816617_r\DevDiv_816617_r.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_816617\DevDiv_816617_r
@@ -62516,6 +70011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_816617_ro.cmd_9052]
 RelativePath=JIT\Regression\JitBlue\DevDiv_816617\DevDiv_816617_ro\DevDiv_816617_ro.cmd
 WorkingDir=JIT\Regression\JitBlue\DevDiv_816617\DevDiv_816617_ro
@@ -62523,6 +70019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_902271.cmd_9053]
 RelativePath=JIT\Regression\JitBlue\devdiv_902271\DevDiv_902271\DevDiv_902271.cmd
 WorkingDir=JIT\Regression\JitBlue\devdiv_902271\DevDiv_902271
@@ -62530,6 +70027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_911875_d.cmd_9054]
 RelativePath=JIT\Regression\JitBlue\devdiv_911875\DevDiv_911875_d\DevDiv_911875_d.cmd
 WorkingDir=JIT\Regression\JitBlue\devdiv_911875\DevDiv_911875_d
@@ -62537,6 +70035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_911875_do.cmd_9055]
 RelativePath=JIT\Regression\JitBlue\devdiv_911875\DevDiv_911875_do\DevDiv_911875_do.cmd
 WorkingDir=JIT\Regression\JitBlue\devdiv_911875\DevDiv_911875_do
@@ -62544,6 +70043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_911875_r.cmd_9056]
 RelativePath=JIT\Regression\JitBlue\devdiv_911875\DevDiv_911875_r\DevDiv_911875_r.cmd
 WorkingDir=JIT\Regression\JitBlue\devdiv_911875\DevDiv_911875_r
@@ -62551,6 +70051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DevDiv_911875_ro.cmd_9057]
 RelativePath=JIT\Regression\JitBlue\devdiv_911875\DevDiv_911875_ro\DevDiv_911875_ro.cmd
 WorkingDir=JIT\Regression\JitBlue\devdiv_911875\DevDiv_911875_ro
@@ -62558,6 +70059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [GitHub_1296.cmd_9058]
 RelativePath=JIT\Regression\JitBlue\GitHub_1296\GitHub_1296\GitHub_1296.cmd
 WorkingDir=JIT\Regression\JitBlue\GitHub_1296\GitHub_1296
@@ -62565,6 +70067,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [GitHub_1323.cmd_9059]
 RelativePath=JIT\Regression\JitBlue\GitHub_1323\GitHub_1323\GitHub_1323.cmd
 WorkingDir=JIT\Regression\JitBlue\GitHub_1323\GitHub_1323
@@ -62572,6 +70075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [GitHub_2580.cmd_9060]
 RelativePath=JIT\Regression\JitBlue\GitHub_2580\GitHub_2580\GitHub_2580.cmd
 WorkingDir=JIT\Regression\JitBlue\GitHub_2580\GitHub_2580
@@ -62579,6 +70083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [GitHub_2610.cmd_9061]
 RelativePath=JIT\Regression\JitBlue\GitHub_2610\GitHub_2610\GitHub_2610.cmd
 WorkingDir=JIT\Regression\JitBlue\GitHub_2610\GitHub_2610
@@ -62586,34 +70091,39 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [GitHub_3449.cmd_9062]
 RelativePath=JIT\Regression\JitBlue\GitHub_3449\GitHub_3449\GitHub_3449.cmd
 WorkingDir=JIT\Regression\JitBlue\GitHub_3449\GitHub_3449
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GitHub_4044.cmd_9063]
 RelativePath=JIT\Regression\JitBlue\GitHub_4044\GitHub_4044\GitHub_4044.cmd
 WorkingDir=JIT\Regression\JitBlue\GitHub_4044\GitHub_4044
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GitHub_4115.cmd_9064]
 RelativePath=JIT\Regression\JitBlue\GitHub_4115\GitHub_4115\GitHub_4115.cmd
 WorkingDir=JIT\Regression\JitBlue\GitHub_4115\GitHub_4115
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GitHub_5164.cmd_9065]
 RelativePath=JIT\Regression\JitBlue\GitHub_5164\GitHub_5164\GitHub_5164.cmd
 WorkingDir=JIT\Regression\JitBlue\GitHub_5164\GitHub_5164
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_804810.cmd_9066]
 RelativePath=JIT\Regression\v4\dev10_804810\dev10_804810\dev10_804810.cmd
 WorkingDir=JIT\Regression\v4\dev10_804810\dev10_804810
@@ -62621,6 +70131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b100336.cmd_9067]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b100336\b100336\b100336.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b100336\b100336
@@ -62628,6 +70139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102759.cmd_9068]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b102759\b102759\b102759.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b102759\b102759
@@ -62635,6 +70147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102870.cmd_9069]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b102870\b102870\b102870.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b102870\b102870
@@ -62642,6 +70155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b103838.cmd_9070]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b103838\b103838\b103838.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b103838\b103838
@@ -62649,6 +70163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b103846.cmd_9071]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b103846\b103846\b103846.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b103846\b103846
@@ -62656,6 +70171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b106158.cmd_9072]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b106158\b106158\b106158.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b106158\b106158
@@ -62663,6 +70179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b108366.cmd_9073]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b108366\b108366\b108366.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b108366\b108366
@@ -62670,6 +70187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b108908.cmd_9074]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b108908\b108908\b108908.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b108908\b108908
@@ -62677,6 +70195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b109721.cmd_9075]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b109721\b109721\b109721.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b109721\b109721
@@ -62684,6 +70203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b109878.cmd_9076]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b109878\b109878\b109878.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b109878\b109878
@@ -62691,6 +70211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b111130.cmd_9077]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b111130\b111130\b111130.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b111130\b111130
@@ -62698,6 +70219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b111192.cmd_9078]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b111192\b111192\b111192.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b111192\b111192
@@ -62705,6 +70227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b112348.cmd_9079]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b112348\b112348\b112348.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b112348\b112348
@@ -62712,6 +70235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b112982.cmd_9080]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b112982\b112982\b112982.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b112982\b112982
@@ -62719,6 +70243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b113286.cmd_9081]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b113286\b113286\b113286.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b113286\b113286
@@ -62726,6 +70251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b113493.cmd_9082]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b113493\b113493\b113493.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b113493\b113493
@@ -62733,6 +70259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b114628.cmd_9083]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b114628\b114628\b114628.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b114628\b114628
@@ -62740,6 +70267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b115103.cmd_9084]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b115103\b115103\b115103.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b115103\b115103
@@ -62747,6 +70275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b115253.cmd_9085]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b115253\b115253\b115253.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b115253\b115253
@@ -62754,6 +70283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b119026a.cmd_9086]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b119026\b119026a\b119026a.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b119026\b119026a
@@ -62761,6 +70291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b119026b.cmd_9087]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b119026\b119026b\b119026b.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b119026\b119026b
@@ -62768,6 +70299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b140298.cmd_9088]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b140298\b140298\b140298.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b140298\b140298
@@ -62775,6 +70307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b141062.cmd_9089]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b141062\b141062\b141062.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b141062\b141062
@@ -62782,6 +70315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b141358.cmd_9090]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b141358\b141358\b141358.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b141358\b141358
@@ -62789,6 +70323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b77951.cmd_9091]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b77951\b77951\b77951.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b77951\b77951
@@ -62796,6 +70331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b79852.cmd_9092]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b79852\b79852\b79852.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b79852\b79852
@@ -62803,6 +70339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b79858.cmd_9093]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b79858\b79858\b79858.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b79858\b79858
@@ -62810,6 +70347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b80365.cmd_9094]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b80365\b80365\b80365.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b80365\b80365
@@ -62817,6 +70355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b80373.cmd_9095]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b80373\b80373\b80373.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b80373\b80373
@@ -62824,6 +70363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b80737.cmd_9096]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b80737\b80737\b80737.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b80737\b80737
@@ -62831,6 +70371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b80738.cmd_9097]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b80738\b80738\b80738.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b80738\b80738
@@ -62838,6 +70379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b81763.cmd_9098]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b81763\b81763\b81763.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b81763\b81763
@@ -62845,6 +70387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b81764.cmd_9099]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b81764\b81764\b81764.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b81764\b81764
@@ -62852,6 +70395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b81766.cmd_9100]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b81766\b81766\b81766.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b81766\b81766
@@ -62859,6 +70403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84128.cmd_9101]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b84128\b84128\b84128.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b84128\b84128
@@ -62866,6 +70411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b84129.cmd_9102]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b84129\b84129\b84129.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b84129\b84129
@@ -62873,6 +70419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84131.cmd_9103]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b84131\b84131\b84131.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b84131\b84131
@@ -62880,6 +70427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84136.cmd_9104]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b84136\b84136\b84136.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b84136\b84136
@@ -62887,6 +70435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84586.cmd_9105]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b84586\b84586\b84586.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b84586\b84586
@@ -62894,6 +70443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84590.cmd_9106]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b84590\b84590\b84590.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b84590\b84590
@@ -62901,6 +70451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84592.cmd_9107]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b84592\b84592\b84592.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b84592\b84592
@@ -62908,6 +70459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84957.cmd_9108]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b84957\b84957\b84957.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b84957\b84957
@@ -62915,6 +70467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84958.cmd_9109]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b84958\b84958\b84958.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b84958\b84958
@@ -62922,6 +70475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84961.cmd_9110]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b84961\b84961\b84961.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b84961\b84961
@@ -62929,6 +70483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b84962.cmd_9111]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b84962\b84962\b84962.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b84962\b84962
@@ -62936,6 +70491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b85314.cmd_9112]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b85314\b85314\b85314.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b85314\b85314
@@ -62943,6 +70499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b85315.cmd_9113]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b85315\b85315\b85315.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b85315\b85315
@@ -62950,6 +70507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b85316.cmd_9114]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b85316\b85316\b85316.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b85316\b85316
@@ -62957,6 +70515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b85317.cmd_9115]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b85317\b85317\b85317.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b85317\b85317
@@ -62964,6 +70523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b85564.cmd_9116]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b85564\b85564\b85564.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b85564\b85564
@@ -62971,6 +70531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b85565.cmd_9117]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b85565\b85565\b85565.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b85565\b85565
@@ -62978,6 +70539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b85566.cmd_9118]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b85566\b85566\b85566.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b85566\b85566
@@ -62985,6 +70547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b92713.cmd_9119]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b92713\b92713\b92713.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b92713\b92713
@@ -62992,6 +70555,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b92726.cmd_9120]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b92726\b92726\b92726.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b92726\b92726
@@ -62999,6 +70563,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b98431.cmd_9121]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b98431\b98431\b98431.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b98431\b98431
@@ -63006,6 +70571,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b99219.cmd_9122]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b99219\b99219\b99219.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b99219\b99219
@@ -63013,6 +70579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b99403.cmd_9123]
 RelativePath=JIT\Regression\VS-ia64-JIT\M00\b99403\b99403\b99403.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\M00\b99403\b99403
@@ -63020,6 +70587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b102615.cmd_9124]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b102615\b102615\b102615.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b102615\b102615
@@ -63027,6 +70595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102860.cmd_9125]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b102860\b102860\b102860.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b102860\b102860
@@ -63034,6 +70603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102887.cmd_9126]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b102887\b102887\b102887.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b102887\b102887
@@ -63041,6 +70611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b124409.cmd_9127]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b124409\b124409\b124409.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b124409\b124409
@@ -63048,6 +70619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b126221.cmd_9128]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b126221\b126221\b126221.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b126221\b126221
@@ -63055,6 +70627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b142473.cmd_9129]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b142473\b142473\b142473.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b142473\b142473
@@ -63062,6 +70635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b223862.cmd_9130]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b223862\b223862\b223862.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b223862\b223862
@@ -63069,6 +70643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b301479.cmd_9131]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b301479\b301479\b301479.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b301479\b301479
@@ -63076,6 +70651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b302509.cmd_9132]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b302509\b302509\b302509.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b302509\b302509
@@ -63083,6 +70659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b91074.cmd_9133]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b91074\b91074\b91074.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b91074\b91074
@@ -63090,6 +70667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b91944.cmd_9134]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b91944\b91944\b91944.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b91944\b91944
@@ -63097,6 +70675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b91953.cmd_9135]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b91953\b91953\b91953.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-Beta1\b91953\b91953
@@ -63104,6 +70683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10789.cmd_9136]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10789\b10789\b10789.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10789\b10789
@@ -63111,6 +70691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10790.cmd_9137]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10790\b10790\b10790.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10790\b10790
@@ -63118,6 +70699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10802.cmd_9138]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10802\b10802\b10802.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10802\b10802
@@ -63125,6 +70707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10827.cmd_9139]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10827\b10827\b10827.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10827\b10827
@@ -63132,6 +70715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10841.cmd_9140]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10841\b10841\b10841.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10841\b10841
@@ -63139,6 +70723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b10852.cmd_9141]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10852\b10852\b10852.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b10852\b10852
@@ -63146,6 +70731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b11131.cmd_9142]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b11131\b11131\b11131.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b11131\b11131
@@ -63153,6 +70739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b11878.cmd_9143]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b11878\b11878\b11878.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b11878\b11878
@@ -63160,6 +70747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12022.cmd_9144]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b12022\b12022\b12022.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b12022\b12022
@@ -63167,6 +70755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12263.cmd_9145]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b12263\b12263\b12263.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b12263\b12263
@@ -63174,6 +70763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12343.cmd_9146]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b12343\b12343\b12343.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b12343\b12343
@@ -63181,6 +70771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12390.cmd_9147]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b12390\b12390\b12390.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b12390\b12390
@@ -63188,6 +70779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12425.cmd_9148]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b12425\b12425\b12425.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b12425\b12425
@@ -63195,6 +70787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b13691.cmd_9149]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b13691\b13691\b13691.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b13691\b13691
@@ -63202,6 +70795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14324.cmd_9150]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b14324\b14324\b14324.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b14324\b14324
@@ -63209,6 +70803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b19112a.cmd_9151]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b19112\b19112a\b19112a.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b19112\b19112a
@@ -63216,6 +70811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b19112b.cmd_9152]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M01\b19112\b19112b\b19112b.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M01\b19112\b19112b
@@ -63223,6 +70819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102518.cmd_9153]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b102518\b102518\b102518.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b102518\b102518
@@ -63230,6 +70827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102729.cmd_9154]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b102729\b102729\b102729.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b102729\b102729
@@ -63237,6 +70835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102763.cmd_9155]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b102763\b102763\b102763.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b102763\b102763
@@ -63244,6 +70843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102844.cmd_9156]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b102844\b102844\b102844.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b102844\b102844
@@ -63251,6 +70851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b102886.cmd_9157]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b102886\b102886\b102886.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b102886\b102886
@@ -63258,13 +70859,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b108129.cmd_9158]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b108129\b108129\b108129.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b108129\b108129
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b10828.cmd_9159]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b10828\b10828\b10828.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b10828\b10828
@@ -63272,6 +70875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b12011.cmd_9160]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b12011\b12011\b12011.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b12011\b12011
@@ -63279,6 +70883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b14355.cmd_9161]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14355\b14355\b14355.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14355\b14355
@@ -63286,6 +70891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b14364.cmd_9162]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14364\b14364\b14364.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14364\b14364
@@ -63293,6 +70899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b14366.cmd_9163]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14366\b14366\b14366.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14366\b14366
@@ -63300,6 +70907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14368.cmd_9164]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14368\b14368\b14368.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14368\b14368
@@ -63307,6 +70915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b14369.cmd_9165]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14369\b14369\b14369.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b14369\b14369
@@ -63314,6 +70923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b15539.cmd_9166]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b15539\b15539\b15539.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b15539\b15539
@@ -63321,6 +70931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b16198.cmd_9167]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b16198\b16198\b16198.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b16198\b16198
@@ -63328,6 +70939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b16224.cmd_9168]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b16224\b16224\b16224.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b16224\b16224
@@ -63335,6 +70947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b17023.cmd_9169]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b17023\b17023\b17023.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b17023\b17023
@@ -63342,6 +70955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b17751.cmd_9170]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b17751\b17751\b17751.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b17751\b17751
@@ -63349,6 +70963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b17904.cmd_9171]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b17904\b17904\b17904.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b17904\b17904
@@ -63356,6 +70971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b19101.cmd_9172]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b19101\b19101\b19101.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b19101\b19101
@@ -63363,6 +70979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b19289.cmd_9173]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b19289\b19289\b19289.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b19289\b19289
@@ -63370,6 +70987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b19394.cmd_9174]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b19394\b19394\b19394.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b19394\b19394
@@ -63377,6 +70995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b21015.cmd_9175]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b21015\b21015\b21015.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b21015\b21015
@@ -63384,6 +71003,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b22521.cmd_9176]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b22521\b22521\b22521.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b22521\b22521
@@ -63391,6 +71011,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b22680.cmd_9177]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b22680\b22680\b22680.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b22680\b22680
@@ -63398,6 +71019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b26496.cmd_9178]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b26496\b26496\b26496.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b26496\b26496
@@ -63405,6 +71027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27077.cmd_9179]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b27077\b27077\b27077.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b27077\b27077
@@ -63412,6 +71035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b27978.cmd_9180]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b27978\b27978\b27978.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b27978\b27978
@@ -63419,6 +71043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b27980.cmd_9181]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b27980\b27980\b27980.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b27980\b27980
@@ -63426,6 +71051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28077.cmd_9182]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b28077\b28077\b28077.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b28077\b28077
@@ -63433,6 +71059,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28141.cmd_9183]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b28141\b28141\b28141.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b28141\b28141
@@ -63440,13 +71067,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28158.cmd_9184]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b28158\b28158\b28158.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b28158\b28158
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;JIT;EXPECTED_PASS;LONG_RUNNING
+Categories=LONG_RUNNING;Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b28158_64.cmd_9185]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b28158\b28158_64\b28158_64.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b28158\b28158_64
@@ -63454,6 +71083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b29343.cmd_9186]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b29343\b29343\b29343.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b29343\b29343
@@ -63461,6 +71091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b29727.cmd_9187]
 RelativePath=JIT\Regression\VS-ia64-JIT\V1.2-M02\b29727\b29727\b29727.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V1.2-M02\b29727\b29727
@@ -63468,6 +71099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b184799.cmd_9188]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b184799\b184799\b184799.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b184799\b184799
@@ -63475,6 +71107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b302558.cmd_9189]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b302558\b302558\b302558.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b302558\b302558
@@ -63482,6 +71115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b309539.cmd_9190]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b309539\b309539\b309539.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b309539\b309539
@@ -63489,6 +71123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b309548.cmd_9191]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b309548\b309548\b309548.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b309548\b309548
@@ -63496,6 +71131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b309576.cmd_9192]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b309576\b309576\b309576.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b309576\b309576
@@ -63503,6 +71139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b311420.cmd_9193]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b311420\b311420\b311420.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b311420\b311420
@@ -63510,6 +71147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b333008.cmd_9194]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b333008\b333008\b333008.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b333008\b333008
@@ -63517,6 +71155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b356258.cmd_9195]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b356258\b356258\b356258.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b356258\b356258
@@ -63524,6 +71163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b360587.cmd_9196]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b360587\b360587\b360587.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b360587\b360587
@@ -63531,6 +71171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b431098.cmd_9198]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b431098\b431098\b431098.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b431098\b431098
@@ -63538,6 +71179,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b450688.cmd_9199]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b450688\b450688\b450688.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b450688\b450688
@@ -63545,6 +71187,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b286991.cmd_9200]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-RTM\b286991\b286991\b286991.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-RTM\b286991\b286991
@@ -63552,6 +71195,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [b460385.cmd_9201]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-RTM\b460385\b460385\b460385.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-RTM\b460385\b460385
@@ -63559,6 +71203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [b539509.cmd_9202]
 RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-RTM\b539509\b539509\b539509.cmd
 WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-RTM\b539509\b539509
@@ -63566,6 +71211,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;JIT;EXPECTED_PASS
 HostStyle=0
+
 [DoWhileBndChk.cmd_9203]
 RelativePath=JIT\RyuJIT\DoWhileBndChk\DoWhileBndChk.cmd
 WorkingDir=JIT\RyuJIT\DoWhileBndChk
@@ -63573,6 +71219,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AbsGeneric_r.cmd_9204]
 RelativePath=JIT\SIMD\AbsGeneric_r\AbsGeneric_r.cmd
 WorkingDir=JIT\SIMD\AbsGeneric_r
@@ -63580,6 +71227,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AbsGeneric_ro.cmd_9205]
 RelativePath=JIT\SIMD\AbsGeneric_ro\AbsGeneric_ro.cmd
 WorkingDir=JIT\SIMD\AbsGeneric_ro
@@ -63587,6 +71235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AbsSqrt_r.cmd_9206]
 RelativePath=JIT\SIMD\AbsSqrt_r\AbsSqrt_r.cmd
 WorkingDir=JIT\SIMD\AbsSqrt_r
@@ -63594,6 +71243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AbsSqrt_ro.cmd_9207]
 RelativePath=JIT\SIMD\AbsSqrt_ro\AbsSqrt_ro.cmd
 WorkingDir=JIT\SIMD\AbsSqrt_ro
@@ -63601,6 +71251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AddingSequence_r.cmd_9208]
 RelativePath=JIT\SIMD\AddingSequence_r\AddingSequence_r.cmd
 WorkingDir=JIT\SIMD\AddingSequence_r
@@ -63608,6 +71259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AddingSequence_ro.cmd_9209]
 RelativePath=JIT\SIMD\AddingSequence_ro\AddingSequence_ro.cmd
 WorkingDir=JIT\SIMD\AddingSequence_ro
@@ -63615,6 +71267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BitwiseOperations_r.cmd_9210]
 RelativePath=JIT\SIMD\BitwiseOperations_r\BitwiseOperations_r.cmd
 WorkingDir=JIT\SIMD\BitwiseOperations_r
@@ -63622,6 +71275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BitwiseOperations_ro.cmd_9211]
 RelativePath=JIT\SIMD\BitwiseOperations_ro\BitwiseOperations_ro.cmd
 WorkingDir=JIT\SIMD\BitwiseOperations_ro
@@ -63629,6 +71283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BoxUnbox_r.cmd_9212]
 RelativePath=JIT\SIMD\BoxUnbox_r\BoxUnbox_r.cmd
 WorkingDir=JIT\SIMD\BoxUnbox_r
@@ -63636,6 +71291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BoxUnbox_ro.cmd_9213]
 RelativePath=JIT\SIMD\BoxUnbox_ro\BoxUnbox_ro.cmd
 WorkingDir=JIT\SIMD\BoxUnbox_ro
@@ -63643,6 +71299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BugWithAVX_r.cmd_9214]
 RelativePath=JIT\SIMD\BugWithAVX_r\BugWithAVX_r.cmd
 WorkingDir=JIT\SIMD\BugWithAVX_r
@@ -63650,6 +71307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [BugWithAVX_ro.cmd_9215]
 RelativePath=JIT\SIMD\BugWithAVX_ro\BugWithAVX_ro.cmd
 WorkingDir=JIT\SIMD\BugWithAVX_ro
@@ -63657,6 +71315,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CircleInConvex_r.cmd_9216]
 RelativePath=JIT\SIMD\CircleInConvex_r\CircleInConvex_r.cmd
 WorkingDir=JIT\SIMD\CircleInConvex_r
@@ -63664,6 +71323,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CircleInConvex_ro.cmd_9217]
 RelativePath=JIT\SIMD\CircleInConvex_ro\CircleInConvex_ro.cmd
 WorkingDir=JIT\SIMD\CircleInConvex_ro
@@ -63671,6 +71331,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CreateGeneric_r.cmd_9218]
 RelativePath=JIT\SIMD\CreateGeneric_r\CreateGeneric_r.cmd
 WorkingDir=JIT\SIMD\CreateGeneric_r
@@ -63678,6 +71339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CreateGeneric_ro.cmd_9219]
 RelativePath=JIT\SIMD\CreateGeneric_ro\CreateGeneric_ro.cmd
 WorkingDir=JIT\SIMD\CreateGeneric_ro
@@ -63685,6 +71347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CtorFromArray_r.cmd_9220]
 RelativePath=JIT\SIMD\CtorFromArray_r\CtorFromArray_r.cmd
 WorkingDir=JIT\SIMD\CtorFromArray_r
@@ -63692,6 +71355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CtorFromArray_ro.cmd_9221]
 RelativePath=JIT\SIMD\CtorFromArray_ro\CtorFromArray_ro.cmd
 WorkingDir=JIT\SIMD\CtorFromArray_ro
@@ -63699,6 +71363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Ctors_r.cmd_9222]
 RelativePath=JIT\SIMD\Ctors_r\Ctors_r.cmd
 WorkingDir=JIT\SIMD\Ctors_r
@@ -63706,6 +71371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Ctors_ro.cmd_9223]
 RelativePath=JIT\SIMD\Ctors_ro\Ctors_ro.cmd
 WorkingDir=JIT\SIMD\Ctors_ro
@@ -63713,6 +71379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DivSignedUnsignedTest_r.cmd_9224]
 RelativePath=JIT\SIMD\DivSignedUnsignedTest_r\DivSignedUnsignedTest_r.cmd
 WorkingDir=JIT\SIMD\DivSignedUnsignedTest_r
@@ -63720,6 +71387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DivSignedUnsignedTest_ro.cmd_9225]
 RelativePath=JIT\SIMD\DivSignedUnsignedTest_ro\DivSignedUnsignedTest_ro.cmd
 WorkingDir=JIT\SIMD\DivSignedUnsignedTest_ro
@@ -63727,6 +71395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Dup_r.cmd_9226]
 RelativePath=JIT\SIMD\Dup_r\Dup_r.cmd
 WorkingDir=JIT\SIMD\Dup_r
@@ -63734,6 +71403,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Dup_ro.cmd_9227]
 RelativePath=JIT\SIMD\Dup_ro\Dup_ro.cmd
 WorkingDir=JIT\SIMD\Dup_ro
@@ -63741,6 +71411,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Haar-likeFeaturesGeneric_r.cmd_9228]
 RelativePath=JIT\SIMD\Haar-likeFeaturesGeneric_r\Haar-likeFeaturesGeneric_r.cmd
 WorkingDir=JIT\SIMD\Haar-likeFeaturesGeneric_r
@@ -63748,6 +71419,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Haar-likeFeaturesGeneric_ro.cmd_9229]
 RelativePath=JIT\SIMD\Haar-likeFeaturesGeneric_ro\Haar-likeFeaturesGeneric_ro.cmd
 WorkingDir=JIT\SIMD\Haar-likeFeaturesGeneric_ro
@@ -63755,6 +71427,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [LdfldGeneric_r.cmd_9230]
 RelativePath=JIT\SIMD\LdfldGeneric_r\LdfldGeneric_r.cmd
 WorkingDir=JIT\SIMD\LdfldGeneric_r
@@ -63762,6 +71435,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [LdfldGeneric_ro.cmd_9231]
 RelativePath=JIT\SIMD\LdfldGeneric_ro\LdfldGeneric_ro.cmd
 WorkingDir=JIT\SIMD\LdfldGeneric_ro
@@ -63769,6 +71443,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Ldfld_r.cmd_9232]
 RelativePath=JIT\SIMD\Ldfld_r\Ldfld_r.cmd
 WorkingDir=JIT\SIMD\Ldfld_r
@@ -63776,6 +71451,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Ldfld_ro.cmd_9233]
 RelativePath=JIT\SIMD\Ldfld_ro\Ldfld_ro.cmd
 WorkingDir=JIT\SIMD\Ldfld_ro
@@ -63783,6 +71459,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Ldind_r.cmd_9234]
 RelativePath=JIT\SIMD\Ldind_r\Ldind_r.cmd
 WorkingDir=JIT\SIMD\Ldind_r
@@ -63790,6 +71467,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Ldind_ro.cmd_9235]
 RelativePath=JIT\SIMD\Ldind_ro\Ldind_ro.cmd
 WorkingDir=JIT\SIMD\Ldind_ro
@@ -63797,6 +71475,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [MinMax_r.cmd_9236]
 RelativePath=JIT\SIMD\MinMax_r\MinMax_r.cmd
 WorkingDir=JIT\SIMD\MinMax_r
@@ -63804,6 +71483,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [MinMax_ro.cmd_9237]
 RelativePath=JIT\SIMD\MinMax_ro\MinMax_ro.cmd
 WorkingDir=JIT\SIMD\MinMax_ro
@@ -63811,6 +71491,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Mul_r.cmd_9238]
 RelativePath=JIT\SIMD\Mul_r\Mul_r.cmd
 WorkingDir=JIT\SIMD\Mul_r
@@ -63818,6 +71499,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Mul_ro.cmd_9239]
 RelativePath=JIT\SIMD\Mul_ro\Mul_ro.cmd
 WorkingDir=JIT\SIMD\Mul_ro
@@ -63825,6 +71507,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [SqrtGeneric_r.cmd_9240]
 RelativePath=JIT\SIMD\SqrtGeneric_r\SqrtGeneric_r.cmd
 WorkingDir=JIT\SIMD\SqrtGeneric_r
@@ -63832,6 +71515,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [SqrtGeneric_ro.cmd_9241]
 RelativePath=JIT\SIMD\SqrtGeneric_ro\SqrtGeneric_ro.cmd
 WorkingDir=JIT\SIMD\SqrtGeneric_ro
@@ -63839,6 +71523,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [StoreElement_r.cmd_9242]
 RelativePath=JIT\SIMD\StoreElement_r\StoreElement_r.cmd
 WorkingDir=JIT\SIMD\StoreElement_r
@@ -63846,6 +71531,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [StoreElement_ro.cmd_9243]
 RelativePath=JIT\SIMD\StoreElement_ro\StoreElement_ro.cmd
 WorkingDir=JIT\SIMD\StoreElement_ro
@@ -63853,6 +71539,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Sums_r.cmd_9244]
 RelativePath=JIT\SIMD\Sums_r\Sums_r.cmd
 WorkingDir=JIT\SIMD\Sums_r
@@ -63860,6 +71547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Sums_ro.cmd_9245]
 RelativePath=JIT\SIMD\Sums_ro\Sums_ro.cmd
 WorkingDir=JIT\SIMD\Sums_ro
@@ -63867,20 +71555,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Vector3Interop_r.cmd_9246]
 RelativePath=JIT\SIMD\Vector3Interop_r\Vector3Interop_r.cmd
 WorkingDir=JIT\SIMD\Vector3Interop_r
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Vector3Interop_ro.cmd_9247]
 RelativePath=JIT\SIMD\Vector3Interop_ro\Vector3Interop_ro.cmd
 WorkingDir=JIT\SIMD\Vector3Interop_ro
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Vector3_r.cmd_9248]
 RelativePath=JIT\SIMD\Vector3_r\Vector3_r.cmd
 WorkingDir=JIT\SIMD\Vector3_r
@@ -63888,6 +71579,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Vector3_ro.cmd_9249]
 RelativePath=JIT\SIMD\Vector3_ro\Vector3_ro.cmd
 WorkingDir=JIT\SIMD\Vector3_ro
@@ -63895,6 +71587,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Vector4_r.cmd_9250]
 RelativePath=JIT\SIMD\Vector4_r\Vector4_r.cmd
 WorkingDir=JIT\SIMD\Vector4_r
@@ -63902,6 +71595,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Vector4_ro.cmd_9251]
 RelativePath=JIT\SIMD\Vector4_ro\Vector4_ro.cmd
 WorkingDir=JIT\SIMD\Vector4_ro
@@ -63909,6 +71603,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorAbs_r.cmd_9252]
 RelativePath=JIT\SIMD\VectorAbs_r\VectorAbs_r.cmd
 WorkingDir=JIT\SIMD\VectorAbs_r
@@ -63916,6 +71611,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorAbs_ro.cmd_9253]
 RelativePath=JIT\SIMD\VectorAbs_ro\VectorAbs_ro.cmd
 WorkingDir=JIT\SIMD\VectorAbs_ro
@@ -63923,6 +71619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorAdd_r.cmd_9254]
 RelativePath=JIT\SIMD\VectorAdd_r\VectorAdd_r.cmd
 WorkingDir=JIT\SIMD\VectorAdd_r
@@ -63930,6 +71627,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorAdd_ro.cmd_9255]
 RelativePath=JIT\SIMD\VectorAdd_ro\VectorAdd_ro.cmd
 WorkingDir=JIT\SIMD\VectorAdd_ro
@@ -63937,6 +71635,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorArgs_r.cmd_9256]
 RelativePath=JIT\SIMD\VectorArgs_r\VectorArgs_r.cmd
 WorkingDir=JIT\SIMD\VectorArgs_r
@@ -63944,6 +71643,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorArgs_ro.cmd_9257]
 RelativePath=JIT\SIMD\VectorArgs_ro\VectorArgs_ro.cmd
 WorkingDir=JIT\SIMD\VectorArgs_ro
@@ -63951,6 +71651,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorArrayInit_r.cmd_9258]
 RelativePath=JIT\SIMD\VectorArrayInit_r\VectorArrayInit_r.cmd
 WorkingDir=JIT\SIMD\VectorArrayInit_r
@@ -63958,6 +71659,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorArrayInit_ro.cmd_9259]
 RelativePath=JIT\SIMD\VectorArrayInit_ro\VectorArrayInit_ro.cmd
 WorkingDir=JIT\SIMD\VectorArrayInit_ro
@@ -63965,6 +71667,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorArray_r.cmd_9260]
 RelativePath=JIT\SIMD\VectorArray_r\VectorArray_r.cmd
 WorkingDir=JIT\SIMD\VectorArray_r
@@ -63972,6 +71675,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorArray_ro.cmd_9261]
 RelativePath=JIT\SIMD\VectorArray_ro\VectorArray_ro.cmd
 WorkingDir=JIT\SIMD\VectorArray_ro
@@ -63979,6 +71683,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorCopyToArray_r.cmd_9262]
 RelativePath=JIT\SIMD\VectorCopyToArray_r\VectorCopyToArray_r.cmd
 WorkingDir=JIT\SIMD\VectorCopyToArray_r
@@ -63986,6 +71691,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorCopyToArray_ro.cmd_9263]
 RelativePath=JIT\SIMD\VectorCopyToArray_ro\VectorCopyToArray_ro.cmd
 WorkingDir=JIT\SIMD\VectorCopyToArray_ro
@@ -63993,6 +71699,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorDiv_r.cmd_9264]
 RelativePath=JIT\SIMD\VectorDiv_r\VectorDiv_r.cmd
 WorkingDir=JIT\SIMD\VectorDiv_r
@@ -64000,6 +71707,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorDiv_ro.cmd_9265]
 RelativePath=JIT\SIMD\VectorDiv_ro\VectorDiv_ro.cmd
 WorkingDir=JIT\SIMD\VectorDiv_ro
@@ -64007,6 +71715,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorDot_r.cmd_9266]
 RelativePath=JIT\SIMD\VectorDot_r\VectorDot_r.cmd
 WorkingDir=JIT\SIMD\VectorDot_r
@@ -64014,6 +71723,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorDot_ro.cmd_9267]
 RelativePath=JIT\SIMD\VectorDot_ro\VectorDot_ro.cmd
 WorkingDir=JIT\SIMD\VectorDot_ro
@@ -64021,6 +71731,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorExp_r.cmd_9268]
 RelativePath=JIT\SIMD\VectorExp_r\VectorExp_r.cmd
 WorkingDir=JIT\SIMD\VectorExp_r
@@ -64028,6 +71739,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorExp_ro.cmd_9269]
 RelativePath=JIT\SIMD\VectorExp_ro\VectorExp_ro.cmd
 WorkingDir=JIT\SIMD\VectorExp_ro
@@ -64035,6 +71747,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorGet_r.cmd_9270]
 RelativePath=JIT\SIMD\VectorGet_r\VectorGet_r.cmd
 WorkingDir=JIT\SIMD\VectorGet_r
@@ -64042,6 +71755,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorGet_ro.cmd_9271]
 RelativePath=JIT\SIMD\VectorGet_ro\VectorGet_ro.cmd
 WorkingDir=JIT\SIMD\VectorGet_ro
@@ -64049,6 +71763,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorHWAccel2_r.cmd_9272]
 RelativePath=JIT\SIMD\VectorHWAccel2_r\VectorHWAccel2_r.cmd
 WorkingDir=JIT\SIMD\VectorHWAccel2_r
@@ -64056,6 +71771,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorHWAccel2_ro.cmd_9273]
 RelativePath=JIT\SIMD\VectorHWAccel2_ro\VectorHWAccel2_ro.cmd
 WorkingDir=JIT\SIMD\VectorHWAccel2_ro
@@ -64063,6 +71779,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorHWAccel_r.cmd_9274]
 RelativePath=JIT\SIMD\VectorHWAccel_r\VectorHWAccel_r.cmd
 WorkingDir=JIT\SIMD\VectorHWAccel_r
@@ -64070,6 +71787,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorHWAccel_ro.cmd_9275]
 RelativePath=JIT\SIMD\VectorHWAccel_ro\VectorHWAccel_ro.cmd
 WorkingDir=JIT\SIMD\VectorHWAccel_ro
@@ -64077,6 +71795,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorInitN_r.cmd_9276]
 RelativePath=JIT\SIMD\VectorInitN_r\VectorInitN_r.cmd
 WorkingDir=JIT\SIMD\VectorInitN_r
@@ -64084,6 +71803,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorInitN_ro.cmd_9277]
 RelativePath=JIT\SIMD\VectorInitN_ro\VectorInitN_ro.cmd
 WorkingDir=JIT\SIMD\VectorInitN_ro
@@ -64091,6 +71811,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorInit_r.cmd_9278]
 RelativePath=JIT\SIMD\VectorInit_r\VectorInit_r.cmd
 WorkingDir=JIT\SIMD\VectorInit_r
@@ -64098,6 +71819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorInit_ro.cmd_9279]
 RelativePath=JIT\SIMD\VectorInit_ro\VectorInit_ro.cmd
 WorkingDir=JIT\SIMD\VectorInit_ro
@@ -64105,6 +71827,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorIntEquals_r.cmd_9280]
 RelativePath=JIT\SIMD\VectorIntEquals_r\VectorIntEquals_r.cmd
 WorkingDir=JIT\SIMD\VectorIntEquals_r
@@ -64112,6 +71835,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorIntEquals_ro.cmd_9281]
 RelativePath=JIT\SIMD\VectorIntEquals_ro\VectorIntEquals_ro.cmd
 WorkingDir=JIT\SIMD\VectorIntEquals_ro
@@ -64119,6 +71843,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorMatrix_r.cmd_9282]
 RelativePath=JIT\SIMD\VectorMatrix_r\VectorMatrix_r.cmd
 WorkingDir=JIT\SIMD\VectorMatrix_r
@@ -64126,6 +71851,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorMatrix_ro.cmd_9283]
 RelativePath=JIT\SIMD\VectorMatrix_ro\VectorMatrix_ro.cmd
 WorkingDir=JIT\SIMD\VectorMatrix_ro
@@ -64133,6 +71859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorMax_r.cmd_9284]
 RelativePath=JIT\SIMD\VectorMax_r\VectorMax_r.cmd
 WorkingDir=JIT\SIMD\VectorMax_r
@@ -64140,6 +71867,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorMax_ro.cmd_9285]
 RelativePath=JIT\SIMD\VectorMax_ro\VectorMax_ro.cmd
 WorkingDir=JIT\SIMD\VectorMax_ro
@@ -64147,6 +71875,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorMin_r.cmd_9286]
 RelativePath=JIT\SIMD\VectorMin_r\VectorMin_r.cmd
 WorkingDir=JIT\SIMD\VectorMin_r
@@ -64154,6 +71883,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorMin_ro.cmd_9287]
 RelativePath=JIT\SIMD\VectorMin_ro\VectorMin_ro.cmd
 WorkingDir=JIT\SIMD\VectorMin_ro
@@ -64161,6 +71891,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorMul_r.cmd_9288]
 RelativePath=JIT\SIMD\VectorMul_r\VectorMul_r.cmd
 WorkingDir=JIT\SIMD\VectorMul_r
@@ -64168,6 +71899,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorMul_ro.cmd_9289]
 RelativePath=JIT\SIMD\VectorMul_ro\VectorMul_ro.cmd
 WorkingDir=JIT\SIMD\VectorMul_ro
@@ -64175,6 +71907,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorRelOp_r.cmd_9290]
 RelativePath=JIT\SIMD\VectorRelOp_r\VectorRelOp_r.cmd
 WorkingDir=JIT\SIMD\VectorRelOp_r
@@ -64182,6 +71915,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorRelOp_ro.cmd_9291]
 RelativePath=JIT\SIMD\VectorRelOp_ro\VectorRelOp_ro.cmd
 WorkingDir=JIT\SIMD\VectorRelOp_ro
@@ -64189,6 +71923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorReturn_r.cmd_9292]
 RelativePath=JIT\SIMD\VectorReturn_r\VectorReturn_r.cmd
 WorkingDir=JIT\SIMD\VectorReturn_r
@@ -64196,6 +71931,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorReturn_ro.cmd_9293]
 RelativePath=JIT\SIMD\VectorReturn_ro\VectorReturn_ro.cmd
 WorkingDir=JIT\SIMD\VectorReturn_ro
@@ -64203,6 +71939,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS;ISSUE_5642
 HostStyle=0
+
 [VectorSet_r.cmd_9294]
 RelativePath=JIT\SIMD\VectorSet_r\VectorSet_r.cmd
 WorkingDir=JIT\SIMD\VectorSet_r
@@ -64210,6 +71947,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorSet_ro.cmd_9295]
 RelativePath=JIT\SIMD\VectorSet_ro\VectorSet_ro.cmd
 WorkingDir=JIT\SIMD\VectorSet_ro
@@ -64217,6 +71955,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorSqrt_r.cmd_9296]
 RelativePath=JIT\SIMD\VectorSqrt_r\VectorSqrt_r.cmd
 WorkingDir=JIT\SIMD\VectorSqrt_r
@@ -64224,6 +71963,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorSqrt_ro.cmd_9297]
 RelativePath=JIT\SIMD\VectorSqrt_ro\VectorSqrt_ro.cmd
 WorkingDir=JIT\SIMD\VectorSqrt_ro
@@ -64231,6 +71971,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorSub_r.cmd_9298]
 RelativePath=JIT\SIMD\VectorSub_r\VectorSub_r.cmd
 WorkingDir=JIT\SIMD\VectorSub_r
@@ -64238,6 +71979,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorSub_ro.cmd_9299]
 RelativePath=JIT\SIMD\VectorSub_ro\VectorSub_ro.cmd
 WorkingDir=JIT\SIMD\VectorSub_ro
@@ -64245,6 +71987,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorUnused_r.cmd_9300]
 RelativePath=JIT\SIMD\VectorUnused_r\VectorUnused_r.cmd
 WorkingDir=JIT\SIMD\VectorUnused_r
@@ -64252,6 +71995,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [VectorUnused_ro.cmd_9301]
 RelativePath=JIT\SIMD\VectorUnused_ro\VectorUnused_ro.cmd
 WorkingDir=JIT\SIMD\VectorUnused_ro
@@ -64259,13 +72003,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri0;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_9302]
 RelativePath=Loader\binding\assemblies\assemblybugs\102140\test\test.cmd
 WorkingDir=Loader\binding\assemblies\assemblybugs\102140\test
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [repro177066.cmd_9303]
 RelativePath=Loader\binding\assemblies\assemblybugs\177066w\repro177066\repro177066.cmd
 WorkingDir=Loader\binding\assemblies\assemblybugs\177066w\repro177066
@@ -64273,6 +72019,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [client.cmd_9304]
 RelativePath=Loader\binding\assemblies\assemblybugs\203962w\client\client.cmd
 WorkingDir=Loader\binding\assemblies\assemblybugs\203962w\client
@@ -64280,6 +72027,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [EmbedStringVersions.cmd_9305]
 RelativePath=Loader\binding\assemblies\assemblyversion\EmbedStringVersions\EmbedStringVersions.cmd
 WorkingDir=Loader\binding\assemblies\assemblyversion\EmbedStringVersions
@@ -64287,6 +72035,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS;UNWIND
 HostStyle=0
+
 [properties.cmd_9306]
 RelativePath=Loader\binding\assemblies\basicapi\assemblynamector\properties\properties.cmd
 WorkingDir=Loader\binding\assemblies\basicapi\assemblynamector\properties
@@ -64294,6 +72043,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [exceptions.cmd_9307]
 RelativePath=Loader\binding\assemblies\generics\arilistienum\methods\exceptions\exceptions.cmd
 WorkingDir=Loader\binding\assemblies\generics\arilistienum\methods\exceptions
@@ -64301,6 +72051,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [methods.cmd_9308]
 RelativePath=Loader\binding\assemblies\generics\arilistienum\methods\methods\methods.cmd
 WorkingDir=Loader\binding\assemblies\generics\arilistienum\methods\methods
@@ -64308,13 +72059,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case10.cmd_9309]
 RelativePath=Loader\classloader\explicitlayout\misc\case10\case10.cmd
 WorkingDir=Loader\classloader\explicitlayout\misc\case10
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [derivedExplicitClass.cmd_9310]
 RelativePath=Loader\classloader\explicitlayout\misc\derivedExplicitClass\derivedExplicitClass.cmd
 WorkingDir=Loader\classloader\explicitlayout\misc\derivedExplicitClass
@@ -64322,6 +72075,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case1.cmd_9311]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case1\case1.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case1
@@ -64329,6 +72083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case11.cmd_9312]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case11\case11.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case11
@@ -64336,6 +72091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case12.cmd_9313]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case12\case12.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case12
@@ -64343,6 +72099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case14.cmd_9314]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case14\case14.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case14
@@ -64350,6 +72107,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case15.cmd_9315]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case15\case15.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case15
@@ -64357,6 +72115,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case2.cmd_9316]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case2\case2.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case2
@@ -64364,6 +72123,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case3.cmd_9317]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case3\case3.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case3
@@ -64371,6 +72131,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case4.cmd_9318]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case4\case4.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case4
@@ -64378,6 +72139,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case5.cmd_9319]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case5\case5.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case5
@@ -64385,6 +72147,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case6.cmd_9320]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case6\case6.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case6
@@ -64392,6 +72155,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case7.cmd_9321]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case7\case7.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case7
@@ -64399,6 +72163,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case8.cmd_9322]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case8\case8.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case8
@@ -64406,6 +72171,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [case9.cmd_9323]
 RelativePath=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case9\case9.cmd
 WorkingDir=Loader\classloader\explicitlayout\objrefandnonobjrefoverlap\case9
@@ -64413,1252 +72179,1423 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [explicitStruct_oddSize.cmd_9324]
 RelativePath=Loader\classloader\explicitlayout\Regressions\298006\explicitStruct_oddSize\explicitStruct_oddSize.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\298006\explicitStruct_oddSize
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [repro369794.cmd_9325]
 RelativePath=Loader\classloader\explicitlayout\Regressions\369794\repro369794\repro369794.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\369794\repro369794
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [bigdat.cmd_9326]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\bigdat\bigdat.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\bigdat
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test10.cmd_9327]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test10\test10.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test10
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test11.cmd_9328]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test11\test11.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test11
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test13.cmd_9329]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test13\test13.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test13
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test14.cmd_9330]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test14\test14.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test14
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test15.cmd_9331]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test15\test15.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test15
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test16.cmd_9332]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test16\test16.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test16
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test2.cmd_9333]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test2\test2.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test21.cmd_9334]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test21\test21.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test21
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test23.cmd_9335]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test23\test23.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test23
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test24.cmd_9336]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test24\test24.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test24
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test3.cmd_9337]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test3\test3.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test9.cmd_9338]
 RelativePath=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test9\test9.cmd
 WorkingDir=Loader\classloader\explicitlayout\Regressions\ASURT\ASURT150271\test9
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ManyGenConstraints.cmd_9339]
 RelativePath=Loader\classloader\generics\Constraints\General\ManyGenConstraints\ManyGenConstraints.cmd
 WorkingDir=Loader\classloader\generics\Constraints\General\ManyGenConstraints
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RecursiveConstraints.cmd_9340]
 RelativePath=Loader\classloader\generics\Constraints\Recursion\RecursiveConstraints\RecursiveConstraints.cmd
 WorkingDir=Loader\classloader\generics\Constraints\Recursion\RecursiveConstraints
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [VSW532403.cmd_9341]
 RelativePath=Loader\classloader\generics\Constraints\Regressions\532403\VSW532403\VSW532403.cmd
 WorkingDir=Loader\classloader\generics\Constraints\Regressions\532403\VSW532403
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [bug62403.cmd_9342]
 RelativePath=Loader\classloader\generics\Constraints\Regressions\ddb62403\bug62403\bug62403.cmd
 WorkingDir=Loader\classloader\generics\Constraints\Regressions\ddb62403\bug62403
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_512868.cmd_9343]
 RelativePath=Loader\classloader\generics\Constraints\Regressions\dev10_512868\dev10_512868\dev10_512868.cmd
 WorkingDir=Loader\classloader\generics\Constraints\Regressions\dev10_512868\dev10_512868
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw609874.cmd_9344]
 RelativePath=Loader\classloader\generics\Constraints\Regressions\vsw609874\vsw609874\vsw609874.cmd
 WorkingDir=Loader\classloader\generics\Constraints\Regressions\vsw609874\vsw609874
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [arity01.cmd_9345]
 RelativePath=Loader\classloader\generics\GenericMethods\arity01\arity01.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\arity01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method001.cmd_9346]
 RelativePath=Loader\classloader\generics\GenericMethods\method001\method001.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method001
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method001a.cmd_9347]
 RelativePath=Loader\classloader\generics\GenericMethods\method001a\method001a.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method001a
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method001b.cmd_9348]
 RelativePath=Loader\classloader\generics\GenericMethods\method001b\method001b.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method001b
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method001c.cmd_9349]
 RelativePath=Loader\classloader\generics\GenericMethods\method001c\method001c.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method001c
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method001d.cmd_9350]
 RelativePath=Loader\classloader\generics\GenericMethods\method001d\method001d.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method001d
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method001e.cmd_9351]
 RelativePath=Loader\classloader\generics\GenericMethods\method001e\method001e.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method001e
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method001f.cmd_9352]
 RelativePath=Loader\classloader\generics\GenericMethods\method001f\method001f.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method001f
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method001g.cmd_9353]
 RelativePath=Loader\classloader\generics\GenericMethods\method001g\method001g.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method001g
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method001h.cmd_9354]
 RelativePath=Loader\classloader\generics\GenericMethods\method001h\method001h.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method001h
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method001i.cmd_9355]
 RelativePath=Loader\classloader\generics\GenericMethods\method001i\method001i.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method001i
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method001j.cmd_9356]
 RelativePath=Loader\classloader\generics\GenericMethods\method001j\method001j.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method001j
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method002.cmd_9357]
 RelativePath=Loader\classloader\generics\GenericMethods\method002\method002.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method002
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method003.cmd_9358]
 RelativePath=Loader\classloader\generics\GenericMethods\method003\method003.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method003
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method004.cmd_9359]
 RelativePath=Loader\classloader\generics\GenericMethods\method004\method004.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method004
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method005.cmd_9360]
 RelativePath=Loader\classloader\generics\GenericMethods\method005\method005.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method005
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method006.cmd_9361]
 RelativePath=Loader\classloader\generics\GenericMethods\method006\method006.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method006
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method007.cmd_9362]
 RelativePath=Loader\classloader\generics\GenericMethods\method007\method007.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method007
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method008.cmd_9363]
 RelativePath=Loader\classloader\generics\GenericMethods\method008\method008.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method008
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method009.cmd_9364]
 RelativePath=Loader\classloader\generics\GenericMethods\method009\method009.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method009
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method010.cmd_9365]
 RelativePath=Loader\classloader\generics\GenericMethods\method010\method010.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method010
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method011.cmd_9366]
 RelativePath=Loader\classloader\generics\GenericMethods\method011\method011.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method011
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method012.cmd_9367]
 RelativePath=Loader\classloader\generics\GenericMethods\method012\method012.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method012
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method013.cmd_9368]
 RelativePath=Loader\classloader\generics\GenericMethods\method013\method013.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method013
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method014.cmd_9369]
 RelativePath=Loader\classloader\generics\GenericMethods\method014\method014.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method014
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method015.cmd_9370]
 RelativePath=Loader\classloader\generics\GenericMethods\method015\method015.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method015
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [method016.cmd_9371]
 RelativePath=Loader\classloader\generics\GenericMethods\method016\method016.cmd
 WorkingDir=Loader\classloader\generics\GenericMethods\method016
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
-HostStyle=0
-[VSW491668.cmd_9372]
-RelativePath=Loader\classloader\generics\GenericMethods\VSW491668\VSW491668.cmd
-WorkingDir=Loader\classloader\generics\GenericMethods\VSW491668
-Expected=0
-MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_FAIL
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [abstract01.cmd_9373]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\abstract01\abstract01.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\abstract01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [abstract02.cmd_9374]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\abstract02\abstract02.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\abstract02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [abstract03.cmd_9375]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\abstract03\abstract03.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\abstract03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [abstract04.cmd_9376]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\abstract04\abstract04.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\abstract04
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [abstract05.cmd_9377]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\abstract05\abstract05.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\abstract05
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [abstract06.cmd_9378]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\abstract06\abstract06.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\abstract06
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [abstract07.cmd_9379]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\abstract07\abstract07.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\abstract07
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [abstract08.cmd_9380]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\abstract08\abstract08.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\abstract08
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [abstract09.cmd_9381]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\abstract09\abstract09.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\abstract09
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [abstract10.cmd_9382]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\abstract10\abstract10.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\abstract10
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [param01.cmd_9383]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\param01\param01.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\param01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [param02.cmd_9384]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\param02\param02.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\param02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [param03.cmd_9385]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\param03\param03.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\param03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [param04.cmd_9386]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\param04\param04.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\param04
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [param05.cmd_9387]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\param05\param05.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\param05
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [param06.cmd_9388]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\param06\param06.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\param06
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [param07.cmd_9389]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\param07\param07.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\param07
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [param08.cmd_9390]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\param08\param08.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\param08
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Type_ofT_Inherit_FromT.cmd_9391]
 RelativePath=Loader\classloader\generics\Instantiation\Negative\Type_ofT_Inherit_FromT\Type_ofT_Inherit_FromT.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Negative\Type_ofT_Inherit_FromT
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedGenericClasses.cmd_9392]
 RelativePath=Loader\classloader\generics\Instantiation\Nesting\NestedGenericClasses\NestedGenericClasses.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Nesting\NestedGenericClasses
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedGenericStructs.cmd_9393]
 RelativePath=Loader\classloader\generics\Instantiation\Nesting\NestedGenericStructs\NestedGenericStructs.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Nesting\NestedGenericStructs
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedGenericTypesMix.cmd_9394]
 RelativePath=Loader\classloader\generics\Instantiation\Nesting\NestedGenericTypesMix\NestedGenericTypesMix.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Nesting\NestedGenericTypesMix
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AbstractBase01.cmd_9395]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\AbstractBase01\AbstractBase01.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\AbstractBase01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AbstractBase02.cmd_9396]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\AbstractBase02\AbstractBase02.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\AbstractBase02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AbstractBase03.cmd_9397]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\AbstractBase03\AbstractBase03.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\AbstractBase03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AbstractBase04.cmd_9398]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\AbstractBase04\AbstractBase04.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\AbstractBase04
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AbstractBase05.cmd_9399]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\AbstractBase05\AbstractBase05.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\AbstractBase05
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AbstractBase06.cmd_9400]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\AbstractBase06\AbstractBase06.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\AbstractBase06
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [AbstractBase07.cmd_9401]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\AbstractBase07\AbstractBase07.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\AbstractBase07
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface01.cmd_9402]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface01\MultipleInterface01.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface02.cmd_9403]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface02\MultipleInterface02.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface03.cmd_9404]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface03\MultipleInterface03.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface04.cmd_9405]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface04\MultipleInterface04.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface04
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface05.cmd_9406]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface05\MultipleInterface05.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface05
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface06.cmd_9407]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface06\MultipleInterface06.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface06
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface07.cmd_9408]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface07\MultipleInterface07.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface07
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface08.cmd_9409]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface08\MultipleInterface08.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface08
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface09.cmd_9410]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface09\MultipleInterface09.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface09
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface10.cmd_9411]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface10\MultipleInterface10.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface10
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface11.cmd_9412]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface11\MultipleInterface11.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface11
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface12.cmd_9413]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface12\MultipleInterface12.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface12
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface13.cmd_9414]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface13\MultipleInterface13.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface13
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MultipleInterface14.cmd_9415]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\MultipleInterface14\MultipleInterface14.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\MultipleInterface14
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedBaseClass01.cmd_9416]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass01\NestedBaseClass01.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedBaseClass02.cmd_9417]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass02\NestedBaseClass02.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedBaseClass03.cmd_9418]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass03\NestedBaseClass03.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedBaseClass04.cmd_9419]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass04\NestedBaseClass04.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass04
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedBaseClass05.cmd_9420]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass05\NestedBaseClass05.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass05
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedBaseClass06.cmd_9421]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass06\NestedBaseClass06.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedBaseClass06
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedClass01.cmd_9422]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedClass01\NestedClass01.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedClass01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedClass02.cmd_9423]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedClass02\NestedClass02.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedClass02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedClass03.cmd_9424]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedClass03\NestedClass03.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedClass03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedClass04.cmd_9425]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedClass04\NestedClass04.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedClass04
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedInterface01.cmd_9426]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedInterface01\NestedInterface01.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedInterface01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedInterface02.cmd_9427]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedInterface02\NestedInterface02.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedInterface02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedInterface03.cmd_9428]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedInterface03\NestedInterface03.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedInterface03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedInterface04.cmd_9429]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedInterface04\NestedInterface04.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedInterface04
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedInterface05.cmd_9430]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedInterface05\NestedInterface05.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedInterface05
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedInterface06.cmd_9431]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedInterface06\NestedInterface06.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedInterface06
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedInterface07.cmd_9432]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedInterface07\NestedInterface07.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedInterface07
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedInterface08.cmd_9433]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedInterface08\NestedInterface08.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedInterface08
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedStruct01.cmd_9434]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedStruct01\NestedStruct01.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedStruct01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedStruct02.cmd_9435]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedStruct02\NestedStruct02.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedStruct02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedStruct03.cmd_9436]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedStruct03\NestedStruct03.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedStruct03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [NestedStruct04.cmd_9437]
 RelativePath=Loader\classloader\generics\Instantiation\Positive\NestedStruct04\NestedStruct04.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Positive\NestedStruct04
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [genrecur.cmd_9438]
 RelativePath=Loader\classloader\generics\Instantiation\Recursion\genrecur\genrecur.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Recursion\genrecur
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GenTypeItself.cmd_9439]
 RelativePath=Loader\classloader\generics\Instantiation\Recursion\GenTypeItself\GenTypeItself.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Recursion\GenTypeItself
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RecursiveInheritance.cmd_9440]
 RelativePath=Loader\classloader\generics\Instantiation\Recursion\RecursiveInheritance\RecursiveInheritance.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Recursion\RecursiveInheritance
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Struct_ImplementMscorlibGenInterface.cmd_9441]
 RelativePath=Loader\classloader\generics\Instantiation\Recursion\Struct_ImplementMscorlibGenInterface\Struct_ImplementMscorlibGenInterface.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Recursion\Struct_ImplementMscorlibGenInterface
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [DevDiv607.cmd_9442]
 RelativePath=Loader\classloader\generics\Instantiation\Regressions\607\DevDiv607\DevDiv607.cmd
 WorkingDir=Loader\classloader\generics\Instantiation\Regressions\607\DevDiv607
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base01a_auto.cmd_9443]
 RelativePath=Loader\classloader\generics\Layout\General\Base01a_auto\Base01a_auto.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base01a_auto
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base01a_auto_ser.cmd_9444]
 RelativePath=Loader\classloader\generics\Layout\General\Base01a_auto_ser\Base01a_auto_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base01a_auto_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base01a_seq.cmd_9445]
 RelativePath=Loader\classloader\generics\Layout\General\Base01a_seq\Base01a_seq.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base01a_seq
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base01a_seq_ser.cmd_9446]
 RelativePath=Loader\classloader\generics\Layout\General\Base01a_seq_ser\Base01a_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base01a_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base01b_auto_ser.cmd_9447]
 RelativePath=Loader\classloader\generics\Layout\General\Base01b_auto_ser\Base01b_auto_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base01b_auto_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base01b_seq.cmd_9448]
 RelativePath=Loader\classloader\generics\Layout\General\Base01b_seq\Base01b_seq.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base01b_seq
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base01b_seq_ser.cmd_9449]
 RelativePath=Loader\classloader\generics\Layout\General\Base01b_seq_ser\Base01b_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base01b_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base01c_seq_ser.cmd_9450]
 RelativePath=Loader\classloader\generics\Layout\General\Base01c_seq_ser\Base01c_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base01c_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base01d_seq_ser.cmd_9451]
 RelativePath=Loader\classloader\generics\Layout\General\Base01d_seq_ser\Base01d_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base01d_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base02a_auto.cmd_9452]
 RelativePath=Loader\classloader\generics\Layout\General\Base02a_auto\Base02a_auto.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base02a_auto
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base02a_auto_ser.cmd_9453]
 RelativePath=Loader\classloader\generics\Layout\General\Base02a_auto_ser\Base02a_auto_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base02a_auto_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base02a_seq.cmd_9454]
 RelativePath=Loader\classloader\generics\Layout\General\Base02a_seq\Base02a_seq.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base02a_seq
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base02a_seq_ser.cmd_9455]
 RelativePath=Loader\classloader\generics\Layout\General\Base02a_seq_ser\Base02a_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base02a_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base02b_auto_ser.cmd_9456]
 RelativePath=Loader\classloader\generics\Layout\General\Base02b_auto_ser\Base02b_auto_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base02b_auto_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base02b_seq.cmd_9457]
 RelativePath=Loader\classloader\generics\Layout\General\Base02b_seq\Base02b_seq.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base02b_seq
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base02b_seq_ser.cmd_9458]
 RelativePath=Loader\classloader\generics\Layout\General\Base02b_seq_ser\Base02b_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base02b_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base02c_seq_ser.cmd_9459]
 RelativePath=Loader\classloader\generics\Layout\General\Base02c_seq_ser\Base02c_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base02c_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Base02d_seq_ser.cmd_9460]
 RelativePath=Loader\classloader\generics\Layout\General\Base02d_seq_ser\Base02d_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\Base02d_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [class01_auto.cmd_9461]
 RelativePath=Loader\classloader\generics\Layout\General\class01_auto\class01_auto.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\class01_auto
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [class01_auto_ser.cmd_9462]
 RelativePath=Loader\classloader\generics\Layout\General\class01_auto_ser\class01_auto_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\class01_auto_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [class01_seq.cmd_9463]
 RelativePath=Loader\classloader\generics\Layout\General\class01_seq\class01_seq.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\class01_seq
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [class01_seq_ser.cmd_9464]
 RelativePath=Loader\classloader\generics\Layout\General\class01_seq_ser\class01_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\class01_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [class02_auto.cmd_9465]
 RelativePath=Loader\classloader\generics\Layout\General\class02_auto\class02_auto.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\class02_auto
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [class02_auto_ser.cmd_9466]
 RelativePath=Loader\classloader\generics\Layout\General\class02_auto_ser\class02_auto_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\class02_auto_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [class02_seq_ser.cmd_9467]
 RelativePath=Loader\classloader\generics\Layout\General\class02_seq_ser\class02_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\class02_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [struct01_auto.cmd_9468]
 RelativePath=Loader\classloader\generics\Layout\General\struct01_auto\struct01_auto.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\struct01_auto
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [struct01_auto_ser.cmd_9469]
 RelativePath=Loader\classloader\generics\Layout\General\struct01_auto_ser\struct01_auto_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\struct01_auto_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [struct01_seq.cmd_9470]
 RelativePath=Loader\classloader\generics\Layout\General\struct01_seq\struct01_seq.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\struct01_seq
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [struct01_seq_ser.cmd_9471]
 RelativePath=Loader\classloader\generics\Layout\General\struct01_seq_ser\struct01_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\struct01_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [struct02_auto.cmd_9472]
 RelativePath=Loader\classloader\generics\Layout\General\struct02_auto\struct02_auto.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\struct02_auto
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [struct02_auto_ser.cmd_9473]
 RelativePath=Loader\classloader\generics\Layout\General\struct02_auto_ser\struct02_auto_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\struct02_auto_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [struct02_seq.cmd_9474]
 RelativePath=Loader\classloader\generics\Layout\General\struct02_seq\struct02_seq.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\struct02_seq
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [struct02_seq_ser.cmd_9475]
 RelativePath=Loader\classloader\generics\Layout\General\struct02_seq_ser\struct02_seq_ser.cmd
 WorkingDir=Loader\classloader\generics\Layout\General\struct02_seq_ser
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Negative002.cmd_9476]
 RelativePath=Loader\classloader\generics\Layout\Specific\Negative002\Negative002.cmd
 WorkingDir=Loader\classloader\generics\Layout\Specific\Negative002
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Negative004.cmd_9477]
 RelativePath=Loader\classloader\generics\Layout\Specific\Negative004\Negative004.cmd
 WorkingDir=Loader\classloader\generics\Layout\Specific\Negative004
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Negative_ExplicitGen.cmd_9478]
 RelativePath=Loader\classloader\generics\Layout\Specific\Negative_ExplicitGen\Negative_ExplicitGen.cmd
 WorkingDir=Loader\classloader\generics\Layout\Specific\Negative_ExplicitGen
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Positive007.cmd_9479]
 RelativePath=Loader\classloader\generics\Layout\Specific\Positive007\Positive007.cmd
 WorkingDir=Loader\classloader\generics\Layout\Specific\Positive007
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Positive008.cmd_9480]
 RelativePath=Loader\classloader\generics\Layout\Specific\Positive008\Positive008.cmd
 WorkingDir=Loader\classloader\generics\Layout\Specific\Positive008
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Positive009.cmd_9481]
 RelativePath=Loader\classloader\generics\Layout\Specific\Positive009\Positive009.cmd
 WorkingDir=Loader\classloader\generics\Layout\Specific\Positive009
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Positive010.cmd_9482]
 RelativePath=Loader\classloader\generics\Layout\Specific\Positive010\Positive010.cmd
 WorkingDir=Loader\classloader\generics\Layout\Specific\Positive010
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ConstraintsAndInheritance.cmd_9483]
 RelativePath=Loader\classloader\generics\Misc\ConstraintsAndInheritance\ConstraintsAndInheritance.cmd
 WorkingDir=Loader\classloader\generics\Misc\ConstraintsAndInheritance
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestWithManyParams.cmd_9484]
 RelativePath=Loader\classloader\generics\Misc\TestWithManyParams\TestWithManyParams.cmd
 WorkingDir=Loader\classloader\generics\Misc\TestWithManyParams
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_9485]
 RelativePath=Loader\classloader\generics\regressions\109968\test\test.cmd
 WorkingDir=Loader\classloader\generics\regressions\109968\test
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [repro123712.cmd_9486]
 RelativePath=Loader\classloader\generics\regressions\123712\repro123712\repro123712.cmd
 WorkingDir=Loader\classloader\generics\regressions\123712\repro123712
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test137310.cmd_9487]
 RelativePath=Loader\classloader\generics\regressions\137310\test137310\test137310.cmd
 WorkingDir=Loader\classloader\generics\regressions\137310\test137310
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test188892.cmd_9488]
 RelativePath=Loader\classloader\generics\regressions\188892\test188892\test188892.cmd
 WorkingDir=Loader\classloader\generics\regressions\188892\test188892
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [repro237932.cmd_9489]
 RelativePath=Loader\classloader\generics\regressions\237932\repro237932\repro237932.cmd
 WorkingDir=Loader\classloader\generics\regressions\237932\repro237932
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b334376.cmd_9490]
 RelativePath=Loader\classloader\generics\regressions\334376\b334376\b334376.cmd
 WorkingDir=Loader\classloader\generics\regressions\334376\b334376
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Test.cmd_9491]
 RelativePath=Loader\classloader\generics\regressions\341477\Test\Test.cmd
 WorkingDir=Loader\classloader\generics\regressions\341477\Test
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [testExplicitOverride.cmd_9492]
 RelativePath=Loader\classloader\generics\regressions\395780\testExplicitOverride\testExplicitOverride.cmd
 WorkingDir=Loader\classloader\generics\regressions\395780\testExplicitOverride
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [testExplicitOverride2.cmd_9493]
 RelativePath=Loader\classloader\generics\regressions\395780\testExplicitOverride2\testExplicitOverride2.cmd
 WorkingDir=Loader\classloader\generics\regressions\395780\testExplicitOverride2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw433497.cmd_9494]
 RelativePath=Loader\classloader\generics\regressions\433497\vsw433497\vsw433497.cmd
 WorkingDir=Loader\classloader\generics\regressions\433497\vsw433497
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b448208.cmd_9495]
 RelativePath=Loader\classloader\generics\regressions\448208\b448208\b448208.cmd
 WorkingDir=Loader\classloader\generics\regressions\448208\b448208
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw515341.cmd_9496]
 RelativePath=Loader\classloader\generics\regressions\515341\vsw515341\vsw515341.cmd
 WorkingDir=Loader\classloader\generics\regressions\515341\vsw515341
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw536564.cmd_9497]
 RelativePath=Loader\classloader\generics\regressions\536564\vsw536564\vsw536564.cmd
 WorkingDir=Loader\classloader\generics\regressions\536564\vsw536564
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dd95372.cmd_9498]
 RelativePath=Loader\classloader\generics\regressions\dd95372\dd95372\dd95372.cmd
 WorkingDir=Loader\classloader\generics\regressions\dd95372\dd95372
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ddb3422.cmd_9499]
 RelativePath=Loader\classloader\generics\regressions\ddb3422\ddb3422\ddb3422.cmd
 WorkingDir=Loader\classloader\generics\regressions\ddb3422\ddb3422
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_393447.cmd_9500]
 RelativePath=Loader\classloader\generics\regressions\dev10_393447\dev10_393447\dev10_393447.cmd
 WorkingDir=Loader\classloader\generics\regressions\dev10_393447\dev10_393447
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_531793.cmd_9501]
 RelativePath=Loader\classloader\generics\regressions\dev10_531793\dev10_531793\dev10_531793.cmd
 WorkingDir=Loader\classloader\generics\regressions\dev10_531793\dev10_531793
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [repro237932.cmd_9502]
 RelativePath=Loader\classloader\generics\regressions\vsw237932\repro237932\repro237932.cmd
 WorkingDir=Loader\classloader\generics\regressions\vsw237932\repro237932
@@ -65666,13 +73603,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [testExplicitOverride2.cmd_9503]
 RelativePath=Loader\classloader\generics\regressions\vsw395780\testExplicitOverride2\testExplicitOverride2.cmd
 WorkingDir=Loader\classloader\generics\regressions\vsw395780\testExplicitOverride2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw514968.cmd_9504]
 RelativePath=Loader\classloader\generics\regressions\vsw514968\vsw514968\vsw514968.cmd
 WorkingDir=Loader\classloader\generics\regressions\vsw514968\vsw514968
@@ -65680,6 +73619,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StaticsProblem5.cmd_9505]
 RelativePath=Loader\classloader\generics\regressions\vsw524571\StaticsProblem5\StaticsProblem5.cmd
 WorkingDir=Loader\classloader\generics\regressions\vsw524571\StaticsProblem5
@@ -65687,608 +73627,695 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [StaticsProblem1.cmd_9506]
 RelativePath=Loader\classloader\generics\Statics\Regressions\524571\StaticsProblem1\StaticsProblem1.cmd
 WorkingDir=Loader\classloader\generics\Statics\Regressions\524571\StaticsProblem1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [StaticsProblem2.cmd_9507]
 RelativePath=Loader\classloader\generics\Statics\Regressions\524571\StaticsProblem2\StaticsProblem2.cmd
 WorkingDir=Loader\classloader\generics\Statics\Regressions\524571\StaticsProblem2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [StaticsProblem3.cmd_9508]
 RelativePath=Loader\classloader\generics\Statics\Regressions\524571\StaticsProblem3\StaticsProblem3.cmd
 WorkingDir=Loader\classloader\generics\Statics\Regressions\524571\StaticsProblem3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [StaticsProblem4.cmd_9509]
 RelativePath=Loader\classloader\generics\Statics\Regressions\524571\StaticsProblem4\StaticsProblem4.cmd
 WorkingDir=Loader\classloader\generics\Statics\Regressions\524571\StaticsProblem4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [StaticsProblem5.cmd_9510]
 RelativePath=Loader\classloader\generics\Statics\Regressions\524571\StaticsProblem5\StaticsProblem5.cmd
 WorkingDir=Loader\classloader\generics\Statics\Regressions\524571\StaticsProblem5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Method001.cmd_9511]
 RelativePath=Loader\classloader\generics\Variance\CoreCLR\Method001\Method001.cmd
 WorkingDir=Loader\classloader\generics\Variance\CoreCLR\Method001
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Method003.cmd_9512]
 RelativePath=Loader\classloader\generics\Variance\CoreCLR\Method003\Method003.cmd
 WorkingDir=Loader\classloader\generics\Variance\CoreCLR\Method003
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Delegates001.cmd_9513]
 RelativePath=Loader\classloader\generics\Variance\Delegates\Delegates001\Delegates001.cmd
 WorkingDir=Loader\classloader\generics\Variance\Delegates\Delegates001
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Delegates002.cmd_9514]
 RelativePath=Loader\classloader\generics\Variance\Delegates\Delegates002\Delegates002.cmd
 WorkingDir=Loader\classloader\generics\Variance\Delegates\Delegates002
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CastClass001.cmd_9515]
 RelativePath=Loader\classloader\generics\Variance\IL\CastClass001\CastClass001.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\CastClass001
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CastClass004.cmd_9516]
 RelativePath=Loader\classloader\generics\Variance\IL\CastClass004\CastClass004.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\CastClass004
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [InterfaceInheritanceTest2.cmd_9517]
 RelativePath=Loader\classloader\generics\Variance\IL\InterfaceInheritanceTest2\InterfaceInheritanceTest2.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\InterfaceInheritanceTest2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [IsInst001.cmd_9518]
 RelativePath=Loader\classloader\generics\Variance\IL\IsInst001\IsInst001.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\IsInst001
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [IsInst002.cmd_9519]
 RelativePath=Loader\classloader\generics\Variance\IL\IsInst002\IsInst002.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\IsInst002
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [IsInst003.cmd_9520]
 RelativePath=Loader\classloader\generics\Variance\IL\IsInst003\IsInst003.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\IsInst003
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [IsInst004.cmd_9521]
 RelativePath=Loader\classloader\generics\Variance\IL\IsInst004\IsInst004.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\IsInst004
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [IsInst005.cmd_9522]
 RelativePath=Loader\classloader\generics\Variance\IL\IsInst005\IsInst005.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\IsInst005
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [IsInst006.cmd_9523]
 RelativePath=Loader\classloader\generics\Variance\IL\IsInst006\IsInst006.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\IsInst006
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Unbox001.cmd_9524]
 RelativePath=Loader\classloader\generics\Variance\IL\Unbox001\Unbox001.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\Unbox001
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Unbox002.cmd_9525]
 RelativePath=Loader\classloader\generics\Variance\IL\Unbox002\Unbox002.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\Unbox002
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Unbox003.cmd_9526]
 RelativePath=Loader\classloader\generics\Variance\IL\Unbox003\Unbox003.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\Unbox003
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Unbox004.cmd_9527]
 RelativePath=Loader\classloader\generics\Variance\IL\Unbox004\Unbox004.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\Unbox004
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Unbox005.cmd_9528]
 RelativePath=Loader\classloader\generics\Variance\IL\Unbox005\Unbox005.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\Unbox005
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Unbox006.cmd_9529]
 RelativePath=Loader\classloader\generics\Variance\IL\Unbox006\Unbox006.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\Unbox006
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw543506.cmd_9530]
 RelativePath=Loader\classloader\generics\Variance\IL\vsw543506\vsw543506.cmd
 WorkingDir=Loader\classloader\generics\Variance\IL\vsw543506
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Interfaces001.cmd_9531]
 RelativePath=Loader\classloader\generics\Variance\Interfaces\Interfaces001\Interfaces001.cmd
 WorkingDir=Loader\classloader\generics\Variance\Interfaces\Interfaces001
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Interfaces002.cmd_9532]
 RelativePath=Loader\classloader\generics\Variance\Interfaces\Interfaces002\Interfaces002.cmd
 WorkingDir=Loader\classloader\generics\Variance\Interfaces\Interfaces002
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Method001.cmd_9533]
 RelativePath=Loader\classloader\generics\Variance\Methods\Method001\Method001.cmd
 WorkingDir=Loader\classloader\generics\Variance\Methods\Method001
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Method002.cmd_9534]
 RelativePath=Loader\classloader\generics\Variance\Methods\Method002\Method002.cmd
 WorkingDir=Loader\classloader\generics\Variance\Methods\Method002
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Method003.cmd_9535]
 RelativePath=Loader\classloader\generics\Variance\Methods\Method003\Method003.cmd
 WorkingDir=Loader\classloader\generics\Variance\Methods\Method003
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Method004.cmd_9536]
 RelativePath=Loader\classloader\generics\Variance\Methods\Method004\Method004.cmd
 WorkingDir=Loader\classloader\generics\Variance\Methods\Method004
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_468712.cmd_9537]
 RelativePath=Loader\classloader\generics\Variance\Regressions\dev10_468712\dev10_468712\dev10_468712.cmd
 WorkingDir=Loader\classloader\generics\Variance\Regressions\dev10_468712\dev10_468712
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Class2_ImplicitOverrideVirtual.cmd_9538]
 RelativePath=Loader\classloader\generics\VSD\Class2_ImplicitOverrideVirtual\Class2_ImplicitOverrideVirtual.cmd
 WorkingDir=Loader\classloader\generics\VSD\Class2_ImplicitOverrideVirtual
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Class2_ImplicitOverrideVirtualNewslot.cmd_9539]
 RelativePath=Loader\classloader\generics\VSD\Class2_ImplicitOverrideVirtualNewslot\Class2_ImplicitOverrideVirtualNewslot.cmd
 WorkingDir=Loader\classloader\generics\VSD\Class2_ImplicitOverrideVirtualNewslot
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Class2_ImplicitOverrideVirtualNewslot_Interface.cmd_9540]
 RelativePath=Loader\classloader\generics\VSD\Class2_ImplicitOverrideVirtualNewslot_Interface\Class2_ImplicitOverrideVirtualNewslot_Interface.cmd
 WorkingDir=Loader\classloader\generics\VSD\Class2_ImplicitOverrideVirtualNewslot_Interface
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Class2_ImplicitOverrideVirtual_Interface.cmd_9541]
 RelativePath=Loader\classloader\generics\VSD\Class2_ImplicitOverrideVirtual_Interface\Class2_ImplicitOverrideVirtual_Interface.cmd
 WorkingDir=Loader\classloader\generics\VSD\Class2_ImplicitOverrideVirtual_Interface
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Class_ExplicitOverrideVirtualNewslot.cmd_9542]
 RelativePath=Loader\classloader\generics\VSD\Class_ExplicitOverrideVirtualNewslot\Class_ExplicitOverrideVirtualNewslot.cmd
 WorkingDir=Loader\classloader\generics\VSD\Class_ExplicitOverrideVirtualNewslot
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Class_ExplicitOverrideVirtualNewslotFinal.cmd_9543]
 RelativePath=Loader\classloader\generics\VSD\Class_ExplicitOverrideVirtualNewslotFinal\Class_ExplicitOverrideVirtualNewslotFinal.cmd
 WorkingDir=Loader\classloader\generics\VSD\Class_ExplicitOverrideVirtualNewslotFinal
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Class_ImplicitOverrideVirtualNewslot.cmd_9544]
 RelativePath=Loader\classloader\generics\VSD\Class_ImplicitOverrideVirtualNewslot\Class_ImplicitOverrideVirtualNewslot.cmd
 WorkingDir=Loader\classloader\generics\VSD\Class_ImplicitOverrideVirtualNewslot
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Class_ImplicitOverrideVirtualNewslotFinal.cmd_9545]
 RelativePath=Loader\classloader\generics\VSD\Class_ImplicitOverrideVirtualNewslotFinal\Class_ImplicitOverrideVirtualNewslotFinal.cmd
 WorkingDir=Loader\classloader\generics\VSD\Class_ImplicitOverrideVirtualNewslotFinal
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Struct_ExplicitOverrideVirtualNewslot.cmd_9546]
 RelativePath=Loader\classloader\generics\VSD\Struct_ExplicitOverrideVirtualNewslot\Struct_ExplicitOverrideVirtualNewslot.cmd
 WorkingDir=Loader\classloader\generics\VSD\Struct_ExplicitOverrideVirtualNewslot
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Struct_ExplicitOverrideVirtualNewslotFinal.cmd_9547]
 RelativePath=Loader\classloader\generics\VSD\Struct_ExplicitOverrideVirtualNewslotFinal\Struct_ExplicitOverrideVirtualNewslotFinal.cmd
 WorkingDir=Loader\classloader\generics\VSD\Struct_ExplicitOverrideVirtualNewslotFinal
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Struct_ImplicitOverrideVirtualNewslot.cmd_9548]
 RelativePath=Loader\classloader\generics\VSD\Struct_ImplicitOverrideVirtualNewslot\Struct_ImplicitOverrideVirtualNewslot.cmd
 WorkingDir=Loader\classloader\generics\VSD\Struct_ImplicitOverrideVirtualNewslot
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Struct_ImplicitOverrideVirtualNewslotFinal.cmd_9549]
 RelativePath=Loader\classloader\generics\VSD\Struct_ImplicitOverrideVirtualNewslotFinal\Struct_ImplicitOverrideVirtualNewslotFinal.cmd
 WorkingDir=Loader\classloader\generics\VSD\Struct_ImplicitOverrideVirtualNewslotFinal
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Ambiguous.cmd_9550]
 RelativePath=Loader\classloader\InterfaceFolding\Ambiguous\Ambiguous.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\Ambiguous
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase0.cmd_9551]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase0\TestCase0.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase0
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase0_Nested_I.cmd_9552]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase0_Nested_I\TestCase0_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase0_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase0_Nested_I_Nested_J.cmd_9553]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase0_Nested_I_Nested_J\TestCase0_Nested_I_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase0_Nested_I_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase0_Nested_J.cmd_9554]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase0_Nested_J\TestCase0_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase0_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase0_Nested_J_Nested_I.cmd_9555]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase0_Nested_J_Nested_I\TestCase0_Nested_J_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase0_Nested_J_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase1.cmd_9556]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase1\TestCase1.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase1_Nested_I.cmd_9557]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase1_Nested_I\TestCase1_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase1_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase1_Nested_I_Nested_J.cmd_9558]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase1_Nested_I_Nested_J\TestCase1_Nested_I_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase1_Nested_I_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase1_Nested_J.cmd_9559]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase1_Nested_J\TestCase1_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase1_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase1_Nested_J_Nested_I.cmd_9560]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase1_Nested_J_Nested_I\TestCase1_Nested_J_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase1_Nested_J_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase2.cmd_9561]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase2\TestCase2.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase2_Nested_I.cmd_9562]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase2_Nested_I\TestCase2_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase2_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase2_Nested_I_Nested_J.cmd_9563]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase2_Nested_I_Nested_J\TestCase2_Nested_I_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase2_Nested_I_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase2_Nested_J.cmd_9564]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase2_Nested_J\TestCase2_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase2_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase2_Nested_J_Nested_I.cmd_9565]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase2_Nested_J_Nested_I\TestCase2_Nested_J_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase2_Nested_J_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase3.cmd_9566]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase3\TestCase3.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase3_Nested_I.cmd_9567]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase3_Nested_I\TestCase3_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase3_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase3_Nested_I_Nested_J.cmd_9568]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase3_Nested_I_Nested_J\TestCase3_Nested_I_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase3_Nested_I_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase3_Nested_J.cmd_9569]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase3_Nested_J\TestCase3_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase3_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase3_Nested_J_Nested_I.cmd_9570]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase3_Nested_J_Nested_I\TestCase3_Nested_J_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase3_Nested_J_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase4.cmd_9571]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase4\TestCase4.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase4_Nested_I.cmd_9572]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase4_Nested_I\TestCase4_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase4_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase4_Nested_I_Nested_J.cmd_9573]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase4_Nested_I_Nested_J\TestCase4_Nested_I_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase4_Nested_I_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase4_Nested_J.cmd_9574]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase4_Nested_J\TestCase4_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase4_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase4_Nested_J_Nested_I.cmd_9575]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase4_Nested_J_Nested_I\TestCase4_Nested_J_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase4_Nested_J_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase5.cmd_9576]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase5\TestCase5.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase5_Nested_I.cmd_9577]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase5_Nested_I\TestCase5_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase5_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase5_Nested_I_Nested_J.cmd_9578]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase5_Nested_I_Nested_J\TestCase5_Nested_I_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase5_Nested_I_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase5_Nested_J.cmd_9579]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase5_Nested_J\TestCase5_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase5_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase5_Nested_J_Nested_I.cmd_9580]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase5_Nested_J_Nested_I\TestCase5_Nested_J_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase5_Nested_J_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase6.cmd_9581]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase6\TestCase6.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase6
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase6_Nested_I.cmd_9582]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase6_Nested_I\TestCase6_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase6_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase6_Nested_I_Nested_J.cmd_9583]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase6_Nested_I_Nested_J\TestCase6_Nested_I_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase6_Nested_I_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase6_Nested_J.cmd_9584]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase6_Nested_J\TestCase6_Nested_J.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase6_Nested_J
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase6_Nested_J_Nested_I.cmd_9585]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase6_Nested_J_Nested_I\TestCase6_Nested_J_Nested_I.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase6_Nested_J_Nested_I
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TestCase7.cmd_9586]
 RelativePath=Loader\classloader\InterfaceFolding\TestCase7\TestCase7.cmd
 WorkingDir=Loader\classloader\InterfaceFolding\TestCase7
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [override_override1.cmd_9587]
 RelativePath=Loader\classloader\MethodImpl\override_override1\override_override1.cmd
 WorkingDir=Loader\classloader\MethodImpl\override_override1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [self_override1.cmd_9588]
 RelativePath=Loader\classloader\MethodImpl\self_override1\self_override1.cmd
 WorkingDir=Loader\classloader\MethodImpl\self_override1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [self_override2.cmd_9589]
 RelativePath=Loader\classloader\MethodImpl\self_override2\self_override2.cmd
 WorkingDir=Loader\classloader\MethodImpl\self_override2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [self_override3.cmd_9590]
 RelativePath=Loader\classloader\MethodImpl\self_override3\self_override3.cmd
 WorkingDir=Loader\classloader\MethodImpl\self_override3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [self_override5.cmd_9591]
 RelativePath=Loader\classloader\MethodImpl\self_override5\self_override5.cmd
 WorkingDir=Loader\classloader\MethodImpl\self_override5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exploit.cmd_9592]
 RelativePath=Loader\classloader\methodoverriding\regressions\549411\exploit\exploit.cmd
 WorkingDir=Loader\classloader\methodoverriding\regressions\549411\exploit
@@ -66296,13 +74323,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [VSW576621.cmd_9593]
 RelativePath=Loader\classloader\methodoverriding\regressions\576621\VSW576621\VSW576621.cmd
 WorkingDir=Loader\classloader\methodoverriding\regressions\576621\VSW576621
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw577403.cmd_9594]
 RelativePath=Loader\classloader\methodoverriding\regressions\577403\vsw577403\vsw577403.cmd
 WorkingDir=Loader\classloader\methodoverriding\regressions\577403\vsw577403
@@ -66310,6 +74339,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [vsw593884.cmd_9595]
 RelativePath=Loader\classloader\methodoverriding\regressions\593884\vsw593884\vsw593884.cmd
 WorkingDir=Loader\classloader\methodoverriding\regressions\593884\vsw593884
@@ -66317,111 +74347,127 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [dev10_432038.cmd_9596]
 RelativePath=Loader\classloader\methodoverriding\regressions\dev10_432038\dev10_432038\dev10_432038.cmd
 WorkingDir=Loader\classloader\methodoverriding\regressions\dev10_432038\dev10_432038
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exec16.cmd_9597]
 RelativePath=Loader\classloader\nesting\coreclr\exec16\exec16.cmd
 WorkingDir=Loader\classloader\nesting\coreclr\exec16
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [exec3.cmd_9598]
 RelativePath=Loader\classloader\nesting\coreclr\exec3\exec3.cmd
 WorkingDir=Loader\classloader\nesting\coreclr\exec3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [nesting18.cmd_9599]
 RelativePath=Loader\classloader\nesting\coreclr\nesting18\nesting18.cmd
 WorkingDir=Loader\classloader\nesting\coreclr\nesting18
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [nesting31.cmd_9600]
 RelativePath=Loader\classloader\nesting\coreclr\nesting31\nesting31.cmd
 WorkingDir=Loader\classloader\nesting\coreclr\nesting31
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [nesting4.cmd_9601]
 RelativePath=Loader\classloader\nesting\coreclr\nesting4\nesting4.cmd
 WorkingDir=Loader\classloader\nesting\coreclr\nesting4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [VSW491577.cmd_9602]
 RelativePath=Loader\classloader\nesting\coreclr\VSW491577\VSW491577.cmd
 WorkingDir=Loader\classloader\nesting\coreclr\VSW491577
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MainApp.cmd_9603]
 RelativePath=Loader\classloader\nesting\Regressions\dev10_602978\MainApp\MainApp.cmd
 WorkingDir=Loader\classloader\nesting\Regressions\dev10_602978\MainApp
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [nesting4.cmd_9604]
 RelativePath=Loader\classloader\nesting\Tests\nesting4\nesting4.cmd
 WorkingDir=Loader\classloader\nesting\Tests\nesting4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [nesting63.cmd_9605]
 RelativePath=Loader\classloader\nesting\Tests\nesting63\nesting63.cmd
 WorkingDir=Loader\classloader\nesting\Tests\nesting63
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [nesting7.cmd_9606]
 RelativePath=Loader\classloader\nesting\Tests\nesting7\nesting7.cmd
 WorkingDir=Loader\classloader\nesting\Tests\nesting7
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Test6_ImplementingClass.cmd_9607]
 RelativePath=Loader\classloader\PrivateInterfaceImpl\Test6_ImplementingClass\Test6_ImplementingClass.cmd
 WorkingDir=Loader\classloader\PrivateInterfaceImpl\Test6_ImplementingClass
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_9608]
 RelativePath=Loader\classloader\regressions\101904\test\test.cmd
 WorkingDir=Loader\classloader\regressions\101904\test
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [main.cmd_9609]
 RelativePath=Loader\classloader\regressions\111021\main\main.cmd
 WorkingDir=Loader\classloader\regressions\111021\main
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Foo.cmd_9610]
 RelativePath=Loader\classloader\regressions\139056\Foo\Foo.cmd
 WorkingDir=Loader\classloader\regressions\139056\Foo
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw144257.cmd_9611]
 RelativePath=Loader\classloader\regressions\144257\vsw144257\vsw144257.cmd
 WorkingDir=Loader\classloader\regressions\144257\vsw144257
@@ -66429,41 +74475,47 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [TestObjectGetTypeVirtual.cmd_9612]
 RelativePath=Loader\classloader\regressions\14610\TestObjectGetTypeVirtual\TestObjectGetTypeVirtual.cmd
 WorkingDir=Loader\classloader\regressions\14610\TestObjectGetTypeVirtual
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MethodImplFinal.cmd_9613]
 RelativePath=Loader\classloader\regressions\163172\MethodImplFinal\MethodImplFinal.cmd
 WorkingDir=Loader\classloader\regressions\163172\MethodImplFinal
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test5.cmd_9614]
 RelativePath=Loader\classloader\regressions\181424\test5\test5.cmd
 WorkingDir=Loader\classloader\regressions\181424\test5
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [bug.cmd_9615]
 RelativePath=Loader\classloader\regressions\208900\bug\bug.cmd
 WorkingDir=Loader\classloader\regressions\208900\bug
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test3.cmd_9616]
 RelativePath=Loader\classloader\regressions\226741\test3\test3.cmd
 WorkingDir=Loader\classloader\regressions\226741\test3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [nullenum1000.cmd_9617]
 RelativePath=Loader\classloader\regressions\245191\nullenum1000\nullenum1000.cmd
 WorkingDir=Loader\classloader\regressions\245191\nullenum1000
@@ -66471,20 +74523,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [vsw307137.cmd_9618]
 RelativePath=Loader\classloader\regressions\307137\vsw307137\vsw307137.cmd
 WorkingDir=Loader\classloader\regressions\307137\vsw307137
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b347422.cmd_9619]
 RelativePath=Loader\classloader\regressions\347422\b347422\b347422.cmd
 WorkingDir=Loader\classloader\regressions\347422\b347422
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test359519.cmd_9620]
 RelativePath=Loader\classloader\regressions\359519\test359519\test359519.cmd
 WorkingDir=Loader\classloader\regressions\359519\test359519
@@ -66492,6 +74547,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [vsw405223.cmd_9621]
 RelativePath=Loader\classloader\regressions\405223\vsw405223\vsw405223.cmd
 WorkingDir=Loader\classloader\regressions\405223\vsw405223
@@ -66499,20 +74555,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test.cmd_9622]
 RelativePath=Loader\classloader\regressions\421439\Test\Test.cmd
 WorkingDir=Loader\classloader\regressions\421439\Test
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CMain.cmd_9623]
 RelativePath=Loader\classloader\regressions\429802\CMain\CMain.cmd
 WorkingDir=Loader\classloader\regressions\429802\CMain
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b434481_GenericRecurInit.cmd_9624]
 RelativePath=Loader\classloader\regressions\434481\b434481_GenericRecurInit\b434481_GenericRecurInit.cmd
 WorkingDir=Loader\classloader\regressions\434481\b434481_GenericRecurInit
@@ -66520,244 +74579,279 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test.cmd_9625]
 RelativePath=Loader\classloader\regressions\440935\Test\Test.cmd
 WorkingDir=Loader\classloader\regressions\440935\Test
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [LoadType.cmd_9626]
 RelativePath=Loader\classloader\regressions\451034\LoadType\LoadType.cmd
 WorkingDir=Loader\classloader\regressions\451034\LoadType
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [b452707.cmd_9627]
 RelativePath=Loader\classloader\regressions\452707\b452707\b452707.cmd
 WorkingDir=Loader\classloader\regressions\452707\b452707
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test532654_b.cmd_9628]
 RelativePath=Loader\classloader\regressions\523654\test532654_b\test532654_b.cmd
 WorkingDir=Loader\classloader\regressions\523654\test532654_b
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw529206ModuleCctor.cmd_9629]
 RelativePath=Loader\classloader\regressions\529206\vsw529206ModuleCctor\vsw529206ModuleCctor.cmd
 WorkingDir=Loader\classloader\regressions\529206\vsw529206ModuleCctor
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw529206StaticCctor.cmd_9630]
 RelativePath=Loader\classloader\regressions\529206\vsw529206StaticCctor\vsw529206StaticCctor.cmd
 WorkingDir=Loader\classloader\regressions\529206\vsw529206StaticCctor
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw583649.cmd_9631]
 RelativePath=Loader\classloader\regressions\583649\vsw583649\vsw583649.cmd
 WorkingDir=Loader\classloader\regressions\583649\vsw583649
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [pumpFromCctor.cmd_9632]
 RelativePath=Loader\classloader\regressions\91888\pumpFromCctor\pumpFromCctor.cmd
 WorkingDir=Loader\classloader\regressions\91888\pumpFromCctor
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test23.cmd_9633]
 RelativePath=Loader\classloader\regressions\asurt150271\test23\test23.cmd
 WorkingDir=Loader\classloader\regressions\asurt150271\test23
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test3.cmd_9634]
 RelativePath=Loader\classloader\regressions\asurt150271\test3\test3.cmd
 WorkingDir=Loader\classloader\regressions\asurt150271\test3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dd116295.cmd_9635]
 RelativePath=Loader\classloader\regressions\dd116295\dd116295\dd116295.cmd
 WorkingDir=Loader\classloader\regressions\dd116295\dd116295
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dd52.cmd_9636]
 RelativePath=Loader\classloader\regressions\dd52\dd52\dd52.cmd
 WorkingDir=Loader\classloader\regressions\dd52\dd52
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_398410.cmd_9637]
 RelativePath=Loader\classloader\regressions\dev10_398410\dev10_398410\dev10_398410.cmd
 WorkingDir=Loader\classloader\regressions\dev10_398410\dev10_398410
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_403582.cmd_9638]
 RelativePath=Loader\classloader\regressions\dev10_403582\dev10_403582\dev10_403582.cmd
 WorkingDir=Loader\classloader\regressions\dev10_403582\dev10_403582
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_443322.cmd_9639]
 RelativePath=Loader\classloader\regressions\dev10_443322\dev10_443322\dev10_443322.cmd
 WorkingDir=Loader\classloader\regressions\dev10_443322\dev10_443322
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_493135.cmd_9640]
 RelativePath=Loader\classloader\regressions\dev10_493135\dev10_493135\dev10_493135.cmd
 WorkingDir=Loader\classloader\regressions\dev10_493135\dev10_493135
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_526434.cmd_9641]
 RelativePath=Loader\classloader\regressions\dev10_526434\dev10_526434\dev10_526434.cmd
 WorkingDir=Loader\classloader\regressions\dev10_526434\dev10_526434
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ConstrainedMethods.cmd_9642]
 RelativePath=Loader\classloader\regressions\dev10_568786\4_Misc\ConstrainedMethods\ConstrainedMethods.cmd
 WorkingDir=Loader\classloader\regressions\dev10_568786\4_Misc\ConstrainedMethods
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [MethodCalls.cmd_9643]
 RelativePath=Loader\classloader\regressions\dev10_568786\4_Misc\MethodCalls\MethodCalls.cmd
 WorkingDir=Loader\classloader\regressions\dev10_568786\4_Misc\MethodCalls
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RecursiveGen.cmd_9644]
 RelativePath=Loader\classloader\regressions\dev10_568786\4_Misc\RecursiveGen\RecursiveGen.cmd
 WorkingDir=Loader\classloader\regressions\dev10_568786\4_Misc\RecursiveGen
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [SealedTypes.cmd_9645]
 RelativePath=Loader\classloader\regressions\dev10_568786\4_Misc\SealedTypes\SealedTypes.cmd
 WorkingDir=Loader\classloader\regressions\dev10_568786\4_Misc\SealedTypes
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Variance1.cmd_9646]
 RelativePath=Loader\classloader\regressions\dev10_568786\4_Misc\Variance1\Variance1.cmd
 WorkingDir=Loader\classloader\regressions\dev10_568786\4_Misc\Variance1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Variance2.cmd_9647]
 RelativePath=Loader\classloader\regressions\dev10_568786\4_Misc\Variance2\Variance2.cmd
 WorkingDir=Loader\classloader\regressions\dev10_568786\4_Misc\Variance2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_630250.cmd_9648]
 RelativePath=Loader\classloader\regressions\dev10_630250\dev10_630250\dev10_630250.cmd
 WorkingDir=Loader\classloader\regressions\dev10_630250\dev10_630250
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_710121.cmd_9649]
 RelativePath=Loader\classloader\regressions\dev10_710121\dev10_710121\dev10_710121.cmd
 WorkingDir=Loader\classloader\regressions\dev10_710121\dev10_710121
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_715437.cmd_9650]
 RelativePath=Loader\classloader\regressions\dev10_715437\dev10_715437\dev10_715437.cmd
 WorkingDir=Loader\classloader\regressions\dev10_715437\dev10_715437
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_720779.cmd_9651]
 RelativePath=Loader\classloader\regressions\dev10_720779\dev10_720779\dev10_720779.cmd
 WorkingDir=Loader\classloader\regressions\dev10_720779\dev10_720779
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_724989.cmd_9652]
 RelativePath=Loader\classloader\regressions\dev10_724989\dev10_724989\dev10_724989.cmd
 WorkingDir=Loader\classloader\regressions\dev10_724989\dev10_724989
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_788724.cmd_9653]
 RelativePath=Loader\classloader\regressions\dev10_788724\dev10_788724\dev10_788724.cmd
 WorkingDir=Loader\classloader\regressions\dev10_788724\dev10_788724
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_794943.cmd_9654]
 RelativePath=Loader\classloader\regressions\dev10_794943\dev10_794943\dev10_794943.cmd
 WorkingDir=Loader\classloader\regressions\dev10_794943\dev10_794943
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Case1.cmd_9655]
 RelativePath=Loader\classloader\regressions\dev10_813331\Case1\Case1.cmd
 WorkingDir=Loader\classloader\regressions\dev10_813331\Case1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Case2.cmd_9656]
 RelativePath=Loader\classloader\regressions\dev10_813331\Case2\Case2.cmd
 WorkingDir=Loader\classloader\regressions\dev10_813331\Case2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Case3.cmd_9657]
 RelativePath=Loader\classloader\regressions\dev10_813331\Case3\Case3.cmd
 WorkingDir=Loader\classloader\regressions\dev10_813331\Case3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Case4.cmd_9658]
 RelativePath=Loader\classloader\regressions\dev10_813331\Case4\Case4.cmd
 WorkingDir=Loader\classloader\regressions\dev10_813331\Case4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev10_851479.cmd_9659]
 RelativePath=Loader\classloader\regressions\dev10_851479\dev10_851479\dev10_851479.cmd
 WorkingDir=Loader\classloader\regressions\dev10_851479\dev10_851479
@@ -66765,6 +74859,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [dev10_889822.cmd_9660]
 RelativePath=Loader\classloader\regressions\dev10_889822\dev10_889822\dev10_889822.cmd
 WorkingDir=Loader\classloader\regressions\dev10_889822\dev10_889822
@@ -66772,832 +74867,951 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [dev10_897464.cmd_9661]
 RelativePath=Loader\classloader\regressions\dev10_897464\dev10_897464\dev10_897464.cmd
 WorkingDir=Loader\classloader\regressions\dev10_897464\dev10_897464
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev11_11333.cmd_9662]
 RelativePath=Loader\classloader\regressions\dev11_11333\dev11_11333\dev11_11333.cmd
 WorkingDir=Loader\classloader\regressions\dev11_11333\dev11_11333
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev11_95728.cmd_9663]
 RelativePath=Loader\classloader\regressions\dev11_95728\dev11_95728\dev11_95728.cmd
 WorkingDir=Loader\classloader\regressions\dev11_95728\dev11_95728
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [dev12_518401.cmd_9664]
 RelativePath=Loader\classloader\regressions\Dev12_518401\dev12_518401\dev12_518401.cmd
 WorkingDir=Loader\classloader\regressions\Dev12_518401\dev12_518401
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [main.cmd_9665]
 RelativePath=Loader\classloader\regressions\vsw111021\main\main.cmd
 WorkingDir=Loader\classloader\regressions\vsw111021\main
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw188290.cmd_9666]
 RelativePath=Loader\classloader\regressions\vsw188290\vsw188290\vsw188290.cmd
 WorkingDir=Loader\classloader\regressions\vsw188290\vsw188290
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GenericAssertin.cmd_9667]
 RelativePath=Loader\classloader\regressions\vsw305955\GenericAssertin\GenericAssertin.cmd
 WorkingDir=Loader\classloader\regressions\vsw305955\GenericAssertin
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw307137.cmd_9668]
 RelativePath=Loader\classloader\regressions\vsw307137\vsw307137\vsw307137.cmd
 WorkingDir=Loader\classloader\regressions\vsw307137\vsw307137
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw529206ModuleCctor.cmd_9669]
 RelativePath=Loader\classloader\regressions\vsw529206\vsw529206ModuleCctor\vsw529206ModuleCctor.cmd
 WorkingDir=Loader\classloader\regressions\vsw529206\vsw529206ModuleCctor
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [vsw531159.cmd_9670]
 RelativePath=Loader\classloader\regressions\vsw531159\vsw531159\vsw531159.cmd
 WorkingDir=Loader\classloader\regressions\vsw531159\vsw531159
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-11-6-two.cmd_9671]
 RelativePath=Loader\classloader\rmv\il\RMV-2-11-6-two\RMV-2-11-6-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-11-6-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-13-15-two.cmd_9672]
 RelativePath=Loader\classloader\rmv\il\RMV-2-13-15-two\RMV-2-13-15-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-13-15-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-13-22-three.cmd_9673]
 RelativePath=Loader\classloader\rmv\il\RMV-2-13-22-three\RMV-2-13-22-three.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-13-22-three
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-13-25-five.cmd_9674]
 RelativePath=Loader\classloader\rmv\il\RMV-2-13-25-five\RMV-2-13-25-five.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-13-25-five
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-13-26-two.cmd_9675]
 RelativePath=Loader\classloader\rmv\il\RMV-2-13-26-two\RMV-2-13-26-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-13-26-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-13-40a-two.cmd_9676]
 RelativePath=Loader\classloader\rmv\il\RMV-2-13-40a-two\RMV-2-13-40a-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-13-40a-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-13-41a-two.cmd_9677]
 RelativePath=Loader\classloader\rmv\il\RMV-2-13-41a-two\RMV-2-13-41a-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-13-41a-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-13-41g-two.cmd_9678]
 RelativePath=Loader\classloader\rmv\il\RMV-2-13-41g-two\RMV-2-13-41g-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-13-41g-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-13-6b-two.cmd_9679]
 RelativePath=Loader\classloader\rmv\il\RMV-2-13-6b-two\RMV-2-13-6b-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-13-6b-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-13-7-two.cmd_9680]
 RelativePath=Loader\classloader\rmv\il\RMV-2-13-7-two\RMV-2-13-7-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-13-7-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-15-12b.cmd_9681]
 RelativePath=Loader\classloader\rmv\il\RMV-2-15-12b\RMV-2-15-12b.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-15-12b
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-25-9-two.cmd_9682]
 RelativePath=Loader\classloader\rmv\il\RMV-2-25-9-two\RMV-2-25-9-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-25-9-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-5-5-two.cmd_9683]
 RelativePath=Loader\classloader\rmv\il\RMV-2-5-5-two\RMV-2-5-5-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-5-5-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-5-8-two.cmd_9684]
 RelativePath=Loader\classloader\rmv\il\RMV-2-5-8-two\RMV-2-5-8-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-5-8-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-8-20-one.cmd_9685]
 RelativePath=Loader\classloader\rmv\il\RMV-2-8-20-one\RMV-2-8-20-one.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-8-20-one
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-8-20-two.cmd_9686]
 RelativePath=Loader\classloader\rmv\il\RMV-2-8-20-two\RMV-2-8-20-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-8-20-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-8-28-two.cmd_9687]
 RelativePath=Loader\classloader\rmv\il\RMV-2-8-28-two\RMV-2-8-28-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-8-28-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-8-3-two.cmd_9688]
 RelativePath=Loader\classloader\rmv\il\RMV-2-8-3-two\RMV-2-8-3-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-8-3-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-8-30-two.cmd_9689]
 RelativePath=Loader\classloader\rmv\il\RMV-2-8-30-two\RMV-2-8-30-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-8-30-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-8-31-two.cmd_9690]
 RelativePath=Loader\classloader\rmv\il\RMV-2-8-31-two\RMV-2-8-31-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-8-31-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-8-33-two.cmd_9691]
 RelativePath=Loader\classloader\rmv\il\RMV-2-8-33-two\RMV-2-8-33-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-8-33-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-8-39g-two.cmd_9692]
 RelativePath=Loader\classloader\rmv\il\RMV-2-8-39g-two\RMV-2-8-39g-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-8-39g-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [RMV-2-8-7-two.cmd_9693]
 RelativePath=Loader\classloader\rmv\il\RMV-2-8-7-two\RMV-2-8-7-two.cmd
 WorkingDir=Loader\classloader\rmv\il\RMV-2-8-7-two
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [t1.cmd_9694]
 RelativePath=Loader\classloader\SequentialLayout\Regress\217070\t1\t1.cmd
 WorkingDir=Loader\classloader\SequentialLayout\Regress\217070\t1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [t2.cmd_9695]
 RelativePath=Loader\classloader\SequentialLayout\Regress\217070\t2\t2.cmd
 WorkingDir=Loader\classloader\SequentialLayout\Regress\217070\t2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [LiteralStatic.cmd_9696]
 RelativePath=Loader\classloader\Statics\Misc\LiteralStatic\LiteralStatic.cmd
 WorkingDir=Loader\classloader\Statics\Misc\LiteralStatic
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Enum_ValueField.cmd_9697]
 RelativePath=Loader\classloader\Statics\Regressions\484837\Enum_ValueField\Enum_ValueField.cmd
 WorkingDir=Loader\classloader\Statics\Regressions\484837\Enum_ValueField
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HelloWorld.cmd_9698]
 RelativePath=Loader\classloader\TSAmbiguities\CollapsedInterfaces\HelloWorld\HelloWorld.cmd
 WorkingDir=Loader\classloader\TSAmbiguities\CollapsedInterfaces\HelloWorld
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HelloWorld.cmd_9699]
 RelativePath=Loader\classloader\TSAmbiguities\CollapsedMethods\InterfaceDefinition\HelloWorld\HelloWorld.cmd
 WorkingDir=Loader\classloader\TSAmbiguities\CollapsedMethods\InterfaceDefinition\HelloWorld
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HelloWorld.cmd_9700]
 RelativePath=Loader\classloader\TSAmbiguities\CollapsedMethods\InterfaceImplementation\HelloWorld\HelloWorld.cmd
 WorkingDir=Loader\classloader\TSAmbiguities\CollapsedMethods\InterfaceImplementation\HelloWorld
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HelloWorld.cmd_9701]
 RelativePath=Loader\classloader\TSAmbiguities\CollapsedMethods\Override\HelloWorld\HelloWorld.cmd
 WorkingDir=Loader\classloader\TSAmbiguities\CollapsedMethods\Override\HelloWorld
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HelloWorld.cmd_9702]
 RelativePath=Loader\classloader\TSAmbiguities\SameMethodImpl\CollapsedInterfaces\HelloWorld\HelloWorld.cmd
 WorkingDir=Loader\classloader\TSAmbiguities\SameMethodImpl\CollapsedInterfaces\HelloWorld
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HelloWorld.cmd_9703]
 RelativePath=Loader\classloader\TSAmbiguities\SameMethodImpl\Override\HelloWorld\HelloWorld.cmd
 WorkingDir=Loader\classloader\TSAmbiguities\SameMethodImpl\Override\HelloWorld
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HelloWorld.cmd_9704]
 RelativePath=Loader\classloader\TSAmbiguities\Variance\Covariant_CollapsedInterfaces\HelloWorld\HelloWorld.cmd
 WorkingDir=Loader\classloader\TSAmbiguities\Variance\Covariant_CollapsedInterfaces\HelloWorld
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HelloWorld.cmd_9705]
 RelativePath=Loader\classloader\TSAmbiguities\Variance\Covariant_InherittedCollision\HelloWorld\HelloWorld.cmd
 WorkingDir=Loader\classloader\TSAmbiguities\Variance\Covariant_InherittedCollision\HelloWorld
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HelloWorld.cmd_9706]
 RelativePath=Loader\classloader\TSAmbiguities\Variance\Variant_CollapsedInterfaces\HelloWorld\HelloWorld.cmd
 WorkingDir=Loader\classloader\TSAmbiguities\Variance\Variant_CollapsedInterfaces\HelloWorld
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [HelloWorld.cmd_9707]
 RelativePath=Loader\classloader\TSAmbiguities\Variance\Variant_InherittedCollision\HelloWorld\HelloWorld.cmd
 WorkingDir=Loader\classloader\TSAmbiguities\Variance\Variant_InherittedCollision\HelloWorld
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [UnitTest.cmd_9708]
 RelativePath=Loader\classloader\TypeForwarding\UnitTest\UnitTest\UnitTest.cmd
 WorkingDir=Loader\classloader\TypeForwarding\UnitTest\UnitTest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test1.cmd_9709]
 RelativePath=Loader\classloader\TypeInitialization\backpatching\test1\test1.cmd
 WorkingDir=Loader\classloader\TypeInitialization\backpatching\test1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CctorOpenFile.cmd_9710]
 RelativePath=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorOpenFile\CctorOpenFile.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorOpenFile
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CctorThrowInlinedStatic.cmd_9711]
 RelativePath=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorThrowInlinedStatic\CctorThrowInlinedStatic.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorThrowInlinedStatic
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CctorThrowLDFTNStaticMethod.cmd_9712]
 RelativePath=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorThrowLDFTNStaticMethod\CctorThrowLDFTNStaticMethod.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorThrowLDFTNStaticMethod
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CctorThrowMethodAccess.cmd_9713]
 RelativePath=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorThrowMethodAccess\CctorThrowMethodAccess.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorThrowMethodAccess
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CctorThrowStaticField.cmd_9714]
 RelativePath=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorThrowStaticField\CctorThrowStaticField.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorThrowStaticField
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CctorThrowStaticFieldBFI.cmd_9715]
 RelativePath=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorThrowStaticFieldBFI\CctorThrowStaticFieldBFI.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CctorsWithSideEffects\CctorThrowStaticFieldBFI
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ResetGlobalFields.cmd_9716]
 RelativePath=Loader\classloader\TypeInitialization\CctorsWithSideEffects\ResetGlobalFields\ResetGlobalFields.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CctorsWithSideEffects\ResetGlobalFields
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TypeLoadInitExcep.cmd_9717]
 RelativePath=Loader\classloader\TypeInitialization\CctorsWithSideEffects\TypeLoadInitExcep\TypeLoadInitExcep.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CctorsWithSideEffects\TypeLoadInitExcep
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [TypeLoadInitExcepBFI.cmd_9718]
 RelativePath=Loader\classloader\TypeInitialization\CctorsWithSideEffects\TypeLoadInitExcepBFI\TypeLoadInitExcepBFI.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CctorsWithSideEffects\TypeLoadInitExcepBFI
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [UntrustedCodeBFI.cmd_9719]
 RelativePath=Loader\classloader\TypeInitialization\CctorsWithSideEffects\UntrustedCodeBFI\UntrustedCodeBFI.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CctorsWithSideEffects\UntrustedCodeBFI
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CircularCctorFourThreads.cmd_9720]
 RelativePath=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorFourThreads\CircularCctorFourThreads.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorFourThreads
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CircularCctorFourThreadsBFI.cmd_9721]
 RelativePath=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorFourThreadsBFI\CircularCctorFourThreadsBFI.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorFourThreadsBFI
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CircularCctorThreeThreads01.cmd_9722]
 RelativePath=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads01\CircularCctorThreeThreads01.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CircularCctorThreeThreads01BFI.cmd_9723]
 RelativePath=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads01BFI\CircularCctorThreeThreads01BFI.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads01BFI
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CircularCctorThreeThreads02.cmd_9724]
 RelativePath=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads02\CircularCctorThreeThreads02.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CircularCctorThreeThreads02BFI.cmd_9725]
 RelativePath=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads02BFI\CircularCctorThreeThreads02BFI.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads02BFI
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CircularCctorThreeThreads03.cmd_9726]
 RelativePath=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads03\CircularCctorThreeThreads03.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CircularCctorThreeThreads03BFI.cmd_9727]
 RelativePath=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads03BFI\CircularCctorThreeThreads03BFI.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CircularCctors\CircularCctorThreeThreads03BFI
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CctorThrowStaticFieldBFI.cmd_9728]
 RelativePath=Loader\classloader\TypeInitialization\CoreCLR\CctorThrowStaticFieldBFI\CctorThrowStaticFieldBFI.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CoreCLR\CctorThrowStaticFieldBFI
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CircularCctorThreeThreads03.cmd_9729]
 RelativePath=Loader\classloader\TypeInitialization\CoreCLR\CircularCctorThreeThreads03\CircularCctorThreeThreads03.cmd
 WorkingDir=Loader\classloader\TypeInitialization\CoreCLR\CircularCctorThreeThreads03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GenMethInlined.cmd_9730]
 RelativePath=Loader\classloader\TypeInitialization\Inlining\GenMethInlined\GenMethInlined.cmd
 WorkingDir=Loader\classloader\TypeInitialization\Inlining\GenMethInlined
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GenMethInlined_Multinested.cmd_9731]
 RelativePath=Loader\classloader\TypeInitialization\Inlining\GenMethInlined_Multinested\GenMethInlined_Multinested.cmd
 WorkingDir=Loader\classloader\TypeInitialization\Inlining\GenMethInlined_Multinested
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GenTypeInlined.cmd_9732]
 RelativePath=Loader\classloader\TypeInitialization\Inlining\GenTypeInlined\GenTypeInlined.cmd
 WorkingDir=Loader\classloader\TypeInitialization\Inlining\GenTypeInlined
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [GenTypeInlined_Multinested.cmd_9733]
 RelativePath=Loader\classloader\TypeInitialization\Inlining\GenTypeInlined_Multinested\GenTypeInlined_Multinested.cmd
 WorkingDir=Loader\classloader\TypeInitialization\Inlining\GenTypeInlined_Multinested
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Inlined.cmd_9734]
 RelativePath=Loader\classloader\TypeInitialization\Inlining\Inlined\Inlined.cmd
 WorkingDir=Loader\classloader\TypeInitialization\Inlining\Inlined
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Inlined_Multinested.cmd_9735]
 RelativePath=Loader\classloader\TypeInitialization\Inlining\Inlined_Multinested\Inlined_Multinested.cmd
 WorkingDir=Loader\classloader\TypeInitialization\Inlining\Inlined_Multinested
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CctorZeroVal01.cmd_9736]
 RelativePath=Loader\classloader\TypeInitialization\ThisNulllPointer\CctorZeroVal01\CctorZeroVal01.cmd
 WorkingDir=Loader\classloader\TypeInitialization\ThisNulllPointer\CctorZeroVal01
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CctorZeroVal02.cmd_9737]
 RelativePath=Loader\classloader\TypeInitialization\ThisNulllPointer\CctorZeroVal02\CctorZeroVal02.cmd
 WorkingDir=Loader\classloader\TypeInitialization\ThisNulllPointer\CctorZeroVal02
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CctorZeroVal03.cmd_9738]
 RelativePath=Loader\classloader\TypeInitialization\ThisNulllPointer\CctorZeroVal03\CctorZeroVal03.cmd
 WorkingDir=Loader\classloader\TypeInitialization\ThisNulllPointer\CctorZeroVal03
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-1-1.cmd_9739]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-1-1\L-1-1-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-1-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-1-3.cmd_9740]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-1-3\L-1-1-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-1-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-10-1.cmd_9741]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-10-1\L-1-10-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-10-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-10-3.cmd_9742]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-10-3\L-1-10-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-10-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-11-1.cmd_9743]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-11-1\L-1-11-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-11-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-11-3.cmd_9744]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-11-3\L-1-11-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-11-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-12-1.cmd_9745]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-12-1\L-1-12-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-12-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-12-3.cmd_9746]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-12-3\L-1-12-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-12-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-2-1.cmd_9747]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-2-1\L-1-2-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-2-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-2-3.cmd_9748]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-2-3\L-1-2-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-2-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-3-1.cmd_9749]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-3-1\L-1-3-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-3-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-4-1.cmd_9750]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-4-1\L-1-4-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-4-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-5-1.cmd_9751]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-5-1\L-1-5-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-5-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-5-3.cmd_9752]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-5-3\L-1-5-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-5-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-6-1.cmd_9753]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-6-1\L-1-6-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-6-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-6-3.cmd_9754]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-6-3\L-1-6-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-6-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-7-1.cmd_9755]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-7-1\L-1-7-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-7-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-7-3.cmd_9756]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-7-3\L-1-7-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-7-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-8-1.cmd_9757]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-8-1\L-1-8-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-8-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-8-3.cmd_9758]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-8-3\L-1-8-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-8-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-9-1.cmd_9759]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-9-1\L-1-9-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-9-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-1-9-3.cmd_9760]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-9-3\L-1-9-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-1-9-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-10-1.cmd_9761]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-10-1\L-2-10-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-10-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-10-3.cmd_9762]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-10-3\L-2-10-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-10-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-11-1.cmd_9763]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-11-1\L-2-11-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-11-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-11-3.cmd_9764]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-11-3\L-2-11-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-11-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-12-1.cmd_9765]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-12-1\L-2-12-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-12-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-12-3.cmd_9766]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-12-3\L-2-12-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-12-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-3-1.cmd_9767]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-3-1\L-2-3-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-3-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-4-1.cmd_9768]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-4-1\L-2-4-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-4-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-5-1.cmd_9769]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-5-1\L-2-5-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-5-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-5-3.cmd_9770]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-5-3\L-2-5-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-5-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-6-1.cmd_9771]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-6-1\L-2-6-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-6-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-6-3.cmd_9772]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-6-3\L-2-6-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-6-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-9-1.cmd_9773]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-9-1\L-2-9-1.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-9-1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [L-2-9-3.cmd_9774]
 RelativePath=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-9-3\L-2-9-3.cmd
 WorkingDir=Loader\classloader\v1\Beta1\Layout\Matrix\cs\L-2-9-3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Case1.cmd_9775]
 RelativePath=Loader\classloader\v1\M10\Acceptance\Case1\Case1.cmd
 WorkingDir=Loader\classloader\v1\M10\Acceptance\Case1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Case2.cmd_9776]
 RelativePath=Loader\classloader\v1\M10\Acceptance\Case2\Case2.cmd
 WorkingDir=Loader\classloader\v1\M10\Acceptance\Case2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Case3.cmd_9777]
 RelativePath=Loader\classloader\v1\M10\Acceptance\Case3\Case3.cmd
 WorkingDir=Loader\classloader\v1\M10\Acceptance\Case3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Case4.cmd_9778]
 RelativePath=Loader\classloader\v1\M10\Acceptance\Case4\Case4.cmd
 WorkingDir=Loader\classloader\v1\M10\Acceptance\Case4
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Exception.cmd_9779]
 RelativePath=Loader\lowlevel\regress\105736\Exception\Exception.cmd
 WorkingDir=Loader\lowlevel\regress\105736\Exception
@@ -67605,6 +75819,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [DontUseNetmodule.cmd_9780]
 RelativePath=Loader\multimodule\DontUseNetmodule\DontUseNetmodule.cmd
 WorkingDir=Loader\multimodule\DontUseNetmodule
@@ -67612,34 +75827,39 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [FromNativePaths.cmd_9781]
 RelativePath=Loader\NativeLibs\FromNativePaths\FromNativePaths.cmd
 WorkingDir=Loader\NativeLibs\FromNativePaths
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [main.cmd_9782]
 RelativePath=Loader\regressions\classloader\main\main.cmd
 WorkingDir=Loader\regressions\classloader\main
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [vsw307137.cmd_9783]
 RelativePath=Loader\regressions\classloader\vsw307137\vsw307137.cmd
 WorkingDir=Loader\regressions\classloader\vsw307137
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Polyrec.cmd_9784]
 RelativePath=Loader\regressions\polyrec\Polyrec\Polyrec.cmd
 WorkingDir=Loader\regressions\polyrec\Polyrec
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AssemblyAttrs.cmd_9785]
 RelativePath=Loader\versioning\coverage\AssemblyAttrs\AssemblyAttrs.cmd
 WorkingDir=Loader\versioning\coverage\AssemblyAttrs
@@ -67647,48 +75867,55 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Compilation.cmd_9786]
 RelativePath=managed\Compilation\Compilation\Compilation.cmd
 WorkingDir=managed\Compilation\Compilation
 Expected=0
 MaxAllowedDurationSeconds=800
-Categories=Pri0;RT;EXPECTED_PASS;NATIVE_INTEROP;LONG_RUNNING
+Categories=RT;Pri0;LONG_RUNNING;NATIVE_INTEROP;EXPECTED_FAIL;10108
 HostStyle=0
+
 [generics.cmd_9787]
 RelativePath=readytorun\generics\generics.cmd
 WorkingDir=readytorun\generics
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [callgenericctor.cmd_9788]
 RelativePath=readytorun\genericsload\callgenericctor\callgenericctor.cmd
 WorkingDir=readytorun\genericsload\callgenericctor
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [usegenericfield.cmd_9789]
 RelativePath=readytorun\genericsload\usegenericfield\usegenericfield.cmd
 WorkingDir=readytorun\genericsload\usegenericfield
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [mainv1.cmd_9790]
 RelativePath=readytorun\mainv1\mainv1.cmd
 WorkingDir=readytorun\mainv1
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;UNSTABLE
+Categories=UNSTABLE;EXPECTED_PASS
 HostStyle=0
+
 [mainv2.cmd_9791]
 RelativePath=readytorun\mainv2\mainv2.cmd
 WorkingDir=readytorun\mainv2
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS;UNSTABLE
+Categories=UNSTABLE;EXPECTED_PASS
 HostStyle=0
+
 [Dev10_629953.cmd_9792]
 RelativePath=reflection\regression\dev10bugs\Dev10_629953\Dev10_629953.cmd
 WorkingDir=reflection\regression\dev10bugs\Dev10_629953
@@ -67696,6 +75923,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Dev10_630880.cmd_9793]
 RelativePath=reflection\regression\dev10bugs\Dev10_630880\Dev10_630880.cmd
 WorkingDir=reflection\regression\dev10bugs\Dev10_630880
@@ -67703,132 +75931,151 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_9794]
 RelativePath=Regressions\assemblyref\test\test.cmd
 WorkingDir=Regressions\assemblyref\test
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [AboveStackLimit.cmd_9795]
 RelativePath=Regressions\common\AboveStackLimit\AboveStackLimit.cmd
 WorkingDir=Regressions\common\AboveStackLimit
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ArrayCopy.cmd_9796]
 RelativePath=Regressions\common\ArrayCopy\ArrayCopy.cmd
 WorkingDir=Regressions\common\ArrayCopy
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [avtest.cmd_9797]
 RelativePath=Regressions\common\avtest\avtest.cmd
 WorkingDir=Regressions\common\avtest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [CompEx.cmd_9798]
 RelativePath=Regressions\common\CompEx\CompEx.cmd
 WorkingDir=Regressions\common\CompEx
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [date.cmd_9799]
 RelativePath=Regressions\common\date\date.cmd
 WorkingDir=Regressions\common\date
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [DisableTransparencyEnforcement.cmd_9800]
 RelativePath=Regressions\common\DisableTransparencyEnforcement\DisableTransparencyEnforcement.cmd
 WorkingDir=Regressions\common\DisableTransparencyEnforcement
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [interlock.cmd_9801]
 RelativePath=Regressions\common\interlock\interlock.cmd
 WorkingDir=Regressions\common\interlock
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Marshal.cmd_9802]
 RelativePath=Regressions\common\Marshal\Marshal.cmd
 WorkingDir=Regressions\common\Marshal
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [pow3.cmd_9803]
 RelativePath=Regressions\common\pow3\pow3.cmd
 WorkingDir=Regressions\common\pow3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [test1307.cmd_9804]
 RelativePath=Regressions\common\test1307\test1307.cmd
 WorkingDir=Regressions\common\test1307
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [testClass.cmd_9805]
 RelativePath=Regressions\common\testClass\testClass.cmd
 WorkingDir=Regressions\common\testClass
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [testInterface.cmd_9806]
 RelativePath=Regressions\common\testInterface\testInterface.cmd
 WorkingDir=Regressions\common\testInterface
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ThreadCulture.cmd_9807]
 RelativePath=Regressions\common\ThreadCulture\ThreadCulture.cmd
 WorkingDir=Regressions\common\ThreadCulture
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ToLower.cmd_9808]
 RelativePath=Regressions\common\ToLower\ToLower.cmd
 WorkingDir=Regressions\common\ToLower
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [Unsafe.cmd_9809]
 RelativePath=Regressions\common\Unsafe\Unsafe.cmd
 WorkingDir=Regressions\common\Unsafe
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [avtest.cmd_9810]
 RelativePath=Regressions\coreclr\0014\avtest\avtest.cmd
 WorkingDir=Regressions\coreclr\0014\avtest
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
 HostStyle=0
+
 [ArrayCopy.cmd_9811]
 RelativePath=Regressions\coreclr\0018\ArrayCopy\ArrayCopy.cmd
 WorkingDir=Regressions\coreclr\0018\ArrayCopy
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [thread08-simplified.cmd_9812]
 RelativePath=Regressions\coreclr\0028\thread08-simplified\thread08-simplified.cmd
 WorkingDir=Regressions\coreclr\0028\thread08-simplified
@@ -67836,6 +76083,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [expl_double_1.cmd_9813]
 RelativePath=Regressions\coreclr\0041\expl_double_1\expl_double_1.cmd
 WorkingDir=Regressions\coreclr\0041\expl_double_1
@@ -67843,6 +76091,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [nullable.cmd_9814]
 RelativePath=Regressions\coreclr\0044\nullable\nullable.cmd
 WorkingDir=Regressions\coreclr\0044\nullable
@@ -67850,6 +76099,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [istype.cmd_9815]
 RelativePath=Regressions\coreclr\0046\istype\istype.cmd
 WorkingDir=Regressions\coreclr\0046\istype
@@ -67857,13 +76107,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [date.cmd_9816]
 RelativePath=Regressions\coreclr\0069\date\date.cmd
 WorkingDir=Regressions\coreclr\0069\date
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [LargeArrayTest.cmd_9817]
 RelativePath=Regressions\coreclr\0075\LargeArrayTest\LargeArrayTest.cmd
 WorkingDir=Regressions\coreclr\0075\LargeArrayTest
@@ -67871,13 +76123,15 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [interlock.cmd_9818]
 RelativePath=Regressions\coreclr\0077\interlock\interlock.cmd
 WorkingDir=Regressions\coreclr\0077\interlock
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [delete_next_card_table.cmd_9819]
 RelativePath=Regressions\coreclr\0080\delete_next_card_table\delete_next_card_table.cmd
 WorkingDir=Regressions\coreclr\0080\delete_next_card_table
@@ -67885,34 +76139,39 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [AboveStackLimit.cmd_9820]
 RelativePath=Regressions\coreclr\0099\AboveStackLimit\AboveStackLimit.cmd
 WorkingDir=Regressions\coreclr\0099\AboveStackLimit
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [pow3.cmd_9821]
 RelativePath=Regressions\coreclr\0138\pow3\pow3.cmd
 WorkingDir=Regressions\coreclr\0138\pow3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [CompEx.cmd_9822]
 RelativePath=Regressions\coreclr\0198\CompEx\CompEx.cmd
 WorkingDir=Regressions\coreclr\0198\CompEx
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ThreadCulture.cmd_9823]
 RelativePath=Regressions\coreclr\0202\ThreadCulture\ThreadCulture.cmd
 WorkingDir=Regressions\coreclr\0202\ThreadCulture
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [genrecur.cmd_9824]
 RelativePath=Regressions\coreclr\0211\genrecur\genrecur.cmd
 WorkingDir=Regressions\coreclr\0211\genrecur
@@ -67920,20 +76179,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Marshal.cmd_9825]
 RelativePath=Regressions\coreclr\0275\Marshal\Marshal.cmd
 WorkingDir=Regressions\coreclr\0275\Marshal
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [ToLower.cmd_9826]
 RelativePath=Regressions\coreclr\0308\ToLower\ToLower.cmd
 WorkingDir=Regressions\coreclr\0308\ToLower
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [unsafe.cmd_9827]
 RelativePath=Regressions\coreclr\0342\unsafe\unsafe.cmd
 WorkingDir=Regressions\coreclr\0342\unsafe
@@ -67941,6 +76203,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [hello.cmd_9828]
 RelativePath=Regressions\coreclr\0416\hello\hello.cmd
 WorkingDir=Regressions\coreclr\0416\hello
@@ -67948,20 +76211,23 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_9829]
 RelativePath=Regressions\coreclr\0433\test\test.cmd
 WorkingDir=Regressions\coreclr\0433\test
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [test.cmd_9830]
 RelativePath=Regressions\coreclr\0487\test\test.cmd
 WorkingDir=Regressions\coreclr\0487\test
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Test570.cmd_9831]
 RelativePath=Regressions\coreclr\0570\Test570\Test570.cmd
 WorkingDir=Regressions\coreclr\0570\Test570
@@ -67969,6 +76235,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test0576.cmd_9832]
 RelativePath=Regressions\coreclr\0576\Test0576\Test0576.cmd
 WorkingDir=Regressions\coreclr\0576\Test0576
@@ -67976,6 +76243,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [csgen.1.cmd_9833]
 RelativePath=Regressions\coreclr\0582\csgen.1\csgen.1.cmd
 WorkingDir=Regressions\coreclr\0582\csgen.1
@@ -67983,6 +76251,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test583.cmd_9834]
 RelativePath=Regressions\coreclr\0583\Test583\Test583.cmd
 WorkingDir=Regressions\coreclr\0583\Test583
@@ -67990,6 +76259,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test584.cmd_9835]
 RelativePath=Regressions\coreclr\0584\Test584\Test584.cmd
 WorkingDir=Regressions\coreclr\0584\Test584
@@ -67997,6 +76267,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test0792.cmd_9836]
 RelativePath=Regressions\coreclr\0792\Test0792\Test0792.cmd
 WorkingDir=Regressions\coreclr\0792\Test0792
@@ -68004,6 +76275,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test0828.cmd_9837]
 RelativePath=Regressions\coreclr\0828\Test0828\Test0828.cmd
 WorkingDir=Regressions\coreclr\0828\Test0828
@@ -68011,6 +76283,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test0829.cmd_9838]
 RelativePath=Regressions\coreclr\0829\Test0829\Test0829.cmd
 WorkingDir=Regressions\coreclr\0829\Test0829
@@ -68018,6 +76291,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [override.cmd_9839]
 RelativePath=Regressions\coreclr\0857\override\override.cmd
 WorkingDir=Regressions\coreclr\0857\override
@@ -68025,6 +76299,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [test0939.cmd_9840]
 RelativePath=Regressions\coreclr\0939\test0939\test0939.cmd
 WorkingDir=Regressions\coreclr\0939\test0939
@@ -68032,6 +76307,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test968.cmd_9841]
 RelativePath=Regressions\coreclr\0968\Test968\Test968.cmd
 WorkingDir=Regressions\coreclr\0968\Test968
@@ -68039,27 +76315,31 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [test1307.cmd_9842]
 RelativePath=Regressions\coreclr\1307\test1307\test1307.cmd
 WorkingDir=Regressions\coreclr\1307\test1307
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [testClass.cmd_9843]
 RelativePath=Regressions\coreclr\1333\testClass\testClass.cmd
 WorkingDir=Regressions\coreclr\1333\testClass
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [testInterface.cmd_9844]
 RelativePath=Regressions\coreclr\1333\testInterface\testInterface.cmd
 WorkingDir=Regressions\coreclr\1333\testInterface
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=NEW;EXPECTED_PASS
+Categories=EXPECTED_PASS
 HostStyle=0
+
 [Test1337.cmd_9845]
 RelativePath=Regressions\coreclr\1337\Test1337\Test1337.cmd
 WorkingDir=Regressions\coreclr\1337\Test1337
@@ -68067,6 +76347,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Co1727ctor_OO.cmd_9846]
 RelativePath=Regressions\coreclr\1386\Co1727ctor_OO\Co1727ctor_OO.cmd
 WorkingDir=Regressions\coreclr\1386\Co1727ctor_OO
@@ -68074,6 +76355,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test1402.cmd_9847]
 RelativePath=Regressions\coreclr\1402\Test1402\Test1402.cmd
 WorkingDir=Regressions\coreclr\1402\Test1402
@@ -68081,6 +76363,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [InterlockExchange.cmd_9848]
 RelativePath=Regressions\coreclr\1514\InterlockExchange\InterlockExchange.cmd
 WorkingDir=Regressions\coreclr\1514\InterlockExchange
@@ -68088,6 +76371,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test1534.cmd_9849]
 RelativePath=Regressions\coreclr\1534\Test1534\Test1534.cmd
 WorkingDir=Regressions\coreclr\1534\Test1534
@@ -68095,6 +76379,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test1535.cmd_9850]
 RelativePath=Regressions\coreclr\1535\Test1535\Test1535.cmd
 WorkingDir=Regressions\coreclr\1535\Test1535
@@ -68102,6 +76387,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test1549.cmd_9851]
 RelativePath=Regressions\coreclr\1549\Test1549\Test1549.cmd
 WorkingDir=Regressions\coreclr\1549\Test1549
@@ -68109,6 +76395,7 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [Test72162.cmd_9852]
 RelativePath=Regressions\coreclr\72162\Test72162\Test72162.cmd
 WorkingDir=Regressions\coreclr\72162\Test72162
@@ -68116,10 +76403,14132 @@ Expected=0
 MaxAllowedDurationSeconds=600
 Categories=Pri1;RT;EXPECTED_PASS
 HostStyle=0
+
 [expl_double.cmd_9853]
 RelativePath=Regressions\expl_double\expl_double\expl_double.cmd
 WorkingDir=Regressions\expl_double\expl_double
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri0;RT;EXPECTED_PASS
+Categories=RT;Pri0;EXPECTED_PASS
+HostStyle=0
+
+[DevDiv_278371.cmd_9854]
+RelativePath=JIT\Regression\JitBlue\DevDiv_278371\DevDiv_278371\DevDiv_278371.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_278371\DevDiv_278371
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated193.cmd_9855]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest193\Generated193\Generated193.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest193\Generated193
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1415.cmd_9856]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1415\Generated1415\Generated1415.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1415\Generated1415
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1246.cmd_9857]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1246\Generated1246\Generated1246.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1246\Generated1246
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1313.cmd_9858]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1313\Generated1313\Generated1313.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1313\Generated1313
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated80.cmd_9859]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest80\Generated80\Generated80.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest80\Generated80
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1482.cmd_9860]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1482\Generated1482\Generated1482.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1482\Generated1482
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated560.cmd_9861]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest560\Generated560\Generated560.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest560\Generated560
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated864.cmd_9862]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest864\Generated864\Generated864.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest864\Generated864
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated344.cmd_9863]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest344\Generated344\Generated344.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest344\Generated344
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated507.cmd_9864]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest507\Generated507\Generated507.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest507\Generated507
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated223.cmd_9865]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest223\Generated223\Generated223.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest223\Generated223
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b410474.cmd_9866]
+RelativePath=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b410474\b410474\b410474.cmd
+WorkingDir=JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b410474\b410474
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated1156.cmd_9867]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1156\Generated1156\Generated1156.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1156\Generated1156
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1330.cmd_9868]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1330\Generated1330\Generated1330.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1330\Generated1330
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated349.cmd_9869]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest349\Generated349\Generated349.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest349\Generated349
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated766.cmd_9870]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest766\Generated766\Generated766.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest766\Generated766
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1222.cmd_9871]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1222\Generated1222\Generated1222.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1222\Generated1222
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated517.cmd_9872]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest517\Generated517\Generated517.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest517\Generated517
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated997.cmd_9873]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest997\Generated997\Generated997.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest997\Generated997
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated88.cmd_9874]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest88\Generated88\Generated88.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest88\Generated88
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated847.cmd_9875]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest847\Generated847\Generated847.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest847\Generated847
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated895.cmd_9876]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest895\Generated895\Generated895.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest895\Generated895
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated286.cmd_9877]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest286\Generated286\Generated286.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest286\Generated286
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1302.cmd_9878]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1302\Generated1302\Generated1302.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1302\Generated1302
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated90.cmd_9879]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest90\Generated90\Generated90.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest90\Generated90
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated464.cmd_9880]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest464\Generated464\Generated464.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest464\Generated464
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated679.cmd_9881]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest679\Generated679\Generated679.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest679\Generated679
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated869.cmd_9882]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest869\Generated869\Generated869.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest869\Generated869
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1124.cmd_9883]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1124\Generated1124\Generated1124.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1124\Generated1124
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated559.cmd_9884]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest559\Generated559\Generated559.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest559\Generated559
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b07847.cmd_9885]
+RelativePath=JIT\Regression\CLR-x86-EJIT\v1-m10\b07847\b07847\b07847.cmd
+WorkingDir=JIT\Regression\CLR-x86-EJIT\v1-m10\b07847\b07847
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2441;NEW
+HostStyle=0
+
+[Generated554.cmd_9886]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest554\Generated554\Generated554.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest554\Generated554
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i60.cmd_9887]
+RelativePath=JIT\jit64\mcc\interop\mcc_i60\mcc_i60.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i60
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1394.cmd_9888]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1394\Generated1394\Generated1394.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1394\Generated1394
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated772.cmd_9889]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest772\Generated772\Generated772.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest772\Generated772
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1403.cmd_9890]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1403\Generated1403\Generated1403.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1403\Generated1403
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated610.cmd_9891]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest610\Generated610\Generated610.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest610\Generated610
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated785.cmd_9892]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest785\Generated785\Generated785.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest785\Generated785
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated703.cmd_9893]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest703\Generated703\Generated703.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest703\Generated703
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated753.cmd_9894]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest753\Generated753\Generated753.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest753\Generated753
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated146.cmd_9895]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest146\Generated146\Generated146.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest146\Generated146
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated527.cmd_9896]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest527\Generated527\Generated527.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest527\Generated527
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated592.cmd_9897]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest592\Generated592\Generated592.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest592\Generated592
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[uint64Opt_ro.cmd_9898]
+RelativePath=JIT\Directed\shift\uint64Opt_ro\uint64Opt_ro.cmd
+WorkingDir=JIT\Directed\shift\uint64Opt_ro
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated425.cmd_9899]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest425\Generated425\Generated425.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest425\Generated425
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated885.cmd_9900]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest885\Generated885\Generated885.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest885\Generated885
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1396.cmd_9901]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1396\Generated1396\Generated1396.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1396\Generated1396
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Test7685.cmd_9902]
+RelativePath=Regressions\coreclr\GitHub_7685\Test7685\Test7685.cmd
+WorkingDir=Regressions\coreclr\GitHub_7685\Test7685
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;10107;NEW
+HostStyle=0
+
+[Generated921.cmd_9903]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest921\Generated921\Generated921.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest921\Generated921
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_278376.cmd_9904]
+RelativePath=JIT\Regression\JitBlue\DevDiv_278376\DevDiv_278376\DevDiv_278376.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_278376\DevDiv_278376
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_dbgsin_cs_il.cmd_9905]
+RelativePath=JIT\Methodical\Boxing\xlang\_dbgsin_cs_il\_dbgsin_cs_il.cmd
+WorkingDir=JIT\Methodical\Boxing\xlang\_dbgsin_cs_il
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated883.cmd_9906]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest883\Generated883\Generated883.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest883\Generated883
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated471.cmd_9907]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest471\Generated471\Generated471.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest471\Generated471
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1015.cmd_9908]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1015\Generated1015\Generated1015.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1015\Generated1015
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated528.cmd_9909]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest528\Generated528\Generated528.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest528\Generated528
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[pinvoke-examples.cmd_9910]
+RelativePath=JIT\Directed\pinvoke\pinvoke-examples\pinvoke-examples.cmd
+WorkingDir=JIT\Directed\pinvoke\pinvoke-examples
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DivConst.cmd_9911]
+RelativePath=JIT\CodeGenBringUpTests\DivConst\DivConst.cmd
+WorkingDir=JIT\CodeGenBringUpTests\DivConst
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated648.cmd_9912]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest648\Generated648\Generated648.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest648\Generated648
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1446.cmd_9913]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1446\Generated1446\Generated1446.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1446\Generated1446
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1257.cmd_9914]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1257\Generated1257\Generated1257.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1257\Generated1257
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated285.cmd_9915]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest285\Generated285\Generated285.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest285\Generated285
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated971.cmd_9916]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest971\Generated971\Generated971.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest971\Generated971
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1065.cmd_9917]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1065\Generated1065\Generated1065.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1065\Generated1065
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated435.cmd_9918]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest435\Generated435\Generated435.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest435\Generated435
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated16.cmd_9919]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest16\Generated16\Generated16.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest16\Generated16
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated195.cmd_9920]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest195\Generated195\Generated195.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest195\Generated195
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated520.cmd_9921]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest520\Generated520\Generated520.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest520\Generated520
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated143.cmd_9922]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest143\Generated143\Generated143.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest143\Generated143
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1092.cmd_9923]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1092\Generated1092\Generated1092.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1092\Generated1092
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated145.cmd_9924]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest145\Generated145\Generated145.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest145\Generated145
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated649.cmd_9925]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest649\Generated649\Generated649.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest649\Generated649
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated79.cmd_9926]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest79\Generated79\Generated79.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest79\Generated79
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1310.cmd_9927]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1310\Generated1310\Generated1310.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1310\Generated1310
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated911.cmd_9928]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest911\Generated911\Generated911.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest911\Generated911
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated419.cmd_9929]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest419\Generated419\Generated419.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest419\Generated419
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated290.cmd_9930]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest290\Generated290\Generated290.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest290\Generated290
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_359733.cmd_9931]
+RelativePath=JIT\Regression\JitBlue\DevDiv_359733\DevDiv_359733\DevDiv_359733.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_359733\DevDiv_359733
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated730.cmd_9932]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest730\Generated730\Generated730.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest730\Generated730
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated13.cmd_9933]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest13\Generated13\Generated13.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest13\Generated13
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated750.cmd_9934]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest750\Generated750\Generated750.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest750\Generated750
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1285.cmd_9935]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1285\Generated1285\Generated1285.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1285\Generated1285
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated689.cmd_9936]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest689\Generated689\Generated689.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest689\Generated689
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1395.cmd_9937]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1395\Generated1395\Generated1395.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1395\Generated1395
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1409.cmd_9938]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1409\Generated1409\Generated1409.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1409\Generated1409
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1010.cmd_9939]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1010\Generated1010\Generated1010.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1010\Generated1010
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[536168.cmd_9940]
+RelativePath=GC\Regressions\dev10bugs\536168\536168\536168.cmd
+WorkingDir=GC\Regressions\dev10bugs\536168\536168
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[Generated1498.cmd_9941]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1498\Generated1498\Generated1498.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1498\Generated1498
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated619.cmd_9942]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest619\Generated619\Generated619.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest619\Generated619
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated240.cmd_9943]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest240\Generated240\Generated240.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest240\Generated240
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_280123.cmd_9944]
+RelativePath=JIT\Regression\JitBlue\DevDiv_280123\DevDiv_280123\DevDiv_280123.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_280123\DevDiv_280123
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated405.cmd_9945]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest405\Generated405\Generated405.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest405\Generated405
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated220.cmd_9946]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest220\Generated220\Generated220.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest220\Generated220
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated105.cmd_9947]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest105\Generated105\Generated105.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest105\Generated105
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated867.cmd_9948]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest867\Generated867\Generated867.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest867\Generated867
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1318.cmd_9949]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1318\Generated1318\Generated1318.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1318\Generated1318
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1404.cmd_9950]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1404\Generated1404\Generated1404.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1404\Generated1404
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated903.cmd_9951]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest903\Generated903\Generated903.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest903\Generated903
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated524.cmd_9952]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest524\Generated524\Generated524.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest524\Generated524
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated0.cmd_9953]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest0\Generated0\Generated0.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest0\Generated0
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated95.cmd_9954]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest95\Generated95\Generated95.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest95\Generated95
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_377155.cmd_9955]
+RelativePath=JIT\Regression\JitBlue\DevDiv_377155\DevDiv_377155\DevDiv_377155.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_377155\DevDiv_377155
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated9.cmd_9956]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest9\Generated9\Generated9.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest9\Generated9
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated877.cmd_9957]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest877\Generated877\Generated877.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest877\Generated877
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated175.cmd_9958]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest175\Generated175\Generated175.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest175\Generated175
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated824.cmd_9959]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest824\Generated824\Generated824.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest824\Generated824
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated621.cmd_9960]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest621\Generated621\Generated621.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest621\Generated621
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1496.cmd_9961]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1496\Generated1496\Generated1496.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1496\Generated1496
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated416.cmd_9962]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest416\Generated416\Generated416.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest416\Generated416
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[rvastatic2.cmd_9963]
+RelativePath=JIT\Directed\rvastatics\rvastatic2\rvastatic2.cmd
+WorkingDir=JIT\Directed\rvastatics\rvastatic2
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated748.cmd_9964]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest748\Generated748\Generated748.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest748\Generated748
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1354.cmd_9965]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1354\Generated1354\Generated1354.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1354\Generated1354
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated298.cmd_9966]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest298\Generated298\Generated298.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest298\Generated298
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated409.cmd_9967]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest409\Generated409\Generated409.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest409\Generated409
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated976.cmd_9968]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest976\Generated976\Generated976.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest976\Generated976
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated27.cmd_9969]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest27\Generated27\Generated27.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest27\Generated27
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated23.cmd_9970]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest23\Generated23\Generated23.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest23\Generated23
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated72.cmd_9971]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest72\Generated72\Generated72.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest72\Generated72
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1137.cmd_9972]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1137\Generated1137\Generated1137.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1137\Generated1137
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[valuetuple.cmd_9973]
+RelativePath=JIT\Methodical\structs\valuetuple\valuetuple.cmd
+WorkingDir=JIT\Methodical\structs\valuetuple
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated618.cmd_9974]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest618\Generated618\Generated618.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest618\Generated618
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated651.cmd_9975]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest651\Generated651\Generated651.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest651\Generated651
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated880.cmd_9976]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest880\Generated880\Generated880.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest880\Generated880
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[reregisterforfinalize.cmd_9977]
+RelativePath=GC\LargeMemory\API\gc\reregisterforfinalize\reregisterforfinalize.cmd
+WorkingDir=GC\LargeMemory\API\gc\reregisterforfinalize
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1452.cmd_9978]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1452\Generated1452\Generated1452.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1452\Generated1452
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated101.cmd_9979]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest101\Generated101\Generated101.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest101\Generated101
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1281.cmd_9980]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1281\Generated1281\Generated1281.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1281\Generated1281
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated861.cmd_9981]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest861\Generated861\Generated861.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest861\Generated861
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[SeekUnroll.cmd_9982]
+RelativePath=JIT\Performance\CodeQuality\SIMD\SeekUnroll\SeekUnroll\SeekUnroll.cmd
+WorkingDir=JIT\Performance\CodeQuality\SIMD\SeekUnroll\SeekUnroll
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated848.cmd_9983]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest848\Generated848\Generated848.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest848\Generated848
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated860.cmd_9984]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest860\Generated860\Generated860.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest860\Generated860
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1118.cmd_9985]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1118\Generated1118\Generated1118.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1118\Generated1118
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated486.cmd_9986]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest486\Generated486\Generated486.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest486\Generated486
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated367.cmd_9987]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest367\Generated367\Generated367.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest367\Generated367
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_278523.cmd_9988]
+RelativePath=JIT\Regression\JitBlue\DevDiv_278523\DevDiv_278523\DevDiv_278523.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_278523\DevDiv_278523
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1479.cmd_9989]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1479\Generated1479\Generated1479.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1479\Generated1479
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated544.cmd_9990]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest544\Generated544\Generated544.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest544\Generated544
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated570.cmd_9991]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest570\Generated570\Generated570.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest570\Generated570
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated153.cmd_9992]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest153\Generated153\Generated153.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest153\Generated153
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated989.cmd_9993]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest989\Generated989\Generated989.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest989\Generated989
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated360.cmd_9994]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest360\Generated360\Generated360.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest360\Generated360
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[getgeneration.cmd_9995]
+RelativePath=GC\LargeMemory\API\gc\getgeneration\getgeneration.cmd
+WorkingDir=GC\LargeMemory\API\gc\getgeneration
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[DevDiv_370233.cmd_9996]
+RelativePath=JIT\Regression\JitBlue\DevDiv_370233\DevDiv_370233\DevDiv_370233.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_370233\DevDiv_370233
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1432.cmd_9997]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1432\Generated1432\Generated1432.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1432\Generated1432
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b409748.cmd_9998]
+RelativePath=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b409748\b409748\b409748.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b409748\b409748
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1366.cmd_9999]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1366\Generated1366\Generated1366.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1366\Generated1366
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated645.cmd_10000]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest645\Generated645\Generated645.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest645\Generated645
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated990.cmd_10001]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest990\Generated990\Generated990.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest990\Generated990
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1060.cmd_10002]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1060\Generated1060\Generated1060.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1060\Generated1060
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated709.cmd_10003]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest709\Generated709\Generated709.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest709\Generated709
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated508.cmd_10004]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest508\Generated508\Generated508.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest508\Generated508
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[uint64Opt_r.cmd_10005]
+RelativePath=JIT\Directed\shift\uint64Opt_r\uint64Opt_r.cmd
+WorkingDir=JIT\Directed\shift\uint64Opt_r
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1078.cmd_10006]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1078\Generated1078\Generated1078.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1078\Generated1078
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1405.cmd_10007]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1405\Generated1405\Generated1405.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1405\Generated1405
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1192.cmd_10008]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1192\Generated1192\Generated1192.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1192\Generated1192
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated945.cmd_10009]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest945\Generated945\Generated945.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest945\Generated945
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated165.cmd_10010]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest165\Generated165\Generated165.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest165\Generated165
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated792.cmd_10011]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest792\Generated792\Generated792.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest792\Generated792
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1233.cmd_10012]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1233\Generated1233\Generated1233.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1233\Generated1233
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated546.cmd_10013]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest546\Generated546\Generated546.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest546\Generated546
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated61.cmd_10014]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest61\Generated61\Generated61.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest61\Generated61
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated76.cmd_10015]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest76\Generated76\Generated76.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest76\Generated76
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[lohfragmentation.cmd_10016]
+RelativePath=GC\Features\LOHFragmentation\lohfragmentation\lohfragmentation.cmd
+WorkingDir=GC\Features\LOHFragmentation\lohfragmentation
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[Generated336.cmd_10017]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest336\Generated336\Generated336.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest336\Generated336
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1234.cmd_10018]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1234\Generated1234\Generated1234.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1234\Generated1234
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated795.cmd_10019]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest795\Generated795\Generated795.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest795\Generated795
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated788.cmd_10020]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest788\Generated788\Generated788.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest788\Generated788
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1459.cmd_10021]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1459\Generated1459\Generated1459.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1459\Generated1459
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated872.cmd_10022]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest872\Generated872\Generated872.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest872\Generated872
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated843.cmd_10023]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest843\Generated843\Generated843.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest843\Generated843
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated479.cmd_10024]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest479\Generated479\Generated479.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest479\Generated479
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated889.cmd_10025]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest889\Generated889\Generated889.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest889\Generated889
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated999.cmd_10026]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest999\Generated999\Generated999.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest999\Generated999
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated874.cmd_10027]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest874\Generated874\Generated874.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest874\Generated874
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1424.cmd_10028]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1424\Generated1424\Generated1424.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1424\Generated1424
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Vector3Test.cmd_10029]
+RelativePath=JIT\Regression\JitBlue\GitHub_7508\Vector3Test\Vector3Test.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_7508\Vector3Test
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated245.cmd_10030]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest245\Generated245\Generated245.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest245\Generated245
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_278372.cmd_10031]
+RelativePath=JIT\Regression\JitBlue\DevDiv_278372\DevDiv_278372\DevDiv_278372.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_278372\DevDiv_278372
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated431.cmd_10032]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest431\Generated431\Generated431.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest431\Generated431
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated963.cmd_10033]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest963\Generated963\Generated963.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest963\Generated963
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated407.cmd_10034]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest407\Generated407\Generated407.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest407\Generated407
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1143.cmd_10035]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1143\Generated1143\Generated1143.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1143\Generated1143
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1381.cmd_10036]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1381\Generated1381\Generated1381.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1381\Generated1381
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1028.cmd_10037]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1028\Generated1028\Generated1028.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1028\Generated1028
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b32374.cmd_10038]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32374\b32374\b32374.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32374\b32374
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[BestFitMapping.cmd_10039]
+RelativePath=Interop\BestFitMapping\BestFitMapping\BestFitMapping.cmd
+WorkingDir=Interop\BestFitMapping\BestFitMapping
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated21.cmd_10040]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest21\Generated21\Generated21.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest21\Generated21
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated593.cmd_10041]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest593\Generated593\Generated593.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest593\Generated593
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1478.cmd_10043]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1478\Generated1478\Generated1478.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1478\Generated1478
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated385.cmd_10044]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest385\Generated385\Generated385.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest385\Generated385
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated460.cmd_10045]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest460\Generated460\Generated460.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest460\Generated460
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1218.cmd_10046]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1218\Generated1218\Generated1218.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1218\Generated1218
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1439.cmd_10047]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1439\Generated1439\Generated1439.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1439\Generated1439
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1221.cmd_10048]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1221\Generated1221\Generated1221.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1221\Generated1221
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated514.cmd_10049]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest514\Generated514\Generated514.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest514\Generated514
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1283.cmd_10050]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1283\Generated1283\Generated1283.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1283\Generated1283
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1278.cmd_10051]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1278\Generated1278\Generated1278.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1278\Generated1278
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1284.cmd_10052]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1284\Generated1284\Generated1284.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1284\Generated1284
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated978.cmd_10053]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest978\Generated978\Generated978.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest978\Generated978
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW;9457;R2R_FAIL
+HostStyle=0
+
+[Generated179.cmd_10054]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest179\Generated179\Generated179.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest179\Generated179
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated261.cmd_10055]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest261\Generated261\Generated261.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest261\Generated261
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated879.cmd_10056]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest879\Generated879\Generated879.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest879\Generated879
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated355.cmd_10057]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest355\Generated355\Generated355.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest355\Generated355
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1288.cmd_10058]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1288\Generated1288\Generated1288.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1288\Generated1288
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[nonrefsdarr_il_d.cmd_10059]
+RelativePath=JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_d\nonrefsdarr_il_d.cmd
+WorkingDir=JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_d
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;4851;NEW
+HostStyle=0
+
+[Generated987.cmd_10060]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest987\Generated987\Generated987.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest987\Generated987
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_1206929.cmd_10061]
+RelativePath=JIT\Regression\JitBlue\DevDiv_1206929\DevDiv_1206929\DevDiv_1206929.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_1206929\DevDiv_1206929
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1127.cmd_10062]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1127\Generated1127\Generated1127.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1127\Generated1127
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1444.cmd_10063]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1444\Generated1444\Generated1444.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1444\Generated1444
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated733.cmd_10064]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest733\Generated733\Generated733.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest733\Generated733
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated466.cmd_10065]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest466\Generated466\Generated466.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest466\Generated466
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated358.cmd_10066]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest358\Generated358\Generated358.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest358\Generated358
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated896.cmd_10067]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest896\Generated896\Generated896.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest896\Generated896
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated894.cmd_10068]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest894\Generated894\Generated894.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest894\Generated894
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1152.cmd_10069]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1152\Generated1152\Generated1152.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1152\Generated1152
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated129.cmd_10070]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest129\Generated129\Generated129.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest129\Generated129
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_362706.cmd_10071]
+RelativePath=JIT\Regression\JitBlue\DevDiv_362706\DevDiv_362706\DevDiv_362706.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_362706\DevDiv_362706
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated606.cmd_10072]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest606\Generated606\Generated606.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest606\Generated606
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_il_relseq.cmd_10073]
+RelativePath=JIT\Methodical\refany\_il_relseq\_il_relseq.cmd
+WorkingDir=JIT\Methodical\refany\_il_relseq
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1476.cmd_10074]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1476\Generated1476\Generated1476.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1476\Generated1476
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1073.cmd_10075]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1073\Generated1073\Generated1073.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1073\Generated1073
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1305.cmd_10076]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1305\Generated1305\Generated1305.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1305\Generated1305
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1464.cmd_10077]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1464\Generated1464\Generated1464.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1464\Generated1464
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1449.cmd_10078]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1449\Generated1449\Generated1449.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1449\Generated1449
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated111.cmd_10079]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest111\Generated111\Generated111.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest111\Generated111
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1263.cmd_10080]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1263\Generated1263\Generated1263.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1263\Generated1263
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated985.cmd_10081]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest985\Generated985\Generated985.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest985\Generated985
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated535.cmd_10082]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest535\Generated535\Generated535.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest535\Generated535
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1050.cmd_10083]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1050\Generated1050\Generated1050.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1050\Generated1050
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated281.cmd_10084]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest281\Generated281\Generated281.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest281\Generated281
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated951.cmd_10085]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest951\Generated951\Generated951.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest951\Generated951
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1075.cmd_10086]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1075\Generated1075\Generated1075.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1075\Generated1075
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[basefinal.cmd_10087]
+RelativePath=GC\Scenarios\BaseFinal\basefinal\basefinal.cmd
+WorkingDir=GC\Scenarios\BaseFinal\basefinal
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[Generated1357.cmd_10088]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1357\Generated1357\Generated1357.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1357\Generated1357
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated299.cmd_10089]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest299\Generated299\Generated299.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest299\Generated299
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated624.cmd_10090]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest624\Generated624\Generated624.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest624\Generated624
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated258.cmd_10091]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest258\Generated258\Generated258.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest258\Generated258
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[TailcallVerifyWithPrefix.cmd_10092]
+RelativePath=JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd
+WorkingDir=JIT\opt\Tailcall\TailcallVerifyWithPrefix
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated611.cmd_10093]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest611\Generated611\Generated611.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest611\Generated611
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1375.cmd_10094]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1375\Generated1375\Generated1375.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1375\Generated1375
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[arglist.cmd_10095]
+RelativePath=JIT\Directed\PREFIX\unaligned\2\arglist\arglist.cmd
+WorkingDir=JIT\Directed\PREFIX\unaligned\2\arglist
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated404.cmd_10096]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest404\Generated404\Generated404.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest404\Generated404
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated214.cmd_10097]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest214\Generated214\Generated214.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest214\Generated214
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated799.cmd_10098]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest799\Generated799\Generated799.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest799\Generated799
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated332.cmd_10099]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest332\Generated332\Generated332.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest332\Generated332
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated666.cmd_10100]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest666\Generated666\Generated666.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest666\Generated666
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1296.cmd_10101]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1296\Generated1296\Generated1296.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1296\Generated1296
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated373.cmd_10102]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest373\Generated373\Generated373.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest373\Generated373
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1066.cmd_10103]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1066\Generated1066\Generated1066.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1066\Generated1066
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1005.cmd_10104]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1005\Generated1005\Generated1005.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1005\Generated1005
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated210.cmd_10105]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest210\Generated210\Generated210.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest210\Generated210
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1159.cmd_10106]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1159\Generated1159\Generated1159.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1159\Generated1159
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b102637.cmd_10107]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102637\b102637\b102637.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102637\b102637
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[ExecuteCodeWithGuaranteedCleanup.cmd_10108]
+RelativePath=baseservices\compilerservices\RuntimeHelpers\ExecuteCodeWithGuaranteedCleanup\ExecuteCodeWithGuaranteedCleanup.cmd
+WorkingDir=baseservices\compilerservices\RuntimeHelpers\ExecuteCodeWithGuaranteedCleanup
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated742.cmd_10109]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest742\Generated742\Generated742.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest742\Generated742
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated537.cmd_10110]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest537\Generated537\Generated537.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest537\Generated537
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated759.cmd_10111]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest759\Generated759\Generated759.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest759\Generated759
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1408.cmd_10112]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1408\Generated1408\Generated1408.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1408\Generated1408
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated294.cmd_10113]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest294\Generated294\Generated294.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest294\Generated294
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated312.cmd_10114]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest312\Generated312\Generated312.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest312\Generated312
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated402.cmd_10115]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest402\Generated402\Generated402.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest402\Generated402
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1489.cmd_10116]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1489\Generated1489\Generated1489.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1489\Generated1489
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1326.cmd_10117]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1326\Generated1326\Generated1326.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1326\Generated1326
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1254.cmd_10118]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1254\Generated1254\Generated1254.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1254\Generated1254
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated668.cmd_10119]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest668\Generated668\Generated668.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest668\Generated668
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated811.cmd_10120]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest811\Generated811\Generated811.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest811\Generated811
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated384.cmd_10121]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest384\Generated384\Generated384.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest384\Generated384
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1109.cmd_10122]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1109\Generated1109\Generated1109.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1109\Generated1109
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1163.cmd_10123]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1163\Generated1163\Generated1163.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1163\Generated1163
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MarshalStructure.cmd_10124]
+RelativePath=Interop\MarshalAPI\MarshalStructure\MarshalStructure\MarshalStructure.cmd
+WorkingDir=Interop\MarshalAPI\MarshalStructure\MarshalStructure
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i32.cmd_10125]
+RelativePath=JIT\jit64\mcc\interop\mcc_i32\mcc_i32.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i32
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated778.cmd_10126]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest778\Generated778\Generated778.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest778\Generated778
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1229.cmd_10127]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1229\Generated1229\Generated1229.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1229\Generated1229
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1376.cmd_10128]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1376\Generated1376\Generated1376.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1376\Generated1376
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated251.cmd_10129]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest251\Generated251\Generated251.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest251\Generated251
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated325.cmd_10130]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest325\Generated325\Generated325.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest325\Generated325
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated222.cmd_10131]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest222\Generated222\Generated222.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest222\Generated222
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated455.cmd_10132]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest455\Generated455\Generated455.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest455\Generated455
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated922.cmd_10133]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest922\Generated922\Generated922.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest922\Generated922
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1232.cmd_10134]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1232\Generated1232\Generated1232.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1232\Generated1232
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated74.cmd_10135]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest74\Generated74\Generated74.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest74\Generated74
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated589.cmd_10136]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest589\Generated589\Generated589.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest589\Generated589
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated825.cmd_10137]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest825\Generated825\Generated825.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest825\Generated825
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1043.cmd_10138]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1043\Generated1043\Generated1043.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1043\Generated1043
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[SizeConstTest.cmd_10139]
+RelativePath=Interop\SizeConst\SizeConstTest\SizeConstTest.cmd
+WorkingDir=Interop\SizeConst\SizeConstTest
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1186.cmd_10140]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1186\Generated1186\Generated1186.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1186\Generated1186
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated377.cmd_10141]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest377\Generated377\Generated377.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest377\Generated377
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated207.cmd_10142]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest207\Generated207\Generated207.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest207\Generated207
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated932.cmd_10143]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest932\Generated932\Generated932.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest932\Generated932
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1201.cmd_10144]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1201\Generated1201\Generated1201.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1201\Generated1201
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated950.cmd_10145]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest950\Generated950\Generated950.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest950\Generated950
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated25.cmd_10146]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest25\Generated25\Generated25.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest25\Generated25
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated209.cmd_10147]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest209\Generated209\Generated209.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest209\Generated209
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1093.cmd_10148]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1093\Generated1093\Generated1093.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1093\Generated1093
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated719.cmd_10149]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest719\Generated719\Generated719.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest719\Generated719
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1082.cmd_10150]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1082\Generated1082\Generated1082.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1082\Generated1082
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated221.cmd_10151]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest221\Generated221\Generated221.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest221\Generated221
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated501.cmd_10152]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest501\Generated501\Generated501.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest501\Generated501
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b28901.cmd_10153]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28901\b28901\b28901.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28901\b28901
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated659.cmd_10154]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest659\Generated659\Generated659.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest659\Generated659
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated60.cmd_10155]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest60\Generated60\Generated60.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest60\Generated60
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1120.cmd_10156]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1120\Generated1120\Generated1120.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1120\Generated1120
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1304.cmd_10157]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1304\Generated1304\Generated1304.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1304\Generated1304
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i10.cmd_10158]
+RelativePath=JIT\jit64\mcc\interop\mcc_i10\mcc_i10.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i10
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[overlap.cmd_10159]
+RelativePath=JIT\Directed\RVAInit\overlap\overlap.cmd
+WorkingDir=JIT\Directed\RVAInit\overlap
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[b30838.cmd_10160]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30838\b30838\b30838.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30838\b30838
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1430.cmd_10161]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1430\Generated1430\Generated1430.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1430\Generated1430
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated746.cmd_10162]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest746\Generated746\Generated746.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest746\Generated746
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1370.cmd_10163]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1370\Generated1370\Generated1370.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1370\Generated1370
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mutualrecurthd-tls.cmd_10164]
+RelativePath=JIT\Directed\tls\mutualrecurthd-tls\mutualrecurthd-tls.cmd
+WorkingDir=JIT\Directed\tls\mutualrecurthd-tls
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2441;NEW
+HostStyle=0
+
+[Generated461.cmd_10165]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest461\Generated461\Generated461.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest461\Generated461
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated457.cmd_10166]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest457\Generated457\Generated457.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest457\Generated457
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1041.cmd_10167]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1041\Generated1041\Generated1041.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1041\Generated1041
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated661.cmd_10168]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest661\Generated661\Generated661.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest661\Generated661
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated519.cmd_10169]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest519\Generated519\Generated519.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest519\Generated519
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_8599.cmd_10170]
+RelativePath=JIT\Regression\JitBlue\GitHub_8599\GitHub_8599\GitHub_8599.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_8599\GitHub_8599
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated704.cmd_10171]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest704\Generated704\Generated704.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest704\Generated704
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated458.cmd_10172]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest458\Generated458\Generated458.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest458\Generated458
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[arglist.cmd_10173]
+RelativePath=JIT\Directed\PREFIX\volatile\1\arglist\arglist.cmd
+WorkingDir=JIT\Directed\PREFIX\volatile\1\arglist
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated995.cmd_10174]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest995\Generated995\Generated995.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest995\Generated995
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated937.cmd_10175]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest937\Generated937\Generated937.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest937\Generated937
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated51.cmd_10176]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest51\Generated51\Generated51.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest51\Generated51
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated947.cmd_10177]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest947\Generated947\Generated947.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest947\Generated947
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated575.cmd_10178]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest575\Generated575\Generated575.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest575\Generated575
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[271010.cmd_10179]
+RelativePath=GC\Coverage\271010\271010.cmd
+WorkingDir=GC\Coverage\271010
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[Generated933.cmd_10180]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest933\Generated933\Generated933.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest933\Generated933
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated452.cmd_10181]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest452\Generated452\Generated452.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest452\Generated452
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1306.cmd_10182]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1306\Generated1306\Generated1306.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1306\Generated1306
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1072.cmd_10183]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1072\Generated1072\Generated1072.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1072\Generated1072
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1483.cmd_10184]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1483\Generated1483\Generated1483.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1483\Generated1483
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1172.cmd_10185]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1172\Generated1172\Generated1172.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1172\Generated1172
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1035.cmd_10186]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1035\Generated1035\Generated1035.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1035\Generated1035
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[rva_rvastatic1.cmd_10187]
+RelativePath=JIT\Directed\intrinsic\interlocked\rva_rvastatic1\rva_rvastatic1.cmd
+WorkingDir=JIT\Directed\intrinsic\interlocked\rva_rvastatic1
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated1145.cmd_10188]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1145\Generated1145\Generated1145.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1145\Generated1145
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated357.cmd_10189]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest357\Generated357\Generated357.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest357\Generated357
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated904.cmd_10190]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest904\Generated904\Generated904.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest904\Generated904
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated888.cmd_10191]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest888\Generated888\Generated888.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest888\Generated888
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1267.cmd_10192]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1267\Generated1267\Generated1267.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1267\Generated1267
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated31.cmd_10193]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest31\Generated31\Generated31.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest31\Generated31
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1481.cmd_10194]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1481\Generated1481\Generated1481.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1481\Generated1481
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated371.cmd_10195]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest371\Generated371\Generated371.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest371\Generated371
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1193.cmd_10196]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1193\Generated1193\Generated1193.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1193\Generated1193
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated841.cmd_10197]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest841\Generated841\Generated841.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest841\Generated841
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_7906.cmd_10198]
+RelativePath=JIT\Regression\JitBlue\GitHub_7906\GitHub_7906\GitHub_7906.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_7906\GitHub_7906
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated734.cmd_10199]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest734\Generated734\Generated734.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest734\Generated734
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated783.cmd_10200]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest783\Generated783\Generated783.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest783\Generated783
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1387.cmd_10201]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1387\Generated1387\Generated1387.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1387\Generated1387
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1360.cmd_10202]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1360\Generated1360\Generated1360.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1360\Generated1360
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1348.cmd_10203]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1348\Generated1348\Generated1348.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1348\Generated1348
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated868.cmd_10204]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest868\Generated868\Generated868.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest868\Generated868
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated497.cmd_10205]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest497\Generated497\Generated497.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest497\Generated497
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated339.cmd_10206]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest339\Generated339\Generated339.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest339\Generated339
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated612.cmd_10207]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest612\Generated612\Generated612.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest612\Generated612
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW;R2R_FAIL;9457
+HostStyle=0
+
+[Generated103.cmd_10208]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest103\Generated103\Generated103.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest103\Generated103
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated662.cmd_10209]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest662\Generated662\Generated662.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest662\Generated662
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated156.cmd_10210]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest156\Generated156\Generated156.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest156\Generated156
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated82.cmd_10211]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest82\Generated82\Generated82.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest82\Generated82
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated22.cmd_10212]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest22\Generated22\Generated22.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest22\Generated22
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_359736_ro.cmd_10213]
+RelativePath=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_ro\DevDiv_359736_ro.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_ro
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;10111;NEW
+HostStyle=0
+
+[Generated1104.cmd_10214]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1104\Generated1104\Generated1104.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1104\Generated1104
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated410.cmd_10215]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest410\Generated410\Generated410.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest410\Generated410
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1149.cmd_10216]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1149\Generated1149\Generated1149.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1149\Generated1149
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated390.cmd_10217]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest390\Generated390\Generated390.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest390\Generated390
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated681.cmd_10218]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest681\Generated681\Generated681.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest681\Generated681
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW;R2R_FAIL;9457
+HostStyle=0
+
+[Generated754.cmd_10219]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest754\Generated754\Generated754.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest754\Generated754
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1299.cmd_10220]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1299\Generated1299\Generated1299.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1299\Generated1299
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated556.cmd_10221]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest556\Generated556\Generated556.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest556\Generated556
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated133.cmd_10222]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest133\Generated133\Generated133.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest133\Generated133
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1435.cmd_10223]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1435\Generated1435\Generated1435.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1435\Generated1435
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated408.cmd_10224]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest408\Generated408\Generated408.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest408\Generated408
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated637.cmd_10225]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest637\Generated637\Generated637.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest637\Generated637
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated320.cmd_10226]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest320\Generated320\Generated320.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest320\Generated320
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated908.cmd_10228]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest908\Generated908\Generated908.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest908\Generated908
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated256.cmd_10229]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest256\Generated256\Generated256.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest256\Generated256
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated491.cmd_10230]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest491\Generated491\Generated491.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest491\Generated491
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated38.cmd_10231]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest38\Generated38\Generated38.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest38\Generated38
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1131.cmd_10232]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1131\Generated1131\Generated1131.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1131\Generated1131
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated713.cmd_10233]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest713\Generated713\Generated713.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest713\Generated713
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated768.cmd_10234]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest768\Generated768\Generated768.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest768\Generated768
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated743.cmd_10235]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest743\Generated743\Generated743.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest743\Generated743
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated264.cmd_10236]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest264\Generated264\Generated264.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest264\Generated264
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated567.cmd_10237]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest567\Generated567\Generated567.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest567\Generated567
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated833.cmd_10238]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest833\Generated833\Generated833.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest833\Generated833
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated573.cmd_10239]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest573\Generated573\Generated573.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest573\Generated573
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated988.cmd_10240]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest988\Generated988\Generated988.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest988\Generated988
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated805.cmd_10241]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest805\Generated805\Generated805.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest805\Generated805
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated347.cmd_10242]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest347\Generated347\Generated347.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest347\Generated347
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated120.cmd_10243]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest120\Generated120\Generated120.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest120\Generated120
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated977.cmd_10244]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest977\Generated977\Generated977.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest977\Generated977
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1342.cmd_10245]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1342\Generated1342\Generated1342.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1342\Generated1342
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_255263.cmd_10246]
+RelativePath=JIT\Regression\JitBlue\DevDiv_255263\DevDiv_255263\DevDiv_255263.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_255263\DevDiv_255263
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated451.cmd_10247]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest451\Generated451\Generated451.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest451\Generated451
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1029.cmd_10248]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1029\Generated1029\Generated1029.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1029\Generated1029
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated84.cmd_10249]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest84\Generated84\Generated84.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest84\Generated84
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated330.cmd_10250]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest330\Generated330\Generated330.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest330\Generated330
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1431.cmd_10251]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1431\Generated1431\Generated1431.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1431\Generated1431
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated420.cmd_10252]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest420\Generated420\Generated420.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest420\Generated420
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated672.cmd_10253]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest672\Generated672\Generated672.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest672\Generated672
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1016.cmd_10254]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1016\Generated1016\Generated1016.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1016\Generated1016
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated994.cmd_10255]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest994\Generated994\Generated994.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest994\Generated994
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1308.cmd_10256]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1308\Generated1308\Generated1308.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1308\Generated1308
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated394.cmd_10257]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest394\Generated394\Generated394.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest394\Generated394
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1100.cmd_10258]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1100\Generated1100\Generated1100.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1100\Generated1100
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated779.cmd_10259]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest779\Generated779\Generated779.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest779\Generated779
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1122.cmd_10260]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1122\Generated1122\Generated1122.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1122\Generated1122
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated854.cmd_10261]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest854\Generated854\Generated854.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest854\Generated854
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1088.cmd_10262]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1088\Generated1088\Generated1088.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1088\Generated1088
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated340.cmd_10263]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest340\Generated340\Generated340.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest340\Generated340
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated362.cmd_10264]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest362\Generated362\Generated362.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest362\Generated362
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_il_dbgpointer_i.cmd_10265]
+RelativePath=JIT\Methodical\tailcall\_il_dbgpointer_i\_il_dbgpointer_i.cmd
+WorkingDir=JIT\Methodical\tailcall\_il_dbgpointer_i
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated376.cmd_10266]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest376\Generated376\Generated376.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest376\Generated376
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1059.cmd_10267]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1059\Generated1059\Generated1059.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1059\Generated1059
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated418.cmd_10268]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest418\Generated418\Generated418.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest418\Generated418
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated19.cmd_10269]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest19\Generated19\Generated19.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest19\Generated19
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1134.cmd_10270]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1134\Generated1134\Generated1134.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1134\Generated1134
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1303.cmd_10271]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1303\Generated1303\Generated1303.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1303\Generated1303
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_relsin_cs_il.cmd_10272]
+RelativePath=JIT\Methodical\Boxing\xlang\_relsin_cs_il\_relsin_cs_il.cmd
+WorkingDir=JIT\Methodical\Boxing\xlang\_relsin_cs_il
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b03689.cmd_10273]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b03689\b03689\b03689.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b03689\b03689
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2441;NEW
+HostStyle=0
+
+[FixedAddressValueType.cmd_10274]
+RelativePath=baseservices\compilerservices\FixedAddressValueType\FixedAddressValueType\FixedAddressValueType.cmd
+WorkingDir=baseservices\compilerservices\FixedAddressValueType\FixedAddressValueType
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated529.cmd_10275]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest529\Generated529\Generated529.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest529\Generated529
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1236.cmd_10276]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1236\Generated1236\Generated1236.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1236\Generated1236
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated208.cmd_10277]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest208\Generated208\Generated208.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest208\Generated208
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated63.cmd_10278]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest63\Generated63\Generated63.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest63\Generated63
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated83.cmd_10279]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest83\Generated83\Generated83.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest83\Generated83
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated482.cmd_10280]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest482\Generated482\Generated482.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest482\Generated482
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated823.cmd_10281]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest823\Generated823\Generated823.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest823\Generated823
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[finalizertest.cmd_10282]
+RelativePath=GC\LargeMemory\Allocation\finalizertest\finalizertest.cmd
+WorkingDir=GC\LargeMemory\Allocation\finalizertest
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[Generated1176.cmd_10283]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1176\Generated1176\Generated1176.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1176\Generated1176
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated665.cmd_10284]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest665\Generated665\Generated665.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest665\Generated665
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1168.cmd_10285]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1168\Generated1168\Generated1168.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1168\Generated1168
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1174.cmd_10286]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1174\Generated1174\Generated1174.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1174\Generated1174
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1210.cmd_10287]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1210\Generated1210\Generated1210.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1210\Generated1210
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1336.cmd_10288]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1336\Generated1336\Generated1336.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1336\Generated1336
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated69.cmd_10289]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest69\Generated69\Generated69.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest69\Generated69
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1139.cmd_10290]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1139\Generated1139\Generated1139.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1139\Generated1139
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[collect.cmd_10291]
+RelativePath=GC\LargeMemory\API\gc\collect\collect.cmd
+WorkingDir=GC\LargeMemory\API\gc\collect
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[Generated604.cmd_10292]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest604\Generated604\Generated604.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest604\Generated604
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1026.cmd_10293]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1026\Generated1026\Generated1026.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1026\Generated1026
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1214.cmd_10294]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1214\Generated1214\Generated1214.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1214\Generated1214
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated541.cmd_10295]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest541\Generated541\Generated541.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest541\Generated541
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated329.cmd_10296]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest329\Generated329\Generated329.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest329\Generated329
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated725.cmd_10297]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest725\Generated725\Generated725.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest725\Generated725
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated562.cmd_10298]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest562\Generated562\Generated562.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest562\Generated562
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated306.cmd_10299]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest306\Generated306\Generated306.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest306\Generated306
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated191.cmd_10300]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest191\Generated191\Generated191.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest191\Generated191
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated406.cmd_10301]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest406\Generated406\Generated406.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest406\Generated406
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated551.cmd_10302]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest551\Generated551\Generated551.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest551\Generated551
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1343.cmd_10303]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1343\Generated1343\Generated1343.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1343\Generated1343
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1279.cmd_10304]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1279\Generated1279\Generated1279.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1279\Generated1279
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated796.cmd_10305]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest796\Generated796\Generated796.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest796\Generated796
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated740.cmd_10306]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest740\Generated740\Generated740.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest740\Generated740
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1494.cmd_10307]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1494\Generated1494\Generated1494.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1494\Generated1494
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated301.cmd_10308]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest301\Generated301\Generated301.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest301\Generated301
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1135.cmd_10309]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1135\Generated1135\Generated1135.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1135\Generated1135
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated953.cmd_10310]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest953\Generated953\Generated953.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest953\Generated953
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b26324a.cmd_10311]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324a\b26324a.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324a
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated563.cmd_10312]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest563\Generated563\Generated563.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest563\Generated563
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated516.cmd_10313]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest516\Generated516\Generated516.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest516\Generated516
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1108.cmd_10314]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1108\Generated1108\Generated1108.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1108\Generated1108
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated627.cmd_10315]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest627\Generated627\Generated627.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest627\Generated627
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated821.cmd_10316]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest821\Generated821\Generated821.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest821\Generated821
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated68.cmd_10317]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest68\Generated68\Generated68.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest68\Generated68
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated317.cmd_10318]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest317\Generated317\Generated317.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest317\Generated317
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1307.cmd_10319]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1307\Generated1307\Generated1307.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1307\Generated1307
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[byrefs.cmd_10320]
+RelativePath=reflection\ldtoken\byrefs\byrefs.cmd
+WorkingDir=reflection\ldtoken\byrefs
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i72.cmd_10321]
+RelativePath=JIT\jit64\mcc\interop\mcc_i72\mcc_i72.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i72
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated277.cmd_10322]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest277\Generated277\Generated277.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest277\Generated277
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1161.cmd_10323]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1161\Generated1161\Generated1161.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1161\Generated1161
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated765.cmd_10324]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest765\Generated765\Generated765.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest765\Generated765
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1167.cmd_10325]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1167\Generated1167\Generated1167.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1167\Generated1167
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated770.cmd_10326]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest770\Generated770\Generated770.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest770\Generated770
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated803.cmd_10327]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest803\Generated803\Generated803.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest803\Generated803
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1490.cmd_10328]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1490\Generated1490\Generated1490.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1490\Generated1490
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated511.cmd_10329]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest511\Generated511\Generated511.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest511\Generated511
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated488.cmd_10330]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest488\Generated488\Generated488.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest488\Generated488
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated631.cmd_10331]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest631\Generated631\Generated631.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest631\Generated631
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated196.cmd_10332]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest196\Generated196\Generated196.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest196\Generated196
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated77.cmd_10333]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest77\Generated77\Generated77.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest77\Generated77
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated292.cmd_10334]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest292\Generated292\Generated292.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest292\Generated292
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_orelsin_cs_il.cmd_10335]
+RelativePath=JIT\Methodical\Boxing\xlang\_orelsin_cs_il\_orelsin_cs_il.cmd
+WorkingDir=JIT\Methodical\Boxing\xlang\_orelsin_cs_il
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated64.cmd_10336]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest64\Generated64\Generated64.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest64\Generated64
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated443.cmd_10337]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest443\Generated443\Generated443.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest443\Generated443
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated549.cmd_10338]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest549\Generated549\Generated549.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest549\Generated549
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated723.cmd_10339]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest723\Generated723\Generated723.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest723\Generated723
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1125.cmd_10340]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1125\Generated1125\Generated1125.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1125\Generated1125
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated351.cmd_10341]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest351\Generated351\Generated351.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest351\Generated351
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated66.cmd_10342]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest66\Generated66\Generated66.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest66\Generated66
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated379.cmd_10343]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest379\Generated379\Generated379.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest379\Generated379
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated160.cmd_10344]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest160\Generated160\Generated160.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest160\Generated160
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated984.cmd_10345]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest984\Generated984\Generated984.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest984\Generated984
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated227.cmd_10346]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest227\Generated227\Generated227.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest227\Generated227
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated901.cmd_10347]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest901\Generated901\Generated901.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest901\Generated901
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated311.cmd_10348]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest311\Generated311\Generated311.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest311\Generated311
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated116.cmd_10349]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest116\Generated116\Generated116.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest116\Generated116
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated837.cmd_10350]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest837\Generated837\Generated837.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest837\Generated837
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated650.cmd_10351]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest650\Generated650\Generated650.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest650\Generated650
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1316.cmd_10352]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1316\Generated1316\Generated1316.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1316\Generated1316
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated15.cmd_10353]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest15\Generated15\Generated15.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest15\Generated15
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated566.cmd_10354]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest566\Generated566\Generated566.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest566\Generated566
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated400.cmd_10355]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest400\Generated400\Generated400.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest400\Generated400
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated188.cmd_10356]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest188\Generated188\Generated188.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest188\Generated188
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated346.cmd_10357]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest346\Generated346\Generated346.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest346\Generated346
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[bleref_il_r.cmd_10358]
+RelativePath=JIT\Directed\coverage\importer\Desktop\bleref_il_r\bleref_il_r.cmd
+WorkingDir=JIT\Directed\coverage\importer\Desktop\bleref_il_r
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;4851NEW
+HostStyle=0
+
+[Generated1391.cmd_10359]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1391\Generated1391\Generated1391.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1391\Generated1391
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_8231.cmd_10360]
+RelativePath=JIT\Regression\JitBlue\GitHub_8231\GitHub_8231\GitHub_8231.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_8231\GitHub_8231
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated219.cmd_10361]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest219\Generated219\Generated219.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest219\Generated219
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1297.cmd_10363]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1297\Generated1297\Generated1297.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1297\Generated1297
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated387.cmd_10364]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest387\Generated387\Generated387.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest387\Generated387
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1399.cmd_10365]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1399\Generated1399\Generated1399.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1399\Generated1399
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[global_il_d.cmd_10366]
+RelativePath=JIT\Methodical\cctor\misc\global_il_d\global_il_d.cmd
+WorkingDir=JIT\Methodical\cctor\misc\global_il_d
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;10109;NEW
+HostStyle=0
+
+[Generated229.cmd_10367]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest229\Generated229\Generated229.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest229\Generated229
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated510.cmd_10368]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest510\Generated510\Generated510.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest510\Generated510
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated284.cmd_10369]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest284\Generated284\Generated284.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest284\Generated284
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i51.cmd_10370]
+RelativePath=JIT\jit64\mcc\interop\mcc_i51\mcc_i51.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i51
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1179.cmd_10371]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1179\Generated1179\Generated1179.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1179\Generated1179
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1440.cmd_10372]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1440\Generated1440\Generated1440.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1440\Generated1440
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated250.cmd_10373]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest250\Generated250\Generated250.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest250\Generated250
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1196.cmd_10374]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1196\Generated1196\Generated1196.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1196\Generated1196
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated538.cmd_10375]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest538\Generated538\Generated538.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest538\Generated538
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated436.cmd_10376]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest436\Generated436\Generated436.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest436\Generated436
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated875.cmd_10377]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest875\Generated875\Generated875.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest875\Generated875
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated121.cmd_10378]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest121\Generated121\Generated121.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest121\Generated121
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated86.cmd_10379]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest86\Generated86\Generated86.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest86\Generated86
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated186.cmd_10380]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest186\Generated186\Generated186.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest186\Generated186
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[arglist.cmd_10381]
+RelativePath=JIT\Directed\PREFIX\unaligned\1\arglist\arglist.cmd
+WorkingDir=JIT\Directed\PREFIX\unaligned\1\arglist
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated413.cmd_10382]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest413\Generated413\Generated413.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest413\Generated413
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1264.cmd_10383]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1264\Generated1264\Generated1264.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1264\Generated1264
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated849.cmd_10384]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest849\Generated849\Generated849.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest849\Generated849
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1155.cmd_10385]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1155\Generated1155\Generated1155.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1155\Generated1155
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated338.cmd_10386]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest338\Generated338\Generated338.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest338\Generated338
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated673.cmd_10387]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest673\Generated673\Generated673.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest673\Generated673
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1106.cmd_10388]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1106\Generated1106\Generated1106.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1106\Generated1106
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1077.cmd_10389]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1077\Generated1077\Generated1077.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1077\Generated1077
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1128.cmd_10390]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1128\Generated1128\Generated1128.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1128\Generated1128
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1249.cmd_10391]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1249\Generated1249\Generated1249.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1249\Generated1249
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1194.cmd_10392]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1194\Generated1194\Generated1194.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1194\Generated1194
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated426.cmd_10393]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest426\Generated426\Generated426.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest426\Generated426
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[revcomp.cmd_10394]
+RelativePath=JIT\Performance\CodeQuality\BenchmarksGame\revcomp\revcomp\revcomp.cmd
+WorkingDir=JIT\Performance\CodeQuality\BenchmarksGame\revcomp\revcomp
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_216571.cmd_10395]
+RelativePath=JIT\Regression\JitBlue\DevDiv_216571\DevDiv_216571\DevDiv_216571.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_216571\DevDiv_216571
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_simpleoddpower_il_d.cmd_10396]
+RelativePath=JIT\Methodical\delegate\_simpleoddpower_il_d\_simpleoddpower_il_d.cmd
+WorkingDir=JIT\Methodical\delegate\_simpleoddpower_il_d
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated45.cmd_10397]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest45\Generated45\Generated45.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest45\Generated45
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated472.cmd_10398]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest472\Generated472\Generated472.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest472\Generated472
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated484.cmd_10399]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest484\Generated484\Generated484.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest484\Generated484
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated576.cmd_10400]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest576\Generated576\Generated576.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest576\Generated576
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated609.cmd_10401]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest609\Generated609\Generated609.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest609\Generated609
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated834.cmd_10402]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest834\Generated834\Generated834.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest834\Generated834
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated961.cmd_10403]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest961\Generated961\Generated961.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest961\Generated961
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1406.cmd_10404]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1406\Generated1406\Generated1406.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1406\Generated1406
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1382.cmd_10405]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1382\Generated1382\Generated1382.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1382\Generated1382
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[verify01_small.cmd_10406]
+RelativePath=JIT\jit64\localloc\verify\verify01_small\verify01_small.cmd
+WorkingDir=JIT\jit64\localloc\verify\verify01_small
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;8156;NEW
+HostStyle=0
+
+[Generated962.cmd_10407]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest962\Generated962\Generated962.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest962\Generated962
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated453.cmd_10408]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest453\Generated453\Generated453.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest453\Generated453
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated498.cmd_10409]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest498\Generated498\Generated498.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest498\Generated498
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1189.cmd_10410]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1189\Generated1189\Generated1189.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1189\Generated1189
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated616.cmd_10411]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest616\Generated616\Generated616.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest616\Generated616
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated952.cmd_10412]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest952\Generated952\Generated952.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest952\Generated952
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated581.cmd_10413]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest581\Generated581\Generated581.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest581\Generated581
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_odbgsin_cs_il.cmd_10414]
+RelativePath=JIT\Methodical\Boxing\xlang\_odbgsin_cs_il\_odbgsin_cs_il.cmd
+WorkingDir=JIT\Methodical\Boxing\xlang\_odbgsin_cs_il
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated203.cmd_10415]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest203\Generated203\Generated203.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest203\Generated203
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1090.cmd_10416]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1090\Generated1090\Generated1090.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1090\Generated1090
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_6318.cmd_10417]
+RelativePath=JIT\Regression\JitBlue\GitHub_6318\GitHub_6318\GitHub_6318.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_6318\GitHub_6318
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[badcodeafterfinally_d.cmd_10418]
+RelativePath=JIT\Methodical\eh\deadcode\badcodeafterfinally_d\badcodeafterfinally_d.cmd
+WorkingDir=JIT\Methodical\eh\deadcode\badcodeafterfinally_d
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2444;NEW
+HostStyle=0
+
+[Generated1238.cmd_10419]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1238\Generated1238\Generated1238.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1238\Generated1238
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1454.cmd_10420]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1454\Generated1454\Generated1454.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1454\Generated1454
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated608.cmd_10421]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest608\Generated608\Generated608.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest608\Generated608
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated676.cmd_10422]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest676\Generated676\Generated676.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest676\Generated676
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1277.cmd_10423]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1277\Generated1277\Generated1277.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1277\Generated1277
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated71.cmd_10424]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest71\Generated71\Generated71.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest71\Generated71
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated259.cmd_10425]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest259\Generated259\Generated259.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest259\Generated259
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1044.cmd_10426]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1044\Generated1044\Generated1044.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1044\Generated1044
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1291.cmd_10427]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1291\Generated1291\Generated1291.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1291\Generated1291
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1129.cmd_10428]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1129\Generated1129\Generated1129.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1129\Generated1129
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1486.cmd_10429]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1486\Generated1486\Generated1486.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1486\Generated1486
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_CoreRT_2073.cmd_10430]
+RelativePath=JIT\Regression\JitBlue\GitHub_CoreRT_2073\GitHub_CoreRT_2073\GitHub_CoreRT_2073.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_CoreRT_2073\GitHub_CoreRT_2073
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_255294.cmd_10431]
+RelativePath=JIT\Regression\JitBlue\DevDiv_255294\DevDiv_255294\DevDiv_255294.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_255294\DevDiv_255294
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated543.cmd_10432]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest543\Generated543\Generated543.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest543\Generated543
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated206.cmd_10433]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest206\Generated206\Generated206.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest206\Generated206
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated530.cmd_10434]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest530\Generated530\Generated530.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest530\Generated530
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated969.cmd_10435]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest969\Generated969\Generated969.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest969\Generated969
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_5047.cmd_10436]
+RelativePath=JIT\Regression\JitBlue\GitHub_5047\GitHub_5047\GitHub_5047.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_5047\GitHub_5047
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1465.cmd_10437]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1465\Generated1465\Generated1465.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1465\Generated1465
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b49644.cmd_10438]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49644\b49644\b49644.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49644\b49644
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[global_il_r.cmd_10439]
+RelativePath=JIT\Methodical\cctor\misc\global_il_r\global_il_r.cmd
+WorkingDir=JIT\Methodical\cctor\misc\global_il_r
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;10109;NEW
+HostStyle=0
+
+[dev10_865840.cmd_10440]
+RelativePath=JIT\Regression\Dev11\dev10_865840\dev10_865840\dev10_865840.cmd
+WorkingDir=JIT\Regression\Dev11\dev10_865840\dev10_865840
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2445;NEW
+HostStyle=0
+
+[Generated728.cmd_10441]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest728\Generated728\Generated728.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest728\Generated728
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated902.cmd_10442]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest902\Generated902\Generated902.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest902\Generated902
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[muldimjagary.cmd_10443]
+RelativePath=GC\Scenarios\muldimjagary\muldimjagary\muldimjagary.cmd
+WorkingDir=GC\Scenarios\muldimjagary\muldimjagary
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[Generated140.cmd_10444]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest140\Generated140\Generated140.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest140\Generated140
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1314.cmd_10445]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1314\Generated1314\Generated1314.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1314\Generated1314
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1142.cmd_10446]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1142\Generated1142\Generated1142.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1142\Generated1142
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1367.cmd_10447]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1367\Generated1367\Generated1367.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1367\Generated1367
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated6.cmd_10448]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest6\Generated6\Generated6.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest6\Generated6
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1095.cmd_10449]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1095\Generated1095\Generated1095.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1095\Generated1095
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_278365.cmd_10450]
+RelativePath=JIT\Regression\JitBlue\DevDiv_278365\DevDiv_278365\DevDiv_278365.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_278365\DevDiv_278365
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated555.cmd_10451]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest555\Generated555\Generated555.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest555\Generated555
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1212.cmd_10452]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1212\Generated1212\Generated1212.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1212\Generated1212
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW;R2R_FAIL;9457
+HostStyle=0
+
+[Generated660.cmd_10453]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest660\Generated660\Generated660.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest660\Generated660
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_279396.cmd_10454]
+RelativePath=JIT\Regression\JitBlue\DevDiv_279396\DevDiv_279396\DevDiv_279396.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_279396\DevDiv_279396
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i82.cmd_10455]
+RelativePath=JIT\jit64\mcc\interop\mcc_i82\mcc_i82.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i82
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1333.cmd_10456]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1333\Generated1333\Generated1333.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1333\Generated1333
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated149.cmd_10457]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest149\Generated149\Generated149.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest149\Generated149
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated334.cmd_10458]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest334\Generated334\Generated334.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest334\Generated334
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated243.cmd_10459]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest243\Generated243\Generated243.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest243\Generated243
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated279.cmd_10460]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest279\Generated279\Generated279.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest279\Generated279
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated515.cmd_10461]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest515\Generated515\Generated515.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest515\Generated515
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[rvastatic4.cmd_10462]
+RelativePath=JIT\Directed\rvastatics\rvastatic4\rvastatic4.cmd
+WorkingDir=JIT\Directed\rvastatics\rvastatic4
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated944.cmd_10463]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest944\Generated944\Generated944.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest944\Generated944
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1206.cmd_10464]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1206\Generated1206\Generated1206.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1206\Generated1206
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1471.cmd_10465]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1471\Generated1471\Generated1471.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1471\Generated1471
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1309.cmd_10466]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1309\Generated1309\Generated1309.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1309\Generated1309
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b16423.cmd_10467]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16423\b16423\b16423.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16423\b16423
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[DevDiv_279829.cmd_10468]
+RelativePath=JIT\Regression\JitBlue\DevDiv_279829\DevDiv_279829\DevDiv_279829.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_279829\DevDiv_279829
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated741.cmd_10469]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest741\Generated741\Generated741.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest741\Generated741
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1116.cmd_10470]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1116\Generated1116\Generated1116.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1116\Generated1116
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated714.cmd_10471]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest714\Generated714\Generated714.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest714\Generated714
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b26323.cmd_10472]
+RelativePath=JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b26323\b26323\b26323.cmd
+WorkingDir=JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b26323\b26323
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[smalloom.cmd_10473]
+RelativePath=GC\Coverage\smalloom\smalloom.cmd
+WorkingDir=GC\Coverage\smalloom
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[Generated583.cmd_10474]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest583\Generated583\Generated583.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest583\Generated583
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1368.cmd_10475]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1368\Generated1368\Generated1368.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1368\Generated1368
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated737.cmd_10476]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest737\Generated737\Generated737.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest737\Generated737
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1358.cmd_10477]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1358\Generated1358\Generated1358.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1358\Generated1358
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated197.cmd_10478]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest197\Generated197\Generated197.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest197\Generated197
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated114.cmd_10479]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest114\Generated114\Generated114.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest114\Generated114
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated112.cmd_10480]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest112\Generated112\Generated112.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest112\Generated112
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_284785.cmd_10481]
+RelativePath=JIT\Regression\JitBlue\DevDiv_284785\DevDiv_284785\DevDiv_284785.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_284785\DevDiv_284785
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1255.cmd_10482]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1255\Generated1255\Generated1255.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1255\Generated1255
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1184.cmd_10483]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1184\Generated1184\Generated1184.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1184\Generated1184
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated40.cmd_10484]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest40\Generated40\Generated40.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest40\Generated40
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated986.cmd_10485]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest986\Generated986\Generated986.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest986\Generated986
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1158.cmd_10486]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1158\Generated1158\Generated1158.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1158\Generated1158
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated991.cmd_10487]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest991\Generated991\Generated991.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest991\Generated991
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated762.cmd_10488]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest762\Generated762\Generated762.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest762\Generated762
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_il_rellocalloc.cmd_10489]
+RelativePath=JIT\Methodical\xxobj\operand\_il_rellocalloc\_il_rellocalloc.cmd
+WorkingDir=JIT\Methodical\xxobj\operand\_il_rellocalloc
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2444;NEW
+HostStyle=0
+
+[Generated1025.cmd_10490]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1025\Generated1025\Generated1025.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1025\Generated1025
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated233.cmd_10491]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest233\Generated233\Generated233.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest233\Generated233
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated11.cmd_10492]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest11\Generated11\Generated11.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest11\Generated11
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated262.cmd_10493]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest262\Generated262\Generated262.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest262\Generated262
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b37646.cmd_10494]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37646\b37646\b37646.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37646\b37646
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1223.cmd_10495]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1223\Generated1223\Generated1223.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1223\Generated1223
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated658.cmd_10496]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest658\Generated658\Generated658.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest658\Generated658
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated132.cmd_10497]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest132\Generated132\Generated132.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest132\Generated132
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_il_dbgpointer.cmd_10498]
+RelativePath=JIT\Methodical\tailcall\_il_dbgpointer\_il_dbgpointer.cmd
+WorkingDir=JIT\Methodical\tailcall\_il_dbgpointer
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated910.cmd_10499]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest910\Generated910\Generated910.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest910\Generated910
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1103.cmd_10500]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1103\Generated1103\Generated1103.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1103\Generated1103
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i52.cmd_10501]
+RelativePath=JIT\jit64\mcc\interop\mcc_i52\mcc_i52.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i52
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1380.cmd_10502]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1380\Generated1380\Generated1380.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1380\Generated1380
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated247.cmd_10503]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest247\Generated247\Generated247.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest247\Generated247
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1011.cmd_10504]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1011\Generated1011\Generated1011.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1011\Generated1011
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1369.cmd_10505]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1369\Generated1369\Generated1369.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1369\Generated1369
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated166.cmd_10506]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest166\Generated166\Generated166.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest166\Generated166
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1160.cmd_10507]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1160\Generated1160\Generated1160.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1160\Generated1160
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1013.cmd_10509]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1013\Generated1013\Generated1013.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1013\Generated1013
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated761.cmd_10510]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest761\Generated761\Generated761.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest761\Generated761
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated870.cmd_10511]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest870\Generated870\Generated870.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest870\Generated870
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated7.cmd_10512]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest7\Generated7\Generated7.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest7\Generated7
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated752.cmd_10513]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest752\Generated752\Generated752.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest752\Generated752
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated213.cmd_10514]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest213\Generated213\Generated213.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest213\Generated213
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated183.cmd_10515]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest183\Generated183\Generated183.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest183\Generated183
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated246.cmd_10516]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest246\Generated246\Generated246.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest246\Generated246
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[foregroundgc.cmd_10517]
+RelativePath=GC\Features\BackgroundGC\foregroundgc\foregroundgc.cmd
+WorkingDir=GC\Features\BackgroundGC\foregroundgc
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[Generated701.cmd_10518]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest701\Generated701\Generated701.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest701\Generated701
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated685.cmd_10519]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest685\Generated685\Generated685.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest685\Generated685
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated835.cmd_10520]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest835\Generated835\Generated835.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest835\Generated835
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[verify01_large.cmd_10521]
+RelativePath=JIT\jit64\localloc\verify\verify01_large\verify01_large.cmd
+WorkingDir=JIT\jit64\localloc\verify\verify01_large
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;4851;NEW
+HostStyle=0
+
+[Generated202.cmd_10522]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest202\Generated202\Generated202.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest202\Generated202
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1121.cmd_10523]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1121\Generated1121\Generated1121.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1121\Generated1121
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1327.cmd_10524]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1327\Generated1327\Generated1327.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1327\Generated1327
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1393.cmd_10525]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1393\Generated1393\Generated1393.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1393\Generated1393
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1425.cmd_10526]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1425\Generated1425\Generated1425.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1425\Generated1425
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated266.cmd_10527]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest266\Generated266\Generated266.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest266\Generated266
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated318.cmd_10528]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest318\Generated318\Generated318.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest318\Generated318
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated594.cmd_10529]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest594\Generated594\Generated594.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest594\Generated594
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1219.cmd_10530]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1219\Generated1219\Generated1219.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1219\Generated1219
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_359737.cmd_10531]
+RelativePath=JIT\Regression\JitBlue\DevDiv_359737\DevDiv_359737\DevDiv_359737.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_359737\DevDiv_359737
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_6649.cmd_10532]
+RelativePath=JIT\Regression\JitBlue\GitHub_6649\GitHub_6649\GitHub_6649.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_6649\GitHub_6649
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1290.cmd_10533]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1290\Generated1290\Generated1290.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1290\Generated1290
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated131.cmd_10534]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest131\Generated131\Generated131.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest131\Generated131
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[NoThrowInline.cmd_10535]
+RelativePath=JIT\Performance\CodeQuality\Inlining\NoThrowInline\NoThrowInline.cmd
+WorkingDir=JIT\Performance\CodeQuality\Inlining\NoThrowInline
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated632.cmd_10536]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest632\Generated632\Generated632.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest632\Generated632
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated801.cmd_10537]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest801\Generated801\Generated801.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest801\Generated801
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated884.cmd_10538]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest884\Generated884\Generated884.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest884\Generated884
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated98.cmd_10539]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest98\Generated98\Generated98.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest98\Generated98
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1009.cmd_10540]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1009\Generated1009\Generated1009.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1009\Generated1009
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1428.cmd_10541]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1428\Generated1428\Generated1428.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1428\Generated1428
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_278375.cmd_10542]
+RelativePath=JIT\Regression\JitBlue\DevDiv_278375\DevDiv_278375\DevDiv_278375.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_278375\DevDiv_278375
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated736.cmd_10543]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest736\Generated736\Generated736.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest736\Generated736
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated793.cmd_10544]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest793\Generated793\Generated793.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest793\Generated793
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1386.cmd_10545]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1386\Generated1386\Generated1386.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1386\Generated1386
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1076.cmd_10546]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1076\Generated1076\Generated1076.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1076\Generated1076
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated238.cmd_10547]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest238\Generated238\Generated238.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest238\Generated238
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated295.cmd_10548]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest295\Generated295\Generated295.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest295\Generated295
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b31746.cmd_10549]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31746\b31746\b31746.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31746\b31746
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated158.cmd_10550]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest158\Generated158\Generated158.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest158\Generated158
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated942.cmd_10551]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest942\Generated942\Generated942.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest942\Generated942
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated430.cmd_10552]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest430\Generated430\Generated430.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest430\Generated430
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated644.cmd_10553]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest644\Generated644\Generated644.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest644\Generated644
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated462.cmd_10554]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest462\Generated462\Generated462.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest462\Generated462
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated182.cmd_10555]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest182\Generated182\Generated182.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest182\Generated182
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated767.cmd_10556]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest767\Generated767\Generated767.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest767\Generated767
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated331.cmd_10558]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest331\Generated331\Generated331.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest331\Generated331
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated218.cmd_10559]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest218\Generated218\Generated218.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest218\Generated218
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated297.cmd_10560]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest297\Generated297\Generated297.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest297\Generated297
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated587.cmd_10561]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest587\Generated587\Generated587.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest587\Generated587
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated481.cmd_10562]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest481\Generated481\Generated481.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest481\Generated481
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_simpleoddpower_il_r.cmd_10563]
+RelativePath=JIT\Methodical\delegate\_simpleoddpower_il_r\_simpleoddpower_il_r.cmd
+WorkingDir=JIT\Methodical\delegate\_simpleoddpower_il_r
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1132.cmd_10564]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1132\Generated1132\Generated1132.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1132\Generated1132
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1493.cmd_10565]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1493\Generated1493\Generated1493.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1493\Generated1493
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[scenario.cmd_10566]
+RelativePath=GC\Features\SustainedLowLatency\scenario\scenario.cmd
+WorkingDir=GC\Features\SustainedLowLatency\scenario
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[Generated1205.cmd_10567]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1205\Generated1205\Generated1205.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1205\Generated1205
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_7907.cmd_10568]
+RelativePath=JIT\Regression\JitBlue\GitHub_7907\GitHub_7907\GitHub_7907.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_7907\GitHub_7907
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated852.cmd_10569]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest852\Generated852\Generated852.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest852\Generated852
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1150.cmd_10570]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1150\Generated1150\Generated1150.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1150\Generated1150
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated167.cmd_10571]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest167\Generated167\Generated167.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest167\Generated167
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1488.cmd_10572]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1488\Generated1488\Generated1488.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1488\Generated1488
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated981.cmd_10573]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest981\Generated981\Generated981.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest981\Generated981
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated128.cmd_10574]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest128\Generated128\Generated128.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest128\Generated128
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated421.cmd_10575]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest421\Generated421\Generated421.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest421\Generated421
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated322.cmd_10576]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest322\Generated322\Generated322.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest322\Generated322
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1312.cmd_10577]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1312\Generated1312\Generated1312.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1312\Generated1312
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated827.cmd_10578]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest827\Generated827\Generated827.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest827\Generated827
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated780.cmd_10579]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest780\Generated780\Generated780.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest780\Generated780
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated862.cmd_10580]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest862\Generated862\Generated862.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest862\Generated862
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1057.cmd_10581]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1057\Generated1057\Generated1057.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1057\Generated1057
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1426.cmd_10582]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1426\Generated1426\Generated1426.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1426\Generated1426
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated257.cmd_10583]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest257\Generated257\Generated257.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest257\Generated257
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1468.cmd_10584]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1468\Generated1468\Generated1468.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1468\Generated1468
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated941.cmd_10585]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest941\Generated941\Generated941.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest941\Generated941
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated523.cmd_10586]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest523\Generated523\Generated523.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest523\Generated523
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1215.cmd_10587]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1215\Generated1215\Generated1215.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1215\Generated1215
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated890.cmd_10588]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest890\Generated890\Generated890.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest890\Generated890
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated368.cmd_10589]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest368\Generated368\Generated368.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest368\Generated368
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated829.cmd_10590]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest829\Generated829\Generated829.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest829\Generated829
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated85.cmd_10591]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest85\Generated85\Generated85.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest85\Generated85
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1359.cmd_10592]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1359\Generated1359\Generated1359.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1359\Generated1359
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated348.cmd_10593]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest348\Generated348\Generated348.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest348\Generated348
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated190.cmd_10594]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest190\Generated190\Generated190.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest190\Generated190
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[arglist_pos.cmd_10595]
+RelativePath=JIT\Methodical\Coverage\arglist_pos\arglist_pos.cmd
+WorkingDir=JIT\Methodical\Coverage\arglist_pos
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[mcc_i03.cmd_10596]
+RelativePath=JIT\jit64\mcc\interop\mcc_i03\mcc_i03.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i03
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated126.cmd_10597]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest126\Generated126\Generated126.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest126\Generated126
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated48.cmd_10598]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest48\Generated48\Generated48.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest48\Generated48
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated417.cmd_10599]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest417\Generated417\Generated417.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest417\Generated417
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated5.cmd_10600]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest5\Generated5\Generated5.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest5\Generated5
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated925.cmd_10601]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest925\Generated925\Generated925.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest925\Generated925
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated857.cmd_10602]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest857\Generated857\Generated857.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest857\Generated857
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated979.cmd_10603]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest979\Generated979\Generated979.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest979\Generated979
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated807.cmd_10604]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest807\Generated807\Generated807.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest807\Generated807
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated280.cmd_10605]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest280\Generated280\Generated280.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest280\Generated280
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1433.cmd_10606]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1433\Generated1433\Generated1433.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1433\Generated1433
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated157.cmd_10607]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest157\Generated157\Generated157.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest157\Generated157
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Shift.cmd_10608]
+RelativePath=JIT\CodeGenBringUpTests\Shift\Shift.cmd
+WorkingDir=JIT\CodeGenBringUpTests\Shift
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated656.cmd_10609]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest656\Generated656\Generated656.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest656\Generated656
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated477.cmd_10610]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest477\Generated477\Generated477.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest477\Generated477
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated881.cmd_10611]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest881\Generated881\Generated881.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest881\Generated881
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1049.cmd_10612]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1049\Generated1049\Generated1049.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1049\Generated1049
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated73.cmd_10613]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest73\Generated73\Generated73.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest73\Generated73
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1062.cmd_10614]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1062\Generated1062\Generated1062.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1062\Generated1062
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[rvastatic3.cmd_10615]
+RelativePath=JIT\Directed\rvastatics\rvastatic3\rvastatic3.cmd
+WorkingDir=JIT\Directed\rvastatics\rvastatic3
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated1268.cmd_10616]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1268\Generated1268\Generated1268.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1268\Generated1268
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated248.cmd_10617]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest248\Generated248\Generated248.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest248\Generated248
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated503.cmd_10618]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest503\Generated503\Generated503.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest503\Generated503
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1273.cmd_10619]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1273\Generated1273\Generated1273.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1273\Generated1273
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated381.cmd_10620]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest381\Generated381\Generated381.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest381\Generated381
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1224.cmd_10621]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1224\Generated1224\Generated1224.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1224\Generated1224
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1081.cmd_10622]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1081\Generated1081\Generated1081.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1081\Generated1081
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[regexdna.cmd_10623]
+RelativePath=JIT\Performance\CodeQuality\BenchmarksGame\regexdna\regexdna\regexdna.cmd
+WorkingDir=JIT\Performance\CodeQuality\BenchmarksGame\regexdna\regexdna
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated504.cmd_10624]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest504\Generated504\Generated504.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest504\Generated504
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1260.cmd_10625]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1260\Generated1260\Generated1260.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1260\Generated1260
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated47.cmd_10626]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest47\Generated47\Generated47.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest47\Generated47
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated313.cmd_10627]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest313\Generated313\Generated313.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest313\Generated313
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated682.cmd_10628]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest682\Generated682\Generated682.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest682\Generated682
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW;R2R_FAIL;9457
+HostStyle=0
+
+[Generated614.cmd_10629]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest614\Generated614\Generated614.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest614\Generated614
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW;R2R_FAIL;9457
+HostStyle=0
+
+[Generated1046.cmd_10630]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1046\Generated1046\Generated1046.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1046\Generated1046
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1499.cmd_10631]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1499\Generated1499\Generated1499.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1499\Generated1499
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1265.cmd_10632]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1265\Generated1265\Generated1265.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1265\Generated1265
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1170.cmd_10633]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1170\Generated1170\Generated1170.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1170\Generated1170
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated437.cmd_10634]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest437\Generated437\Generated437.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest437\Generated437
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated415.cmd_10635]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest415\Generated415\Generated415.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest415\Generated415
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated267.cmd_10636]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest267\Generated267\Generated267.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest267\Generated267
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1133.cmd_10637]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1133\Generated1133\Generated1133.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1133\Generated1133
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated692.cmd_10638]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest692\Generated692\Generated692.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest692\Generated692
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1248.cmd_10639]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1248\Generated1248\Generated1248.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1248\Generated1248
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated595.cmd_10640]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest595\Generated595\Generated595.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest595\Generated595
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1334.cmd_10641]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1334\Generated1334\Generated1334.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1334\Generated1334
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated414.cmd_10642]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest414\Generated414\Generated414.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest414\Generated414
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated702.cmd_10643]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest702\Generated702\Generated702.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest702\Generated702
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated293.cmd_10644]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest293\Generated293\Generated293.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest293\Generated293
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_il_relpointer.cmd_10645]
+RelativePath=JIT\Methodical\tailcall\_il_relpointer\_il_relpointer.cmd
+WorkingDir=JIT\Methodical\tailcall\_il_relpointer
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated1472.cmd_10646]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1472\Generated1472\Generated1472.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1472\Generated1472
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated386.cmd_10647]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest386\Generated386\Generated386.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest386\Generated386
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1287.cmd_10648]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1287\Generated1287\Generated1287.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1287\Generated1287
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated162.cmd_10649]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest162\Generated162\Generated162.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest162\Generated162
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated32.cmd_10650]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest32\Generated32\Generated32.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest32\Generated32
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated729.cmd_10651]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest729\Generated729\Generated729.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest729\Generated729
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated776.cmd_10652]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest776\Generated776\Generated776.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest776\Generated776
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated212.cmd_10653]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest212\Generated212\Generated212.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest212\Generated212
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated93.cmd_10654]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest93\Generated93\Generated93.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest93\Generated93
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated878.cmd_10655]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest878\Generated878\Generated878.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest878\Generated878
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated242.cmd_10656]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest242\Generated242\Generated242.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest242\Generated242
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated361.cmd_10657]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest361\Generated361\Generated361.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest361\Generated361
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated198.cmd_10658]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest198\Generated198\Generated198.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest198\Generated198
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated710.cmd_10659]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest710\Generated710\Generated710.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest710\Generated710
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated603.cmd_10660]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest603\Generated603\Generated603.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest603\Generated603
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1182.cmd_10661]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1182\Generated1182\Generated1182.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1182\Generated1182
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated393.cmd_10662]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest393\Generated393\Generated393.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest393\Generated393
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated487.cmd_10663]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest487\Generated487\Generated487.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest487\Generated487
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1289.cmd_10664]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1289\Generated1289\Generated1289.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1289\Generated1289
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated913.cmd_10665]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest913\Generated913\Generated913.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest913\Generated913
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated502.cmd_10666]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest502\Generated502\Generated502.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest502\Generated502
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_359736_d.cmd_10667]
+RelativePath=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_d\DevDiv_359736_d.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_d
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated817.cmd_10668]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest817\Generated817\Generated817.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest817\Generated817
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated512.cmd_10669]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest512\Generated512\Generated512.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest512\Generated512
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated124.cmd_10670]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest124\Generated124\Generated124.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest124\Generated124
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1199.cmd_10671]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1199\Generated1199\Generated1199.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1199\Generated1199
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated244.cmd_10672]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest244\Generated244\Generated244.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest244\Generated244
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i01.cmd_10673]
+RelativePath=JIT\jit64\mcc\interop\mcc_i01\mcc_i01.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i01
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1017.cmd_10674]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1017\Generated1017\Generated1017.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1017\Generated1017
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1226.cmd_10675]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1226\Generated1226\Generated1226.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1226\Generated1226
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated967.cmd_10676]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest967\Generated967\Generated967.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest967\Generated967
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated598.cmd_10677]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest598\Generated598\Generated598.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest598\Generated598
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1448.cmd_10678]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1448\Generated1448\Generated1448.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1448\Generated1448
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated260.cmd_10679]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest260\Generated260\Generated260.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest260\Generated260
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated836.cmd_10680]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest836\Generated836\Generated836.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest836\Generated836
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1038.cmd_10681]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1038\Generated1038\Generated1038.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1038\Generated1038
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_6239.cmd_10682]
+RelativePath=JIT\Regression\JitBlue\GitHub_6239\GitHub_6239\GitHub_6239.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_6239\GitHub_6239
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated151.cmd_10683]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest151\Generated151\Generated151.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest151\Generated151
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_142976.cmd_10684]
+RelativePath=JIT\Regression\JitBlue\DevDiv_142976\DevDiv_142976\DevDiv_142976.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_142976\DevDiv_142976
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1241.cmd_10685]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1241\Generated1241\Generated1241.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1241\Generated1241
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1271.cmd_10686]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1271\Generated1271\Generated1271.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1271\Generated1271
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated278.cmd_10687]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest278\Generated278\Generated278.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest278\Generated278
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated800.cmd_10688]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest800\Generated800\Generated800.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest800\Generated800
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1364.cmd_10689]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1364\Generated1364\Generated1364.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1364\Generated1364
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated34.cmd_10690]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest34\Generated34\Generated34.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest34\Generated34
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1220.cmd_10691]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1220\Generated1220\Generated1220.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1220\Generated1220
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i70.cmd_10692]
+RelativePath=JIT\jit64\mcc\interop\mcc_i70\mcc_i70.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i70
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated335.cmd_10693]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest335\Generated335\Generated335.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest335\Generated335
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1340.cmd_10694]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1340\Generated1340\Generated1340.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1340\Generated1340
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1392.cmd_10695]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1392\Generated1392\Generated1392.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1392\Generated1392
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_283795.cmd_10696]
+RelativePath=JIT\Regression\JitBlue\DevDiv_283795\DevDiv_283795\DevDiv_283795.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_283795\DevDiv_283795
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated720.cmd_10697]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest720\Generated720\Generated720.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest720\Generated720
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1274.cmd_10698]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1274\Generated1274\Generated1274.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1274\Generated1274
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated20.cmd_10699]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest20\Generated20\Generated20.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest20\Generated20
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated844.cmd_10700]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest844\Generated844\Generated844.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest844\Generated844
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1485.cmd_10701]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1485\Generated1485\Generated1485.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1485\Generated1485
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated383.cmd_10702]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest383\Generated383\Generated383.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest383\Generated383
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated480.cmd_10703]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest480\Generated480\Generated480.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest480\Generated480
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated773.cmd_10704]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest773\Generated773\Generated773.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest773\Generated773
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1361.cmd_10705]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1361\Generated1361\Generated1361.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1361\Generated1361
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated806.cmd_10707]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest806\Generated806\Generated806.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest806\Generated806
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated37.cmd_10708]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest37\Generated37\Generated37.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest37\Generated37
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1457.cmd_10709]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1457\Generated1457\Generated1457.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1457\Generated1457
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1373.cmd_10710]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1373\Generated1373\Generated1373.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1373\Generated1373
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1402.cmd_10711]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1402\Generated1402\Generated1402.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1402\Generated1402
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated395.cmd_10712]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest395\Generated395\Generated395.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest395\Generated395
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated622.cmd_10713]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest622\Generated622\Generated622.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest622\Generated622
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated873.cmd_10714]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest873\Generated873\Generated873.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest873\Generated873
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated891.cmd_10715]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest891\Generated891\Generated891.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest891\Generated891
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1280.cmd_10716]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1280\Generated1280\Generated1280.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1280\Generated1280
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1420.cmd_10717]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1420\Generated1420\Generated1420.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1420\Generated1420
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated705.cmd_10718]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest705\Generated705\Generated705.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest705\Generated705
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated315.cmd_10719]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest315\Generated315\Generated315.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest315\Generated315
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated639.cmd_10720]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest639\Generated639\Generated639.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest639\Generated639
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated912.cmd_10721]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest912\Generated912\Generated912.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest912\Generated912
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[structfieldparam_r.cmd_10722]
+RelativePath=JIT\Directed\StructABI\structfieldparam_r\structfieldparam_r.cmd
+WorkingDir=JIT\Directed\StructABI\structfieldparam_r
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1014.cmd_10723]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1014\Generated1014\Generated1014.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1014\Generated1014
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated3.cmd_10724]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest3\Generated3\Generated3.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest3\Generated3
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated909.cmd_10725]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest909\Generated909\Generated909.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest909\Generated909
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated522.cmd_10726]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest522\Generated522\Generated522.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest522\Generated522
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated580.cmd_10727]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest580\Generated580\Generated580.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest580\Generated580
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1056.cmd_10728]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1056\Generated1056\Generated1056.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1056\Generated1056
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b21220.cmd_10729]
+RelativePath=JIT\jit64\regress\ndpw\21220\b21220\b21220.cmd
+WorkingDir=JIT\jit64\regress\ndpw\21220\b21220
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;4851;NEW
+HostStyle=0
+
+[Generated1054.cmd_10730]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1054\Generated1054\Generated1054.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1054\Generated1054
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1052.cmd_10731]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1052\Generated1052\Generated1052.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1052\Generated1052
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_278526.cmd_10732]
+RelativePath=JIT\Regression\JitBlue\DevDiv_278526\DevDiv_278526\DevDiv_278526.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_278526\DevDiv_278526
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated936.cmd_10733]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest936\Generated936\Generated936.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest936\Generated936
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1445.cmd_10734]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1445\Generated1445\Generated1445.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1445\Generated1445
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated633.cmd_10735]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest633\Generated633\Generated633.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest633\Generated633
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated432.cmd_10736]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest432\Generated432\Generated432.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest432\Generated432
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated447.cmd_10737]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest447\Generated447\Generated447.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest447\Generated447
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated446.cmd_10738]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest446\Generated446\Generated446.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest446\Generated446
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated319.cmd_10739]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest319\Generated319\Generated319.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest319\Generated319
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated791.cmd_10740]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest791\Generated791\Generated791.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest791\Generated791
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated863.cmd_10741]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest863\Generated863\Generated863.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest863\Generated863
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated438.cmd_10742]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest438\Generated438\Generated438.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest438\Generated438
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated350.cmd_10743]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest350\Generated350\Generated350.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest350\Generated350
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1301.cmd_10744]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1301\Generated1301\Generated1301.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1301\Generated1301
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated958.cmd_10745]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest958\Generated958\Generated958.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest958\Generated958
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1419.cmd_10746]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1419\Generated1419\Generated1419.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1419\Generated1419
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated178.cmd_10747]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest178\Generated178\Generated178.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest178\Generated178
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated775.cmd_10748]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest775\Generated775\Generated775.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest775\Generated775
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated236.cmd_10749]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest236\Generated236\Generated236.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest236\Generated236
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated625.cmd_10750]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest625\Generated625\Generated625.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest625\Generated625
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[UDivConst.cmd_10751]
+RelativePath=JIT\CodeGenBringUpTests\UDivConst\UDivConst.cmd
+WorkingDir=JIT\CodeGenBringUpTests\UDivConst
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1070.cmd_10752]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1070\Generated1070\Generated1070.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1070\Generated1070
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1110.cmd_10753]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1110\Generated1110\Generated1110.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1110\Generated1110
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated465.cmd_10754]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest465\Generated465\Generated465.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest465\Generated465
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated605.cmd_10755]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest605\Generated605\Generated605.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest605\Generated605
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated687.cmd_10756]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest687\Generated687\Generated687.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest687\Generated687
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1456.cmd_10757]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1456\Generated1456\Generated1456.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1456\Generated1456
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated392.cmd_10758]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest392\Generated392\Generated392.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest392\Generated392
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1324.cmd_10759]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1324\Generated1324\Generated1324.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1324\Generated1324
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1275.cmd_10760]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1275\Generated1275\Generated1275.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1275\Generated1275
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1071.cmd_10761]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1071\Generated1071\Generated1071.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1071\Generated1071
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1146.cmd_10762]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1146\Generated1146\Generated1146.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1146\Generated1146
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1413.cmd_10763]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1413\Generated1413\Generated1413.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1413\Generated1413
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated55.cmd_10764]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest55\Generated55\Generated55.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest55\Generated55
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated965.cmd_10765]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest965\Generated965\Generated965.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest965\Generated965
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated130.cmd_10766]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest130\Generated130\Generated130.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest130\Generated130
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated217.cmd_10767]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest217\Generated217\Generated217.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest217\Generated217
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated774.cmd_10768]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest774\Generated774\Generated774.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest774\Generated774
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated164.cmd_10769]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest164\Generated164\Generated164.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest164\Generated164
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1451.cmd_10770]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1451\Generated1451\Generated1451.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1451\Generated1451
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated982.cmd_10771]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest982\Generated982\Generated982.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest982\Generated982
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1037.cmd_10772]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1037\Generated1037\Generated1037.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1037\Generated1037
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated797.cmd_10773]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest797\Generated797\Generated797.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest797\Generated797
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1181.cmd_10774]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1181\Generated1181\Generated1181.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1181\Generated1181
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1390.cmd_10775]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1390\Generated1390\Generated1390.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1390\Generated1390
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated970.cmd_10776]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest970\Generated970\Generated970.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest970\Generated970
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1022.cmd_10777]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1022\Generated1022\Generated1022.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1022\Generated1022
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1006.cmd_10778]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1006\Generated1006\Generated1006.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1006\Generated1006
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1328.cmd_10779]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1328\Generated1328\Generated1328.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1328\Generated1328
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated56.cmd_10780]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest56\Generated56\Generated56.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest56\Generated56
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated585.cmd_10781]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest585\Generated585\Generated585.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest585\Generated585
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1034.cmd_10782]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1034\Generated1034\Generated1034.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1034\Generated1034
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated596.cmd_10783]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest596\Generated596\Generated596.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest596\Generated596
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1024.cmd_10784]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1024\Generated1024\Generated1024.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1024\Generated1024
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated996.cmd_10785]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest996\Generated996\Generated996.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest996\Generated996
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1495.cmd_10786]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1495\Generated1495\Generated1495.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1495\Generated1495
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated695.cmd_10787]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest695\Generated695\Generated695.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest695\Generated695
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated304.cmd_10788]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest304\Generated304\Generated304.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest304\Generated304
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated30.cmd_10789]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest30\Generated30\Generated30.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest30\Generated30
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated412.cmd_10790]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest412\Generated412\Generated412.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest412\Generated412
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated819.cmd_10791]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest819\Generated819\Generated819.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest819\Generated819
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated138.cmd_10792]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest138\Generated138\Generated138.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest138\Generated138
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1042.cmd_10793]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1042\Generated1042\Generated1042.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1042\Generated1042
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i53.cmd_10794]
+RelativePath=JIT\jit64\mcc\interop\mcc_i53\mcc_i53.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i53
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[b37598.cmd_10795]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37598\b37598\b37598.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37598\b37598
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated647.cmd_10796]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest647\Generated647\Generated647.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest647\Generated647
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated521.cmd_10797]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest521\Generated521\Generated521.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest521\Generated521
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated181.cmd_10798]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest181\Generated181\Generated181.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest181\Generated181
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1069.cmd_10799]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1069\Generated1069\Generated1069.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1069\Generated1069
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1319.cmd_10800]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1319\Generated1319\Generated1319.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1319\Generated1319
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated70.cmd_10801]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest70\Generated70\Generated70.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest70\Generated70
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[RuntimeWrappedException.cmd_10802]
+RelativePath=baseservices\compilerservices\RuntimeWrappedException\RuntimeWrappedException\RuntimeWrappedException.cmd
+WorkingDir=baseservices\compilerservices\RuntimeWrappedException\RuntimeWrappedException
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated493.cmd_10803]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest493\Generated493\Generated493.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest493\Generated493
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated914.cmd_10804]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest914\Generated914\Generated914.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest914\Generated914
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated789.cmd_10805]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest789\Generated789\Generated789.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest789\Generated789
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i71.cmd_10806]
+RelativePath=JIT\jit64\mcc\interop\mcc_i71\mcc_i71.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i71
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated790.cmd_10807]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest790\Generated790\Generated790.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest790\Generated790
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1180.cmd_10808]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1180\Generated1180\Generated1180.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1180\Generated1180
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1140.cmd_10809]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1140\Generated1140\Generated1140.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1140\Generated1140
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1462.cmd_10810]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1462\Generated1462\Generated1462.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1462\Generated1462
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated992.cmd_10811]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest992\Generated992\Generated992.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest992\Generated992
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated964.cmd_10812]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest964\Generated964\Generated964.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest964\Generated964
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated831.cmd_10813]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest831\Generated831\Generated831.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest831\Generated831
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated147.cmd_10814]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest147\Generated147\Generated147.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest147\Generated147
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[uint64Opt_d.cmd_10815]
+RelativePath=JIT\Directed\shift\uint64Opt_d\uint64Opt_d.cmd
+WorkingDir=JIT\Directed\shift\uint64Opt_d
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[bleref_il_d.cmd_10816]
+RelativePath=JIT\Directed\coverage\importer\Desktop\bleref_il_d\bleref_il_d.cmd
+WorkingDir=JIT\Directed\coverage\importer\Desktop\bleref_il_d
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;4851;NEW
+HostStyle=0
+
+[Generated113.cmd_10817]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest113\Generated113\Generated113.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest113\Generated113
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated316.cmd_10818]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest316\Generated316\Generated316.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest316\Generated316
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1461.cmd_10819]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1461\Generated1461\Generated1461.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1461\Generated1461
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1191.cmd_10820]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1191\Generated1191\Generated1191.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1191\Generated1191
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated448.cmd_10821]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest448\Generated448\Generated448.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest448\Generated448
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated928.cmd_10822]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest928\Generated928\Generated928.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest928\Generated928
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_367099.cmd_10823]
+RelativePath=JIT\Regression\JitBlue\DevDiv_367099\DevDiv_367099\DevDiv_367099.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_367099\DevDiv_367099
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_8170.cmd_10824]
+RelativePath=JIT\Regression\JitBlue\GitHub_8170\GitHub_8170\GitHub_8170.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_8170\GitHub_8170
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[extended.cmd_10825]
+RelativePath=JIT\Directed\RVAInit\extended\extended.cmd
+WorkingDir=JIT\Directed\RVAInit\extended
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated255.cmd_10826]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest255\Generated255\Generated255.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest255\Generated255
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1102.cmd_10827]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1102\Generated1102\Generated1102.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1102\Generated1102
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1322.cmd_10828]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1322\Generated1322\Generated1322.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1322\Generated1322
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[InlineGCStruct.cmd_10829]
+RelativePath=JIT\Performance\CodeQuality\Inlining\InlineGCStruct\InlineGCStruct.cmd
+WorkingDir=JIT\Performance\CodeQuality\Inlining\InlineGCStruct
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1429.cmd_10830]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1429\Generated1429\Generated1429.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1429\Generated1429
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated252.cmd_10831]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest252\Generated252\Generated252.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest252\Generated252
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated716.cmd_10833]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest716\Generated716\Generated716.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest716\Generated716
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1148.cmd_10834]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1148\Generated1148\Generated1148.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1148\Generated1148
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated342.cmd_10835]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest342\Generated342\Generated342.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest342\Generated342
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1209.cmd_10836]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1209\Generated1209\Generated1209.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1209\Generated1209
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1068.cmd_10837]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1068\Generated1068\Generated1068.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1068\Generated1068
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated578.cmd_10838]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest578\Generated578\Generated578.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest578\Generated578
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated674.cmd_10839]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest674\Generated674\Generated674.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest674\Generated674
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated401.cmd_10840]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest401\Generated401\Generated401.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest401\Generated401
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated354.cmd_10841]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest354\Generated354\Generated354.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest354\Generated354
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated291.cmd_10842]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest291\Generated291\Generated291.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest291\Generated291
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1374.cmd_10843]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1374\Generated1374\Generated1374.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1374\Generated1374
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1293.cmd_10844]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1293\Generated1293\Generated1293.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1293\Generated1293
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated818.cmd_10845]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest818\Generated818\Generated818.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest818\Generated818
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b46867.cmd_10846]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46867\b46867\b46867.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46867\b46867
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated635.cmd_10847]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest635\Generated635\Generated635.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest635\Generated635
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1030.cmd_10848]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1030\Generated1030\Generated1030.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1030\Generated1030
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1027.cmd_10849]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1027\Generated1027\Generated1027.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1027\Generated1027
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated845.cmd_10850]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest845\Generated845\Generated845.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest845\Generated845
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated81.cmd_10851]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest81\Generated81\Generated81.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest81\Generated81
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated798.cmd_10852]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest798\Generated798\Generated798.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest798\Generated798
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_288222.cmd_10853]
+RelativePath=JIT\Regression\JitBlue\DevDiv_288222\DevDiv_288222\DevDiv_288222.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_288222\DevDiv_288222
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated363.cmd_10854]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest363\Generated363\Generated363.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest363\Generated363
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated17.cmd_10855]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest17\Generated17\Generated17.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest17\Generated17
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_6238.cmd_10856]
+RelativePath=JIT\Regression\JitBlue\GitHub_6238\GitHub_6238\GitHub_6238.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_6238\GitHub_6238
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated784.cmd_10857]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest784\Generated784\Generated784.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest784\Generated784
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1300.cmd_10858]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1300\Generated1300\Generated1300.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1300\Generated1300
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1298.cmd_10859]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1298\Generated1298\Generated1298.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1298\Generated1298
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated478.cmd_10860]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest478\Generated478\Generated478.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest478\Generated478
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated700.cmd_10861]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest700\Generated700\Generated700.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest700\Generated700
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated892.cmd_10862]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest892\Generated892\Generated892.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest892\Generated892
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1130.cmd_10863]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1130\Generated1130\Generated1130.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1130\Generated1130
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated638.cmd_10864]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest638\Generated638\Generated638.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest638\Generated638
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[ldelemnullarr1_il_d.cmd_10865]
+RelativePath=JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_d\ldelemnullarr1_il_d.cmd
+WorkingDir=JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_d
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;4851;NEW
+HostStyle=0
+
+[Generated1080.cmd_10866]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1080\Generated1080\Generated1080.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1080\Generated1080
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated427.cmd_10867]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest427\Generated427\Generated427.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest427\Generated427
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated670.cmd_10868]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest670\Generated670\Generated670.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest670\Generated670
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b91248.cmd_10869]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91248\b91248\b91248.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91248\b91248
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated42.cmd_10870]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest42\Generated42\Generated42.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest42\Generated42
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i33.cmd_10871]
+RelativePath=JIT\jit64\mcc\interop\mcc_i33\mcc_i33.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i33
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated830.cmd_10872]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest830\Generated830\Generated830.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest830\Generated830
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated473.cmd_10873]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest473\Generated473\Generated473.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest473\Generated473
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1019.cmd_10874]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1019\Generated1019\Generated1019.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1019\Generated1019
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated669.cmd_10875]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest669\Generated669\Generated669.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest669\Generated669
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated756.cmd_10876]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest756\Generated756\Generated756.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest756\Generated756
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated442.cmd_10877]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest442\Generated442\Generated442.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest442\Generated442
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1315.cmd_10878]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1315\Generated1315\Generated1315.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1315\Generated1315
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated65.cmd_10879]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest65\Generated65\Generated65.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest65\Generated65
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated898.cmd_10880]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest898\Generated898\Generated898.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest898\Generated898
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated653.cmd_10881]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest653\Generated653\Generated653.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest653\Generated653
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1001.cmd_10882]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1001\Generated1001\Generated1001.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1001\Generated1001
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1332.cmd_10883]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1332\Generated1332\Generated1332.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1332\Generated1332
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated136.cmd_10884]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest136\Generated136\Generated136.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest136\Generated136
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated804.cmd_10885]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest804\Generated804\Generated804.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest804\Generated804
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated654.cmd_10886]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest654\Generated654\Generated654.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest654\Generated654
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1123.cmd_10887]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1123\Generated1123\Generated1123.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1123\Generated1123
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated454.cmd_10888]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest454\Generated454\Generated454.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest454\Generated454
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1113.cmd_10889]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1113\Generated1113\Generated1113.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1113\Generated1113
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated440.cmd_10890]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest440\Generated440\Generated440.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest440\Generated440
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1477.cmd_10891]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1477\Generated1477\Generated1477.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1477\Generated1477
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1421.cmd_10892]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1421\Generated1421\Generated1421.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1421\Generated1421
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated171.cmd_10893]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest171\Generated171\Generated171.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest171\Generated171
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i63.cmd_10894]
+RelativePath=JIT\jit64\mcc\interop\mcc_i63\mcc_i63.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i63
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated582.cmd_10895]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest582\Generated582\Generated582.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest582\Generated582
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated946.cmd_10896]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest946\Generated946\Generated946.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest946\Generated946
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated569.cmd_10897]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest569\Generated569\Generated569.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest569\Generated569
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i02.cmd_10899]
+RelativePath=JIT\jit64\mcc\interop\mcc_i02\mcc_i02.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i02
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1004.cmd_10900]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1004\Generated1004\Generated1004.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1004\Generated1004
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1096.cmd_10901]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1096\Generated1096\Generated1096.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1096\Generated1096
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1266.cmd_10902]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1266\Generated1266\Generated1266.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1266\Generated1266
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated980.cmd_10903]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest980\Generated980\Generated980.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest980\Generated980
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated954.cmd_10904]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest954\Generated954\Generated954.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest954\Generated954
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated375.cmd_10905]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest375\Generated375\Generated375.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest375\Generated375
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated106.cmd_10906]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest106\Generated106\Generated106.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest106\Generated106
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated547.cmd_10907]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest547\Generated547\Generated547.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest547\Generated547
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated876.cmd_10908]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest876\Generated876\Generated876.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest876\Generated876
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated468.cmd_10909]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest468\Generated468\Generated468.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest468\Generated468
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1031.cmd_10910]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1031\Generated1031\Generated1031.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1031\Generated1031
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated810.cmd_10911]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest810\Generated810\Generated810.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest810\Generated810
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1185.cmd_10912]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1185\Generated1185\Generated1185.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1185\Generated1185
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated763.cmd_10913]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest763\Generated763\Generated763.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest763\Generated763
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1349.cmd_10914]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1349\Generated1349\Generated1349.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1349\Generated1349
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated927.cmd_10915]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest927\Generated927\Generated927.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest927\Generated927
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated43.cmd_10916]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest43\Generated43\Generated43.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest43\Generated43
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1190.cmd_10917]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1190\Generated1190\Generated1190.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1190\Generated1190
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1261.cmd_10918]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1261\Generated1261\Generated1261.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1261\Generated1261
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1351.cmd_10919]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1351\Generated1351\Generated1351.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1351\Generated1351
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated423.cmd_10920]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest423\Generated423\Generated423.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest423\Generated423
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated429.cmd_10921]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest429\Generated429\Generated429.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest429\Generated429
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i00.cmd_10922]
+RelativePath=JIT\jit64\mcc\interop\mcc_i00\mcc_i00.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i00
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1389.cmd_10923]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1389\Generated1389\Generated1389.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1389\Generated1389
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_278369.cmd_10924]
+RelativePath=JIT\Regression\JitBlue\DevDiv_278369\DevDiv_278369\DevDiv_278369.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_278369\DevDiv_278369
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated882.cmd_10925]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest882\Generated882\Generated882.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest882\Generated882
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1239.cmd_10926]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1239\Generated1239\Generated1239.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1239\Generated1239
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW;R2R_FAIL;9457
+HostStyle=0
+
+[Generated374.cmd_10927]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest374\Generated374\Generated374.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest374\Generated374
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated226.cmd_10928]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest226\Generated226\Generated226.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest226\Generated226
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated328.cmd_10929]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest328\Generated328\Generated328.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest328\Generated328
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated943.cmd_10930]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest943\Generated943\Generated943.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest943\Generated943
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated189.cmd_10931]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest189\Generated189\Generated189.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest189\Generated189
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated467.cmd_10932]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest467\Generated467\Generated467.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest467\Generated467
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[structfieldparam_ro.cmd_10933]
+RelativePath=JIT\Directed\StructABI\structfieldparam_ro\structfieldparam_ro.cmd
+WorkingDir=JIT\Directed\StructABI\structfieldparam_ro
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1325.cmd_10934]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1325\Generated1325\Generated1325.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1325\Generated1325
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated366.cmd_10935]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest366\Generated366\Generated366.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest366\Generated366
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated302.cmd_10936]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest302\Generated302\Generated302.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest302\Generated302
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated591.cmd_10937]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest591\Generated591\Generated591.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest591\Generated591
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated509.cmd_10938]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest509\Generated509\Generated509.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest509\Generated509
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated2.cmd_10939]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest2\Generated2\Generated2.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest2\Generated2
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated655.cmd_10940]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest655\Generated655\Generated655.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest655\Generated655
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b36472.cmd_10941]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36472\b36472\b36472.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36472\b36472
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[mcc_i31.cmd_10942]
+RelativePath=JIT\jit64\mcc\interop\mcc_i31\mcc_i31.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i31
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated572.cmd_10943]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest572\Generated572\Generated572.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest572\Generated572
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1230.cmd_10944]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1230\Generated1230\Generated1230.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1230\Generated1230
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated949.cmd_10945]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest949\Generated949\Generated949.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest949\Generated949
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated641.cmd_10946]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest641\Generated641\Generated641.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest641\Generated641
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1345.cmd_10947]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1345\Generated1345\Generated1345.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1345\Generated1345
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated235.cmd_10948]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest235\Generated235\Generated235.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest235\Generated235
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated476.cmd_10949]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest476\Generated476\Generated476.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest476\Generated476
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated540.cmd_10950]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest540\Generated540\Generated540.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest540\Generated540
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated634.cmd_10951]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest634\Generated634\Generated634.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest634\Generated634
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[funclet.cmd_10952]
+RelativePath=JIT\jit64\gc\misc\funclet\funclet.cmd
+WorkingDir=JIT\jit64\gc\misc\funclet
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated671.cmd_10953]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest671\Generated671\Generated671.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest671\Generated671
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[ldelemnullarr1_il_r.cmd_10954]
+RelativePath=JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_r\ldelemnullarr1_il_r.cmd
+WorkingDir=JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_r
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;4851;NEW
+HostStyle=0
+
+[Generated1228.cmd_10956]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1228\Generated1228\Generated1228.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1228\Generated1228
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1423.cmd_10957]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1423\Generated1423\Generated1423.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1423\Generated1423
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated100.cmd_10958]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest100\Generated100\Generated100.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest100\Generated100
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1388.cmd_10959]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1388\Generated1388\Generated1388.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1388\Generated1388
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated296.cmd_10960]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest296\Generated296\Generated296.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest296\Generated296
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1353.cmd_10961]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1353\Generated1353\Generated1353.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1353\Generated1353
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated816.cmd_10962]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest816\Generated816\Generated816.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest816\Generated816
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated485.cmd_10963]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest485\Generated485\Generated485.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest485\Generated485
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated270.cmd_10964]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest270\Generated270\Generated270.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest270\Generated270
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated905.cmd_10965]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest905\Generated905\Generated905.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest905\Generated905
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated826.cmd_10966]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest826\Generated826\Generated826.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest826\Generated826
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1055.cmd_10967]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1055\Generated1055\Generated1055.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1055\Generated1055
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated439.cmd_10968]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest439\Generated439\Generated439.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest439\Generated439
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1350.cmd_10969]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1350\Generated1350\Generated1350.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1350\Generated1350
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated108.cmd_10970]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest108\Generated108\Generated108.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest108\Generated108
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated161.cmd_10971]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest161\Generated161\Generated161.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest161\Generated161
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1173.cmd_10972]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1173\Generated1173\Generated1173.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1173\Generated1173
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated33.cmd_10973]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest33\Generated33\Generated33.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest33\Generated33
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated686.cmd_10974]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest686\Generated686\Generated686.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest686\Generated686
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated398.cmd_10975]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest398\Generated398\Generated398.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest398\Generated398
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated309.cmd_10976]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest309\Generated309\Generated309.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest309\Generated309
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated850.cmd_10977]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest850\Generated850\Generated850.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest850\Generated850
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_359736_do.cmd_10978]
+RelativePath=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_do\DevDiv_359736_do.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_do
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;10111;NEW
+HostStyle=0
+
+[nonrefsdarr_il_r.cmd_10979]
+RelativePath=JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_r\nonrefsdarr_il_r.cmd
+WorkingDir=JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_r
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;4851;NEW
+HostStyle=0
+
+[Generated107.cmd_10980]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest107\Generated107\Generated107.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest107\Generated107
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1085.cmd_10981]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1085\Generated1085\Generated1085.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1085\Generated1085
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated495.cmd_10982]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest495\Generated495\Generated495.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest495\Generated495
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1165.cmd_10984]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1165\Generated1165\Generated1165.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1165\Generated1165
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated8.cmd_10985]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest8\Generated8\Generated8.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest8\Generated8
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated62.cmd_10986]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest62\Generated62\Generated62.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest62\Generated62
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated150.cmd_10987]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest150\Generated150\Generated150.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest150\Generated150
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1002.cmd_10988]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1002\Generated1002\Generated1002.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1002\Generated1002
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated24.cmd_10989]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest24\Generated24\Generated24.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest24\Generated24
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1292.cmd_10990]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1292\Generated1292\Generated1292.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1292\Generated1292
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b26324b.cmd_10991]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324b\b26324b.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324b
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[b41391.cmd_10992]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41391\b41391\b41391.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41391\b41391
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated814.cmd_10993]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest814\Generated814\Generated814.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest814\Generated814
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1474.cmd_10994]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1474\Generated1474\Generated1474.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1474\Generated1474
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1337.cmd_10995]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1337\Generated1337\Generated1337.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1337\Generated1337
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated176.cmd_10996]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest176\Generated176\Generated176.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest176\Generated176
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated956.cmd_10997]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest956\Generated956\Generated956.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest956\Generated956
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated382.cmd_10998]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest382\Generated382\Generated382.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest382\Generated382
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1371.cmd_10999]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1371\Generated1371\Generated1371.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1371\Generated1371
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1207.cmd_11000]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1207\Generated1207\Generated1207.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1207\Generated1207
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1216.cmd_11001]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1216\Generated1216\Generated1216.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1216\Generated1216
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated615.cmd_11002]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest615\Generated615\Generated615.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest615\Generated615
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1365.cmd_11003]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1365\Generated1365\Generated1365.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1365\Generated1365
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated557.cmd_11004]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest557\Generated557\Generated557.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest557\Generated557
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b08046.cmd_11005]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1.2-M01\b08046\b08046\b08046.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1.2-M01\b08046\b08046
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;8156;NEW
+HostStyle=0
+
+[Generated1045.cmd_11006]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1045\Generated1045\Generated1045.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1045\Generated1045
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1099.cmd_11007]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1099\Generated1099\Generated1099.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1099\Generated1099
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1084.cmd_11008]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1084\Generated1084\Generated1084.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1084\Generated1084
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated607.cmd_11009]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest607\Generated607\Generated607.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest607\Generated607
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated940.cmd_11010]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest940\Generated940\Generated940.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest940\Generated940
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated41.cmd_11011]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest41\Generated41\Generated41.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest41\Generated41
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated28.cmd_11012]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest28\Generated28\Generated28.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest28\Generated28
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated855.cmd_11013]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest855\Generated855\Generated855.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest855\Generated855
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1259.cmd_11014]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1259\Generated1259\Generated1259.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1259\Generated1259
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1447.cmd_11015]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1447\Generated1447\Generated1447.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1447\Generated1447
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated934.cmd_11016]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest934\Generated934\Generated934.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest934\Generated934
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated626.cmd_11017]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest626\Generated626\Generated626.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest626\Generated626
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated173.cmd_11018]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest173\Generated173\Generated173.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest173\Generated173
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1231.cmd_11019]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1231\Generated1231\Generated1231.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1231\Generated1231
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated760.cmd_11020]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest760\Generated760\Generated760.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest760\Generated760
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated192.cmd_11021]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest192\Generated192\Generated192.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest192\Generated192
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1466.cmd_11022]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1466\Generated1466\Generated1466.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1466\Generated1466
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated104.cmd_11023]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest104\Generated104\Generated104.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest104\Generated104
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1171.cmd_11024]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1171\Generated1171\Generated1171.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1171\Generated1171
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated230.cmd_11025]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest230\Generated230\Generated230.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest230\Generated230
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated731.cmd_11026]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest731\Generated731\Generated731.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest731\Generated731
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1021.cmd_11027]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1021\Generated1021\Generated1021.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1021\Generated1021
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated142.cmd_11028]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest142\Generated142\Generated142.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest142\Generated142
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1377.cmd_11029]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1377\Generated1377\Generated1377.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1377\Generated1377
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated601.cmd_11030]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest601\Generated601\Generated601.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest601\Generated601
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated677.cmd_11031]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest677\Generated677\Generated677.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest677\Generated677
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated561.cmd_11032]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest561\Generated561\Generated561.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest561\Generated561
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated718.cmd_11033]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest718\Generated718\Generated718.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest718\Generated718
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated623.cmd_11034]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest623\Generated623\Generated623.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest623\Generated623
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated693.cmd_11035]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest693\Generated693\Generated693.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest693\Generated693
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated500.cmd_11036]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest500\Generated500\Generated500.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest500\Generated500
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1183.cmd_11037]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1183\Generated1183\Generated1183.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1183\Generated1183
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1253.cmd_11038]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1253\Generated1253\Generated1253.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1253\Generated1253
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1039.cmd_11039]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1039\Generated1039\Generated1039.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1039\Generated1039
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1203.cmd_11040]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1203\Generated1203\Generated1203.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1203\Generated1203
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated887.cmd_11041]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest887\Generated887\Generated887.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest887\Generated887
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1023.cmd_11042]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1023\Generated1023\Generated1023.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1023\Generated1023
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1098.cmd_11043]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1098\Generated1098\Generated1098.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1098\Generated1098
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1114.cmd_11044]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1114\Generated1114\Generated1114.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1114\Generated1114
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1208.cmd_11045]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1208\Generated1208\Generated1208.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1208\Generated1208
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated957.cmd_11046]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest957\Generated957\Generated957.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest957\Generated957
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated839.cmd_11047]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest839\Generated839\Generated839.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest839\Generated839
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated141.cmd_11048]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest141\Generated141\Generated141.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest141\Generated141
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated49.cmd_11049]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest49\Generated49\Generated49.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest49\Generated49
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated254.cmd_11050]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest254\Generated254\Generated254.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest254\Generated254
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i81.cmd_11051]
+RelativePath=JIT\jit64\mcc\interop\mcc_i81\mcc_i81.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i81
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated273.cmd_11052]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest273\Generated273\Generated273.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest273\Generated273
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated744.cmd_11053]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest744\Generated744\Generated744.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest744\Generated744
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1401.cmd_11054]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1401\Generated1401\Generated1401.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1401\Generated1401
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated699.cmd_11055]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest699\Generated699\Generated699.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest699\Generated699
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1020.cmd_11056]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1020\Generated1020\Generated1020.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1020\Generated1020
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1138.cmd_11057]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1138\Generated1138\Generated1138.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1138\Generated1138
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b31745.cmd_11058]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31745\b31745\b31745.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31745\b31745
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated463.cmd_11059]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest463\Generated463\Generated463.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest463\Generated463
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated444.cmd_11060]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest444\Generated444\Generated444.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest444\Generated444
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1012.cmd_11061]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1012\Generated1012\Generated1012.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1012\Generated1012
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated97.cmd_11062]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest97\Generated97\Generated97.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest97\Generated97
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i73.cmd_11063]
+RelativePath=JIT\jit64\mcc\interop\mcc_i73\mcc_i73.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i73
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1198.cmd_11064]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1198\Generated1198\Generated1198.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1198\Generated1198
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated548.cmd_11065]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest548\Generated548\Generated548.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest548\Generated548
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1048.cmd_11066]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1048\Generated1048\Generated1048.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1048\Generated1048
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated492.cmd_11067]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest492\Generated492\Generated492.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest492\Generated492
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated122.cmd_11068]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest122\Generated122\Generated122.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest122\Generated122
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1323.cmd_11069]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1323\Generated1323\Generated1323.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1323\Generated1323
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated276.cmd_11070]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest276\Generated276\Generated276.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest276\Generated276
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b30864.cmd_11071]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30864\b30864\b30864.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30864\b30864
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated738.cmd_11072]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest738\Generated738\Generated738.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest738\Generated738
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated707.cmd_11073]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest707\Generated707\Generated707.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest707\Generated707
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated590.cmd_11074]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest590\Generated590\Generated590.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest590\Generated590
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated846.cmd_11075]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest846\Generated846\Generated846.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest846\Generated846
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated434.cmd_11076]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest434\Generated434\Generated434.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest434\Generated434
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated966.cmd_11077]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest966\Generated966\Generated966.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest966\Generated966
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated586.cmd_11078]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest586\Generated586\Generated586.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest586\Generated586
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated489.cmd_11079]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest489\Generated489\Generated489.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest489\Generated489
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1467.cmd_11080]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1467\Generated1467\Generated1467.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1467\Generated1467
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated929.cmd_11081]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest929\Generated929\Generated929.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest929\Generated929
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1177.cmd_11082]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1177\Generated1177\Generated1177.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1177\Generated1177
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1053.cmd_11083]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1053\Generated1053\Generated1053.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1053\Generated1053
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1000.cmd_11084]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1000\Generated1000\Generated1000.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1000\Generated1000
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated808.cmd_11085]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest808\Generated808\Generated808.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest808\Generated808
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1225.cmd_11086]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1225\Generated1225\Generated1225.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1225\Generated1225
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated628.cmd_11087]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest628\Generated628\Generated628.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest628\Generated628
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1256.cmd_11088]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1256\Generated1256\Generated1256.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1256\Generated1256
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated600.cmd_11089]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest600\Generated600\Generated600.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest600\Generated600
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1492.cmd_11090]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1492\Generated1492\Generated1492.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1492\Generated1492
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1126.cmd_11091]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1126\Generated1126\Generated1126.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1126\Generated1126
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated10.cmd_11092]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest10\Generated10\Generated10.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest10\Generated10
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_359734.cmd_11093]
+RelativePath=JIT\Regression\JitBlue\DevDiv_359734\DevDiv_359734\DevDiv_359734.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_359734\DevDiv_359734
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[badcodeafterfinally_r.cmd_11094]
+RelativePath=JIT\Methodical\eh\deadcode\badcodeafterfinally_r\badcodeafterfinally_r.cmd
+WorkingDir=JIT\Methodical\eh\deadcode\badcodeafterfinally_r
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2444;NEW
+HostStyle=0
+
+[Generated180.cmd_11095]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest180\Generated180\Generated180.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest180\Generated180
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated118.cmd_11096]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest118\Generated118\Generated118.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest118\Generated118
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated948.cmd_11097]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest948\Generated948\Generated948.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest948\Generated948
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated44.cmd_11098]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest44\Generated44\Generated44.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest44\Generated44
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1295.cmd_11099]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1295\Generated1295\Generated1295.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1295\Generated1295
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated271.cmd_11100]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest271\Generated271\Generated271.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest271\Generated271
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated201.cmd_11101]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest201\Generated201\Generated201.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest201\Generated201
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[test-tls.cmd_11102]
+RelativePath=JIT\Directed\tls\test-tls\test-tls.cmd
+WorkingDir=JIT\Directed\tls\test-tls
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2441;NEW
+HostStyle=0
+
+[Generated1227.cmd_11103]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1227\Generated1227\Generated1227.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1227\Generated1227
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated282.cmd_11104]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest282\Generated282\Generated282.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest282\Generated282
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1101.cmd_11105]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1101\Generated1101\Generated1101.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1101\Generated1101
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated526.cmd_11106]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest526\Generated526\Generated526.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest526\Generated526
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated853.cmd_11107]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest853\Generated853\Generated853.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest853\Generated853
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1417.cmd_11108]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1417\Generated1417\Generated1417.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1417\Generated1417
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated96.cmd_11109]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest96\Generated96\Generated96.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest96\Generated96
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated588.cmd_11110]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest588\Generated588\Generated588.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest588\Generated588
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated525.cmd_11111]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest525\Generated525\Generated525.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest525\Generated525
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1487.cmd_11112]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1487\Generated1487\Generated1487.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1487\Generated1487
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated326.cmd_11113]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest326\Generated326\Generated326.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest326\Generated326
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated726.cmd_11114]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest726\Generated726\Generated726.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest726\Generated726
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated553.cmd_11116]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest553\Generated553\Generated553.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest553\Generated553
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated283.cmd_11117]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest283\Generated283\Generated283.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest283\Generated283
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1383.cmd_11118]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1383\Generated1383\Generated1383.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1383\Generated1383
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1175.cmd_11119]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1175\Generated1175\Generated1175.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1175\Generated1175
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated456.cmd_11120]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest456\Generated456\Generated456.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest456\Generated456
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1250.cmd_11121]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1250\Generated1250\Generated1250.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1250\Generated1250
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated840.cmd_11122]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest840\Generated840\Generated840.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest840\Generated840
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i11.cmd_11123]
+RelativePath=JIT\jit64\mcc\interop\mcc_i11\mcc_i11.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i11
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated715.cmd_11124]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest715\Generated715\Generated715.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest715\Generated715
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated300.cmd_11125]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest300\Generated300\Generated300.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest300\Generated300
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated998.cmd_11126]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest998\Generated998\Generated998.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest998\Generated998
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1258.cmd_11127]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1258\Generated1258\Generated1258.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1258\Generated1258
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated459.cmd_11128]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest459\Generated459\Generated459.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest459\Generated459
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated815.cmd_11129]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest815\Generated815\Generated815.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest815\Generated815
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[uint64Opt_do.cmd_11130]
+RelativePath=JIT\Directed\shift\uint64Opt_do\uint64Opt_do.cmd
+WorkingDir=JIT\Directed\shift\uint64Opt_do
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated369.cmd_11131]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest369\Generated369\Generated369.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest369\Generated369
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated269.cmd_11132]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest269\Generated269\Generated269.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest269\Generated269
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated683.cmd_11133]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest683\Generated683\Generated683.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest683\Generated683
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW;R2R_FAIL;9457
+HostStyle=0
+
+[Generated449.cmd_11134]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest449\Generated449\Generated449.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest449\Generated449
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1311.cmd_11135]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1311\Generated1311\Generated1311.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1311\Generated1311
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated26.cmd_11136]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest26\Generated26\Generated26.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest26\Generated26
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1032.cmd_11137]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1032\Generated1032\Generated1032.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1032\Generated1032
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated930.cmd_11138]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest930\Generated930\Generated930.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest930\Generated930
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1040.cmd_11139]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1040\Generated1040\Generated1040.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1040\Generated1040
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1107.cmd_11140]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1107\Generated1107\Generated1107.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1107\Generated1107
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1067.cmd_11141]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1067\Generated1067\Generated1067.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1067\Generated1067
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b41852.cmd_11142]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b41852\b41852\b41852.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b41852\b41852
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated78.cmd_11143]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest78\Generated78\Generated78.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest78\Generated78
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GetGenerationWR2.cmd_11144]
+RelativePath=GC\API\GC\GetGenerationWR2\GetGenerationWR2.cmd
+WorkingDir=GC\API\GC\GetGenerationWR2
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated749.cmd_11145]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest749\Generated749\Generated749.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest749\Generated749
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated148.cmd_11146]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest148\Generated148\Generated148.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest148\Generated148
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated813.cmd_11147]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest813\Generated813\Generated813.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest813\Generated813
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated194.cmd_11148]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest194\Generated194\Generated194.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest194\Generated194
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated234.cmd_11149]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest234\Generated234\Generated234.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest234\Generated234
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated57.cmd_11150]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest57\Generated57\Generated57.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest57\Generated57
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated469.cmd_11151]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest469\Generated469\Generated469.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest469\Generated469
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated755.cmd_11152]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest755\Generated755\Generated755.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest755\Generated755
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated787.cmd_11153]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest787\Generated787\Generated787.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest787\Generated787
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated241.cmd_11154]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest241\Generated241\Generated241.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest241\Generated241
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated690.cmd_11155]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest690\Generated690\Generated690.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest690\Generated690
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[binarytrees3.cmd_11156]
+RelativePath=JIT\Performance\CodeQuality\BenchmarksGame\binarytrees\binarytrees3\binarytrees3.cmd
+WorkingDir=JIT\Performance\CodeQuality\BenchmarksGame\binarytrees\binarytrees3
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated781.cmd_11157]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest781\Generated781\Generated781.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest781\Generated781
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1119.cmd_11158]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1119\Generated1119\Generated1119.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1119\Generated1119
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated513.cmd_11159]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest513\Generated513\Generated513.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest513\Generated513
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated343.cmd_11160]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest343\Generated343\Generated343.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest343\Generated343
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated809.cmd_11161]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest809\Generated809\Generated809.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest809\Generated809
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated617.cmd_11162]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest617\Generated617\Generated617.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest617\Generated617
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated532.cmd_11163]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest532\Generated532\Generated532.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest532\Generated532
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated441.cmd_11164]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest441\Generated441\Generated441.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest441\Generated441
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated751.cmd_11165]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest751\Generated751\Generated751.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest751\Generated751
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1414.cmd_11166]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1414\Generated1414\Generated1414.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1414\Generated1414
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated388.cmd_11167]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest388\Generated388\Generated388.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest388\Generated388
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated722.cmd_11168]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest722\Generated722\Generated722.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest722\Generated722
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated542.cmd_11169]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest542\Generated542\Generated542.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest542\Generated542
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_8460.cmd_11170]
+RelativePath=JIT\Regression\JitBlue\GitHub_8460\GitHub_8460\GitHub_8460.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_8460\GitHub_8460
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated688.cmd_11171]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest688\Generated688\Generated688.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest688\Generated688
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated169.cmd_11172]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest169\Generated169\Generated169.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest169\Generated169
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated584.cmd_11173]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest584\Generated584\Generated584.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest584\Generated584
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated558.cmd_11174]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest558\Generated558\Generated558.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest558\Generated558
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated771.cmd_11175]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest771\Generated771\Generated771.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest771\Generated771
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[arglist.cmd_11176]
+RelativePath=JIT\Directed\PREFIX\unaligned\4\arglist\arglist.cmd
+WorkingDir=JIT\Directed\PREFIX\unaligned\4\arglist
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1384.cmd_11177]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1384\Generated1384\Generated1384.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1384\Generated1384
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1441.cmd_11178]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1441\Generated1441\Generated1441.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1441\Generated1441
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b35784.cmd_11179]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b35784\b35784\b35784.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b35784\b35784
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated445.cmd_11180]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest445\Generated445\Generated445.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest445\Generated445
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated424.cmd_11181]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest424\Generated424\Generated424.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest424\Generated424
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated200.cmd_11182]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest200\Generated200\Generated200.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest200\Generated200
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated916.cmd_11183]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest916\Generated916\Generated916.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest916\Generated916
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated820.cmd_11184]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest820\Generated820\Generated820.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest820\Generated820
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1262.cmd_11185]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1262\Generated1262\Generated1262.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1262\Generated1262
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated717.cmd_11186]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest717\Generated717\Generated717.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest717\Generated717
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1086.cmd_11187]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1086\Generated1086\Generated1086.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1086\Generated1086
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1213.cmd_11188]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1213\Generated1213\Generated1213.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1213\Generated1213
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1061.cmd_11189]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1061\Generated1061\Generated1061.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1061\Generated1061
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated110.cmd_11190]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest110\Generated110\Generated110.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest110\Generated110
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated871.cmd_11191]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest871\Generated871\Generated871.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest871\Generated871
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated12.cmd_11192]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest12\Generated12\Generated12.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest12\Generated12
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1244.cmd_11193]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1244\Generated1244\Generated1244.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1244\Generated1244
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[runmoduleconstructor.cmd_11194]
+RelativePath=baseservices\compilerservices\modulector\runmoduleconstructor\runmoduleconstructor.cmd
+WorkingDir=baseservices\compilerservices\modulector\runmoduleconstructor
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated117.cmd_11195]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest117\Generated117\Generated117.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest117\Generated117
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1240.cmd_11196]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1240\Generated1240\Generated1240.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1240\Generated1240
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1341.cmd_11197]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1341\Generated1341\Generated1341.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1341\Generated1341
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated39.cmd_11198]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest39\Generated39\Generated39.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest39\Generated39
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1443.cmd_11199]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1443\Generated1443\Generated1443.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1443\Generated1443
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated727.cmd_11200]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest727\Generated727\Generated727.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest727\Generated727
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[doublinknoleak.cmd_11201]
+RelativePath=GC\Scenarios\DoublinkList\doublinknoleak\doublinknoleak.cmd
+WorkingDir=GC\Scenarios\DoublinkList\doublinknoleak
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;3392;LONG_RUNNING;NEW
+HostStyle=0
+
+[Generated411.cmd_11202]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest411\Generated411\Generated411.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest411\Generated411
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated663.cmd_11203]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest663\Generated663\Generated663.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest663\Generated663
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated391.cmd_11204]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest391\Generated391\Generated391.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest391\Generated391
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1347.cmd_11205]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1347\Generated1347\Generated1347.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1347\Generated1347
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated918.cmd_11206]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest918\Generated918\Generated918.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest918\Generated918
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated696.cmd_11207]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest696\Generated696\Generated696.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest696\Generated696
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1211.cmd_11208]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1211\Generated1211\Generated1211.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1211\Generated1211
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW;R2R_FAIL;9457
+HostStyle=0
+
+[Generated577.cmd_11209]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest577\Generated577\Generated577.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest577\Generated577
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated91.cmd_11210]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest91\Generated91\Generated91.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest91\Generated91
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated640.cmd_11211]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest640\Generated640\Generated640.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest640\Generated640
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated308.cmd_11212]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest308\Generated308\Generated308.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest308\Generated308
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1453.cmd_11213]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1453\Generated1453\Generated1453.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1453\Generated1453
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1450.cmd_11214]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1450\Generated1450\Generated1450.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1450\Generated1450
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1473.cmd_11215]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1473\Generated1473\Generated1473.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1473\Generated1473
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_8220.cmd_11216]
+RelativePath=JIT\Regression\JitBlue\GitHub_8220\GitHub_8220\GitHub_8220.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_8220\GitHub_8220
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1018.cmd_11217]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1018\Generated1018\Generated1018.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1018\Generated1018
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated187.cmd_11218]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest187\Generated187\Generated187.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest187\Generated187
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated506.cmd_11219]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest506\Generated506\Generated506.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest506\Generated506
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated769.cmd_11220]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest769\Generated769\Generated769.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest769\Generated769
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1247.cmd_11221]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1247\Generated1247\Generated1247.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1247\Generated1247
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated533.cmd_11222]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest533\Generated533\Generated533.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest533\Generated533
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated307.cmd_11223]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest307\Generated307\Generated307.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest307\Generated307
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated102.cmd_11224]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest102\Generated102\Generated102.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest102\Generated102
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1036.cmd_11225]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1036\Generated1036\Generated1036.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1036\Generated1036
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated579.cmd_11226]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest579\Generated579\Generated579.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest579\Generated579
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated288.cmd_11227]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest288\Generated288\Generated288.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest288\Generated288
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated786.cmd_11228]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest786\Generated786\Generated786.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest786\Generated786
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated620.cmd_11229]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest620\Generated620\Generated620.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest620\Generated620
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1410.cmd_11230]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1410\Generated1410\Generated1410.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1410\Generated1410
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated574.cmd_11231]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest574\Generated574\Generated574.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest574\Generated574
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[superpmicollect.cmd_11232]
+RelativePath=JIT\superpmi\superpmicollect\superpmicollect.cmd
+WorkingDir=JIT\superpmi\superpmicollect
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;NEW
+HostStyle=0
+
+[Generated483.cmd_11233]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest483\Generated483\Generated483.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest483\Generated483
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated228.cmd_11234]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest228\Generated228\Generated228.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest228\Generated228
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated564.cmd_11235]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest564\Generated564\Generated564.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest564\Generated564
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated399.cmd_11236]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest399\Generated399\Generated399.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest399\Generated399
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated137.cmd_11237]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest137\Generated137\Generated137.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest137\Generated137
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1003.cmd_11238]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1003\Generated1003\Generated1003.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1003\Generated1003
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[rva_rvastatic2.cmd_11239]
+RelativePath=JIT\Directed\intrinsic\interlocked\rva_rvastatic2\rva_rvastatic2.cmd
+WorkingDir=JIT\Directed\intrinsic\interlocked\rva_rvastatic2
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated993.cmd_11240]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest993\Generated993\Generated993.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest993\Generated993
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated851.cmd_11241]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest851\Generated851\Generated851.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest851\Generated851
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1197.cmd_11242]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1197\Generated1197\Generated1197.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1197\Generated1197
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1187.cmd_11243]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1187\Generated1187\Generated1187.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1187\Generated1187
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated225.cmd_11244]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest225\Generated225\Generated225.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest225\Generated225
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated365.cmd_11245]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest365\Generated365\Generated365.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest365\Generated365
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1338.cmd_11246]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1338\Generated1338\Generated1338.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1338\Generated1338
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated571.cmd_11247]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest571\Generated571\Generated571.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest571\Generated571
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated838.cmd_11248]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest838\Generated838\Generated838.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest838\Generated838
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated115.cmd_11249]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest115\Generated115\Generated115.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest115\Generated115
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated856.cmd_11250]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest856\Generated856\Generated856.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest856\Generated856
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1115.cmd_11251]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1115\Generated1115\Generated1115.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1115\Generated1115
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1217.cmd_11252]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1217\Generated1217\Generated1217.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1217\Generated1217
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[ModConst.cmd_11253]
+RelativePath=JIT\CodeGenBringUpTests\ModConst\ModConst.cmd
+WorkingDir=JIT\CodeGenBringUpTests\ModConst
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated475.cmd_11254]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest475\Generated475\Generated475.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest475\Generated475
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1320.cmd_11255]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1320\Generated1320\Generated1320.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1320\Generated1320
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated378.cmd_11256]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest378\Generated378\Generated378.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest378\Generated378
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_il_relpointer_i.cmd_11257]
+RelativePath=JIT\Methodical\tailcall\_il_relpointer_i\_il_relpointer_i.cmd
+WorkingDir=JIT\Methodical\tailcall\_il_relpointer_i
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated955.cmd_11258]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest955\Generated955\Generated955.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest955\Generated955
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated721.cmd_11259]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest721\Generated721\Generated721.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest721\Generated721
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated215.cmd_11260]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest215\Generated215\Generated215.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest215\Generated215
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated531.cmd_11261]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest531\Generated531\Generated531.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest531\Generated531
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1153.cmd_11262]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1153\Generated1153\Generated1153.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1153\Generated1153
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated59.cmd_11263]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest59\Generated59\Generated59.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest59\Generated59
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated711.cmd_11264]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest711\Generated711\Generated711.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest711\Generated711
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1434.cmd_11265]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1434\Generated1434\Generated1434.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1434\Generated1434
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1058.cmd_11266]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1058\Generated1058\Generated1058.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1058\Generated1058
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated125.cmd_11267]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest125\Generated125\Generated125.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest125\Generated125
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated959.cmd_11268]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest959\Generated959\Generated959.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest959\Generated959
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated184.cmd_11269]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest184\Generated184\Generated184.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest184\Generated184
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1105.cmd_11270]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1105\Generated1105\Generated1105.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1105\Generated1105
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated67.cmd_11271]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest67\Generated67\Generated67.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest67\Generated67
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated842.cmd_11272]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest842\Generated842\Generated842.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest842\Generated842
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated231.cmd_11273]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest231\Generated231\Generated231.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest231\Generated231
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated782.cmd_11274]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest782\Generated782\Generated782.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest782\Generated782
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1470.cmd_11275]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1470\Generated1470\Generated1470.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1470\Generated1470
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1166.cmd_11276]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1166\Generated1166\Generated1166.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1166\Generated1166
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[rvastatic1.cmd_11277]
+RelativePath=JIT\Directed\rvastatics\rvastatic1\rvastatic1.cmd
+WorkingDir=JIT\Directed\rvastatics\rvastatic1
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated708.cmd_11278]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest708\Generated708\Generated708.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest708\Generated708
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1242.cmd_11279]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1242\Generated1242\Generated1242.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1242\Generated1242
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1362.cmd_11280]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1362\Generated1362\Generated1362.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1362\Generated1362
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated396.cmd_11281]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest396\Generated396\Generated396.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest396\Generated396
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated758.cmd_11282]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest758\Generated758\Generated758.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest758\Generated758
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1339.cmd_11283]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1339\Generated1339\Generated1339.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1339\Generated1339
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated352.cmd_11284]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest352\Generated352\Generated352.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest352\Generated352
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1276.cmd_11285]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1276\Generated1276\Generated1276.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1276\Generated1276
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated265.cmd_11286]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest265\Generated265\Generated265.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest265\Generated265
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_il_dbgseq.cmd_11287]
+RelativePath=JIT\Methodical\refany\_il_dbgseq\_il_dbgseq.cmd
+WorkingDir=JIT\Methodical\refany\_il_dbgseq
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[mcc_i61.cmd_11288]
+RelativePath=JIT\jit64\mcc\interop\mcc_i61\mcc_i61.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i61
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1500.cmd_11289]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1500\Generated1500\Generated1500.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1500\Generated1500
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1154.cmd_11290]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1154\Generated1154\Generated1154.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1154\Generated1154
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1418.cmd_11291]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1418\Generated1418\Generated1418.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1418\Generated1418
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated630.cmd_11292]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest630\Generated630\Generated630.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest630\Generated630
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1491.cmd_11293]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1491\Generated1491\Generated1491.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1491\Generated1491
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i13.cmd_11294]
+RelativePath=JIT\jit64\mcc\interop\mcc_i13\mcc_i13.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i13
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated568.cmd_11295]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest568\Generated568\Generated568.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest568\Generated568
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated364.cmd_11296]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest364\Generated364\Generated364.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest364\Generated364
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated536.cmd_11297]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest536\Generated536\Generated536.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest536\Generated536
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated428.cmd_11298]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest428\Generated428\Generated428.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest428\Generated428
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1188.cmd_11299]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1188\Generated1188\Generated1188.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1188\Generated1188
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated802.cmd_11300]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest802\Generated802\Generated802.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest802\Generated802
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated52.cmd_11301]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest52\Generated52\Generated52.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest52\Generated52
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1346.cmd_11302]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1346\Generated1346\Generated1346.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1346\Generated1346
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated664.cmd_11303]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest664\Generated664\Generated664.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest664\Generated664
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1455.cmd_11304]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1455\Generated1455\Generated1455.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1455\Generated1455
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated926.cmd_11305]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest926\Generated926\Generated926.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest926\Generated926
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated172.cmd_11306]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest172\Generated172\Generated172.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest172\Generated172
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1144.cmd_11307]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1144\Generated1144\Generated1144.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1144\Generated1144
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated974.cmd_11308]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest974\Generated974\Generated974.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest974\Generated974
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated155.cmd_11309]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest155\Generated155\Generated155.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest155\Generated155
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated886.cmd_11310]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest886\Generated886\Generated886.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest886\Generated886
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated274.cmd_11311]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest274\Generated274\Generated274.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest274\Generated274
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1169.cmd_11312]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1169\Generated1169\Generated1169.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1169\Generated1169
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1294.cmd_11313]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1294\Generated1294\Generated1294.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1294\Generated1294
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_280127.cmd_11314]
+RelativePath=JIT\Regression\JitBlue\DevDiv_280127\DevDiv_280127\DevDiv_280127.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_280127\DevDiv_280127
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1243.cmd_11315]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1243\Generated1243\Generated1243.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1243\Generated1243
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1321.cmd_11316]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1321\Generated1321\Generated1321.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1321\Generated1321
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated177.cmd_11317]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest177\Generated177\Generated177.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest177\Generated177
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1411.cmd_11318]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1411\Generated1411\Generated1411.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1411\Generated1411
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated303.cmd_11319]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest303\Generated303\Generated303.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest303\Generated303
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated36.cmd_11320]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest36\Generated36\Generated36.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest36\Generated36
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1437.cmd_11321]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1437\Generated1437\Generated1437.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1437\Generated1437
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated960.cmd_11322]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest960\Generated960\Generated960.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest960\Generated960
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated321.cmd_11323]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest321\Generated321\Generated321.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest321\Generated321
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1436.cmd_11324]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1436\Generated1436\Generated1436.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1436\Generated1436
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated333.cmd_11325]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest333\Generated333\Generated333.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest333\Generated333
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated915.cmd_11326]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest915\Generated915\Generated915.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest915\Generated915
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1378.cmd_11327]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1378\Generated1378\Generated1378.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1378\Generated1378
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated680.cmd_11328]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest680\Generated680\Generated680.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest680\Generated680
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated747.cmd_11329]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest747\Generated747\Generated747.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest747\Generated747
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1237.cmd_11330]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1237\Generated1237\Generated1237.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1237\Generated1237
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1074.cmd_11331]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1074\Generated1074\Generated1074.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1074\Generated1074
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated712.cmd_11332]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest712\Generated712\Generated712.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest712\Generated712
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated735.cmd_11333]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest735\Generated735\Generated735.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest735\Generated735
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i83.cmd_11334]
+RelativePath=JIT\jit64\mcc\interop\mcc_i83\mcc_i83.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i83
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated858.cmd_11335]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest858\Generated858\Generated858.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest858\Generated858
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated272.cmd_11336]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest272\Generated272\Generated272.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest272\Generated272
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated239.cmd_11337]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest239\Generated239\Generated239.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest239\Generated239
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated777.cmd_11338]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest777\Generated777\Generated777.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest777\Generated777
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1480.cmd_11339]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1480\Generated1480\Generated1480.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1480\Generated1480
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated499.cmd_11340]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest499\Generated499\Generated499.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest499\Generated499
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1111.cmd_11341]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1111\Generated1111\Generated1111.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1111\Generated1111
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated35.cmd_11342]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest35\Generated35\Generated35.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest35\Generated35
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated127.cmd_11343]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest127\Generated127\Generated127.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest127\Generated127
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated433.cmd_11344]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest433\Generated433\Generated433.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest433\Generated433
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated403.cmd_11345]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest403\Generated403\Generated403.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest403\Generated403
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated224.cmd_11346]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest224\Generated224\Generated224.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest224\Generated224
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated920.cmd_11347]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest920\Generated920\Generated920.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest920\Generated920
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated906.cmd_11348]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest906\Generated906\Generated906.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest906\Generated906
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1033.cmd_11349]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1033\Generated1033\Generated1033.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1033\Generated1033
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1136.cmd_11350]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1136\Generated1136\Generated1136.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1136\Generated1136
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated232.cmd_11351]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest232\Generated232\Generated232.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest232\Generated232
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1497.cmd_11352]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1497\Generated1497\Generated1497.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1497\Generated1497
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated199.cmd_11353]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest199\Generated199\Generated199.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest199\Generated199
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1363.cmd_11354]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1363\Generated1363\Generated1363.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1363\Generated1363
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i30.cmd_11355]
+RelativePath=JIT\jit64\mcc\interop\mcc_i30\mcc_i30.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i30
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated597.cmd_11356]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest597\Generated597\Generated597.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest597\Generated597
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated356.cmd_11357]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest356\Generated356\Generated356.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest356\Generated356
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1063.cmd_11358]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1063\Generated1063\Generated1063.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1063\Generated1063
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated675.cmd_11359]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest675\Generated675\Generated675.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest675\Generated675
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1352.cmd_11360]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1352\Generated1352\Generated1352.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1352\Generated1352
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated496.cmd_11361]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest496\Generated496\Generated496.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest496\Generated496
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1484.cmd_11362]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1484\Generated1484\Generated1484.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1484\Generated1484
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated897.cmd_11363]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest897\Generated897\Generated897.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest897\Generated897
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1235.cmd_11364]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1235\Generated1235\Generated1235.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1235\Generated1235
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated636.cmd_11365]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest636\Generated636\Generated636.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest636\Generated636
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1079.cmd_11366]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1079\Generated1079\Generated1079.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1079\Generated1079
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated89.cmd_11367]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest89\Generated89\Generated89.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest89\Generated89
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated159.cmd_11368]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest159\Generated159\Generated159.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest159\Generated159
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated828.cmd_11369]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest828\Generated828\Generated828.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest828\Generated828
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated275.cmd_11370]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest275\Generated275\Generated275.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest275\Generated275
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1422.cmd_11371]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1422\Generated1422\Generated1422.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1422\Generated1422
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated359.cmd_11372]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest359\Generated359\Generated359.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest359\Generated359
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated50.cmd_11373]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest50\Generated50\Generated50.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest50\Generated50
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated975.cmd_11374]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest975\Generated975\Generated975.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest975\Generated975
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated216.cmd_11375]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest216\Generated216\Generated216.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest216\Generated216
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[verify01_dynamic.cmd_11376]
+RelativePath=JIT\jit64\localloc\verify\verify01_dynamic\verify01_dynamic.cmd
+WorkingDir=JIT\jit64\localloc\verify\verify01_dynamic
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;4851;NEW
+HostStyle=0
+
+[Generated1094.cmd_11377]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1094\Generated1094\Generated1094.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1094\Generated1094
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated697.cmd_11378]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest697\Generated697\Generated697.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest697\Generated697
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1412.cmd_11379]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1412\Generated1412\Generated1412.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1412\Generated1412
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1272.cmd_11380]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1272\Generated1272\Generated1272.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1272\Generated1272
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated657.cmd_11381]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest657\Generated657\Generated657.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest657\Generated657
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated865.cmd_11382]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest865\Generated865\Generated865.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest865\Generated865
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated94.cmd_11383]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest94\Generated94\Generated94.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest94\Generated94
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[UModConst.cmd_11384]
+RelativePath=JIT\CodeGenBringUpTests\UModConst\UModConst.cmd
+WorkingDir=JIT\CodeGenBringUpTests\UModConst
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated99.cmd_11385]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest99\Generated99\Generated99.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest99\Generated99
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated237.cmd_11386]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest237\Generated237\Generated237.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest237\Generated237
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated109.cmd_11387]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest109\Generated109\Generated109.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest109\Generated109
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated263.cmd_11388]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest263\Generated263\Generated263.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest263\Generated263
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated832.cmd_11389]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest832\Generated832\Generated832.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest832\Generated832
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1469.cmd_11390]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1469\Generated1469\Generated1469.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1469\Generated1469
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1400.cmd_11391]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1400\Generated1400\Generated1400.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1400\Generated1400
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated75.cmd_11392]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest75\Generated75\Generated75.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest75\Generated75
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1397.cmd_11393]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1397\Generated1397\Generated1397.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1397\Generated1397
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated732.cmd_11394]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest732\Generated732\Generated732.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest732\Generated732
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated643.cmd_11395]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest643\Generated643\Generated643.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest643\Generated643
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated893.cmd_11396]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest893\Generated893\Generated893.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest893\Generated893
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1097.cmd_11397]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1097\Generated1097\Generated1097.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1097\Generated1097
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated174.cmd_11398]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest174\Generated174\Generated174.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest174\Generated174
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated123.cmd_11399]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest123\Generated123\Generated123.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest123\Generated123
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i62.cmd_11400]
+RelativePath=JIT\jit64\mcc\interop\mcc_i62\mcc_i62.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i62
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1398.cmd_11401]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1398\Generated1398\Generated1398.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1398\Generated1398
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[_il_dbglocalloc.cmd_11402]
+RelativePath=JIT\Methodical\xxobj\operand\_il_dbglocalloc\_il_dbglocalloc.cmd
+WorkingDir=JIT\Methodical\xxobj\operand\_il_dbglocalloc
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2444;NEW
+HostStyle=0
+
+[mcc_i50.cmd_11403]
+RelativePath=JIT\jit64\mcc\interop\mcc_i50\mcc_i50.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i50
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated341.cmd_11404]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest341\Generated341\Generated341.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest341\Generated341
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated253.cmd_11405]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest253\Generated253\Generated253.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest253\Generated253
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated211.cmd_11406]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest211\Generated211\Generated211.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest211\Generated211
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated46.cmd_11407]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest46\Generated46\Generated46.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest46\Generated46
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated494.cmd_11408]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest494\Generated494\Generated494.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest494\Generated494
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated972.cmd_11409]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest972\Generated972\Generated972.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest972\Generated972
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated163.cmd_11410]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest163\Generated163\Generated163.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest163\Generated163
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated324.cmd_11411]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest324\Generated324\Generated324.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest324\Generated324
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1157.cmd_11412]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1157\Generated1157\Generated1157.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1157\Generated1157
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1007.cmd_11413]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1007\Generated1007\Generated1007.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1007\Generated1007
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated92.cmd_11414]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest92\Generated92\Generated92.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest92\Generated92
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated613.cmd_11415]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest613\Generated613\Generated613.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest613\Generated613
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW;R2R_FAIL;9457
+HostStyle=0
+
+[Generated602.cmd_11416]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest602\Generated602\Generated602.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest602\Generated602
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GetGenerationWR.cmd_11417]
+RelativePath=GC\API\GC\GetGenerationWR\GetGenerationWR.cmd
+WorkingDir=GC\API\GC\GetGenerationWR
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1286.cmd_11418]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1286\Generated1286\Generated1286.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1286\Generated1286
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1141.cmd_11419]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1141\Generated1141\Generated1141.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1141\Generated1141
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1475.cmd_11420]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1475\Generated1475\Generated1475.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1475\Generated1475
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated684.cmd_11421]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest684\Generated684\Generated684.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest684\Generated684
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated935.cmd_11422]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest935\Generated935\Generated935.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest935\Generated935
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated866.cmd_11423]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest866\Generated866\Generated866.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest866\Generated866
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated53.cmd_11424]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest53\Generated53\Generated53.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest53\Generated53
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1178.cmd_11425]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1178\Generated1178\Generated1178.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1178\Generated1178
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated691.cmd_11426]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest691\Generated691\Generated691.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest691\Generated691
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated305.cmd_11427]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest305\Generated305\Generated305.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest305\Generated305
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_5696.cmd_11428]
+RelativePath=JIT\Regression\JitBlue\GitHub_5696\GitHub_5696\GitHub_5696.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_5696\GitHub_5696
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated204.cmd_11429]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest204\Generated204\Generated204.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest204\Generated204
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated698.cmd_11430]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest698\Generated698\Generated698.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest698\Generated698
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated154.cmd_11431]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest154\Generated154\Generated154.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest154\Generated154
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1151.cmd_11432]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1151\Generated1151\Generated1151.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1151\Generated1151
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1427.cmd_11433]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1427\Generated1427\Generated1427.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1427\Generated1427
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1147.cmd_11434]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1147\Generated1147\Generated1147.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1147\Generated1147
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1117.cmd_11435]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1117\Generated1117\Generated1117.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1117\Generated1117
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated170.cmd_11436]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest170\Generated170\Generated170.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest170\Generated170
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated144.cmd_11437]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest144\Generated144\Generated144.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest144\Generated144
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated152.cmd_11438]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest152\Generated152\Generated152.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest152\Generated152
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated642.cmd_11439]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest642\Generated642\Generated642.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest642\Generated642
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated470.cmd_11440]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest470\Generated470\Generated470.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest470\Generated470
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated4.cmd_11441]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest4\Generated4\Generated4.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest4\Generated4
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1355.cmd_11442]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1355\Generated1355\Generated1355.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1355\Generated1355
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated983.cmd_11443]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest983\Generated983\Generated983.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest983\Generated983
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated310.cmd_11444]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest310\Generated310\Generated310.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest310\Generated310
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated185.cmd_11445]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest185\Generated185\Generated185.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest185\Generated185
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated667.cmd_11446]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest667\Generated667\Generated667.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest667\Generated667
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1112.cmd_11447]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1112\Generated1112\Generated1112.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1112\Generated1112
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated54.cmd_11448]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest54\Generated54\Generated54.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest54\Generated54
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1047.cmd_11449]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1047\Generated1047\Generated1047.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1047\Generated1047
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated917.cmd_11450]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest917\Generated917\Generated917.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest917\Generated917
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated899.cmd_11451]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest899\Generated899\Generated899.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest899\Generated899
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1200.cmd_11452]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1200\Generated1200\Generated1200.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1200\Generated1200
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1416.cmd_11453]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1416\Generated1416\Generated1416.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1416\Generated1416
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1356.cmd_11454]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1356\Generated1356\Generated1356.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1356\Generated1356
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated337.cmd_11455]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest337\Generated337\Generated337.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest337\Generated337
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[rvastatic5.cmd_11456]
+RelativePath=JIT\Directed\rvastatics\rvastatic5\rvastatic5.cmd
+WorkingDir=JIT\Directed\rvastatics\rvastatic5
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[pinvoke-bug.cmd_11457]
+RelativePath=JIT\Directed\pinvoke\pinvoke-bug\pinvoke-bug.cmd
+WorkingDir=JIT\Directed\pinvoke\pinvoke-bug
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated323.cmd_11458]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest323\Generated323\Generated323.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest323\Generated323
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1064.cmd_11459]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1064\Generated1064\Generated1064.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1064\Generated1064
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated931.cmd_11460]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest931\Generated931\Generated931.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest931\Generated931
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated327.cmd_11461]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest327\Generated327\Generated327.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest327\Generated327
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated380.cmd_11462]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest380\Generated380\Generated380.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest380\Generated380
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated545.cmd_11463]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest545\Generated545\Generated545.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest545\Generated545
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated629.cmd_11464]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest629\Generated629\Generated629.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest629\Generated629
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated907.cmd_11465]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest907\Generated907\Generated907.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest907\Generated907
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated87.cmd_11466]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest87\Generated87\Generated87.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest87\Generated87
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated370.cmd_11467]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest370\Generated370\Generated370.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest370\Generated370
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1460.cmd_11468]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1460\Generated1460\Generated1460.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1460\Generated1460
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated372.cmd_11469]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest372\Generated372\Generated372.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest372\Generated372
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated550.cmd_11470]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest550\Generated550\Generated550.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest550\Generated550
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated919.cmd_11471]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest919\Generated919\Generated919.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest919\Generated919
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1344.cmd_11472]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1344\Generated1344\Generated1344.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1344\Generated1344
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1087.cmd_11473]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1087\Generated1087\Generated1087.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1087\Generated1087
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated18.cmd_11474]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest18\Generated18\Generated18.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest18\Generated18
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated14.cmd_11475]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest14\Generated14\Generated14.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest14\Generated14
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1463.cmd_11476]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1463\Generated1463\Generated1463.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1463\Generated1463
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated119.cmd_11477]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest119\Generated119\Generated119.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest119\Generated119
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[preemptive_cooperative.cmd_11478]
+RelativePath=JIT\Directed\pinvoke\preemptive_cooperative\preemptive_cooperative.cmd
+WorkingDir=JIT\Directed\pinvoke\preemptive_cooperative
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW;R2R_FAIL;10069;2434
+HostStyle=0
+
+[Generated1089.cmd_11479]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1089\Generated1089\Generated1089.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1089\Generated1089
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1442.cmd_11480]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1442\Generated1442\Generated1442.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1442\Generated1442
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated353.cmd_11481]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest353\Generated353\Generated353.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest353\Generated353
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated724.cmd_11482]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest724\Generated724\Generated724.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest724\Generated724
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated599.cmd_11483]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest599\Generated599\Generated599.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest599\Generated599
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated859.cmd_11484]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest859\Generated859\Generated859.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest859\Generated859
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated389.cmd_11485]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest389\Generated389\Generated389.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest389\Generated389
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated422.cmd_11486]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest422\Generated422\Generated422.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest422\Generated422
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated565.cmd_11487]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest565\Generated565\Generated565.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest565\Generated565
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[SpanBench.cmd_11488]
+RelativePath=JIT\Performance\CodeQuality\Span\SpanBench\SpanBench.cmd
+WorkingDir=JIT\Performance\CodeQuality\Span\SpanBench
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;10544;NEW
+HostStyle=0
+
+[Generated1202.cmd_11489]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1202\Generated1202\Generated1202.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1202\Generated1202
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated518.cmd_11490]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest518\Generated518\Generated518.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest518\Generated518
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated397.cmd_11491]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest397\Generated397\Generated397.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest397\Generated397
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[rva_rvastatic4.cmd_11492]
+RelativePath=JIT\Directed\intrinsic\interlocked\rva_rvastatic4\rva_rvastatic4.cmd
+WorkingDir=JIT\Directed\intrinsic\interlocked\rva_rvastatic4
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated249.cmd_11493]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest249\Generated249\Generated249.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest249\Generated249
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated939.cmd_11494]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest939\Generated939\Generated939.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest939\Generated939
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated900.cmd_11495]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest900\Generated900\Generated900.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest900\Generated900
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1379.cmd_11496]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1379\Generated1379\Generated1379.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1379\Generated1379
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1385.cmd_11497]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1385\Generated1385\Generated1385.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1385\Generated1385
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1051.cmd_11498]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1051\Generated1051\Generated1051.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1051\Generated1051
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated923.cmd_11499]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest923\Generated923\Generated923.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest923\Generated923
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated490.cmd_11500]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest490\Generated490\Generated490.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest490\Generated490
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[rva_rvastatic3.cmd_11501]
+RelativePath=JIT\Directed\intrinsic\interlocked\rva_rvastatic3\rva_rvastatic3.cmd
+WorkingDir=JIT\Directed\intrinsic\interlocked\rva_rvastatic3
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;2451;NEW
+HostStyle=0
+
+[Generated968.cmd_11502]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest968\Generated968\Generated968.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest968\Generated968
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1.cmd_11503]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1\Generated1\Generated1.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1\Generated1
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated757.cmd_11504]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest757\Generated757\Generated757.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest757\Generated757
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated739.cmd_11505]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest739\Generated739\Generated739.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest739\Generated739
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated268.cmd_11506]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest268\Generated268\Generated268.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest268\Generated268
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1204.cmd_11507]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1204\Generated1204\Generated1204.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1204\Generated1204
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated135.cmd_11508]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest135\Generated135\Generated135.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest135\Generated135
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated973.cmd_11509]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest973\Generated973\Generated973.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest973\Generated973
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated822.cmd_11510]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest822\Generated822\Generated822.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest822\Generated822
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1164.cmd_11511]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1164\Generated1164\Generated1164.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1164\Generated1164
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[b88793.cmd_11512]
+RelativePath=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88793\b88793\b88793.cmd
+WorkingDir=JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88793\b88793
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated58.cmd_11513]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest58\Generated58\Generated58.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest58\Generated58
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated552.cmd_11514]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest552\Generated552\Generated552.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest552\Generated552
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1251.cmd_11515]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1251\Generated1251\Generated1251.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1251\Generated1251
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated694.cmd_11516]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest694\Generated694\Generated694.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest694\Generated694
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated764.cmd_11517]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest764\Generated764\Generated764.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest764\Generated764
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated646.cmd_11518]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest646\Generated646\Generated646.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest646\Generated646
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i12.cmd_11519]
+RelativePath=JIT\jit64\mcc\interop\mcc_i12\mcc_i12.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i12
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated1282.cmd_11520]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1282\Generated1282\Generated1282.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1282\Generated1282
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated205.cmd_11521]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest205\Generated205\Generated205.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest205\Generated205
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated745.cmd_11522]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest745\Generated745\Generated745.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest745\Generated745
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_359736_r.cmd_11523]
+RelativePath=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_r\DevDiv_359736_r.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_359736\DevDiv_359736_r
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated29.cmd_11524]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest29\Generated29\Generated29.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest29\Generated29
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1407.cmd_11525]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1407\Generated1407\Generated1407.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1407\Generated1407
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated287.cmd_11526]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest287\Generated287\Generated287.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest287\Generated287
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1195.cmd_11527]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1195\Generated1195\Generated1195.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1195\Generated1195
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated924.cmd_11528]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest924\Generated924\Generated924.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest924\Generated924
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DevDiv_280120.cmd_11529]
+RelativePath=JIT\Regression\JitBlue\DevDiv_280120\DevDiv_280120\DevDiv_280120.cmd
+WorkingDir=JIT\Regression\JitBlue\DevDiv_280120\DevDiv_280120
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1162.cmd_11530]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1162\Generated1162\Generated1162.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1162\Generated1162
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated539.cmd_11532]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest539\Generated539\Generated539.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest539\Generated539
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_8133.cmd_11533]
+RelativePath=JIT\Regression\JitBlue\GitHub_8133\GitHub_8133\GitHub_8133.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_8133\GitHub_8133
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1329.cmd_11534]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1329\Generated1329\Generated1329.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1329\Generated1329
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated289.cmd_11535]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest289\Generated289\Generated289.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest289\Generated289
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated938.cmd_11536]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest938\Generated938\Generated938.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest938\Generated938
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated678.cmd_11537]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest678\Generated678\Generated678.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest678\Generated678
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated505.cmd_11538]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest505\Generated505\Generated505.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest505\Generated505
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated812.cmd_11539]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest812\Generated812\Generated812.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest812\Generated812
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1372.cmd_11540]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1372\Generated1372\Generated1372.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1372\Generated1372
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated706.cmd_11541]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest706\Generated706\Generated706.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest706\Generated706
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1331.cmd_11542]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1331\Generated1331\Generated1331.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1331\Generated1331
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated450.cmd_11543]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest450\Generated450\Generated450.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest450\Generated450
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1335.cmd_11544]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1335\Generated1335\Generated1335.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1335\Generated1335
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[mcc_i80.cmd_11545]
+RelativePath=JIT\jit64\mcc\interop\mcc_i80\mcc_i80.cmd
+WorkingDir=JIT\jit64\mcc\interop\mcc_i80
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;9462;NEW
+HostStyle=0
+
+[Generated652.cmd_11546]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest652\Generated652\Generated652.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest652\Generated652
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated134.cmd_11547]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest134\Generated134\Generated134.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest134\Generated134
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1091.cmd_11548]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1091\Generated1091\Generated1091.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1091\Generated1091
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated474.cmd_11549]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest474\Generated474\Generated474.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest474\Generated474
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated314.cmd_11550]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest314\Generated314\Generated314.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest314\Generated314
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1252.cmd_11551]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1252\Generated1252\Generated1252.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1252\Generated1252
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1438.cmd_11552]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1438\Generated1438\Generated1438.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1438\Generated1438
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1270.cmd_11553]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1270\Generated1270\Generated1270.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1270\Generated1270
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1458.cmd_11554]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1458\Generated1458\Generated1458.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1458\Generated1458
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated794.cmd_11555]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest794\Generated794\Generated794.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest794\Generated794
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated168.cmd_11556]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest168\Generated168\Generated168.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest168\Generated168
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1245.cmd_11557]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1245\Generated1245\Generated1245.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1245\Generated1245
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated139.cmd_11558]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest139\Generated139\Generated139.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest139\Generated139
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1317.cmd_11559]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1317\Generated1317\Generated1317.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1317\Generated1317
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1008.cmd_11560]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1008\Generated1008\Generated1008.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1008\Generated1008
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated534.cmd_11561]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest534\Generated534\Generated534.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest534\Generated534
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1269.cmd_11562]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1269\Generated1269\Generated1269.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1269\Generated1269
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated345.cmd_11563]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest345\Generated345\Generated345.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest345\Generated345
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Generated1083.cmd_11564]
+RelativePath=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1083\Generated1083\Generated1083.cmd
+WorkingDir=Loader\classloader\TypeGeneratorTests\TypeGeneratorTest1083\Generated1083
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFCos.cmd_11565]
+RelativePath=CoreMangLib\cti\system\mathf\MathFCos\MathFCos.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFCos
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[sealeddefault.cmd_11566]
+RelativePath=JIT\opt\Devirtualization\sealeddefault\sealeddefault.cmd
+WorkingDir=JIT\opt\Devirtualization\sealeddefault
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[StringReplace3.cmd_11567]
+RelativePath=CoreMangLib\cti\system\string\StringReplace3\StringReplace3.cmd
+WorkingDir=CoreMangLib\cti\system\string\StringReplace3
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFRound1.cmd_11568]
+RelativePath=CoreMangLib\cti\system\mathf\MathFRound1\MathFRound1.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFRound1
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[ArrayJagged.cmd_11569]
+RelativePath=JIT\CodeGenBringUpTests\ArrayJagged\ArrayJagged.cmd
+WorkingDir=JIT\CodeGenBringUpTests\ArrayJagged
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFFloor.cmd_11570]
+RelativePath=CoreMangLib\cti\system\mathf\MathFFloor\MathFFloor.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFFloor
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[comparable.cmd_11571]
+RelativePath=JIT\opt\Devirtualization\comparable\comparable.cmd
+WorkingDir=JIT\opt\Devirtualization\comparable
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[sealedmethod.cmd_11572]
+RelativePath=JIT\opt\Devirtualization\sealedmethod\sealedmethod.cmd
+WorkingDir=JIT\opt\Devirtualization\sealedmethod
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[generic.cmd_11573]
+RelativePath=JIT\opt\Devirtualization\generic\generic.cmd
+WorkingDir=JIT\opt\Devirtualization\generic
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[ForeignThreadExceptions.cmd_11574]
+RelativePath=Exceptions\ForeignThread\ForeignThreadExceptions\ForeignThreadExceptions.cmd
+WorkingDir=Exceptions\ForeignThread\ForeignThreadExceptions
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;10636;NEW
+HostStyle=0
+
+[MathFExp.cmd_11575]
+RelativePath=CoreMangLib\cti\system\mathf\MathFExp\MathFExp.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFExp
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFMax.cmd_11576]
+RelativePath=CoreMangLib\cti\system\mathf\MathFMax\MathFMax.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFMax
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFAtan2.cmd_11577]
+RelativePath=CoreMangLib\cti\system\mathf\MathFAtan2\MathFAtan2.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFAtan2
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFAtan.cmd_11578]
+RelativePath=CoreMangLib\cti\system\mathf\MathFAtan\MathFAtan.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFAtan
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFRound2.cmd_11579]
+RelativePath=CoreMangLib\cti\system\mathf\MathFRound2\MathFRound2.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFRound2
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[fromcollection.cmd_11580]
+RelativePath=JIT\opt\Devirtualization\fromcollection\fromcollection.cmd
+WorkingDir=JIT\opt\Devirtualization\fromcollection
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_9651.cmd_11581]
+RelativePath=JIT\Regression\JitBlue\GitHub_9651\GitHub_9651\GitHub_9651.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_9651\GitHub_9651
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[overload.cmd_11582]
+RelativePath=JIT\opt\Devirtualization\overload\overload.cmd
+WorkingDir=JIT\opt\Devirtualization\overload
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFIEEERemainder.cmd_11583]
+RelativePath=CoreMangLib\cti\system\mathf\MathFIEEERemainder\MathFIEEERemainder.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFIEEERemainder
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFCosh.cmd_11584]
+RelativePath=CoreMangLib\cti\system\mathf\MathFCosh\MathFCosh.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFCosh
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[ArrayExc.cmd_11585]
+RelativePath=JIT\CodeGenBringUpTests\ArrayExc\ArrayExc.cmd
+WorkingDir=JIT\CodeGenBringUpTests\ArrayExc
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFSqrt.cmd_11586]
+RelativePath=CoreMangLib\cti\system\mathf\MathFSqrt\MathFSqrt.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFSqrt
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Vector3GetHash_r.cmd_11587]
+RelativePath=JIT\SIMD\Vector3GetHash_r\Vector3GetHash_r.cmd
+WorkingDir=JIT\SIMD\Vector3GetHash_r
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[CoreFX_15913.cmd_11588]
+RelativePath=JIT\Regression\JitBlue\CoreFX_15913\CoreFX_15913\CoreFX_15913.cmd
+WorkingDir=JIT\Regression\JitBlue\CoreFX_15913\CoreFX_15913
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFMin.cmd_11589]
+RelativePath=CoreMangLib\cti\system\mathf\MathFMin\MathFMin.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFMin
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[sealedclass.cmd_11590]
+RelativePath=JIT\opt\Devirtualization\sealedclass\sealedclass.cmd
+WorkingDir=JIT\opt\Devirtualization\sealedclass
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Array4.cmd_11591]
+RelativePath=JIT\CodeGenBringUpTests\Array4\Array4.cmd
+WorkingDir=JIT\CodeGenBringUpTests\Array4
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[override.cmd_11592]
+RelativePath=JIT\opt\Devirtualization\override\override.cmd
+WorkingDir=JIT\opt\Devirtualization\override
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[enum.cmd_11593]
+RelativePath=JIT\opt\Devirtualization\enum\enum.cmd
+WorkingDir=JIT\opt\Devirtualization\enum
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Array3.cmd_11594]
+RelativePath=JIT\CodeGenBringUpTests\Array3\Array3.cmd
+WorkingDir=JIT\CodeGenBringUpTests\Array3
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFSin.cmd_11595]
+RelativePath=CoreMangLib\cti\system\mathf\MathFSin\MathFSin.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFSin
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[CheckProjects.cmd_11596]
+RelativePath=JIT\CheckProjects\CheckProjects\CheckProjects.cmd
+WorkingDir=JIT\CheckProjects\CheckProjects
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_FAIL;10635;NEW
+HostStyle=0
+
+[ArrayMD1.cmd_11597]
+RelativePath=JIT\CodeGenBringUpTests\ArrayMD1\ArrayMD1.cmd
+WorkingDir=JIT\CodeGenBringUpTests\ArrayMD1
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFLog10.cmd_11598]
+RelativePath=CoreMangLib\cti\system\mathf\MathFLog10\MathFLog10.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFLog10
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFSign.cmd_11599]
+RelativePath=CoreMangLib\cti\system\mathf\MathFSign\MathFSign.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFSign
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFE.cmd_11600]
+RelativePath=CoreMangLib\cti\system\mathf\MathFE\MathFE.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFE
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFCeiling.cmd_11601]
+RelativePath=CoreMangLib\cti\system\mathf\MathFCeiling\MathFCeiling.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFCeiling
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_10311.cmd_11602]
+RelativePath=JIT\opt\Devirtualization\GitHub_10311\GitHub_10311.cmd
+WorkingDir=JIT\opt\Devirtualization\GitHub_10311
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[late.cmd_11603]
+RelativePath=JIT\opt\Devirtualization\late\late.cmd
+WorkingDir=JIT\opt\Devirtualization\late
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[inlinedevirt.cmd_11604]
+RelativePath=JIT\opt\Devirtualization\inlinedevirt\inlinedevirt.cmd
+WorkingDir=JIT\opt\Devirtualization\inlinedevirt
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFSinh.cmd_11605]
+RelativePath=CoreMangLib\cti\system\mathf\MathFSinh\MathFSinh.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFSinh
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFPI.cmd_11606]
+RelativePath=CoreMangLib\cti\system\mathf\MathFPI\MathFPI.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFPI
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFAbs.cmd_11607]
+RelativePath=CoreMangLib\cti\system\mathf\MathFAbs\MathFAbs.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFAbs
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[sharedoverride.cmd_11608]
+RelativePath=JIT\opt\Devirtualization\sharedoverride\sharedoverride.cmd
+WorkingDir=JIT\opt\Devirtualization\sharedoverride
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFTan.cmd_11609]
+RelativePath=CoreMangLib\cti\system\mathf\MathFTan\MathFTan.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFTan
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Vector3GetHash_ro.cmd_11610]
+RelativePath=JIT\SIMD\Vector3GetHash_ro\Vector3GetHash_ro.cmd
+WorkingDir=JIT\SIMD\Vector3GetHash_ro
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[exacttype.cmd_11611]
+RelativePath=JIT\opt\Devirtualization\exacttype\exacttype.cmd
+WorkingDir=JIT\opt\Devirtualization\exacttype
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[simple.cmd_11612]
+RelativePath=JIT\opt\Devirtualization\simple\simple.cmd
+WorkingDir=JIT\opt\Devirtualization\simple
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Array2.cmd_11613]
+RelativePath=JIT\CodeGenBringUpTests\Array2\Array2.cmd
+WorkingDir=JIT\CodeGenBringUpTests\Array2
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_9945.cmd_11614]
+RelativePath=JIT\opt\Devirtualization\GitHub_9945\GitHub_9945.cmd
+WorkingDir=JIT\opt\Devirtualization\GitHub_9945
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DeadThreads.cmd_11615]
+RelativePath=baseservices\threading\DeadThreads\DeadThreads\DeadThreads.cmd
+WorkingDir=baseservices\threading\DeadThreads\DeadThreads
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[ldtokenmember.cmd_11616]
+RelativePath=reflection\ldtoken\ldtokenmember\ldtokenmember.cmd
+WorkingDir=reflection\ldtoken\ldtokenmember
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFLog.cmd_11617]
+RelativePath=CoreMangLib\cti\system\mathf\MathFLog\MathFLog.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFLog
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[Array1.cmd_11618]
+RelativePath=JIT\CodeGenBringUpTests\Array1\Array1.cmd
+WorkingDir=JIT\CodeGenBringUpTests\Array1
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFAcos.cmd_11619]
+RelativePath=CoreMangLib\cti\system\mathf\MathFAcos\MathFAcos.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFAcos
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFPow.cmd_11620]
+RelativePath=CoreMangLib\cti\system\mathf\MathFPow\MathFPow.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFPow
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[covariance.cmd_11621]
+RelativePath=JIT\opt\Devirtualization\covariance\covariance.cmd
+WorkingDir=JIT\opt\Devirtualization\covariance
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[ArrBoundUnsigned.cmd_11622]
+RelativePath=JIT\opt\AssertionPropagation\ArrBoundUnsigned\ArrBoundUnsigned.cmd
+WorkingDir=JIT\opt\AssertionPropagation\ArrBoundUnsigned
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_9891.cmd_11623]
+RelativePath=JIT\Regression\JitBlue\GitHub_9891\GitHub_9891\GitHub_9891.cmd
+WorkingDir=JIT\Regression\JitBlue\GitHub_9891\GitHub_9891
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[DynMethodJumpStubTests.cmd_11624]
+RelativePath=CoreMangLib\cti\system\reflection\emit\DynMethodJumpStubTests\DynMethodJumpStubTests\DynMethodJumpStubTests.cmd
+WorkingDir=CoreMangLib\cti\system\reflection\emit\DynMethodJumpStubTests\DynMethodJumpStubTests
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[MathFTanh.cmd_11625]
+RelativePath=CoreMangLib\cti\system\mathf\MathFTanh\MathFTanh.cmd
+WorkingDir=CoreMangLib\cti\system\mathf\MathFTanh
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[ArrayMD2.cmd_11626]
+RelativePath=JIT\CodeGenBringUpTests\ArrayMD2\ArrayMD2.cmd
+WorkingDir=JIT\CodeGenBringUpTests\ArrayMD2
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[contravariance.cmd_11627]
+RelativePath=JIT\opt\Devirtualization\contravariance\contravariance.cmd
+WorkingDir=JIT\opt\Devirtualization\contravariance
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[k-nucleotide.cmd_11628]
+RelativePath=JIT\Performance\CodeQuality\BenchmarksGame\k-nucleotide\k-nucleotide\k-nucleotide.cmd
+WorkingDir=JIT\Performance\CodeQuality\BenchmarksGame\k-nucleotide\k-nucleotide
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[ArrayObj.cmd_11629]
+RelativePath=JIT\CodeGenBringUpTests\ArrayObj\ArrayObj.cmd
+WorkingDir=JIT\CodeGenBringUpTests\ArrayObj
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
+HostStyle=0
+
+[GitHub_9945_2.cmd_11630]
+RelativePath=JIT\opt\Devirtualization\GitHub_9945_2\GitHub_9945_2.cmd
+WorkingDir=JIT\opt\Devirtualization\GitHub_9945_2
+Expected=0
+MaxAllowedDurationSeconds=600
+Categories=EXPECTED_PASS;NEW
 HostStyle=0
+
diff --git a/tests/arm64/fails.testlist b/tests/arm64/fails.testlist
new file mode 100644
index 0000000000..783e1b41a3
--- /dev/null
+++ b/tests/arm64/fails.testlist
@@ -0,0 +1,22 @@
+// Optimization failure, No exception thrown
+JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_do/DevDiv_359736_do.sh
+JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_ro/DevDiv_359736_ro.sh
+
+// Unhandled Exception: System.InvalidProgramException: Common Language Runtime detected an invalid program.
+JIT/Methodical/tailcall_v4/smallFrame/smallFrame.sh
+
+// Failed to catch an exception
+Exceptions/ForeignThread/ForeignThreadExceptions/ForeignThreadExceptions.sh
+
+// Expected: 0x43e08b2a2c280290
+JIT/Regression/JitBlue/GitHub_3449/GitHub_3449/GitHub_3449.sh
+
+// Crossgen fails
+// https://github.com/dotnet/coreclr/issues/9481
+JIT/Performance/CodeQuality/Linq/Linq/Linq.sh
+JIT/Performance/CodeQuality/Math/Functions/Functions/Functions.sh
+JIT/Performance/CodeQuality/Serialization/Deserialize/Deserialize.sh
+JIT/Performance/CodeQuality/Serialization/Serialize/Serialize.sh
+JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478/b188478.sh
+JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478/DDB188478.sh
+Loader/classloader/regressions/dev11_95728/dev11_95728/dev11_95728.sh
diff --git a/tests/build.proj b/tests/build.proj
index 63db903219..518d59ca69 100644
--- a/tests/build.proj
+++ b/tests/build.proj
@@ -15,10 +15,16 @@
   <PropertyGroup>
     <TraversalBuildDependsOn>
       BatchRestorePackages;
+      BuildTargetingPack;
       $(TraversalBuildDependsOn);
     </TraversalBuildDependsOn>
   </PropertyGroup>
-  
+
+  <Target Name="BuildTargetingPack" AfterTargets="BatchRestorePackages">
+    <Message Text="Building Targeting Pack" Importance="High" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)\src\Common\external\external.depproj" />
+  </Target>
+
   <Target Name="BatchRestorePackages" DependsOnTargets="VerifyDependencies">
     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." />
     
diff --git a/tests/dir.props b/tests/dir.props
index 329e4bcc60..3a9b043b09 100644
--- a/tests/dir.props
+++ b/tests/dir.props
@@ -15,7 +15,7 @@
 
   <!--   
     Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer   
-    as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks.   
+    as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.6 version of the tasks.   
    -->   
   <PropertyGroup>  
     <BuildToolsTargets45>true</BuildToolsTargets45>   
@@ -29,7 +29,7 @@
     <PackagesDir>$(ProjectDir)..\packages\</PackagesDir>
     <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)..\Tools\</ToolsDir>
     <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/</DotnetCliPath>
-    <BuildToolsTaskDir Condition="'$(BuildToolsTargets45)' == 'true'">$(ToolsDir)net45/</BuildToolsTaskDir>
+    <BuildToolsTaskDir Condition="'$(BuildToolsTargets45)' == 'true'">$(ToolsDir)net46/</BuildToolsTaskDir>
     <SkipImportILTargets>true</SkipImportILTargets>
   </PropertyGroup>
 
@@ -54,6 +54,11 @@
     <OutputPath Condition="'$(OutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(BuildType)</OutputPath>
   </PropertyGroup>
 
+    <!-- Targeting Package paths -->
+  <PropertyGroup>
+    <TargetingPackPath Condition="'$(BaseTargetingPackPath)' == ''">$(RootBinDir)TargetingPack\</TargetingPackPath>
+  </PropertyGroup>
+
   <Import Condition="Exists('$(ToolsDir)BuildVersion.targets')" Project="$(ToolsDir)BuildVersion.targets" />
 
   <!-- Provides properties for dependency versions and configures dependency verification/auto-upgrade. -->
diff --git a/tests/helixprep.proj b/tests/helixprep.proj
index ea71dbadae..91aa4861d7 100644
--- a/tests/helixprep.proj
+++ b/tests/helixprep.proj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="12.0" DefaultTargets="ArchiveAll" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(ToolsDir)\net45\Microsoft.DotNet.Build.Tasks.dll"/>
+  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(ToolsDir)\net46\Microsoft.DotNet.Build.Tasks.dll"/>
   
   <Import Project="dir.props" />
   <Import Project="..\dir.props" />
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <TestCmds Include="$(DiscoveryDirectory)\**\*.cmd" ></TestCmds>
-    <XunitDlls Include="$(DiscoveryDirectory)\*\*.XUnitWrapper.dll" ></XunitDlls>
+    <XunitDlls Include="$(DiscoveryDirectory)\**\*.XUnitWrapper.dll" ></XunitDlls>
     <RequiresSigningFilesToDelete Include="$(DiscoveryDirectory)\**\*.requires_signing" />
   </ItemGroup>
 
@@ -47,6 +47,7 @@
     <Delete Files="@(RequiresSigningFilesToDelete)" />
     <MSBuild Projects="helixprep.proj"
              Properties="BuildPath=%(XunitDlls.RootDir)%(XunitDlls.Directory);ProjectName=%(XunitDlls.Filename);BuildArchiveDir=$(TestWorkingDir)archive\tests\"
+             BuildInParallel="true"
              Targets="ArchiveBuild" />
   </Target>
 
@@ -114,6 +115,7 @@ EXIT /B %ERRORLEVEL%
       <WrapperShContents>$(WrapperShContents)for scriptFilePath in %24(find . -type f -iname '%2A.sh' ! -iname "runtests.sh" | sort)%0a</WrapperShContents>
       <WrapperShContents>$(WrapperShContents)do%0a</WrapperShContents>
       <WrapperShContents>$(WrapperShContents) perl -pi -e 's/\r\n|\n|\r/\n/g' "%24scriptFilePath"%0a</WrapperShContents>
+      <WrapperShContents>$(WrapperShContents) chmod +x "%24scriptFilePath"%0a</WrapperShContents>
       <WrapperShContents>$(WrapperShContents)done%0a</WrapperShContents>
       <WrapperShContents>$(WrapperShContents)%0a</WrapperShContents>
       <WrapperShContents>$(WrapperShContents)echo BEGIN EXECUTION%0a</WrapperShContents>
diff --git a/tests/helixpublish.proj b/tests/helixpublish.proj
index aa967f1d48..fd9713ef30 100644
--- a/tests/helixpublish.proj
+++ b/tests/helixpublish.proj
@@ -1,67 +1,97 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <__BuildType>$(ConfigurationGroup)</__BuildType>
-  </PropertyGroup>
-
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dir.props" />
-  <Import Project="$(ToolsDir)CloudTest.targets" Condition="Exists('$(ToolsDir)CloudTest.targets')" />
-
-  <!-- Define test payload & Correlation (Core_Root) payload -->
-  <ItemGroup>
-    <TestList Include="$(TestWorkingDir)\archive\tests\*" ></TestList>
-    <CoreRootUri Include="$(TestWorkingDir)\archive\Core_Root*\*.zip" ></CoreRootUri>
-    <DummyPackages Include="$(TestWorkingDir)\archive\packages\*" ></DummyPackages>
-    <ForUpload Include="@(TestList)" ></ForUpload>
-    <ForUpload Include="@(CoreRootUri)" ></ForUpload>
-    <SupplementalPayload Include="@(DummyPackages)" >
-      <RelativeBlobPath>$(Platform)$(ConfigurationGroup)/Packages.zip</RelativeBlobPath>
-    </SupplementalPayload>
-  </ItemGroup>
-
-  <!-- Define name & location of test JSON blob -->
+  <!-- CoreClr-Specific Helix test submission project. -->
+
   <PropertyGroup>
-    <PayloadTestListFilename>Tests.$(ConfigurationGroup).json</PayloadTestListFilename>
-    <PayloadTestListFile>$(TestWorkingDir)$(PayloadTestListFilename)</PayloadTestListFile>
-    <SkipArchive>true</SkipArchive>
+    <!-- Workaround for dealing with building on Linux/OSX.  
+         It doesn't seem possible to pass a connection string on the command line, as it contains ';' characters. 
+         Checking for the existence of a connection string will happen inside CloudTest.Helix.targets -->
+    <CloudDropConnectionString    Condition="'$(CloudDropConnectionString)'==''"   >DefaultEndpointsProtocol=https;AccountName=$(CloudDropAccountName);AccountKey=$(CloudDropAccessToken);EndpointSuffix=core.windows.net</CloudDropConnectionString>
+    <CloudResultsConnectionString Condition="'$(CloudResultsConnectionString)'==''">DefaultEndpointsProtocol=https;AccountName=$(CloudResultsAccountName);AccountKey=$(CloudResultsAccessToken);EndpointSuffix=core.windows.net</CloudResultsConnectionString>    
+
+    <!-- Finally, these archives represent the zips of tests that are OSPlatform specific 
+         This is used by CloudTest.Helix.Targets to generate relative blob paths for archives. -->
+    <ArchivesRoot>$(TestWorkingDir)/archive/</ArchivesRoot>
+    <TestArchivesRoot>$(ArchivesRoot)tests</TestArchivesRoot> 
+
+    <RunnerScript Condition="'$(RunnerScript)' == ''">$(TestRunnerScript)</RunnerScript>
+    <SupplementalPayloadDir Condition="'$(SupplementalPayloadDir)' == ''">$(TestWorkingDir)SupplementalPayload/</SupplementalPayloadDir>
+
+    <!-- The old CloudTest.targets forced a single timeout value onto every test -->
+    <!-- Possible TODO: With the CloudTest.Helix.targets refactor, we have the ability to specify variable timeout-->
+    <TimeoutInSeconds Condition="'$(TimeoutInSeconds)' == ''">1000</TimeoutInSeconds>
+
+    <!-- Set required properties for Helix Submission -->
+    <IsOfficial Condition="'$(OfficialBuildId)'!=''">true</IsOfficial>
+    <CurrentDate>$([System.DateTime]::Now.ToString(yyyyMMdd.mmss))</CurrentDate>
+
+    <HelixJobType Condition="'$(HelixJobType)'==''">test/functional/cli/</HelixJobType>
+
+    <HelixSource Condition="'$(HelixSource)'=='' And '$(IsOfficial)'!='' And '$(TestProduct)'!='' And '$(Branch)'!=''">official/$(TestProduct)/$(Branch)/</HelixSource>
+    <HelixSource Condition="'$(HelixSource)'=='' And '$(IsOfficial)'=='' And '$(TestProduct)'!='' And '$(Branch)'!=''">pr/$(TestProduct)/$(Branch)/</HelixSource>
+    <HelixSource Condition="'$(HelixSource)'==''">pr/unknown/</HelixSource>
+
+    <!-- Local path for storing submission-related files -->
+    <HelixLogFolder>$(ArchivesRoot)</HelixLogFolder>
+
+    <!-- Properties used for submission by CloudTest.Helix.Targets-->
+    <BuildMoniker>$(CurrentDate)</BuildMoniker>
+    <BuildMoniker Condition="'$(IsOfficial)'=='true'">$(OfficialBuildId)</BuildMoniker>
+    <HelixArchLabel>$(Platform)</HelixArchLabel>
+    <HelixConfigLabel>$(BuildType)</HelixConfigLabel>
   </PropertyGroup>
 
-  <Target Name="CreateTestListJson"
-          DependsOnTargets="CreateAzureStorage">
+  <!-- Set Helix environment vars based on target platform -->
+  <!-- This is only used in the case where property 'UseScriptRunner' is true.-->
+  <PropertyGroup Condition="'$(TargetsWindows)' == 'true'">
+    <HelixPythonPath>%HELIX_PYTHONPATH%</HelixPythonPath>
+    <RunnerScript>%HELIX_CORRELATION_PAYLOAD%\RunnerScripts\scriptrunner\scriptrunner.py</RunnerScript>
+  </PropertyGroup>
 
-    <!-- Define Correlation Payload as a property -->
-    <PropertyGroup>
-      <CoreRootUris>$(DropUri)$(Platform)$(ConfigurationGroup)/Tests/$([System.String]::Copy('%(RecursiveDir)').Replace('\', '/'))%(CoreRootUri.Filename)%(CoreRootUri.Extension)$(DropUriReadOnlyToken)</CoreRootUris>
-      <CorrelationPayloadProperty>$(CorrelationPayloadUris);$(CoreRootUris)</CorrelationPayloadProperty>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetsWindows)' != 'true'">
+    <HelixPythonPath>$HELIX_PYTHONPATH</HelixPythonPath>
+    <RunnerScript>$HELIX_CORRELATION_PAYLOAD/RunnerScripts/scriptrunner/scriptrunner.py</RunnerScript>
+  </PropertyGroup>
 
+  <Target Name="CoreClrPreCloudBuild" >
+    <!-- Put anything you want to do before submitting the general purpose helix job here.
+         Helix requires properly formatted work items and accessible zip files / others to upload, which we'll construct here. -->
+    
+    <!-- Gather the test archives for this build 
+         If you change binplacing behavior and official runs break, 
+         this is a good place to check.-->
     <ItemGroup>
-      <TestList>
+      <HelixWorkItem Include="$(TestArchivesRoot)/*.zip" /> 
+    </ItemGroup>
+    <Message Text="Full test archive collection : @(HelixWorkItem)" Importance="Low" />
+
+    <!-- Verify the test archives exist.  
+         NOTE: It may be better to make this an error, but in the past we chose not to as this causes a build break when triggered, versus just no tests run. -->
+    <Warning Condition="'@(HelixWorkItem->Count())' == '0'" Text="Didn't find any test archives in supplied folders!!! Review logs to see where test archive(s) were placed and fix." />
+
+    <ItemGroup>      
+      <HelixCorrelationPayloadFile Include="$(ArchivesRoot)Core_Root*/*.zip">
+        <RelativeBlobPath>$(Platform)$(ConfigurationGroup)/%(Identity)</RelativeBlobPath>
+      </HelixCorrelationPayloadFile>
+      <HelixWorkItem>
         <Command Condition="'$(TargetsWindows)' == 'true'">$(HelixPythonPath) $(RunnerScript) --script %HELIX_WORKITEM_PAYLOAD%\runtests.cmd</Command>
         <Command Condition="'$(TargetsWindows)' != 'true'">chmod +x $HELIX_WORKITEM_PAYLOAD/runtests.sh &amp;&amp; $(HelixPythonPath) $(RunnerScript) --script $HELIX_WORKITEM_PAYLOAD/runtests.sh</Command>
-        <CorrelationPayloadUris>[$(CorrelationPayloadProperty)]</CorrelationPayloadUris>
-        <PayloadUri>$(DropUri)$(Platform)$(ConfigurationGroup)/Tests/$([System.String]::Copy('%(RecursiveDir)').Replace('\', '/'))%(Filename)%(Extension)$(DropUriReadOnlyToken)</PayloadUri>
+        <PayloadFile>%(Identity)</PayloadFile>
         <WorkItemId>%(Filename)</WorkItemId>
         <TimeoutInSeconds>$(TimeoutInSeconds)</TimeoutInSeconds>
-      </TestList>
-    </ItemGroup>
-    <WriteItemsToJson JsonFileName="$(PayloadTestListFile)" Items="@(TestList)" />
-    <!-- add test lists to the list of items for upload -->
-    <ItemGroup>
-      <ForUpload Include="$(PayloadTestListFile)">
-        <RelativeBlobPath>$(PayloadTestListFilename)</RelativeBlobPath>
-      </ForUpload>
-    </ItemGroup>
-    <!-- for completion event -->
-    <ItemGroup>
-      <TestListFile Include="$(PayloadTestListFile)">
-        <BuildCompleteJson>$(TestWorkingDir)$(OSPlatformConfig)/FuncBuildComplete.json</BuildCompleteJson>
-        <OfficialBuildJson>$(TestWorkingDir)$(OSPlatformConfig)/FuncOfficialBuild.json</OfficialBuildJson>
-        <HelixJobUploadCompletePath>$(TestWorkingDir)$(OSPlatformConfig)/helixjobuploadcomplete.sem</HelixJobUploadCompletePath>
-      </TestListFile>
+        <RelativeBlobPath>$(Platform)-$(ConfigurationGroup)/Tests/$([System.String]::Copy('%(RecursiveDir)').Replace('\', '/'))%(Filename)%(Extension)</RelativeBlobPath>
+      </HelixWorkItem>      
     </ItemGroup>
   </Target>
 
-  <Target Name="Build" />
+  <!-- Import this at the end so that it can compose properties as needed -->
+  <Import Project="$(ToolsDir)CloudTest.Helix.targets" />
 
+  <!-- main Entrypoint -->
+  <Target Name="Build">
+    <Message Text="CoreClr-specific Helix test upload project, beginning submission to Helix" />
+    <Message Condition="'$(EnableCloudTest)' == 'false'" Text="... skipping upload / submission due to property 'EnableCloudTest' being set to 'false'" />
+    <CallTarget Condition="'$(EnableCloudTest)' != 'false'" Targets="CoreClrPreCloudBuild;HelixCloudBuild" />
+  </Target>
+  
 </Project>
\ No newline at end of file
diff --git a/tests/issues.targets b/tests/issues.targets
index f24bc774c6..9f8b2b3dd4 100644
--- a/tests/issues.targets
+++ b/tests/issues.targets
@@ -46,12 +46,6 @@
         <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\DoublinkList\dlstack\*">
             <Issue>6553</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_d\bleref_il_d.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_r\bleref_il_r.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_d\ldelemnullarr1_il_d.cmd">
             <Issue>4851</Issue>
         </ExcludeList>
@@ -64,6 +58,9 @@
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_r\nonrefsdarr_il_r.cmd">
             <Issue>4851</Issue>
         </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b08046\b08046\b08046.cmd">
+            <Issue>4849</Issue>
+        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic1\rva_rvastatic1.cmd">
             <Issue>2451</Issue>
         </ExcludeList>
@@ -76,9 +73,6 @@
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic4\rva_rvastatic4.cmd">
             <Issue>2451</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\preemptive_cooperative\preemptive_cooperative.cmd">
-            <Issue>2434</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\RVAInit\extended\extended.cmd">
             <Issue>2451</Issue>
         </ExcludeList>
@@ -100,36 +94,12 @@
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic5\rvastatic5.cmd">
             <Issue>2451</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\mutualrecurthd-tls\mutualrecurthd-tls.cmd">
-            <Issue>2441</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\test-tls\test-tls.cmd">
-            <Issue>2441</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_dynamic\verify01_dynamic.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_large\verify01_large.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_small\verify01_small.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\regress\ndpw\21220\b21220\b21220.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\global_il_d\global_il_d.cmd">
             <Issue>2451</Issue>
         </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\global_il_r\global_il_r.cmd">
             <Issue>2451</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_d\badcodeafterfinally_d.cmd">
-            <Issue>2444</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_r\badcodeafterfinally_r.cmd">
-            <Issue>2444</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_dbgpointer\_il_dbgpointer.cmd">
             <Issue>2451</Issue>
         </ExcludeList>
@@ -142,33 +112,63 @@
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_relpointer_i\_il_relpointer_i.cmd">
             <Issue>2451</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_dbglocalloc\_il_dbglocalloc.cmd">
-            <Issue>2444</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_rellocalloc\_il_rellocalloc.cmd">
-            <Issue>2444</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-EJIT\v1-m10\b07847\b07847\b07847.cmd">
-            <Issue>2441</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49644\b49644\b49644.cmd">
             <Issue>2451</Issue>
         </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102637\b102637\b102637.cmd">
             <Issue>2451</Issue>
         </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b410474\b410474\b410474.cmd">
+            <Issue>2451</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_d\bleref_il_d.cmd">		
+            <Issue>4851</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_r\bleref_il_r.cmd">		
+            <Issue>4851</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_dynamic\verify01_dynamic.cmd">		
+            <Issue>4851</Issue>
+        </ExcludeList>		
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_large\verify01_large.cmd">		
+            <Issue>4851</Issue>
+        </ExcludeList>		
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_small\verify01_small.cmd">		
+            <Issue>4851</Issue>
+        </ExcludeList>		
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\regress\ndpw\21220\b21220\b21220.cmd">		
+            <Issue>4851</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\preemptive_cooperative\preemptive_cooperative.cmd">
+            <Issue>2434</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\mutualrecurthd-tls\mutualrecurthd-tls.cmd">
+            <Issue>2441</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\test-tls\test-tls.cmd">
+            <Issue>2441</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-EJIT\v1-m10\b07847\b07847\b07847.cmd">
+            <Issue>2441</Issue>
+        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b03689\b03689\b03689.cmd">
             <Issue>2441</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b08046\b08046\b08046.cmd">
-            <Issue>2414</Issue>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_d\badcodeafterfinally_d.cmd">
+            <Issue>2444</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_r\badcodeafterfinally_r.cmd">
+            <Issue>2444</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_dbglocalloc\_il_dbglocalloc.cmd">
+            <Issue>2444</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_rellocalloc\_il_rellocalloc.cmd">
+            <Issue>2444</Issue>
         </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\Dev11\dev10_865840\dev10_865840\dev10_865840.cmd">
             <Issue>2445</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b410474\b410474\b410474.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest612\Generated612\*">
             <Issue>6707</Issue>
         </ExcludeList>
@@ -187,12 +187,6 @@
         <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest683\Generated683\*">
             <Issue>6707</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\perf\doublealign\Locals\*">
-            <Issue>8418</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\DevDiv_377155\DevDiv_377155\*">
-            <Issue>9282</Issue>
-        </ExcludeList>
     </ItemGroup>
 
     <!-- The following are x86 failures -->
@@ -1737,5 +1731,20 @@
             <Issue>needs triage</Issue>
         </ExcludeList>
     </ItemGroup>
+
+    <!-- Failures while testing via ILLINK -->
+    
+    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(RunTestsViaIllink)' == 'true'">
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\superpmi\superpmicollect\superpmicollect.cmd">
+            <!-- Linker runs reset CORE_ROOT to the linked directory based on superpmicollect.exe.
+                 The test runs other benchmarks to collect superpmi data.
+                 These tests cannot run from the binaries generated wrt superpmicollect.exe -->
+            <Issue>By Test Infrastructure design</Issue>
+        </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\RVAInit\nested\nested.cmd">
+            <!-- Data refered from static field is dropped -->
+            <Issue>Bug</Issue>
+        </ExcludeList>
+    </ItemGroup>
     
 </Project>
diff --git a/tests/override.targets b/tests/override.targets
index 36a9615e73..a01163225f 100644
--- a/tests/override.targets
+++ b/tests/override.targets
@@ -6,27 +6,19 @@
   <!-- Contains overrides for the nuget reference resolution.  The regular nuget reference resolution will not 
        copy references local, which we need in order to correctly execute the xunit project -->
   <Import Project="xunitwrapper.targets" Condition="'$(IsXunitWrapperProject)'=='true'" />
-  
-  <!-- Override the AddDesignTimeFacadeReferences target to add the ability to reference the local version of mscorlib.
+
+  <!-- Override the AddDesignTimeFacadeReferences target to add the ability to reference System.Private.CoreLib.
        Some tests use functionality not available in the portable reference assemblies.
        For portability reasons it's generally a good idea to reference the facades instead of the 
        raw implementation assemblies.  However, these tests are useful. -->
   <Target Name="AddDesignTimeFacadeReferences"
-      Condition="'$(TargetingDefaultPlatform)' == 'true'"
+      Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'"
       BeforeTargets="ResolveReferences"
       DependsOnTargets="GetReferenceAssemblyPaths"
   >
-    <PropertyGroup>
-      <_resolvedMscorlib Condition="'%(ReferencePath.FileName)' == 'mscorlib'">true</_resolvedMscorlib>
-    </PropertyGroup>
 
-    <!-- TODO_SPC: ? -->
     <ItemGroup>
-      <PossibleTargetFrameworks Include="$(_TargetFrameworkDirectories)" />
-      <ReferencePath Include="%(PossibleTargetFrameworks.Identity)mscorlib.dll" 
-                     Condition="'$(ReferenceLocalMscorlib)' != 'true' and '$(_resolvedMscorlib)' != 'true' and '%(PossibleTargetFrameworks.Identity)' != '' and Exists('%(PossibleTargetFrameworks.Identity)mscorlib.dll')" />
-      <ReferencePath Include="$(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType)\ref\mscorlib.dll" 
-                     Condition="'$(ReferenceLocalMscorlib)' == 'true' and '$(_resolvedMscorlib)' != 'true'" />
+      <ReferencePath Include="$(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType)\System.Private.CoreLib.dll" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
index f9b1321698..eec373fb3c 100644
--- a/tests/publishdependency.targets
+++ b/tests/publishdependency.targets
@@ -3,8 +3,8 @@
 
   <UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
   <ItemGroup>
-    <TestTargetFramework Include=".NETCoreApp,Version=v1.1">
-      <Folder>netcoreapp1.1</Folder>
+    <TestTargetFramework Include=".NETCoreApp,Version=v2.0">
+      <Folder>netcoreapp2.0</Folder>
     </TestTargetFramework>
   </ItemGroup>
 
@@ -75,6 +75,7 @@
       </AllResolvedRuntimeDependencies>
       <RunTimeDependecyCopyLocalFile Include="@(AllResolvedRuntimeDependencies)"  Exclude="@(RunTimeDependecyExcludeFiles)"/>
       <RunTimeDependecyCopyLocal Include="@(RunTimeDependecyCopyLocalFile -> '%(File)')"  />
+      <RunTimeDependecyCopyLocal Include="$(TargetingPackPath)/*" />
     </ItemGroup>
     
     <Copy
@@ -122,6 +123,7 @@
       </AllResolvedRuntimeDependencies>
       <RunTimeDependecyCopyLocalFile Include="@(AllResolvedRuntimeDependencies)"  Exclude="@(RunTimeDependecyExcludeFiles)"/>
       <RunTimeDependecyCopyLocal Include="@(RunTimeDependecyCopyLocalFile -> '%(File)')"  />
+      <RunTimeDependecyCopyLocal Include="$(TargetingPackPath)/*" />
     </ItemGroup>
     
     <Copy
diff --git a/tests/runparallel.sh b/tests/runparallel.sh
new file mode 100755
index 0000000000..697d3a0019
--- /dev/null
+++ b/tests/runparallel.sh
@@ -0,0 +1,213 @@
+#!/usr/bin/env bash
+
+function print_usage {
+    echo ''
+    echo 'CoreCLR parallel test runner script.'
+    echo ''
+    echo 'Required arguments:'
+    echo '  --testRootDir=<path>             : Root directory of the test build (e.g. coreclr/bin/tests/Windows_NT.x64.Debug).'
+    echo '  --coreOverlayDir=<path>          : Directory containing core binaries and test dependencies. If not specified, the'
+    echo '                                     default is testRootDir/Tests/coreoverlay. This switch overrides --coreClrBinDir,'
+    echo '                                     --mscorlibDir, --coreFxBinDir, and --coreFxNativeBinDir.'
+    echo '  --playlist=<path>                : Run only the tests that are specified in the file at <path>, in the same format as'
+    echo ''
+    echo 'Optional arguments:'
+    echo '  -h|--help                        : Show usage information.'
+    echo '  --test-env                       : Script to set environment variables for tests'
+    echo ''
+}
+
+function print_results {
+    echo -e \
+       "Results @ $(date +%r)\n\t"\
+       "Pass:$countPassedTests\t"\
+       "Fail:$countFailedTests\n\t"\
+       "Finish:$countFinishedTests\t"\
+       "Incomplete: $countIncompleteTests\n\t"\
+       "Total: $countTotalTests"
+}
+
+function update_results {
+    # Initialize counters for bookkeeping.
+    countTotalTests=$(wc -l < $playlistFile)
+
+    countFinishedTests=$(cd results.int; grep -r 'RUN_TEST_EXIT_CODE' . | wc -l)
+    countPassedTests=$(cd results.int; grep -r 'RUN_TEST_EXIT_CODE=0' . | wc -l)
+    countFailedTests=$((countFinishedTests - countPassedTests))
+    countIncompleteTests=$((countTotalTests - countFinishedTests))
+
+    print_results
+}
+
+function print_elapsed_time {
+    time_end=$(date +"%s")
+    time_diff=$(($time_end-$time_start))
+    echo "$(($time_diff / 60)) minutes and $(($time_diff % 60)) seconds taken to run CoreCLR tests."
+}
+
+
+
+# Handle Ctrl-C. We will stop execution and print the results that
+# we gathered so far.
+function handle_ctrl_c {
+    local errorSource='handle_ctrl_c'
+
+    echo ""
+    echo "*** Stopping... ***"
+
+    update_results
+    echo "$errorSource" "Test run aborted by Ctrl+C."
+
+    print_elapsed_time
+
+    exit 1
+}
+
+function cleanup
+{
+    kill -TERM % >/dev/null
+    mv results.int results.$(date +%F_%I%M%p)
+}
+
+
+prep_test() {
+    # This function runs in a background process. It should not echo anything, and should not use global variables.
+
+    #remove any NI
+    rm -f $(dirname "$1")/*.ni.*
+}
+
+run_test() {
+    # This function runs in a background process. It should not echo anything, and should not use global variables.
+
+    local scriptFilePath=$1
+
+    local scriptFileName=$(basename "$scriptFilePath")
+    local outputFileName=$PWD/results.int/${scriptFilePath////.}
+
+    nice "$scriptFilePath" -debug=$(which time) >"$outputFileName" 2>&1
+
+    echo RUN_TEST_EXIT_CODE="$?" >>"$outputFileName"
+}
+
+# Argument variables
+testRootDir=
+coreOverlayDir=
+testEnv=
+playlistFile=
+
+for i in "$@"
+do
+    case $i in
+        -h|--help)
+            print_usage
+            exit $EXIT_CODE_SUCCESS
+            ;;
+        --coreOverlayDir=*)# Exit code constants
+            coreOverlayDir=${i#*=}
+            ;;
+        --playlist=*)
+            playlistFile=${i#*=}
+            ;;
+        --testRootDir=*)
+            testRootDir=${i#*=}
+            ;;
+        --test-env=*)
+            testEnv=${i#*=}
+            ;;
+        *)
+            echo "Unknown switch: $i"
+            print_usage
+            exit $EXIT_CODE_SUCCESS
+            ;;
+    esac
+done
+
+if [ -z "$coreOverlayDir" ]; then
+    echo "--coreOverlayDir is required."
+    print_usage
+    exit $EXIT_CODE_EXCEPTION
+fi
+
+if [ ! -d "$coreOverlayDir" ]; then
+    echo "Directory specified by --coreOverlayDir does not exist: $coreOverlayDir"
+    exit $EXIT_CODE_EXCEPTION
+fi
+
+if [ -z "$playlistFile" ]; then
+    echo "--playlist is required."
+    print_usage
+    exit $EXIT_CODE_EXCEPTION
+fi
+
+if [ ! -e "$playlistFile" ]; then
+    echo "File specified by --playlist does not exist: $playlistFile"
+    exit $EXIT_CODE_EXCEPTION
+fi
+
+if [ -z "$testRootDir" ]; then
+    echo "--testRootDir is required."
+    print_usage
+    exit $EXIT_CODE_EXCEPTION
+fi
+
+if [ ! -d "$testRootDir" ]; then
+    echo "Directory specified by --testRootDir does not exist: $testRootDir"
+    exit $EXIT_CODE_EXCEPTION
+fi
+
+if [ ! -z "$testEnv" ] && [ ! -e "$testEnv" ]; then
+    echo "File specified by --playlist does not exist: $testEnv"
+    exit $EXIT_CODE_EXCEPTION
+fi
+
+export CORE_ROOT="$coreOverlayDir"
+export __TestEnv=$testEnv
+
+
+# Variables for running tests in the background
+if [ `uname` = "NetBSD" ]; then
+    NumProc=$(getconf NPROCESSORS_ONLN)
+else
+    NumProc=$(getconf _NPROCESSORS_ONLN)
+fi
+
+export TIME='<Command time="%U %S %e" mem="%M %t %K" swap="%W %c %w" fault="%F %R %k %r %s" IO="%I %O" exit="%x"/>'
+
+export -f prep_test
+export -f run_test
+
+cd $testRootDir
+time_start=$(date +"%s")
+
+rm -rf results.int/* results.int
+
+echo "Prepping tests $(date +%r)"
+xargs -d "\n" -P $NumProc -I{} bash -c prep_test  {} < $playlistFile
+
+
+trap cleanup EXIT
+mkdir results.int
+echo $$ > results.int/pid
+cp $testEnv results.int
+
+trap handle_ctrl_c INT TERM
+
+xargs -d "\n" -P $NumProc -I{} bash -c 'run_test "{}" >/dev/null 2>&1' < $playlistFile &
+
+while true
+do
+    update_results
+    sleep 20 &
+    wait -n %
+    if (( $(jobs %xargs 2>/dev/null | wc -l) == 0 )) ;
+    then
+        break
+    fi
+
+    jobs -p > /dev/null
+done
+
+update_results
+
+print_elapsed_time
diff --git a/tests/runtest.cmd b/tests/runtest.cmd
index cfe2c3db41..dcff1bd2ee 100644
--- a/tests/runtest.cmd
+++ b/tests/runtest.cmd
@@ -8,10 +8,24 @@ set __BuildOS=Windows_NT
 set __MSBuildBuildArch=x64
 
 :: Default to highest Visual Studio version available
-set __VSVersion=vs2015
+::
+:: For VS2015 (and prior), only a single instance is allowed to be installed on a box
+:: and VS140COMNTOOLS is set as a global environment variable by the installer. This
+:: allows users to locate where the instance of VS2015 is installed.
+::
+:: For VS2017, multiple instances can be installed on the same box SxS and VS150COMNTOOLS
+:: is no longer set as a global environment variable and is instead only set if the user
+:: has launched the VS2017 Developer Command Prompt.
+::
+:: Following this logic, we will default to the VS2017 toolset if VS150COMNTOOLS tools is
+:: set, as this indicates the user is running from the VS2017 Developer Command Prompt and
+:: is already configured to use that toolset. Otherwise, we will fallback to using the VS2015
+:: toolset if it is installed. Finally, we will fail the script if no supported VS instance
+:: can be found.
+set __VSVersion=vs2017
 
-if defined VS120COMNTOOLS set __VSVersion=vs2013
 if defined VS140COMNTOOLS set __VSVersion=vs2015
+if defined VS150COMNTOOLS set __VSVersion=vs2017
 
 :: Define a prefix for most output progress messages that come from this script. That makes
 :: it easier to see where these are coming from. Note that there is a trailing space here.
@@ -30,6 +44,7 @@ set __LongGCTests=
 set __GCSimulatorTests=
 set __AgainstPackages=
 set __JitDisasm=
+set __CollectDumps=
 
 :Arg_Loop
 if "%1" == "" goto ArgsDone
@@ -49,8 +64,8 @@ if /i "%1" == "debug"                 (set __BuildType=Debug&shift&goto Arg_Loop
 if /i "%1" == "release"               (set __BuildType=Release&shift&goto Arg_Loop)
 if /i "%1" == "checked"               (set __BuildType=Checked&shift&goto Arg_Loop)
 
-if /i "%1" == "vs2013"                (set __VSVersion=%1&shift&goto Arg_Loop)
 if /i "%1" == "vs2015"                (set __VSVersion=%1&shift&goto Arg_Loop)
+if /i "%1" == "vs2017"                (set __VSVersion=%1&shift&goto Arg_Loop)
 
 if /i "%1" == "TestEnv"               (set __TestEnv=%2&shift&shift&goto Arg_Loop)
 if /i "%1" == "AgainstPackages"       (set __AgainstPackages=1&shift&goto Arg_Loop)
@@ -66,8 +81,11 @@ if /i "%1" == "jitdisasm"             (set __JitDisasm=1&shift&goto Arg_Loop)
 if /i "%1" == "GenerateLayoutOnly"    (set __GenerateLayoutOnly=1&shift&goto Arg_Loop)
 if /i "%1" == "PerfTests"             (set __PerfTests=true&shift&goto Arg_Loop)
 if /i "%1" == "runcrossgentests"      (set RunCrossGen=true&shift&goto Arg_Loop)
+if /i "%1" == "link"                  (set DoLink=true&set ILLINK=%2&shift&shift&goto Arg_Loop)
+
 REM change it to COMPlus_GCStress when we stop using xunit harness
 if /i "%1" == "gcstresslevel"         (set __GCSTRESSLEVEL=%2&set __TestTimeout=1800000&shift&shift&goto Arg_Loop)
+if /i "%1" == "collectdumps"          (set __CollectDumps=true&shift&goto Arg_Loop)
 
 if /i not "%1" == "msbuildargs" goto SkipMsbuildArgs
 :: All the rest of the args will be collected and passed directly to msbuild.
@@ -95,30 +113,26 @@ if not defined XunitTestReportDirBase set  XunitTestReportDirBase=%XunitTestBinB
 
 if not exist %__LogsDir% md %__LogsDir%
 
-set __VSProductVersion=
-if /i "%__VSVersion%" == "vs2013" set __VSProductVersion=120
-if /i "%__VSVersion%" == "vs2015" set __VSProductVersion=140
+set _msbuildexe=
+if /i "%__VSVersion%" == "vs2017" (
+  set "__VSToolsRoot=%VS150COMNTOOLS%"
+  set "__VCToolsRoot=%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build"
 
-:: Check presence of VS
-if not defined VS%__VSProductVersion%COMNTOOLS goto NoVS
+  set _msbuildexe="%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe"
+) else if /i "%__VSVersion%" == "vs2015" (
+  set "__VSToolsRoot=%VS140COMNTOOLS%"
+  set "__VCToolsRoot=%VS140COMNTOOLS%\..\..\VC"
 
-set __VSToolsRoot=!VS%__VSProductVersion%COMNTOOLS!
-if %__VSToolsRoot:~-1%==\ set "__VSToolsRoot=%__VSToolsRoot:~0,-1%"
+  set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
+  if not exist !_msbuildexe! set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
+)
 
 :: Does VS really exist?
 if not exist "%__VSToolsRoot%\..\IDE\devenv.exe"      goto NoVS
-if not exist "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" goto NoVS
+if not exist "%__VCToolsRoot%\vcvarsall.bat"          goto NoVS
 if not exist "%__VSToolsRoot%\VsDevCmd.bat"           goto NoVS
 
-if /i "%__VSVersion%" =="vs2015" goto MSBuild14
-set _msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
-goto :CheckMSBuild14
-:MSBuild14
-set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
-:CheckMSBuild14
-if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
+:: Does MSBuild really exist?
 if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe.  Please see https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md for build instructions. && exit /b 1
 
 :: Set the environment for the  build- VS cmd prompt
@@ -146,6 +160,10 @@ if defined __AgainstPackages (
     set __msbuildCommonArgs=%__msbuildCommonArgs% /p:BuildTestsAgainstPackages=true
 )
 
+if defined DoLink (
+    set __msbuildCommonArgs=%__msbuildCommonArgs% /p:RunTestsViaIllink=true
+)
+
 REM Prepare the Test Drop
 REM Cleans any NI from the last run
 powershell "Get-ChildItem -path %__TestWorkingDir% -Include '*.ni.*' -Recurse -Force | Remove-Item -force"
@@ -195,13 +213,37 @@ if not exist %XunitTestBinBase% (
     echo %__MsgPrefix%Run "buildtest.cmd %__BuildArch% %__BuildType%" to build the tests first.
     exit /b 1
 )
+
+if "%__CollectDumps%"=="true" (
+    :: Install dumpling
+    set "__DumplingHelperPath=%__ProjectDir%\..\Tools\DumplingHelper.py"
+    python "!__DumplingHelperPath!" install_dumpling
+
+    :: Create the crash dump folder if necessary
+    set "__CrashDumpFolder=%tmp%\CoreCLRTestCrashDumps"
+    if not exist "!__CrashDumpFolder!" (
+        mkdir "!__CrashDumpFolder!"
+    )
+
+    :: Grab the current time before execution begins. This will be used to determine which crash dumps
+    :: will be uploaded.
+    for /f "delims=" %%a in ('python !__DumplingHelperPath! get_timestamp') do @set __StartTime=%%a
+)
+
 echo %__MsgPrefix%CORE_ROOT that will be used is: %CORE_ROOT%
 echo %__MsgPrefix%Starting the test run ...
 
+del %CORE_ROOT%\mscorlib.ni.dll
+
 set __BuildLogRootName=TestRunResults
 call :msbuild "%__ProjectFilesDir%\runtest.proj" /p:Runtests=true /clp:showcommandline
+set __errorlevel=%errorlevel%
 
-if errorlevel 1 (
+if "%__CollectDumps%"=="true" (
+    python "%__DumplingHelperPath%" collect_dump %errorlevel% "%__CrashDumpFolder%" %__StartTime% "CoreCLR_Tests"
+)
+
+if %__errorlevel% GEQ 1 (
     echo Test Run failed. Refer to the following:
     echo     Html report: %__TestRunHtmlLog%
     exit /b 1
@@ -386,9 +428,10 @@ echo./? -? /h -h /help -help: view this message.
 echo BuildArch- Optional parameter - x64 or x86 ^(default: x64^).
 echo BuildType- Optional parameter - Debug, Release, or Checked ^(default: Debug^).
 echo TestEnv- Optional parameter - this will run a custom script to set custom test environment settings.
-echo VSVersion- Optional parameter - VS2013 or VS2015 ^(default: VS2015^)
+echo VSVersion- Optional parameter - VS2015 or VS2017 ^(default: VS2017^)
 echo AgainstPackages - Optional parameter - this indicates that we are running tests that were built against packages
 echo GenerateLayoutOnly - If specified will not run the tests and will only create the Runtime Dependency Layout
+echo link "ILlink"      - Runs the tests after linking via ILlink
 echo RunCrossgenTests   - Runs ReadytoRun tests
 echo jitstress n        - Runs the tests with COMPlus_JitStress=n
 echo jitstressregs n    - Runs the tests with COMPlus_JitStressRegs=n
@@ -403,6 +446,6 @@ echo CORE_ROOT The path to the runtime
 exit /b 1
 
 :NoVS
-echo Visual Studio 2013+ ^(Community is free^) is a prerequisite to build this repository.
+echo Visual Studio 2015 or 2017 (Community is free) is a prerequisite to build this repository.
 echo See: https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md#prerequisites
 exit /b 1
diff --git a/tests/runtest.proj b/tests/runtest.proj
index 45f2bb7702..58d3744a38 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -29,10 +29,13 @@
       <AllTestDirsPaths Include="@(AllTestDirsNonCanonicalPaths)" >
         <Path>$([System.IO.Path]::GetFullPath(%(Identity)))</Path>
       </AllTestDirsPaths>
-      <NonExcludedTestDirectories Include="@(AllTestDirsPaths -> '%(Path)')" Exclude="@(_SkipTestDir -> '$(XunitTestBinBase)%(Identity)')">
+      <NonExcludedTestDirectories Include="@(AllTestDirsPaths -> '%(Path)')" Exclude="@(_SkipTestDir -> '$(XunitTestBinBase)%(Identity)')" />
+      <TopLevelDirectories Include="@(NonExcludedTestDirectories)" />
+      <SecondLevel Include="$([System.IO.Directory]::GetDirectories(%(TopLevelDirectories.Identity)))" />
+      <SecondLevelDirectories Include="@(SecondLevel)">
         <Path>$([System.IO.Path]::GetFullPath(%(AllRunnableTestPaths.Identity)))</Path>
-      </NonExcludedTestDirectories>
-      <TestDirectoriesWithDup Include="@(NonExcludedTestDirectories -> '%(Identity)')" Condition="$([System.String]::new('%(Path)').StartsWith('%(Identity)'))" />
+      </SecondLevelDirectories>
+      <TestDirectoriesWithDup Include="@(SecondLevelDirectories -> '%(Identity)')" Condition="$([System.String]::new('%(Path)').StartsWith('%(Identity)'))" />
 
     </ItemGroup>
 
@@ -79,11 +82,8 @@ $(_XunitEpilog)
     <TargetFrameworkVersion Condition ="'$(BuildTestsAgainstPackages)' != 'true'">v4.5</TargetFrameworkVersion>
     <IsXunitWrapperProject>true</IsXunitWrapperProject>
     <SkipSigning>true</SkipSigning>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="%24(SolutionDir) == '' Or %24(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <IsTestProject>true</IsTestProject>
     <ProjectJson Condition="'$(BuildTestsAgainstPackages)' != 'true'">%24(TestWrappersPackagesConfigFileDirectory)project.json</ProjectJson>
@@ -118,7 +118,7 @@ $(_XunitEpilog)
   </ItemGroup>
   <Import Project="$(SourceDir)dir.targets" />
   <PropertyGroup>
-     <OutDir>$(XunitTestBinBase)\$(Category)\</OutDir>
+     <OutDir>$(XunitTestBinBase)\$(CategoryWithSlash)\</OutDir>
   </PropertyGroup>
 </Project>
         ]]>
@@ -151,7 +151,9 @@ $(_XunitEpilog)
 
     <PropertyGroup>
       <_CMDDIR_Parent>$([System.IO.Path]::GetDirectoryName($(_CMDDIR)))</_CMDDIR_Parent>
-      <Category>$([System.String]::Copy('$(_CMDDIR)').Replace($(_CMDDIR_Parent)\,''))</Category>
+      <_CMDDIR_Grandparent>$([System.IO.Path]::GetDirectoryName($(_CMDDIR_Parent)))</_CMDDIR_Grandparent>
+      <CategoryWithSlash>$([System.String]::Copy('$(_CMDDIR)').Replace($(_CMDDIR_Grandparent)\,''))</CategoryWithSlash>
+      <Category>$([System.String]::Copy('$(CategoryWithSlash)').Replace('\','.'))</Category>
       <XunitWrapper>$(Category).XUnitWrapper</XunitWrapper>
       <XunitWrapperSrcDir>$(XunitWrapperGeneratedCSDirBase)$(Category)</XunitWrapperSrcDir>
       <XunitWrapperOutputDir>$(XunitWrapperOutputIntermediatedDirBase)$(Category)</XunitWrapperOutputDir>
@@ -435,4 +437,4 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
   <Target Name="Clean">
     <RemoveDir Condition=" '$(BuildWrappers)'=='true'" Directories="$(XunitWrapperGeneratedCSDirBase);$(XunitWrapperOutputIntermediatedDirBase)" ContinueOnError="WarnAndContinue" /> 
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/runtest.sh b/tests/runtest.sh
index 8a917c3bf4..e0458133da 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -43,23 +43,26 @@ function print_usage {
     echo '  -h|--help                        : Show usage information.'
     echo '  --useServerGC                    : Enable server GC for this test run'
     echo '  --test-env                       : Script to set environment variables for tests'
+    echo '  --crossgen                       : Precompiles the framework managed assemblies'
     echo '  --runcrossgentests               : Runs the ready to run tests' 
     echo '  --jitstress=<n>                  : Runs the tests with COMPlus_JitStress=n'
     echo '  --jitstressregs=<n>              : Runs the tests with COMPlus_JitStressRegs=n'
     echo '  --jitminopts                     : Runs the tests with COMPlus_JITMinOpts=1'
     echo '  --jitforcerelocs                 : Runs the tests with COMPlus_ForceRelocs=1'
     echo '  --jitdisasm                      : Runs jit-dasm on the tests'
-    echo '  --gcstresslevel n                : Runs the tests with COMPlus_GCStress=n'
+    echo '  --gcstresslevel=<n>              : Runs the tests with COMPlus_GCStress=n'
     echo '    0: None                                1: GC on all allocs and '"'easy'"' places'
     echo '    2: GC on transitions to preemptive GC  4: GC on every allowable JITed instr'
     echo '    8: GC on every allowable NGEN instr   16: GC only on a unique stack trace'
     echo '  --long-gc                        : Runs the long GC tests'
     echo '  --gcsimulator                    : Runs the GCSimulator tests'
+    echo '  --link <ILlink>                  : Runs the tests after linking via ILlink'
     echo '  --show-time                      : Print execution sequence and running time for each test'
     echo '  --no-lf-conversion               : Do not execute LF conversion before running test script'
     echo '  --build-overlay-only             : Exit after overlay directory is populated'
     echo '  --limitedDumpGeneration          : Enables the generation of a limited number of core dumps if test(s) crash, even if ulimit'
     echo '                                     is zero when launching this script. This option is intended for use in CI.'
+    echo '  --xunitOutputPath=<path>         : Create xUnit XML report at the specifed path (default: <test root>/coreclrtests.xml)'
     echo ''
     echo 'Runtime Code Coverage options:'
     echo '  --coreclr-coverage               : Optional argument to get coreclr code coverage reports'
@@ -117,14 +120,6 @@ case $OSName in
         ;;
 esac
 
-# clean up any existing dumpling remnants from previous runs.
-dumplingsListPath="$PWD/dumplings.txt"
-if [ -f "$dumplingsListPath" ]; then
-    rm "$dumplingsListPath"
-fi
-
-find . -type f -name "local_dumplings.txt" -exec rm {} \;
-
 function xunit_output_begin {
     xunitOutputPath=$testRootDir/coreclrtests.xml
     xunitTestOutputPath=${xunitOutputPath}.test
@@ -346,9 +341,6 @@ function create_core_overlay {
     if [ ! -d "$coreClrBinDir" ]; then
         exit_with_error "$errorSource" "Directory specified by --coreClrBinDir does not exist: $coreClrBinDir"
     fi
-    if [ ! -f "$mscorlibDir/mscorlib.dll" ]; then
-        exit_with_error "$errorSource" "mscorlib.dll was not found in: $mscorlibDir"
-    fi
     if [ -z "$coreFxBinDir" ]; then
         exit_with_error "$errorSource" "One of --coreOverlayDir or --coreFxBinDir must be specified." "$printUsage"
     fi
@@ -362,12 +354,12 @@ function create_core_overlay {
     mkdir "$coreOverlayDir"
 
     cp -f -v "$coreFxBinDir/"* "$coreOverlayDir/" 2>/dev/null
-    cp -f -v "$coreClrBinDir/"* "$coreOverlayDir/" 2>/dev/null
-    cp -f -v "$mscorlibDir/mscorlib.dll" "$coreOverlayDir/" 2>/dev/null
+    cp -f -p -v "$coreClrBinDir/"* "$coreOverlayDir/" 2>/dev/null
     if [ -d "$mscorlibDir/bin" ]; then
         cp -f -v "$mscorlibDir/bin/"* "$coreOverlayDir/" 2>/dev/null
     fi
-    cp -n -v "$testDependenciesDir"/* "$coreOverlayDir/" 2>/dev/null
+    cp -f -v "$testDependenciesDir/"xunit* "$coreOverlayDir/" 2>/dev/null
+    cp -n -v "$testDependenciesDir/"* "$coreOverlayDir/" 2>/dev/null
     if [ -f "$coreOverlayDir/mscorlib.ni.dll" ]; then
         # Test dependencies come from a Windows build, and mscorlib.ni.dll would be the one from Windows
         rm -f "$coreOverlayDir/mscorlib.ni.dll"
@@ -379,12 +371,24 @@ function create_core_overlay {
     copy_test_native_bin_to_test_root
 }
 
+declare -a skipCrossGenFiles
+
+function is_skip_crossgen_test {
+    for skip in "${skipCrossGenFiles[@]}"; do
+        if [ "$1" == "$skip" ]; then
+            return 0
+        fi
+    done
+    return 1
+}
+
 function precompile_overlay_assemblies {
+    skipCrossGenFiles=($(read_array "$(dirname "$0")/skipCrossGenFiles.$ARCH.txt"))
 
     if [ $doCrossgen == 1 ]; then
         local overlayDir=$CORE_ROOT
 
-        filesToPrecompile=$(ls -trh $overlayDir/*.dll)
+        filesToPrecompile=$(find -L $overlayDir -iname \*.dll -not -iname \*.ni.dll -not -iname \*-ms-win-\* -type f )
         for fileToPrecompile in ${filesToPrecompile}
         do
             local filename=${fileToPrecompile}
@@ -395,20 +399,23 @@ function precompile_overlay_assemblies {
                     echo Unable to generate dasm for $filename
                 fi
             else
-                # Precompile any assembly except mscorlib since we already have its NI image available.
-                if [[ "$filename" != *"mscorlib.dll"* ]]; then
-                    if [[ "$filename" != *"mscorlib.ni.dll"* ]]; then
-                        echo Precompiling $filename
-                        $overlayDir/crossgen /Platform_Assemblies_Paths $overlayDir $filename 2>/dev/null
-                        local exitCode=$?
-                        if [ $exitCode == -2146230517 ]; then
-                            echo $filename is not a managed assembly.
-                        elif [ $exitCode != 0 ]; then
-                            echo Unable to precompile $filename.
-                        else
-                            echo Successfully precompiled $filename
-                        fi
+                if is_skip_crossgen_test "$(basename $filename)"; then
+                    continue
+                fi
+                echo Precompiling $filename
+                $overlayDir/crossgen /Platform_Assemblies_Paths $overlayDir $filename 1> $filename.stdout 2>$filename.stderr
+                local exitCode=$?
+                if [[ $exitCode != 0 ]]; then
+                    if grep -q -e '(COR_E_ASSEMBLYEXPECTED)' $filename.stderr; then
+                        printf "\n\t$filename is not a managed assembly.\n\n"
+                    else
+                        echo Unable to precompile $filename.
+                        cat $filename.stdout
+                        cat $filename.stderr
+                        exit $exitCode
                     fi
+                else
+                    rm $filename.{stdout,stderr}
                 fi
             fi
         done
@@ -960,7 +967,7 @@ buildOverlayOnly=
 gcsimulator=
 longgc=
 limitedCoreDumps=
-
+illinker=
 ((disableEventLogging = 0))
 ((serverGC = 0))
 
@@ -994,6 +1001,10 @@ do
         --jitforcerelocs)
             export COMPlus_ForceRelocs=1
             ;;
+        --link=*)
+            export ILLINK=${i#*=}
+            export DoLink=true
+            ;;
         --jitdisasm)
             jitdisasm=1
             ;;
@@ -1075,6 +1086,9 @@ do
         --limitedDumpGeneration)
             limitedCoreDumps=ON
             ;;
+        --xunitOutputPath=*)
+            xunitOutputPath=${i#*=}
+            ;;
         *)
             echo "Unknown switch: $i"
             print_usage
@@ -1184,12 +1198,22 @@ then
     scriptPath=$(dirname $0)
     ${scriptPath}/setup-runtime-dependencies.sh --outputDir=$coreOverlayDir
 else
-    echo "Skip preparing for GC stress test. Dependent package is not supported on this architecture."
+    if [ "$ARCH" != "arm64" ]
+    then
+        echo "Skip preparing for GC stress test. Dependent package is not supported on this architecture."
+    fi
 fi
 
 export __TestEnv=$testEnv
 
 cd "$testRootDir"
+
+dumplingsListPath="$testRootDir/dumplings.txt"
+
+# clean up any existing dumpling remnants from previous runs.
+rm -f "$dumplingsListPath"
+find $testRootDir -type f -name "local_dumplings.txt" -exec rm {} \;
+
 time_start=$(date +"%s")
 if [ -z "$testDirectories" ]
 then
@@ -1211,8 +1235,7 @@ finish_remaining_tests
 
 print_results
 
-echo "constructing $dumplingsListPath"
-find . -type f -name "local_dumplings.txt" -exec cat {} \; > $dumplingsListPath
+find $testRootDir -type f -name "local_dumplings.txt" -exec cat {} \; > $dumplingsListPath
 
 if [ -s $dumplingsListPath ]; then
     cat $dumplingsListPath
diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh
index 6745e63145..3124cc89ce 100755
--- a/tests/scripts/arm32_ci_script.sh
+++ b/tests/scripts/arm32_ci_script.sh
@@ -27,9 +27,14 @@ function usage {
     echo '                                         <path>/platform/rootfs-t30.ext4 should exist'
     echo '    --mountPath=<path>                 : The desired path for mounting the emulator rootfs (without ending /)'
     echo '                                         This path is created if not already present'
-    echo '    --buildConfig=<config>             : The value of config should be either Debug or Release'
+    echo '    --buildConfig=<config>             : The value of config should be either Debug, Checked or Release'
     echo '                                         Any other value is not accepted'
     echo 'Optional Arguments:'
+    echo '    --mode=<mode>                      : docker or emulator (default)'
+    echo '    --arm                              : Build using hard ABI'
+    echo '    --armel                            : Build using softfp ABI (default)'
+    echo '    --linuxCodeName=<name>             : Code name for Linux: For arm, trusty (default) and xenial. For armel, tizen'
+    echo '    --skipRootFS                       : Skip building rootfs'
     echo '    --skipTests                        : Presenting this option skips testing the generated binaries'
     echo '                                         If this option is not presented, then tests are run by default'
     echo '                                         using the other test related options'
@@ -148,7 +153,9 @@ function handle_exit {
 
     echo 'The script is exited. Cleaning environment..'
 
-    clean_env
+    if [ "$__ciMode" == "emulator" ]; then
+        clean_env
+    fi
 }
 trap handle_exit EXIT
 
@@ -229,6 +236,64 @@ function cross_build_coreclr {
     fi
 }
 
+#Cross builds coreclr using Docker
+function cross_build_coreclr_with_docker {
+    __currentWorkingDirectory=`pwd`
+
+    # Check build configuration and choose Docker image
+    __dockerEnvironmentVariables=""
+    if [ "$__buildArch" == "arm" ]; then
+        # TODO: For arm, we are going to embed RootFS inside Docker image.
+        case $__linuxCodeName in
+        trusty)
+            __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu-14.04-cross-0cd4667-20172211042239"
+            __skipRootFS=1
+            __dockerEnvironmentVariables+=" -e ROOTFS_DIR=/crossrootfs/arm"
+            __runtimeOS="ubuntu.14.04"
+        ;;
+        xenial)
+            __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu-16.04-cross-ef0ac75-20175511035548"
+            __skipRootFS=1
+            __dockerEnvironmentVariables+=" -e ROOTFS_DIR=/crossrootfs/arm"
+            __runtimeOS="ubuntu.16.04"
+        ;;
+        *)
+            exit_with_error "ERROR: $__linuxCodeName is not a supported linux name for $__buildArch" false
+        ;;
+        esac
+    elif [ "$__buildArch" == "armel" ]; then
+        # For armel Tizen, we are going to construct RootFS on the fly.
+        case $__linuxCodeName in
+        tizen)
+            __dockerImage=" t2wish/dotnetcore:ubuntu1404_cross_prereqs_v4"
+            __runtimeOS="tizen.4.0.0"
+        ;;
+        *)
+            echo "ERROR: $__linuxCodeName is not a supported linux name for $__buildArch"
+            exit_with_error "ERROR: $__linuxCodeName is not a supported linux name for $__buildArch" false
+        ;;
+        esac
+    else
+        exit_with_error "ERROR: unknown buildArch $__buildArch" false
+    fi
+    __dockerCmd="sudo docker run ${__dockerEnvironmentVariables} --privileged -i --rm -v $__currentWorkingDirectory:/opt/code -w /opt/code $__dockerImage"
+
+    if [ $__skipRootFS == 0 ]; then
+        # Build rootfs
+        __buildRootfsCmd="./cross/build-rootfs.sh $__buildArch $__linuxCodeName --skipunmount"
+
+        (set +x; echo "Build RootFS for $__buildArch $__linuxCodeName")
+        $__dockerCmd $__buildRootfsCmd
+        sudo chown -R $(id -u -n) cross/rootfs
+    fi
+
+    # Cross building coreclr with rootfs in Docker
+    (set +x; echo "Start cross build coreclr for $__buildArch $__linuxCodeName")
+    __buildCmd="./build.sh $__buildArch cross $__verboseFlag $__skipMscorlib $__buildConfig -rebuild clang3.9"
+    $__dockerCmd $__buildCmd
+    sudo chown -R $(id -u -n) ./bin
+}
+
 #Copy the needed files to the emulator to run tests
 function copy_to_emulator {
 
@@ -246,11 +311,6 @@ function copy_to_emulator {
     __testNativeBinDirBase="$__ARMEmulCoreclr/$__testNativeBinDirBase"
 
     sudo cp -R "./$__coreClrBinDirBase" "$__ARMRootfsCoreclrPath/$__coreClrBinDirBase"
-    if [ ! -z "$__mscorlibDir" ]; then
-        sudo cp "$__mscorlibDir/mscorlib.dll" "$__ARMRootfsCoreclrPath/$__coreClrBinDirBase/"
-    else
-        sudo cp "./$__coreClrBinDirBase/mscorlib.dll" "$__ARMRootfsCoreclrPath/$__coreClrBinDirBase/"
-    fi
     __coreClrBinDirBase="$__ARMEmulCoreclr/$__coreClrBinDirBase"
     __mscorlibDirBase="$__coreClrBinDirBase"
 
@@ -297,7 +357,47 @@ function run_tests {
 EOF
 }
 
+function run_tests_using_docker {
+    __currentWorkingDirectory=`pwd`
+
+    # Configure docker
+    __dockerEnvironmentVariables=""
+    if [ "$__buildArch" == "arm" ]; then
+        case $__linuxCodeName in
+        trusty)
+            __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu1404_cross_prereqs_v3"
+            __skipRootFS=1
+            __dockerEnvironmentVariables=" -e ROOTFS_DIR=/crossrootfs/arm"
+        ;;
+        xenial)
+            __dockerImage=" microsoft/dotnet-buildtools-prereqs:ubuntu1604_cross_prereqs_v3"
+            __skipRootFS=1
+            __dockerEnvironmentVariables=" -e ROOTFS_DIR=/crossrootfs/arm"
+        ;;
+        *)
+            exit_with_error "ERROR: $__linuxCodeName is not a supported linux name for $__buildArch" false
+        ;;
+        esac
+    elif [ "$__buildArch" == "armel" ]; then
+        case $__linuxCodeName in
+        tizen)
+            __dockerImage=" t2wish/dotnetcore:ubuntu1404_cross_prereqs_v3"
+        ;;
+        *)
+            exit_with_error "ERROR: $__linuxCodeName is not a supported linux name for $__buildArch" false
+        ;;
+        esac
+    else
+        exit_with_error "ERROR: unknown buildArch $__buildArch" false
+    fi
+    __dockerCmd="sudo docker run ${__dockerEnvironmentVariables} --privileged -i --rm -v $__currentWorkingDirectory:/opt/code -w /opt/code $__dockerImage"
+    __testCmd="./tests/scripts/arm32_ci_test.sh --abi=${__buildArch} --buildConfig=${__buildConfig}"
+
+    $__dockerCmd $__testCmd
+}
+
 #Define script variables
+__ciMode="emulator"
 __ARMEmulRootfs=/mnt/arm-emulator-rootfs
 __ARMEmulPath=
 __ARMRootfsMountPath=
@@ -312,6 +412,8 @@ __testDirFile=
 __verboseFlag=
 __buildOS="Linux"
 __buildArch="armel"
+__linuxCodeName="tizen"
+__skipRootFS=0
 __buildDirName=
 __initialGitHead=`git rev-parse --verify HEAD`
 
@@ -327,10 +429,13 @@ do
         ;;
     --buildConfig=*)
         __buildConfig="$(echo ${arg#*=} | awk '{print tolower($0)}')"
-        if [[ "$__buildConfig" != "debug" && "$__buildConfig" != "release" ]]; then
-            exit_with_error "--buildConfig can be only Debug or Release" true
+        if [[ "$__buildConfig" != "debug" && "$__buildConfig" != "release" && "$__buildConfig" != "checked" ]]; then
+            exit_with_error "--buildConfig can be Debug, Checked or Release" true
         fi
         ;;
+    --mode=*)
+        __ciMode=${arg#*=}
+        ;;
     --skipTests)
         __skipTests=1
         ;;
@@ -355,6 +460,19 @@ do
     --testDirFile=*)
         __testDirFile=${arg#*=}
         ;;
+    --arm)
+        __buildArch="arm"
+        ;;
+    --armel)
+        __buildArch="armel"
+        __linuxCodeName="tizen"
+        ;;
+    --linuxCodeName=*)
+        __linuxCodeName=${arg#*=}
+        ;;
+    --skipRootFS)
+        __skipRootFS=1
+        ;;
     -h|--help)
         usage
         ;;
@@ -372,26 +490,24 @@ if [[ $(git status -s) != "" ]]; then
    exit 1
 fi
 
-#Check if the compulsory arguments have been presented to the script and if the input paths exist
-exit_if_empty "$__ARMEmulPath" "--emulatorPath is a mandatory argument, not provided" true
-exit_if_empty "$__ARMRootfsMountPath" "--mountPath is a mandatory argument, not provided" true
 exit_if_empty "$__buildConfig" "--buildConfig is a mandatory argument, not provided" true
-exit_if_path_absent "$__ARMEmulPath/platform/rootfs-t30.ext4" "Path specified in --emulatorPath does not have the rootfs" false
+if [ "$__ciMode" == "emulator" ]; then
+    #Check if the compulsory arguments have been presented to the script and if the input paths exist
+    exit_if_empty "$__ARMEmulPath" "--emulatorPath is a mandatory argument, not provided" true
+    exit_if_empty "$__ARMRootfsMountPath" "--mountPath is a mandatory argument, not provided" true
+    exit_if_path_absent "$__ARMEmulPath/platform/rootfs-t30.ext4" "Path specified in --emulatorPath does not have the rootfs" false
+    # Test is not available in emulator mode.
+    __skipTests=1
+fi
 
+__coreFxBinDir="./bin/CoreFxBinDir" # TODO-clenup: Just for testing.... 
 #Check if the optional arguments are present in the case that testing is to be done
 if [ $__skipTests == 0 ]; then
     exit_if_empty "$__testRootDir" "Testing requested, but --testRootDir not provided" true
     exit_if_path_absent "$__testRootDir" "Path specified in --testRootDir does not exist" false
 
-    exit_if_empty "$__coreFxNativeBinDir" "Testing requested but --coreFxNativeBinDir not provided" true
-    exit_if_path_absent "$__coreFxNativeBinDir" "Path specified in --coreFxNativeBinDir does not exist" false
-
     exit_if_empty "$__coreFxBinDir" "Testing requested, but --coreFxBinDir not provided" true
-    while IFS=';' read -ra coreFxBinDirectories; do
-        for currDir in "${coreFxBinDirectories[@]}"; do
-            exit_if_path_absent "$currDir" "Path specified in --coreFxBinDir, $currDir does not exist" false
-        done
-    done <<< "$__coreFxBinDir"
+    exit_if_path_absent "$__coreFxBinDir" "Path specified in --coreFxBinDir does not exist" false
 
     exit_if_empty "$__testDirFile" "Testing requested, but --testDirFile not provided" true
     exit_if_path_absent "$__testDirFile" "Path specified in --testDirFile does not exist" false
@@ -408,6 +524,8 @@ fi
 #Change build configuration to the capitalized form to create build product paths correctly
 if [[ "$__buildConfig" == "release" ]]; then
     __buildConfig="Release"
+elif [[ "$__buildConfig" == "checked" ]]; then
+    __buildConfig="Checked"
 else
     __buildConfig="Debug"
 fi
@@ -433,37 +551,50 @@ set -e
 ## Begin cross build
 (set +x; echo "Git HEAD @ $__initialGitHead")
 
-#Mount the emulator
-(set +x; echo 'Mounting emulator...')
-mount_emulator
+if [ "$__ciMode" == "docker" ]; then
+    # Complete the cross build using Docker
+    (set +x; echo 'Building coreclr...')
+    cross_build_coreclr_with_docker
+else
+    #Mount the emulator
+    (set +x; echo 'Mounting emulator...')
+    mount_emulator
 
-#Clean the emulator
-(set +x; echo 'Cleaning emulator...')
-clean_emulator
+    #Clean the emulator
+    (set +x; echo 'Cleaning emulator...')
+    clean_emulator
 
-#Complete the cross build
-(set +x; echo 'Building coreclr...')
-cross_build_coreclr
+    #Complete the cross build
+    (set +x; echo 'Building coreclr...')
+    cross_build_coreclr
+fi
 
 #If tests are to be skipped end the script here, else continue
 if [ $__skipTests == 1 ]; then
     exit 0
 fi
 
-## Tests are going to be performed in an emulated environment
-
-#Copy the needed files to the emulator before entering the emulated environment
-(set +x; echo 'Setting up emulator to run tests...')
-copy_to_emulator
-
-#Enter the emulated mode and run the tests
-(set +x; echo 'Running tests...')
-run_tests
+__unittestResult=0
+## Begin CoreCLR test
+if [ "$__ciMode" == "docker" ]; then
+    run_tests_using_docker
+    __unittestResult=$?
+else
+    ## Tests are going to be performed in an emulated environment
 
+    #Copy the needed files to the emulator before entering the emulated environment
+    (set +x; echo 'Setting up emulator to run tests...')
+    copy_to_emulator
 
-#Clean the environment
-(set +x; echo 'Cleaning environment...')
-clean_env
+    #Enter the emulated mode and run the tests
+    (set +x; echo 'Running tests...')
+    run_tests
+    __unittestResult=$?
 
+    #Clean the environment
+    (set +x; echo 'Cleaning environment...')
+    clean_env
+fi
 
 (set +x; echo 'Build and test complete')
+exit $__unittestResult
diff --git a/tests/scripts/arm32_ci_test.sh b/tests/scripts/arm32_ci_test.sh
new file mode 100755
index 0000000000..33a951e324
--- /dev/null
+++ b/tests/scripts/arm32_ci_test.sh
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+set -x
+
+function usage {
+    echo 'ARM Test Script'
+    echo '$ ./tests/scripts/arm32_ci_test.sh'
+    echo '    --abi=arm'
+    echo '    --buildConfig=Release'
+    echo 'Required Arguments:'
+    echo '    --abi=<abi>                        : arm (default) or armel'
+    echo '    --buildConfig=<config>             : Release (default) Checked, or Debug'
+}
+
+# Display error message and exit
+function exit_with_error {
+    set +x
+
+    local errorMessage="$1"
+    local printUsage=$2
+
+    echo "ERROR: $errorMessage"
+    if [ "$printUsage" == "true" ]; then
+        echo ''
+        usage
+    fi
+    exit 1
+}
+
+# Exit if the input path does not exist
+function exit_if_path_absent {
+    local path="$1"
+    local errorMessage="$2"
+    local printUsage=$3
+
+    if [ ! -f "$path" -a ! -d "$path" ]; then
+        exit_with_error "$errorMessage" $printUsage
+    fi
+}
+
+__abi="arm"
+__buildConfig="Release"
+
+# Parse command line arguments
+for arg in "$@"
+do
+    case $arg in
+    --abi=*)
+        __abi=${arg#*=}
+        if [[ "$__abi" != "arm" && "$__abi" != "armel" ]]; then
+            exit_with_error "--abi can be either arm or armel" true
+        fi
+        ;;
+    --buildConfig=*)
+        __buildConfig=${arg#*=}
+        if [[ "$__buildConfig" != "Debug" && "$__buildConfig" != "Release" && "$__buildConfig" != "Checked" ]]; then
+            exit_with_error "--buildConfig can be Debug, Checked or Release" true
+        fi
+        ;;
+    -v|--verbose)
+        __verboseFlag="verbose"
+        ;;
+    -h|--help)
+        usage
+        exit 0
+        ;;
+    *)
+        exit_with_error "$arg not a recognized argument" true
+        ;;
+    esac
+done
+__buildDirName="Linux.${__abi}.${__buildConfig}"
+
+CORECLR_DIR=/opt/code
+ARM_CHROOT_HOME_DIR=/home/coreclr
+
+if [ -z "${ROOTFS_DIR}" ]; then
+    __ROOTFS_DIR=${CORECLR_DIR}/cross/rootfs/${__abi}
+else
+    __ROOTFS_DIR=${ROOTFS_DIR}
+fi
+
+if [ "$__abi" == "armel" ]; then
+    # TODO: Make use of a single Tizen rootfs for build and test
+
+    # TODO-cleanup: the latest docker image already has mic installed.
+    # Prepare Tizen (armel) environment
+    #echo "deb http://download.tizen.org/tools/latest-release/Ubuntu_14.04 /" >> /etc/apt/sources.list
+    #apt-get update
+    #apt-get -y -qq --force-yes install mic
+
+    pushd ${CORECLR_DIR}/cross/armel/tizen
+    mic --non-interactive create fs --pack-to=tizen.tar.gz tizen-dotnet.ks
+    if [ -d ${__ROOTFS_DIR} ]; then
+        mv ${__ROOTFS_DIR} ${__ROOTFS_DIR}_build
+    fi
+    mkdir -p ${__ROOTFS_DIR}
+    tar -zxf mic-output/tizen.tar.gz -C ${__ROOTFS_DIR}
+    apt-get update
+    apt-get -y -qq --force-yes install --reinstall qemu binfmt-support qemu-user-static
+    __qemuARM=$(which qemu-arm-static)
+    cp $__qemuARM ${CORECLR_DIR}/cross/rootfs/armel/usr/bin/
+    cp $__qemuARM ${__ROOTFS_DIR}/usr/bin/
+    popd
+fi
+
+# Mount
+mkdir -p ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}
+mount -t proc /proc ${__ROOTFS_DIR}/proc
+mount -o bind /dev ${__ROOTFS_DIR}/dev
+mount -o bind /dev/pts ${__ROOTFS_DIR}/dev/pts
+mount -o bind /sys ${__ROOTFS_DIR}/sys
+mount -o bind ${CORECLR_DIR} ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}
+
+chroot ${__ROOTFS_DIR} /bin/bash -x <<EOF
+    cd ${ARM_CHROOT_HOME_DIR}
+    ./tests/runtest.sh --sequential\
+                       --coreClrBinDir=${ARM_CHROOT_HOME_DIR}/bin/Product/${__buildDirName} \
+                       --mscorlibDir=${ARM_CHROOT_HOME_DIR}/bin/Product/${__buildDirName} \
+                       --testNativeBinDir=${ARM_CHROOT_HOME_DIR}/bin/obj/${__buildDirName}/tests \
+                       --coreFxBinDir=${ARM_CHROOT_HOME_DIR}/bin/CoreFxBinDir \
+                       --testRootDir=${ARM_CHROOT_HOME_DIR}/bin/tests/Windows_NT.x64.${__buildConfig} \
+                       --testDirFile=${ARM_CHROOT_HOME_DIR}/tests/testsRunningInsideARM.txt
+EOF
diff --git a/tests/scripts/arm64_post_build.py b/tests/scripts/arm64_post_build.py
index 49f5f6a452..4ed8032fc2 100644
--- a/tests/scripts/arm64_post_build.py
+++ b/tests/scripts/arm64_post_build.py
@@ -34,7 +34,7 @@ from collections import defaultdict
 
 g_arm64ci_path = os.path.join(os.environ["USERPROFILE"], "bin")
 g_dotnet_url = "https://go.microsoft.com/fwlink/?LinkID=831469"
-g_test_url = "https://clrjit.blob.core.windows.net/arm64ci/CoreCLRTests-2c0a2c05ba82460a8d8a4b1e2d98e908e59d5d54.zip"
+g_test_url = "https://clrjit.blob.core.windows.net/arm64ci/CoreCLR-Pri1Testing.zip"
 g_x64_client_url = "https://clrjit.blob.core.windows.net/arm64ci/x64_client.zip"
 
 ################################################################################
diff --git a/tests/scripts/build_illink.cmd b/tests/scripts/build_illink.cmd
new file mode 100644
index 0000000000..726bd44c10
--- /dev/null
+++ b/tests/scripts/build_illink.cmd
@@ -0,0 +1,44 @@
+@if not defined _echo @echo off
+setlocal
+set rid=win10-x64
+
+:Arg_Loop
+if "%1" == ""          goto ArgsDone
+if /i "%1" == "-?"     goto Usage
+if /i "%1" == "-h"     goto Usage
+if /i "%1" == "-help"  goto Usage
+if /i "%1" == "clone"  (set doClone=1&shift&goto Arg_Loop)
+if /i "%1" == "x64"    (set rid=win10-x64&shift&goto Arg_Loop)
+if /i "%1" == "x86"    (set rid=win10-x86&shift&goto Arg_Loop)
+
+goto Usage
+
+:ArgsDone
+
+if defined doCLone (
+    git clone --recursive https://github.com/mono/linker
+)
+
+pushd linker\corebuild
+call restore.cmd -r %rid%
+cd ..\linker
+..\corebuild\Tools\dotnetcli\dotnet.exe publish -r %rid% -c netcore_Release
+popd
+
+echo Built %cd%\linker\linker\bin\netcore_Release\netcoreapp2.0\%rid%\publish\illink.exe
+
+:Done
+exit /b 0
+
+:Usage
+echo.
+echo.Build ILLINKer for CoreCLR testing
+echo.
+echo.Usage:
+echo     build_illink.cmd [clone] [setenv] [arch]
+echo.Where:
+echo.-? -h -help: view this message.
+echo.clone      : Clone the repository https://github.com/mono/linker
+echo.arch       : The architecture to build: x64 (default) or x86
+echo.
+goto Done
diff --git a/tests/scripts/build_illink.sh b/tests/scripts/build_illink.sh
new file mode 100755
index 0000000000..73bbd1a9fd
--- /dev/null
+++ b/tests/scripts/build_illink.sh
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+
+function print_usage {
+    echo ''
+    echo 'Build ILLINKer for CoreCLR testing'
+    echo ''
+    echo 'Optional arguments:'
+    echo '  -?|-h|--help       : Show usage information.'
+    echo '  --clone            : Clone the repository https://github.com/mono/linker'
+    echo '  --arch             : The architecture to build (default X64)'
+    echo '  --os               : The os/runtime to build x64 (ubuntu.16.04)'
+    echo ''
+}
+
+# Argument variables
+clone=
+setenv=
+os='ubuntu'
+arch='x64'
+
+for i in "$@"
+do
+    case $i in
+        -?|-h|--help)
+            print_usage
+            exit $EXIT_CODE_SUCCESS
+            ;;
+	
+        --clone)
+            clone=1
+            ;;
+	
+        --arch=*)
+            arch=${i#*=}
+            ;;
+	
+        --os=*)
+            os=${i#*=}
+            ;;
+	
+        *)
+            echo "Unknown switch: $i"
+            print_usage
+            exit $EXIT_CODE_SUCCESS
+            ;;
+    esac
+done
+
+rid="$os-$arch"
+
+if [ ! -z "$clone" ]; then
+    git clone --recursive https://github.com/mono/linker
+fi
+
+pushd linker/corebuild
+./restore.sh -r $rid
+cd ../linker
+../corebuild/Tools/dotnetcli/dotnet publish -r $rid -c netcore_Release
+popd
+
+dir=$(pwd)
+output="$dir/linker/linker/bin/netcore_Release/netcoreapp2.0/$rid/publish/illink"
+echo Built $output
+
+exit $EXIT_CODE_SUCCESS
diff --git a/tests/scripts/format.py b/tests/scripts/format.py
index 9736c033b2..4c84cb532b 100644
--- a/tests/scripts/format.py
+++ b/tests/scripts/format.py
@@ -84,13 +84,13 @@ def main(argv):
 
     print("Downloading .Net CLI")
     if platform == 'Linux':
-        dotnetcliUrl = "https://go.microsoft.com/fwlink/?LinkID=809129"
+        dotnetcliUrl = "https://go.microsoft.com/fwlink/?linkid=839628"
         dotnetcliFilename = os.path.join(dotnetcliPath, 'dotnetcli-jitutils.tar.gz')
     elif platform == 'OSX':
-        dotnetcliUrl = "https://go.microsoft.com/fwlink/?LinkID=809128"
+        dotnetcliUrl = "https://go.microsoft.com/fwlink/?linkid=839641"
         dotnetcliFilename = os.path.join(dotnetcliPath, 'dotnetcli-jitutils.tar.gz')
     elif platform == 'Windows_NT':
-        dotnetcliUrl = "https://go.microsoft.com/fwlink/?LinkID=809126"
+        dotnetcliUrl = "https://go.microsoft.com/fwlink/?linkid=839634"
         dotnetcliFilename = os.path.join(dotnetcliPath, 'dotnetcli-jitutils.zip')
     else:
         print('Unknown os ', os)
@@ -160,7 +160,7 @@ def main(argv):
 
     # Run bootstrap
 
-    my_env["PATH"] += os.pathsep + dotnetcliPath
+    my_env["PATH"] = dotnetcliPath + os.pathsep + my_env["PATH"]
     if platform == 'Linux' or platform == 'OSX':
         print("Running bootstrap")
         proc = subprocess.Popen(['bash', bootstrapPath], env=my_env)
@@ -173,7 +173,7 @@ def main(argv):
 
     returncode = 0
     jitutilsBin = os.path.join(coreclr, "jitutils", "bin")
-    my_env["PATH"] += os.pathsep + jitutilsBin
+    my_env["PATH"] = jitutilsBin + os.pathsep + my_env["PATH"]
     current_dir = os.getcwd()
 
     if not os.path.isdir(jitutilsBin):
diff --git a/tests/scripts/lst_creator.py b/tests/scripts/lst_creator.py
index 7f477ff2bc..deebd2fa04 100644..100755
--- a/tests/scripts/lst_creator.py
+++ b/tests/scripts/lst_creator.py
@@ -7,227 +7,398 @@
 ##
 # Title               :lst_creator.py
 #
-# Script to create a working list file from the test overlay directory. This 
+# Script to create a working list file from the test overlay directory. This
 # will be used by smarty to run tests.
 #
 ################################################################################
 
+import argparse
+import datetime
 import os
-import os.path
+import re
 import sys
 
+from collections import defaultdict
+
 ################################################################################
-# Globals
+# Argument Parser
 ################################################################################
 
-g_debug = False
-g_name = ""
-g_old_list_file = ""
+DESCRIPTION = """Python script to help create/update the arm64 lstFile
+              """
+
+PARSER = argparse.ArgumentParser(description=DESCRIPTION)
 
-def print_debug(str):
-    if g_debug is True:
-        print str
+PARSER.add_argument("--test", dest="testing", action="store_true", default=False)
+PARSER.add_argument("-lst_file", dest="old_list_file", nargs='?', default=None)
+PARSER.add_argument("-test_dir", dest="test_dir", nargs='?', default=None)
+PARSER.add_argument("-commit_hash", dest="commit_hash", nargs='?', default=None)
+PARSER.add_argument("-failures_csv", dest="failures_csv", nargs='?', default=None)
+PARSER.add_argument("--unset_new", dest="unset_new", action="store_true", default=False)
+ARGS = PARSER.parse_args(sys.argv[1:])
 
 ################################################################################
-# Requires the OSS test overlay directory to be built and passed.
-#
-# find_tests
+# Helper Functions
 ################################################################################
 
-def find_tests(base_dir, cat = None, dir = None):
-    # Begin walking this folder recursively.
-    # Look for any file that ends with .cmd
-    # we will be returning a list of these files.
+def create_list_file(file_name, metadata):
+    """ Create a lstFile given a set of metadata input
 
-    subdir_list = []
-    cmd_list = []
+    Args:
+        file_name (str): Location to write the lstFile
+        metadata ({ str: { str: str } }): Dictionary mapping test name to
+                                        : a dictionary of key/value
+                                        : attributes.
 
-    def traverse_dir(dir, cat, cat_dir, add_cat = False):
-        if os.path.basename(dir) == cat_dir:
-            add_cat = True
+    """
 
-        dir = os.path.abspath(dir)
+    current_time = datetime.datetime.now()
+    current_time_str = current_time.strftime("%d-%b-%Y %H:%M:%S%z")
 
-        for filename in os.listdir(dir):
-            print_debug(filename)
+    metadata = [metadata[item] for item in metadata]
+    metadata = sorted(metadata, key=lambda item: item[1])
 
-            filename = os.path.join(dir, filename)
-            print_debug("Full Path: " + filename)
+    new_metadata = [item for item in metadata if item[1] == -1]
+    old_metadata = [item for item in metadata if item[1] != -1]
 
-            if os.path.isfile(filename) and filename.split(".")[-1] == "cmd":
-                if add_cat is True:
-                    cmd_list.append((filename, cat))
-                else:
-                    cmd_list.append((filename, g_name))
+    with open(file_name, "w") as file_handle:
+        file_handle.write("## This list file has been produced automatically. Any changes" + os.pathsep)
+        file_handle.write("## are subject to being overwritten when reproducing this file." + os.pathsep))
+        file_handle.write("## " + os.pathsep))
+        file_handle.write("## Last Updated: %s%s" % (current_time_str, os.pathsep))
+        file_handle.write("## Commit: %s%s" % (ARGS.commit_hash, os.pathsep))
+        file_handle.write("## " + os.pathsep))
 
-            elif os.path.isdir(filename):
-                traverse_dir(filename, cat, cat_dir, add_cat)
+        order = ["RelativePath", "WorkingDir", "Expected", 
+                "MaxAllowedDurationSeconds", "Categories", "HostStyle"]
 
-    traverse_dir(base_dir, cat, dir)
+        def write_metadata(data, count=None):
+            for item in data:
+                test_name = item[0]["RelativePath"]
+                if item[1] != -1:
+                    count = item[1]
 
-    return cmd_list
+                item = item[0]
 
-################################################################################
-# Main
-################################################################################
+                # Get the test name.
+                title = "[%s_%d]" % (test_name.split("\\")[-1], count)
+                count += 1
 
-if __name__ == "__main__":
-    print "Starting lst_creator"
-    print "- - - - - - - - - - - - - - - - - - - - - - - - - - - -"
-    print
+                file_handle.write("%s\n" % title)
 
-    if len(sys.argv) < 4:
-        print "Error, incorrect number of arguments."
-        print "Ex usage: python lst_creator <root_oss_test_dir> <lst file name> <optional cat name> <old list file location>"
-        print "Tests must be built!"
-        exit(1)
+                attribute_str = ""
+                for key in order:
+                    attribute_str += "%s=%s%s" % (key, item[key], os.pathsep))
 
-    if not os.path.isdir(sys.argv[1]):
-        print "Error argument passed is not a valid directory."
-        exit(1)
+                file_handle.write(attribute_str + os.pathsep))
 
-    g_name = sys.argv[3]
+        write_metadata(old_metadata)
+        write_metadata(new_metadata, old_metadata[-1][1] + 1)
 
-    cat, dirname = None, None
-    
-    if len(sys.argv) > 4:
-        if sys.argv[4] == "-D":
-            cat = sys.argv[5]
-            dirname = sys.argv[6]
+def create_metadata(tests):
+    """ Given a set of tests create the metadata around them
 
-        elif sys.argv[4] != "-D":
-            g_old_list_file = sys.argv[4]
+    Args:
+        tests ([str]): List of tests for which to determine metadata
 
-            if not os.path.isfile(g_old_list_file):
+    Returns:
+        test_metadata ({ str: { str: str } }): Dictionary mapping test name to
+                                             : a dictionary of key/value
+                                             : attributes.
 
-                print "Error, old list file must be valid."
-                exit(1)
+    """
+    test_metadata = defaultdict(lambda: None)
 
-    cmd_list = find_tests(sys.argv[1], cat, dirname)
+    failures_csv = ARGS.failures_csv
 
-    print "Found " + str(len(cmd_list)) + " tests to add."
-    print
+    failure_information = defaultdict(lambda: None)
+
+    if failures_csv is not None:
+        lines = []
+        assert(os.path.isfile(failures_csv))
+
+        with open(failures_csv, "r") as file_handle:
+            lines = file_handle.readlines()
+        
+        try:
+            for line in lines:
+                split = line.split(",")
+                relative_path = split[0].replace("/", "\\")
+                category = split[1]
+
+                failure_information[relative_path] = category.strip()
+        except:
+            raise Exception("Error. CSV format expects: relativepath,category")
+
+    for test in tests:
+        working_directory = os.path.dirname(test).replace("/", "\\")
+
+        # Make sure the tests use the windows \ seperator.
+        relative_path = test.replace("/", "\\")
+        max_duration = "600"
+        categories = "EXPECTED_PASS"
+        expected = "0"
+        host_style = "0"
+
+        metadata = defaultdict(lambda: None)
+        metadata["RelativePath"] = relative_path
+        metadata["WorkingDir"] = working_directory
+        metadata["MaxAllowedDurationSeconds"] = max_duration
+        metadata["HostStyle"] = host_style
+        metadata["Expected"] = expected
+        metadata["Categories"] = categories
 
-    if g_old_list_file is not "":
-        print "Updating the old list file"
+        if failure_information[relative_path] is not None:
+            metadata["Categories"] = failure_information[relative_path]
 
-    else:
-        print "Creating the lst file."
+        test_metadata[relative_path] = metadata
 
-    unique_output = dict()
-    largest_value = 0
+    return test_metadata
 
-    # If there was an old list file passed. Parse it for all the old tests.
+def get_all_tests(base_dir):
+    """ Find all of the tests in the enlistment
 
-    if g_old_list_file is not "":
-        old_list_file_lines = []
+    Args:
+        base_dir (str): Directory to start traversing from
 
-        with open(sys.argv[4]) as lst_file_handle:
+    Returns:
+        test_list ([str]): List of the tests. Note this is defined to be every
+                         : cmd file under the base_dir.
 
-            old_list_file_lines = lst_file_handle.readlines()
+    Note:
+        To find the tests correctly you must build the tests correctly and 
+        pass that directory. This method will NOT check to make sure that 
+        this has been done correctly.
 
-        for line in old_list_file_lines:
-            split_line = line.split("[")
+        This is a recursive method.
 
-            # We only need the test names
-            # which come in as [ testname_number ]
-            if len(split_line) == 1:
-                continue
+    """
 
-            # This is a test name, start splitting
+    def get_all_tests_helper(working_dir):
+        """ Helper function to recursively get all tests.
+        """
 
-            split_line = split_line[1].split("]")
-            split_line = split_line[0].split("_")
+        assert os.path.isdir(working_dir)
 
-            if largest_value < int(split_line[-1]):
-                largest_value = int(split_line[-1])
+        items = os.listdir(working_dir)
+        items = [os.path.join(working_dir, item) for item in items]
+        dirs = [item for item in items if os.path.isdir(item)]
+        tests = [item for item in items if ".cmd" in item]
 
-            test_name = "_".join(split_line[:-1])
 
-            if len(test_name.split("exe")) == 1:
-                # Error, name is not an exe.
-                print "Error"
+        for item in dirs:
+            tests += get_all_tests_helper(item)
 
-                sys.exit(1)
+        return tests
 
-            unique_output[test_name] = True
+    # Recursively get all of the tests in the directory.
+    tests = get_all_tests_helper(base_dir)
 
-        print str(len(unique_output)) + " tests found in the old lstFile."
+    # Find the correct base directory for the tests.
+    common_prefix = os.path.commonprefix(tests)
 
-    output = []
+    if common_prefix is not None:
+        tests = [test.replace(common_prefix, "") for test in tests]
 
-    repeat_count = 0
-    count = largest_value
+    return tests
 
-    for line in cmd_list:
-        path, cat = line[0], line[1]
+def log(message):
+    """ Log a debug message. This is to be used when the --test option is passed
+    """
 
-        # get the relative path
-        prefix = os.path.commonprefix([path, sys.argv[1]])
-        rel_path = os.path.relpath(path, prefix)
+    if ARGS.testing is True:
+        print message
 
-        cmd_contents = None
-        with open(path) as cmd_file_handle:
-            cmd_contents = cmd_file_handle.readlines()
+def parse_lst_file(lst_file):
+    """Parse a lstFile given.
 
-        expected_exit_code_line = None
+    Args:
+        lst_file(str): location of the lstFile
 
-        for cmd_line in cmd_contents:
-            if cmd_line.find("CLRTestExpectedExitCode") != -1:
-                expected_exit_code_line = cmd_line
-                break
+    Returns:
+        test_metadata (defaultdict(lambda: None)): Key is test name.
 
-        if expected_exit_code_line is None:
-            print "Error, cmd file missing contents. Skipping, however, the test suite was not built correctly."
-            print path
+    """
+
+    assert os.path.isfile(lst_file)
+
+    contents = None
+    with open(lst_file) as file_handle:
+        contents = file_handle.read()
+
+    split = re.split("\[(.*?)\]", contents)
+
+    unique_name = None
+    test_metadata = defaultdict(lambda: None)
+    for item in split:
+        if len(item) == 0 or item[0] == "#":
             continue
 
-        expected = expected_exit_code_line[expected_exit_code_line.find("CLRTestExpectedExitCode") + (len("CLRTestExpectedExitCode") + 1):].strip()
-        max_allowed_duration = 600
-        categories = cat
-        build_type = "CoreSys"
-        relative_path = rel_path[:rel_path.find("cmd")] + "exe"
-        working_dir = os.path.dirname(rel_path)
-        test_name = os.path.basename(relative_path)
+        if unique_name is None:
+            unique_name = item
+        else:
+            index = int(unique_name.split("_")[-1])
+            metadata = defaultdict(lambda: None)
 
-        try:
-            if unique_output[test_name] == True:
-                repeat_count += 1
+            attributes = item.split(os.linesep)
+            for attribute in attributes:
+                # Skip the removed new lines.
+                if len(attribute) == 0:
+                    continue
 
-                continue
+                pair = attribute.split("=")
+                key = pair[0].strip()
+                value = pair[1].strip()
 
-        except:
-            output.append("[" + test_name + "_" + str(count) + "]" + "\n")
+                metadata[key] = value
 
-            count = count + 1
+            # Relative path is unique, while the test name alone is not.
+            unique_name = metadata["RelativePath"]
+            test_metadata[unique_name] = (metadata, index)
+            unique_name = None
 
-            output.append("RelativePath=" + os.path.relpath(relative_path) + "\n")
-            output.append("WorkingDir=" + os.path.relpath(working_dir) + "\n")
-            output.append("Expected=" + expected + "\n")
-            output.append("MaxAllowedDurationSeconds=" + str(max_allowed_duration) + "\n")
-            output.append("Categories=" + categories + "\n")
-            output.append("HostStyle=Any")
-            output.append("\n")
+    return test_metadata
 
-    print
-    print "Writing out lst file."
+################################################################################
+# Main
+################################################################################
+
+def main(args):
+    """ Main method
+    Args:
+        args ([str]): the arugments passed to the program.
+
+    """
 
-    if repeat_count > 0:
-        print "Found " + str(repeat_count) + " old tests."
-    
-        # If we found repeats then we open file to append not write.
+    # Assign all of the passed variables.
+    test_dir = args.test_dir
+    old_list_file = args.old_list_file
+    commit_hash = args.commit_hash
+    unset_new = args.unset_new
 
-        with open(g_old_list_file, 'a') as list_file_handle:
-            list_file_handle.write("\n")
+    if commit_hash is None:
+        print "Error please provide a commit hash."
+        sys.exit(1)
 
-            for line in output:
-                list_file_handle.write(line)
+    if test_dir is None or not os.path.isdir(test_dir):
+        print "Error the test directory passed is not a valid directory."
+        sys.exit(1)
 
+    tests = get_all_tests(test_dir)
+    print "Found %d tests in the test directory." % (len(tests))
+    print
 
-    else:
-        with open(sys.argv[2], 'w') as list_file_handle:
+    old_test_metadata = None
+    # If we are updating an old lstFile. Get all of the tests from that
+    # lstFile and their metadata.
+    if old_list_file is not None:
+        old_test_metadata = parse_lst_file(old_list_file)
+
+        print "Found %d tests in the old lstFile." % (len(old_test_metadata))
+
+    test_metadata = create_metadata(tests)
+
+    if old_test_metadata is not None:
+        # If the new information has been changed, we will need to update
+        # the lstFile.
+
+        new_test_count = 0
+        update_count = 0
+        for test_name in test_metadata:
+            new_metadata = test_metadata[test_name]
+            old_metadata = old_test_metadata[test_name]
+
+            attributes = None
+            if old_test_metadata[test_name] is None:
+                new_test_count += 1
+                new_metadata["Categories"] += ";NEW"
+                old_test_metadata[test_name] = (new_metadata, -1)
+
+            else:
+                index = old_metadata[1]
+                old_metadata = old_metadata[0]
+                attributes = set(old_metadata.keys() + new_metadata.keys())
+
+                # Make sure we go through all attributes of both sets.
+                # If an attribute exists in one set but not the other it will
+                # be None. If the new metadata has a new attribute, write this
+                # into the old metadata. If the old metadata has an attribute
+                # that does not exist in the new set. Do not remove it.
+
+                overwritten = False
+
+                for attribute in attributes:
+                    if attribute == "MaxAllowedDurationSeconds":
+                            continue
+                    if attribute == "Categories":
+                        new_split = new_metadata["Categories"].split(";")
+                        old_split = old_metadata["Categories"].split(";")
+
+                        if unset_new:
+                            if "NEW" in old_split:
+                                old_split.remove("NEW")
+
+                        # If an old test is marked as a failing test. Make
+                        # sure that we carry that information along.
+                        if "EXPECTED_PASS" in new_split and "EXPECTED_FAIL" in old_split:
+                            new_split.remove("EXPECTED_PASS")
+
+                        # If it used to be marked as pass but it is now failing. Make sure
+                        # we remove the old category.
+                        elif "EXPECTED_FAIL" in new_split and "EXPECTED_PASS" in old_split:
+                            old_split.remove("EXPECTED_PASS")
+
+                        joined_categories = set(old_split + new_split)
+
+                        overwritten = True
+                        ordered_categories = []
+                        for item in old_split:
+                            if item in joined_categories:
+                                ordered_categories.append(item)
+                                joined_categories.remove(item)
+
+                        old_metadata[attribute] = ";".join(ordered_categories)
+                        old_metadata[attribute] = old_metadata[attribute] + ";" + ";".join(joined_categories) if len(joined_categories) > 0 else old_metadata[attribute]
+                        old_test_metadata[test_name] = (old_metadata, index)
+
+                    elif new_metadata[attribute] != old_metadata[attribute]:
+                            # If the old information is not the same as the new
+                            # information, keep the new information. overwrite the old
+                            # metadata.
+                            if new_metadata[attribute] is not None:
+                                overwritten = True
+                                old_metadata[attribute] = new_metadata[attribute]
+
+                                old_test_metadata[test_name] = (old_metadata, index)
+
+                    if overwritten:
+                        update_count += 1
+
+        tests_removed = 0
+        tests_to_remove = []
+        for old_test_name in old_test_metadata:
+            # Remove all old unreferenced tests
+            if old_test_name not in test_metadata:
+                tests_to_remove.append(old_test_name)
+                tests_removed += 1
+
+        for test_name in tests_to_remove:
+            old_test_metadata.pop(test_name)
+
+        print "Added %d tests." % new_test_count
+        print "Removed %d tests." % tests_removed
+        print "Finished join. %d tests updated." % update_count
+
+        test_metadata = old_test_metadata
+
+    # Overwrite the old file if provided, else use the generic name Tests.lst
+    lst_file = "Tests.lst" if old_list_file is None else old_list_file
+
+    # Write out the new lstFile
+    create_list_file(lst_file, test_metadata)
 
-            list_file_handle.write("##=== Test Definitions ===============================\n")
+################################################################################
+################################################################################
 
-            for line in output:
-                list_file_handle.write(line)
+if __name__ == "__main__":
+    main(ARGS)
diff --git a/tests/scripts/optdata/bootstrap.py b/tests/scripts/optdata/bootstrap.py
new file mode 100755
index 0000000000..1cf55fa70c
--- /dev/null
+++ b/tests/scripts/optdata/bootstrap.py
@@ -0,0 +1,85 @@
+#!/usr/bin/env python
+
+"""
+    This script prepares the local source tree to be built with
+    custom optdata. Simply run this script and follow the
+    instructions to inject manually created optdata into the build.
+"""
+
+import argparse
+import json
+import os
+from os import path
+import shutil
+import subprocess
+import sys
+
+# Display the docstring if the user passes -h|--help
+argparse.ArgumentParser(description=__doc__).parse_args()
+
+SCRIPT_ROOT = path.dirname(path.realpath(__file__))
+REPO_ROOT = path.realpath(path.join(SCRIPT_ROOT, '..', '..', '..'))
+
+NUGET_SRC_DIR = path.join(REPO_ROOT, 'src', '.nuget')
+assert path.exists(NUGET_SRC_DIR), \
+    "Expected %s to exist; please check whether REPO_ROOT is really %s" % (NUGET_SRC_DIR, REPO_ROOT)
+
+ORIGIN_FILE = path.join(SCRIPT_ROOT, 'project.json')
+TARGET_FILE = path.join(NUGET_SRC_DIR, 'optdata', 'project.json')
+
+ARCH_LIST = ['x64', 'x86']
+TOOL_LIST = ['IBC', 'PGO']
+
+def get_buildos():
+    """Returns the Build_OS component used by the build system."""
+    if os.name == 'nt':
+        return 'Windows_NT'
+    else:
+        sysname = os.uname()[0]
+        return 'OSX' if sysname.lower() == 'Darwin'.lower() else sysname
+
+def get_optdata_version(tool):
+    """Returns the version string specified in project.json for the given tool."""
+    package_name = 'optimization.%s.CoreCLR' % (tool)
+    with open(ORIGIN_FILE) as json_file:
+        return json.load(json_file)['dependencies'][package_name]
+
+def get_optdata_dir(tool, arch):
+    """Returns an absolute path to the directory that should contain optdata given a tool,arch"""
+    package_name = 'optimization.%s-%s.%s.CoreCLR' % (get_buildos(), arch, tool)
+    package_version = get_optdata_version(tool)
+    return path.join(REPO_ROOT, 'packages', package_name, package_version, 'data')
+
+def check_for_unstaged_changes(file_path):
+    """Returns whether a file in git has untracked changes."""
+    if not path.exists(file_path):
+        return False
+    try:
+        subprocess.check_call(['git', 'diff', '--quiet', '--', file_path])
+        return False
+    except subprocess.CalledProcessError:
+        return True
+
+def main():
+    """Entry point"""
+    if check_for_unstaged_changes(TARGET_FILE):
+        print("ERROR: You seem to have unstaged changes to %s that would be overwritten."
+              % (TARGET_FILE))
+        print("Please clean, commit, or stash them before running this script.")
+        return 1
+
+    if not path.exists(path.dirname(TARGET_FILE)):
+        os.makedirs(path.dirname(TARGET_FILE))
+    shutil.copyfile(ORIGIN_FILE, TARGET_FILE)
+
+    print("Bootstrapping optdata is complete.")
+    for tool in TOOL_LIST:
+        for arch in ARCH_LIST:
+            optdata_dir = get_optdata_dir(tool, arch)
+            print("  * Copy %s %s files into: %s" % (arch, tool, optdata_dir))
+    print("NOTE: Make sure to add 'skiprestoreoptdata' as a switch on the build command line!")
+
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/tests/scripts/optdata/project.json b/tests/scripts/optdata/project.json
new file mode 100644
index 0000000000..ae8f9463c4
--- /dev/null
+++ b/tests/scripts/optdata/project.json
@@ -0,0 +1,12 @@
+{
+    "dependencies": {
+        "optimization.IBC.CoreCLR": "99.99.99-test",
+        "optimization.PGO.CoreCLR": "99.99.99-test"
+    },
+    "frameworks": {
+        "netstandard": {}
+    },
+    "runtimes": {
+        "win7-x64": {}
+    }
+}
diff --git a/tests/scripts/perf-prep.sh b/tests/scripts/perf-prep.sh
index effdc0a615..4468dbb6f7 100755
--- a/tests/scripts/perf-prep.sh
+++ b/tests/scripts/perf-prep.sh
@@ -11,6 +11,8 @@ function print_usage {
     echo ''
     echo 'Required arguments:'
     echo '  --branch=<path>             : branch where coreclr/corefx/test bits are copied from (e.g. dotnet_coreclr).'
+    echo 'Optional arguments:'
+    echo '  --throughput                : if we are running setup for a throughput run.'
 }
 
 # Exit code constants
@@ -20,6 +22,7 @@ readonly EXIT_CODE_SUCCESS=0       # Script ran normally.
 perfArch="x64"
 perfConfig="Release"
 perfBranch=
+throughput=0
 
 for i in "$@"
 do
@@ -31,6 +34,9 @@ do
         --branch=*)
             perfBranch=${i#*=}
             ;;
+        -t|--throughput)
+            throughput=1
+            ;;
         *)
             echo "Unknown switch: $i"
             print_usage
@@ -57,22 +63,38 @@ unzip -q -o benchview.zip -d ./tests/scripts/Microsoft.BenchView.JSONFormat
 python3.5 --version
 python3.5 ./tests/scripts/Microsoft.BenchView.JSONFormat/tools/machinedata.py
 
-# Set up the copies
-# Coreclr build containing the tests and mscorlib
-curl https://ci.dot.net/job/$perfBranch/job/master/job/release_windows_nt/lastSuccessfulBuild/artifact/bin/tests/tests.zip -o tests.zip
+if [ $throughput -eq 1 ]; then
+    # Clone corefx
+    if [ -d "_" ]; then
+        rm -r -f _
+    fi
+    mkdir _
+    git clone https://github.com/dotnet/corefx.git _/fx
+    cd _/fx
+
+    # Checkout the specific commit we want
+    git checkout f0b9e238c08f62a1db90ef0378980ac771204d35
+
+    # Build
+    ./build.sh -release
+else
+    # Set up the copies
+    # Coreclr build containing the tests and mscorlib
+    curl https://ci.dot.net/job/$perfBranch/job/master/job/release_windows_nt/lastSuccessfulBuild/artifact/bin/tests/tests.zip -o tests.zip
 
-# Corefx components.  We now have full stack builds on all distros we test here, so we can copy straight from CoreFX jobs.
-mkdir corefx
-curl https://ci.dot.net/job/dotnet_corefx/job/master/job/ubuntu14.04_release/lastSuccessfulBuild/artifact/bin/build.tar.gz -o ./corefx/build.tar.gz
+    # Corefx components.  We now have full stack builds on all distros we test here, so we can copy straight from CoreFX jobs.
+    mkdir corefx
+    curl https://ci.dot.net/job/dotnet_corefx/job/master/job/ubuntu14.04_release/lastSuccessfulBuild/artifact/bin/build.tar.gz -o ./corefx/build.tar.gz
 
-# Unpack the corefx binaries
-pushd corefx > /dev/null
-tar -xf build.tar.gz
-rm build.tar.gz
-popd > /dev/null
+    # Unpack the corefx binaries
+    pushd corefx > /dev/null
+    tar -xf build.tar.gz
+    rm build.tar.gz
+    popd > /dev/null
 
-# Unzip the tests first.  Exit with 0
-mkdir bin
-mkdir bin/tests
-unzip -q -o tests.zip -d ./bin/tests/Windows_NT.$perfArch.$perfConfig || exit 0
-echo "unzip tests to ./bin/tests/Windows_NT.$perfArch.$perfConfig"
+    # Unzip the tests first.  Exit with 0
+    mkdir bin
+    mkdir bin/tests
+    unzip -q -o tests.zip -d ./bin/tests/Windows_NT.$perfArch.$perfConfig || exit 0
+    echo "unzip tests to ./bin/tests/Windows_NT.$perfArch.$perfConfig"
+fi
diff --git a/tests/scripts/run-corefx-tests.py b/tests/scripts/run-corefx-tests.py
index f0111da19c..2340a64d00 100644
--- a/tests/scripts/run-corefx-tests.py
+++ b/tests/scripts/run-corefx-tests.py
@@ -167,19 +167,6 @@ def nth_dirname(path, n):
 
     return path
 
-
-def dotnet_rid_os(dotnet_path):
-    """ Determine the OS identifier from the RID as reported by dotnet
-    Args:
-        dotnet_path (str): path to folder containing dotnet(.exe)
-    Returns:
-        rid_os (str): OS component of RID as reported by dotnet
-    """
-    dotnet_info = subprocess.check_output([os.path.join(dotnet_path, 'dotnet'), '--info'])
-    m = re.search('^\s*RID:\s+([^-]*)-(\S*)\s*$', dotnet_info, re.MULTILINE)
-    return m.group(1)
-
-
 def log(message):
     """ Print logging information
     Args:
@@ -263,37 +250,21 @@ def main(args):
     # Determine the RID to specify the to corefix build scripts.  This seems to
     # be way harder than it ought to be.
  
-    if testing:
-        rid_os = dotnet_rid_os('')
-    else:
-        if Is_windows:
-            rid_os = "win7"
-        else:
-            rid_os = dotnet_rid_os(os.path.join(clr_root, 'Tools', 'dotnetcli'))
-
     # Gather up some arguments to pass to both build and build-tests.
 
-    config_args = '-Release -RuntimeOS=%s -ArchGroup=%s' % (rid_os, arch)
+    config_args = '-Release -os:%s -buildArch:%s' % (clr_os, arch)
 
     # Run the primary (non-test) corefx build
 
-    command = ' '.join(('build.cmd' if Is_windows else './build.sh', config_args))
+    command = ' '.join(('build.cmd' if Is_windows else './build.sh',
+                        config_args,
+                        '-- /p:CoreCLROverridePath=%s' % core_root))
+
     log(command)
     returncode = 0 if testing else os.system(command)
     if returncode != 0:
         sys.exit(returncode)
 
-    # Copy the coreclr runtime we wish to run tests against.  This is the recommended
-    # hack until a full-stack test solution is ready.  This assumes there is a single
-    # directory under <fx_root>/bin/runtime into which we copy coreclr binaries.  We
-    # assume the appropriate coreclr has already been built.
-
-    fx_runtime_dir = os.path.join(fx_root, 'bin', 'runtime')
-    overlay_dest = os.path.join(fx_runtime_dir, os.listdir(fx_runtime_dir)[0])
-    log('[overlay] %s -> %s' % (core_root, overlay_dest))
-    if not testing:
-        distutils.dir_util.copy_tree(core_root, overlay_dest)
-
     # Build the build-tests command line.
 
     if Is_windows:
diff --git a/tests/scripts/run-throughput-perf.py b/tests/scripts/run-throughput-perf.py
new file mode 100644
index 0000000000..ee6e4a3c58
--- /dev/null
+++ b/tests/scripts/run-throughput-perf.py
@@ -0,0 +1,400 @@
+#!/usr/bin/env python
+#
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the MIT license.
+# See the LICENSE file in the project root for more information.
+#
+##########################################################################
+##########################################################################
+#
+# Module: run-throughput-tests.py
+#
+# Notes: runs throughput testing for coreclr and uploads the timing results
+#        to benchview
+#
+#
+##########################################################################
+##########################################################################
+
+import argparse
+import distutils.dir_util
+import os
+import re
+import shutil
+import subprocess
+import sys
+import time
+import timeit
+import stat
+import csv
+
+##########################################################################
+# Globals
+##########################################################################
+
+# List of dlls we want to exclude
+dll_exclude_list = {
+    'Windows_NT': [
+        # Require Newtonsoft.Json
+        "Microsoft.DotNet.ProjectModel.dll",
+        "Microsoft.Extensions.DependencyModel.dll",
+        # Require System.Security.Principal.Windows
+        "System.Net.Requests.dll",
+        "System.Net.Security.dll",
+        "System.Net.Sockets.dll"
+    ],
+    'Linux' : [
+        # Required System.Runtime.WindowsRuntime
+        "System.Runtime.WindowsRuntime.UI.Xaml.dll"
+    ]
+}
+
+jit_list = {
+    'Windows_NT': {
+        'x64': 'clrjit.dll',
+        'x86': 'clrjit.dll',
+        'x86jit32': 'compatjit.dll'
+    },
+    'Linux': {
+        'x64': 'libclrjit.so'
+    }
+}
+
+os_group_list = {
+    'Windows_NT': 'Windows_NT',
+    'Ubuntu14.04': 'Linux'
+}
+
+python_exe_list = {
+    'Windows_NT': 'py',
+    'Linux': 'python3.5'
+}
+
+##########################################################################
+# Argument Parser
+##########################################################################
+
+description = 'Tool to collect throughtput performance data'
+
+parser = argparse.ArgumentParser(description=description)
+
+parser.add_argument('-arch', dest='arch', default='x64')
+parser.add_argument('-configuration', dest='build_type', default='Release')
+parser.add_argument('-run_type', dest='run_type', default='rolling')
+parser.add_argument('-os', dest='operating_system', default='Windows_NT')
+parser.add_argument('-clr_root', dest='clr_root', default=None)
+parser.add_argument('-assembly_root', dest='assembly_root', default=None)
+parser.add_argument('-benchview_path', dest='benchview_path', default=None)
+
+##########################################################################
+# Helper Functions
+##########################################################################
+
+def validate_args(args):
+    """ Validate all of the arguments parsed.
+    Args:
+        args (argparser.ArgumentParser): Args parsed by the argument parser.
+    Returns:
+        (arch, build_type, clr_root, fx_root, fx_branch, fx_commit, env_script)
+            (str, str, str, str, str, str, str)
+    Notes:
+    If the arguments are valid then return them all in a tuple. If not, raise
+    an exception stating x argument is incorrect.
+    """
+
+    arch = args.arch
+    build_type = args.build_type
+    run_type = args.run_type
+    operating_system = args.operating_system
+    clr_root = args.clr_root
+    assembly_root = args.assembly_root
+    benchview_path = args.benchview_path
+
+    def validate_arg(arg, check):
+        """ Validate an individual arg
+        Args:
+           arg (str|bool): argument to be validated
+           check (lambda: x-> bool): test that returns either True or False
+                                   : based on whether the check passes.
+
+        Returns:
+           is_valid (bool): Is the argument valid?
+        """
+
+        helper = lambda item: item is not None and check(item)
+
+        if not helper(arg):
+            raise Exception('Argument: %s is not valid.' % (arg))
+
+    valid_archs = {'Windows_NT': ['x86', 'x64', 'x86jit32'], 'Linux': ['x64']}
+    valid_build_types = ['Release']
+    valid_run_types = ['rolling', 'private']
+    valid_os = ['Windows_NT', 'Ubuntu14.04']
+
+    arch = next((a for a in valid_archs if a.lower() == arch.lower()), arch)
+    build_type = next((b for b in valid_build_types if b.lower() == build_type.lower()), build_type)
+
+    validate_arg(operating_system, lambda item: item in valid_os)
+
+    os_group = os_group_list[operating_system]
+
+    validate_arg(arch, lambda item: item in valid_archs[os_group])
+    validate_arg(build_type, lambda item: item in valid_build_types)
+    validate_arg(run_type, lambda item: item in valid_run_types)
+
+    if clr_root is None:
+        raise Exception('--clr_root must be set')
+    else:
+        clr_root = os.path.normpath(clr_root)
+        validate_arg(clr_root, lambda item: os.path.isdir(clr_root))
+
+    if assembly_root is None:
+        raise Exception('--assembly_root must be set')
+    else:
+        assembly_root = os.path.normpath(assembly_root)
+        validate_arg(assembly_root, lambda item: os.path.isdir(assembly_root))
+
+    if not benchview_path is None:
+        benchview_path = os.path.normpath(benchview_path)
+        validate_arg(benchview_path, lambda item: os.path.isdir(benchview_path))
+
+    args = (arch, operating_system, os_group, build_type, run_type, clr_root, assembly_root, benchview_path)
+
+    # Log configuration
+    log('Configuration:')
+    log(' arch: %s' % arch)
+    log(' os: %s' % operating_system)
+    log(' os_group: %s' % os_group)
+    log(' build_type: %s' % build_type)
+    log(' run_type: %s' % run_type)
+    log(' clr_root: %s' % clr_root)
+    log(' assembly_root: %s' % assembly_root)
+    if not benchview_path is None:
+        log('benchview_path : %s' % benchview_path)
+
+    return args
+
+def nth_dirname(path, n):
+    """ Find the Nth parent directory of the given path
+    Args:
+        path (str): path name containing at least N components
+        n (int): num of basenames to remove
+    Returns:
+        outpath (str): path with the last n components removed
+    Notes:
+        If n is 0, path is returned unmodified
+    """
+
+    assert n >= 0
+
+    for i in range(0, n):
+        path = os.path.dirname(path)
+
+    return path
+
+def del_rw(action, name, exc):
+    os.chmod(name, stat.S_IWRITE)
+    os.remove(name)
+
+def log(message):
+    """ Print logging information
+    Args:
+        message (str): message to be printed
+    """
+
+    print('[%s]: %s' % (sys.argv[0], message))
+
+def generateCSV(dll_name, dll_runtimes):
+    """ Write throuput performance data to a csv file to be consumed by measurement.py
+    Args:
+        dll_name (str): the name of the dll
+        dll_runtimes (float[]): A list of runtimes for each iteration of the performance test
+    """
+
+    csv_file_name = "throughput-%s.csv" % (dll_name)
+    csv_file_path = os.path.join(os.getcwd(), csv_file_name)
+
+    with open(csv_file_path, 'w') as csvfile:
+        output_file = csv.writer(csvfile, delimiter=',', lineterminator='\n')
+
+        for iteration in dll_runtimes:
+            output_file.writerow(["default", "coreclr-crossgen-tp", dll_name, iteration])
+
+    return csv_file_name
+
+def runIterations(dll_name, dll_path, iterations, crossgen_path, jit_path, assemblies_path):
+    """ Run throughput testing for a given dll
+    Args:
+        dll_name: the name of the dll
+        dll_path: the path to the dll
+        iterations: the number of times to run crossgen on the dll
+        crossgen_path: the path to crossgen
+        jit_path: the path to the jit
+        assemblies_path: the path to the assemblies that may be needed for the crossgen run
+    Returns:
+        dll_elapsed_times: a list of the elapsed times for the dll
+    """
+
+    dll_elapsed_times = []
+
+    # Set up arguments for running crossgen
+    run_args = [crossgen_path,
+            '/JITPath',
+            jit_path,
+            '/Platform_Assemblies_Paths',
+            assemblies_path,
+            dll_path
+            ]
+
+    log(" ".join(run_args))
+
+    # Time.clock() returns seconds, with a resolution of 0.4 microseconds, so multiply by the multiplier to get milliseconds
+    multiplier = 1000
+
+    for iteration in range(0,iterations):
+        proc = subprocess.Popen(run_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        start_time = timeit.default_timer()
+        (out, err) = proc.communicate()
+        end_time = timeit.default_timer()
+
+        if proc.returncode == 0:
+            # Calculate the runtime
+            elapsed_time = (end_time - start_time) * multiplier
+            dll_elapsed_times.append(elapsed_time)
+        else:
+            log("Error in %s" % (dll_name))
+            log(err.decode("utf-8"))
+
+    return dll_elapsed_times
+
+##########################################################################
+# Main
+##########################################################################
+
+def main(args):
+    global dll_exclude_list
+    global jit_list
+    global os_group_list
+    global python_exe_list
+
+    architecture, operating_system, os_group, build_type, run_type, clr_root, assembly_root, benchview_path = validate_args(args)
+    arch = architecture
+
+    if architecture == 'x86jit32':
+        arch = 'x86'
+
+    current_dir = os.getcwd()
+    jit = jit_list[os_group][architecture]
+    crossgen = 'crossgen'
+
+    if os_group == 'Windows_NT':
+        crossgen += '.exe'
+
+    # Make sandbox
+    sandbox_path = os.path.join(clr_root, "sandbox")
+    if os.path.isdir(sandbox_path):
+        shutil.rmtree(sandbox_path, onerror=del_rw)
+
+    os.makedirs(sandbox_path)
+    os.chdir(sandbox_path)
+
+    # Set up paths
+    bin_path = os.path.join(clr_root, 'bin', 'Product',  os_group + '.' + arch + '.' + build_type)
+
+    crossgen_path = os.path.join(bin_path,crossgen)
+    jit_path = os.path.join(bin_path, jit)
+
+    iterations = 6
+
+    python_exe = python_exe_list[os_group]
+
+    # Run throughput testing
+    for dll_file_name in os.listdir(assembly_root):
+        # Find all framework dlls in the assembly_root dir, which we will crossgen
+        if (dll_file_name.endswith(".dll") and
+                (not ".ni." in dll_file_name) and
+                ("Microsoft" in dll_file_name or "System" in dll_file_name) and
+                (not dll_file_name in dll_exclude_list[os_group])):
+            dll_name = dll_file_name.replace(".dll", "")
+            dll_path = os.path.join(assembly_root, dll_file_name)
+            dll_elapsed_times = runIterations(dll_file_name, dll_path, iterations, crossgen_path, jit_path, assembly_root)
+
+            if len(dll_elapsed_times) != 0:
+                if not benchview_path is None:
+                    # Generate the csv file
+                    csv_file_name = generateCSV(dll_name, dll_elapsed_times)
+                    shutil.copy(csv_file_name, clr_root)
+
+                    # For each benchmark, call measurement.py
+                    measurement_args = [python_exe,
+                            os.path.join(benchview_path, "measurement.py"),
+                            "csv",
+                            os.path.join(os.getcwd(), csv_file_name),
+                            "--metric",
+                            "execution_time",
+                            "--unit",
+                            "milliseconds",
+                            "--better",
+                            "desc",
+                            "--drop-first-value",
+                            "--append"]
+                    log(" ".join(measurement_args))
+                    proc = subprocess.Popen(measurement_args)
+                    proc.communicate()
+                else:
+                    # Write output to console if we are not publishing
+                    log("%s" % (dll_name))
+                    log("Duration: [%s]" % (", ".join(str(x) for x in dll_elapsed_times)))
+
+    # Upload the data
+    if not benchview_path is None:
+        # Call submission.py
+        submission_args = [python_exe,
+                os.path.join(benchview_path, "submission.py"),
+                "measurement.json",
+                "--build",
+                os.path.join(clr_root, "build.json"),
+                "--machine-data",
+                os.path.join(clr_root, "machinedata.json"),
+                "--metadata",
+                os.path.join(clr_root, "submission-metadata.json"),
+                "--group",
+                "CoreCLR-throughput",
+                "--type",
+                run_type,
+                "--config-name",
+                build_type,
+                "--config",
+                "Configuration",
+                build_type,
+                "--config",
+                "OS",
+                operating_system,
+                "--arch",
+                architecture,
+                "--machinepool",
+                "PerfSnake"
+                ]
+        log(" ".join(submission_args))
+        proc = subprocess.Popen(submission_args)
+        proc.communicate()
+
+        # Call upload.py
+        upload_args = [python_exe,
+                os.path.join(benchview_path, "upload.py"),
+                "submission.json",
+                "--container",
+                "coreclr"
+                ]
+        log(" ".join(upload_args))
+        proc = subprocess.Popen(upload_args)
+        proc.communicate()
+
+    os.chdir(current_dir)
+
+    return 0
+
+if __name__ == "__main__":
+    Args = parser.parse_args(sys.argv[1:])
+    main(Args)
diff --git a/tests/scripts/run-xunit-perf.cmd b/tests/scripts/run-xunit-perf.cmd
index 060ba33171..bad1f93a40 100644
--- a/tests/scripts/run-xunit-perf.cmd
+++ b/tests/scripts/run-xunit-perf.cmd
@@ -4,17 +4,26 @@
 
 @setlocal
 @echo off
+Setlocal EnableDelayedExpansion
 
 rem Set defaults for the file extension, architecture and configuration
 set CORECLR_REPO=%CD%
 set TEST_FILE_EXT=exe
 set TEST_ARCH=x64
+set TEST_ARCHITECTURE=x64
 set TEST_CONFIG=Release
 
 goto :ARGLOOP
 
+
 :SETUP
 
+IF /I [%TEST_ARCHITECTURE%] == [x86jit32] (
+    set TEST_ARCH=x86
+) ELSE (
+    set TEST_ARCH=%TEST_ARCHITECTURE%
+)
+
 set CORECLR_OVERLAY=%CORECLR_REPO%\bin\tests\Windows_NT.%TEST_ARCH%.%TEST_CONFIG%\Tests\Core_Root
 set RUNLOG=%CORECLR_REPO%\bin\Logs\perfrun.log
 
@@ -35,9 +44,9 @@ pushd sandbox
 @rem stage stuff we need
 
 @rem xunit and perf
-xcopy /sy %CORECLR_REPO%\packages\Microsoft.DotNet.xunit.performance.runner.Windows\1.0.0-alpha-build0040\tools\* . > %RUNLOG%
-xcopy /sy %CORECLR_REPO%\packages\Microsoft.DotNet.xunit.performance.analysis\1.0.0-alpha-build0040\tools\* . >> %RUNLOG%
-xcopy /sy %CORECLR_REPO%\packages\xunit.console.netcore\1.0.2-prerelease-00177\runtimes\any\native\* . >> %RUNLOG%
+"%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" restore "%CORECLR_REPO%\tests\src\Common\PerfHarness\project.json"
+"%CORECLR_REPO%\Tools\dotnetcli\dotnet.exe" publish "%CORECLR_REPO%\tests\src\Common\PerfHarness\project.json" -c Release -o %CORECLR_REPO%\sandbox
+xcopy /sy %CORECLR_REPO%\packages\Microsoft.Diagnostics.Tracing.TraceEvent\1.0.0-alpha-experimental\lib\native\* . >> %RUNLOG%
 xcopy /sy %CORECLR_REPO%\bin\tests\Windows_NT.%TEST_ARCH%.%TEST_CONFIG%\Tests\Core_Root\* . >> %RUNLOG%
 
 @rem find and stage the tests
@@ -56,7 +65,7 @@ if not [%BENCHVIEW_PATH%] == [] (
                                     --config-name "%TEST_CONFIG%" ^
                                     --config Configuration "%TEST_CONFIG%" ^
                                     --config OS "Windows_NT" ^
-                                    --arch "%TEST_ARCH%" ^
+                                    --arch "%TEST_ARCHITECTURE%" ^
                                     --machinepool "PerfSnake"
   py "%BENCHVIEW_PATH%\upload.py" submission.json --container coreclr
 )
@@ -78,16 +87,21 @@ xcopy /s %BENCHDIR%*.txt . >> %RUNLOG%
 
 set CORE_ROOT=%CORECLR_REPO%\sandbox
 
-xunit.performance.run.exe %BENCHNAME%.%TEST_FILE_EXT% -runner xunit.console.netcore.exe -runnerhost corerun.exe -verbose -runid %PERFOUT% > %BENCHNAME%.out
+@rem setup additional environment variables
+if DEFINED TEST_ENV (
+    if EXIST !TEST_ENV! (
+        call %TEST_ENV%
+    )
+)
 
-xunit.performance.analysis.exe %PERFOUT%.xml -xml %XMLOUT% > %BENCHNAME%-analysis.out
+corerun.exe PerfHarness.dll %WORKSPACE%\sandbox\%BENCHNAME%.%TEST_FILE_EXT% --perf:runid Perf > %BENCHNAME%.out
 
 @rem optionally generate results for benchview
 if not [%BENCHVIEW_PATH%] == [] (
-  py "%BENCHVIEW_PATH%\measurement.py" xunit "perf-%BENCHNAME%.xml" --better desc --drop-first-value --append
+  py "%BENCHVIEW_PATH%\measurement.py" xunit "Perf-%BENCHNAME%.xml" --better desc --drop-first-value --append
   REM Save off the results to the root directory for recovery later in Jenkins
-  xcopy perf-%BENCHNAME%*.xml %CORECLR_REPO%\
-  xcopy perf-%BENCHNAME%*.etl %CORECLR_REPO%\
+  xcopy Perf-%BENCHNAME%*.xml %CORECLR_REPO%\
+  xcopy Perf-%BENCHNAME%*.etl %CORECLR_REPO%\
 ) else (
   type %XMLOUT% | findstr "test name"
   type %XMLOUT% | findstr Duration
@@ -121,7 +135,13 @@ shift
 goto :ARGLOOP
 )
 IF /I [%1] == [-arch] (
-set TEST_ARCH=%2
+set TEST_ARCHITECTURE=%2
+shift
+shift
+goto :ARGLOOP
+)
+IF /I [%1] == [-testEnv] (
+set TEST_ENV=%2
 shift
 shift
 goto :ARGLOOP
diff --git a/tests/scripts/run-xunit-perf.sh b/tests/scripts/run-xunit-perf.sh
index 27f84c2011..6f49bf6e0a 100755
--- a/tests/scripts/run-xunit-perf.sh
+++ b/tests/scripts/run-xunit-perf.sh
@@ -200,9 +200,6 @@ function create_core_overlay {
     if [ ! -d "$coreClrBinDir" ]; then
         exit_with_error "$errorSource" "Directory specified by --coreClrBinDir does not exist: $coreClrBinDir"
     fi
-    if [ ! -f "$mscorlibDir/mscorlib.dll" ]; then
-        exit_with_error "$errorSource" "mscorlib.dll was not found in: $mscorlibDir"
-    fi
     if [ -z "$coreFxBinDir" ]; then
         exit_with_error "$errorSource" "One of --coreOverlayDir or --coreFxBinDir must be specified." "$printUsage"
     fi
@@ -217,12 +214,7 @@ function create_core_overlay {
 
 	cp -f -v "$coreFxBinDir"/* "$coreOverlayDir/" 2>/dev/null
     cp -f -v "$coreClrBinDir/"* "$coreOverlayDir/" 2>/dev/null
-    cp -f -v "$mscorlibDir/mscorlib.dll" "$coreOverlayDir/"
     cp -n -v "$testDependenciesDir"/* "$coreOverlayDir/" 2>/dev/null
-    if [ -f "$coreOverlayDir/mscorlib.ni.dll" ]; then
-        # Test dependencies come from a Windows build, and mscorlib.ni.dll would be the one from Windows
-        rm -f "$coreOverlayDir/mscorlib.ni.dll"
-    fi
 }
 
 function precompile_overlay_assemblies {
@@ -235,20 +227,15 @@ function precompile_overlay_assemblies {
         for fileToPrecompile in ${filesToPrecompile}
         do
             local filename=${fileToPrecompile}
-            # Precompile any assembly except mscorlib since we already have its NI image available.
-            if [[ "$filename" != *"mscorlib.dll"* ]]; then
-                if [[ "$filename" != *"mscorlib.ni.dll"* ]]; then
-                    echo Precompiling $filename
-                    $overlayDir/crossgen /Platform_Assemblies_Paths $overlayDir $filename 2>/dev/null
-                    local exitCode=$?
-                    if [ $exitCode == -2146230517 ]; then
-                        echo $filename is not a managed assembly.
-                    elif [ $exitCode != 0 ]; then
-                        echo Unable to precompile $filename.
-                    else
-                        echo Successfully precompiled $filename
-                    fi
-                fi
+            echo Precompiling $filename
+            $overlayDir/crossgen /Platform_Assemblies_Paths $overlayDir $filename 2>/dev/null
+            local exitCode=$?
+            if [ $exitCode == -2146230517 ]; then
+                echo $filename is not a managed assembly.
+            elif [ $exitCode != 0 ]; then
+                echo Unable to precompile $filename.
+            else
+                echo Successfully precompiled $filename
             fi
         done
     else
diff --git a/tests/scripts/x86_ci_script.sh b/tests/scripts/x86_ci_script.sh
new file mode 100755
index 0000000000..1f82c3010c
--- /dev/null
+++ b/tests/scripts/x86_ci_script.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+#Parse command line arguments
+__buildConfig=
+for arg in "$@"
+do
+    case $arg in
+    --buildConfig=*)
+        __buildConfig="$(echo ${arg#*=} | awk '{print tolower($0)}')"
+        if [[ "$__buildConfig" != "debug" && "$__buildConfig" != "release" && "$__buildConfig" != "checked" ]]; then
+            exit_with_error "--buildConfig can be only Debug or Release" true
+        fi
+        ;;
+    *)
+        ;;
+    esac
+done
+
+#Check if there are any uncommited changes in the source directory as git adds and removes patches
+if [[ $(git status -s) != "" ]]; then
+   echo 'ERROR: There are some uncommited changes. To avoid losing these changes commit them and try again.'
+   echo ''
+   git status
+   exit 1
+fi
+
+#Change build configuration to the capitalized form to create build product paths correctly
+if [[ "$__buildConfig" == "release" ]]; then
+    __buildConfig="Release"
+elif [[ "$__buildConfig" == "checked" ]]; then
+    __buildConfig="Checked"
+else
+    __buildConfig="Debug"
+fi
+__buildDirName="$__buildOS.$__buildArch.$__buildConfig"
+
+set -x
+set -e
+
+__dockerImage="hseok82/dotnet-buildtools-prereqs:ubuntu1604_cross_prereqs_v3_x86"
+
+# Begin cross build
+# We cannot build nuget package yet
+__dockerEnvironmentSet="-e ROOTFS_DIR=/crossrootfs/x86"
+__currentWorkingDir=`pwd`
+__dockerCmd="docker run -i --rm ${__dockerEnvironmentVariable} -v $__currentWorkingDir:/opt/code -w /opt/code $__dockerImage"
+__buildCmd="./build.sh x86 cross skipnuget $__buildConfig"
+$__dockerCmd $__buildCmd
+
+# Begin PAL test
+__dockerImage="hseok82/dotnet-buildtools-prereqs:ubuntu1604_x86_test"
+__dockerCmd="docker run -i --rm -v $__currentWorkingDir:/opt/code -w /opt/code $__dockerImage"
+__palTestCmd="./src/pal/tests/palsuite/runpaltests.sh /opt/code/bin/obj/Linux.x86.${__buildConfig} /opt/code/bin/paltestout"
+$__dockerCmd $__palTestCmd
+
+sudo chown -R $(id -u -n) bin/
+
+(set +x; echo 'Build complete')
diff --git a/tests/skipCrossGenFiles.arm.txt b/tests/skipCrossGenFiles.arm.txt
new file mode 100644
index 0000000000..df66983baa
--- /dev/null
+++ b/tests/skipCrossGenFiles.arm.txt
@@ -0,0 +1,2 @@
+mscorlib.dll
+System.Runtime.WindowsRuntime.UI.Xaml.dll
diff --git a/tests/skipCrossGenFiles.arm64.txt b/tests/skipCrossGenFiles.arm64.txt
new file mode 100644
index 0000000000..53eec85069
--- /dev/null
+++ b/tests/skipCrossGenFiles.arm64.txt
@@ -0,0 +1,5 @@
+System.Runtime.WindowsRuntime.UI.Xaml.dll
+Microsoft.CodeAnalysis.VisualBasic.dll
+System.Net.NameResolution.dll
+System.Net.Sockets.dll
+System.Net.Primitives.dll
diff --git a/tests/skipCrossGenFiles.x64.txt b/tests/skipCrossGenFiles.x64.txt
new file mode 100644
index 0000000000..df66983baa
--- /dev/null
+++ b/tests/skipCrossGenFiles.x64.txt
@@ -0,0 +1,2 @@
+mscorlib.dll
+System.Runtime.WindowsRuntime.UI.Xaml.dll
diff --git a/tests/skipCrossGenFiles.x86.txt b/tests/skipCrossGenFiles.x86.txt
new file mode 100644
index 0000000000..df66983baa
--- /dev/null
+++ b/tests/skipCrossGenFiles.x86.txt
@@ -0,0 +1,2 @@
+mscorlib.dll
+System.Runtime.WindowsRuntime.UI.Xaml.dll
diff --git a/tests/src/AllTestProjects.sln b/tests/src/AllTestProjects.sln
index 13322412de..679f2d7804 100644
--- a/tests/src/AllTestProjects.sln
+++ b/tests/src/AllTestProjects.sln
@@ -623,6 +623,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Args4", "JIT\CodeGenBringUp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Args5", "JIT\CodeGenBringUpTests\Args5.csproj", "{30993D25-1F0D-4CF4-98C0-5F6470B87382}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Array1", "JIT\CodeGenBringUpTests\Array1.csproj", "{7E3680E3-36FC-4B6B-841A-80B8D0C4394C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Array2", "JIT\CodeGenBringUpTests\Array2.csproj", "{4689170F-4BC1-4592-9753-CD4209D950D7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Array3", "JIT\CodeGenBringUpTests\Array3.csproj", "{B4FE2E03-298E-41B8-A32C-8FD0F1BF7E8C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Array4", "JIT\CodeGenBringUpTests\Array4.csproj", "{11F01248-05A0-4FA0-9345-75273E7276C9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArrayExc", "JIT\CodeGenBringUpTests\ArrayExc.csproj", "{DBC775DF-5D8A-42A5-87A5-CC51AAAABE3C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArrayJagged", "JIT\CodeGenBringUpTests\ArrayJagged.csproj", "{0E6C1DC4-EFF7-45CC-8A27-37BA07AC30EE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArrayMD1", "JIT\CodeGenBringUpTests\ArrayMD1.csproj", "{30A8AD2E-3B3B-4813-88E1-9EF2E75BB685}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArrayMD2", "JIT\CodeGenBringUpTests\ArrayMD2.csproj", "{C46B2CCD-C66B-40C8-A031-67FED61AFEDB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArrayObj", "JIT\CodeGenBringUpTests\ArrayObj.csproj", "{AA342BCA-74DE-41AC-88E9-5608E2DCFFAB}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsgAdd1", "JIT\CodeGenBringUpTests\AsgAdd1.csproj", "{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsgAnd1", "JIT\CodeGenBringUpTests\AsgAnd1.csproj", "{18FD8738-0685-482B-9D97-CEB598AAAC5A}"
@@ -819,6 +837,26 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Localloc", "JIT\CodeGenBrin
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocallocLarge", "JIT\CodeGenBringUpTests\LocallocLarge.csproj", "{C5578A39-72FF-4D25-99DA-96A8A99C6740}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocallocB_N", "JIT\CodeGenBringUpTests\LocallocB_N.csproj", "{38302715-A140-493E-AEF4-3E8F9EE99195}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocallocB_N_PSP", "JIT\CodeGenBringUpTests\LocallocB_N_PSP.csproj", "{6222AF08-F765-44C2-B48C-3C040D62303F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocallocCnstB117", "JIT\CodeGenBringUpTests\LocallocCnstB117.csproj", "{5A0F2889-91F1-4670-A4AF-9AF0598E22B7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocallocCnstB117_PSP", "JIT\CodeGenBringUpTests\LocallocCnstB117_PSP.csproj", "{C82D33B6-5779-4E19-8220-1DEA587203B1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocallocCnstB1", "JIT\CodeGenBringUpTests\LocallocCnstB1.csproj", "{4240086D-0722-4E93-A6DD-BF779715CE73}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocallocCnstB1_PSP", "JIT\CodeGenBringUpTests\LocallocCnstB1_PSP.csproj", "{18F8266B-2F59-4058-8FE6-6B8368CD0D0F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocallocCnstB5001", "JIT\CodeGenBringUpTests\LocallocCnstB5001.csproj", "{E7B36F3A-CD18-4F21-8898-CA43C5FDEA1E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocallocCnstB5001_PSP", "JIT\CodeGenBringUpTests\LocallocCnstB5001_PSP.csproj", "{1EB5785A-2050-4AD1-820B-F46CCCC3C65A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocallocCnstB5", "JIT\CodeGenBringUpTests\LocallocCnstB5.csproj", "{061E4E38-14A9-4305-AD27-5A01A95E9FCE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LocallocCnstB5_PSP", "JIT\CodeGenBringUpTests\LocallocCnstB5_PSP.csproj", "{5F015026-51D0-4EF7-B538-24E8864F31D6}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LongArgsAndReturn", "JIT\CodeGenBringUpTests\LongArgsAndReturn.csproj", "{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lt1", "JIT\CodeGenBringUpTests\Lt1.csproj", "{A7850EBD-6701-473E-8686-99535F0794A6}"
@@ -3747,29258 +3785,29286 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StressAllocator", "GC\Stres
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThdTreeGrowingObj", "GC\Stress\Tests\ThdTreeGrowingObj.csproj", "{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CoreMangLib", "CoreMangLib", "{8AE4A865-21A5-41B5-96DE-1F92695ADC6C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cti", "cti", "{F54F4420-F0CB-4BE9-B311-73A8DCBDDD4F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "system", "system", "{C37CECFF-EC02-4B13-A7A5-748C29C4ADB7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "string", "string", "{B58B8AED-8591-47E8-A21D-957053454911}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StringReplace3", "CoreMangLib\cti\system\string\StringReplace3.csproj", "{95DFC527-4AC1-495E-87D7-E94EE1F7140D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x64 = Debug|x64
 		Checked|Any CPU = Checked|Any CPU
 		Checked|Mixed Platforms = Checked|Mixed Platforms
 		Checked|x64 = Checked|x64
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|x64.ActiveCfg = Debug|x64
-		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|x64.Build.0 = Debug|x64
 		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Checked|Any CPU.ActiveCfg = Checked|x64
 		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Checked|Mixed Platforms.ActiveCfg = Checked|x64
 		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Checked|Mixed Platforms.Build.0 = Checked|x64
 		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Checked|x64.ActiveCfg = Checked|x64
 		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Checked|x64.Build.0 = Checked|x64
+		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|x64.ActiveCfg = Debug|x64
+		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|x64.Build.0 = Debug|x64
 		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Any CPU.ActiveCfg = Release|x64
 		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Mixed Platforms.Build.0 = Release|x64
 		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|x64.ActiveCfg = Release|x64
-		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Debug|x64.ActiveCfg = Debug|x64
-		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Debug|x64.Build.0 = Debug|x64
 		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Checked|Any CPU.ActiveCfg = Checked|x64
 		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Checked|Mixed Platforms.ActiveCfg = Checked|x64
 		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Checked|Mixed Platforms.Build.0 = Checked|x64
 		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Checked|x64.ActiveCfg = Checked|x64
 		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Checked|x64.Build.0 = Checked|x64
+		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Debug|x64.ActiveCfg = Debug|x64
+		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Debug|x64.Build.0 = Debug|x64
 		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Release|Any CPU.ActiveCfg = Release|x64
 		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Release|Mixed Platforms.Build.0 = Release|x64
 		{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}.Release|x64.ActiveCfg = Release|x64
-		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Debug|x64.ActiveCfg = Debug|x64
-		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Debug|x64.Build.0 = Debug|x64
 		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Checked|Any CPU.ActiveCfg = Checked|x64
 		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Checked|Mixed Platforms.ActiveCfg = Checked|x64
 		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Checked|Mixed Platforms.Build.0 = Checked|x64
 		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Checked|x64.ActiveCfg = Checked|x64
 		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Checked|x64.Build.0 = Checked|x64
+		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Debug|x64.ActiveCfg = Debug|x64
+		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Debug|x64.Build.0 = Debug|x64
 		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Release|Any CPU.ActiveCfg = Release|x64
 		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Release|Mixed Platforms.Build.0 = Release|x64
 		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Release|x64.ActiveCfg = Release|x64
 		{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}.Release|x64.Build.0 = Release|x64
-		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Debug|x64.ActiveCfg = Debug|x64
-		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Debug|x64.Build.0 = Debug|x64
 		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Checked|Any CPU.ActiveCfg = Checked|x64
 		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Checked|Mixed Platforms.ActiveCfg = Checked|x64
 		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Checked|Mixed Platforms.Build.0 = Checked|x64
 		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Checked|x64.ActiveCfg = Checked|x64
 		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Checked|x64.Build.0 = Checked|x64
+		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Debug|x64.ActiveCfg = Debug|x64
+		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Debug|x64.Build.0 = Debug|x64
 		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Release|Any CPU.ActiveCfg = Release|x64
 		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Release|Mixed Platforms.Build.0 = Release|x64
 		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Release|x64.ActiveCfg = Release|x64
 		{8E3244CB-407F-4142-BAAB-E7A55901A5FA}.Release|x64.Build.0 = Release|x64
-		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Debug|x64.ActiveCfg = Debug|x64
-		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Debug|x64.Build.0 = Debug|x64
 		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Checked|Any CPU.ActiveCfg = Checked|x64
 		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Checked|Mixed Platforms.ActiveCfg = Checked|x64
 		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Checked|Mixed Platforms.Build.0 = Checked|x64
 		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Checked|x64.ActiveCfg = Checked|x64
 		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Checked|x64.Build.0 = Checked|x64
+		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Debug|x64.ActiveCfg = Debug|x64
+		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Debug|x64.Build.0 = Debug|x64
 		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Release|Any CPU.ActiveCfg = Release|x64
 		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Release|Mixed Platforms.Build.0 = Release|x64
 		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Release|x64.ActiveCfg = Release|x64
 		{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}.Release|x64.Build.0 = Release|x64
-		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Debug|x64.ActiveCfg = Debug|x64
-		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Debug|x64.Build.0 = Debug|x64
 		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Checked|Any CPU.ActiveCfg = Checked|x64
 		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Checked|Mixed Platforms.ActiveCfg = Checked|x64
 		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Checked|Mixed Platforms.Build.0 = Checked|x64
 		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Checked|x64.ActiveCfg = Checked|x64
 		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Checked|x64.Build.0 = Checked|x64
+		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Debug|x64.ActiveCfg = Debug|x64
+		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Debug|x64.Build.0 = Debug|x64
 		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Release|Any CPU.ActiveCfg = Release|x64
 		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Release|Mixed Platforms.Build.0 = Release|x64
 		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Release|x64.ActiveCfg = Release|x64
 		{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}.Release|x64.Build.0 = Release|x64
-		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|x64.ActiveCfg = Debug|x64
-		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|x64.Build.0 = Debug|x64
 		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Checked|Any CPU.ActiveCfg = Checked|x64
 		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Checked|Mixed Platforms.ActiveCfg = Checked|x64
 		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Checked|Mixed Platforms.Build.0 = Checked|x64
 		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Checked|x64.ActiveCfg = Checked|x64
 		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Checked|x64.Build.0 = Checked|x64
+		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|x64.ActiveCfg = Debug|x64
+		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Debug|x64.Build.0 = Debug|x64
 		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|Any CPU.ActiveCfg = Release|x64
 		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|Mixed Platforms.Build.0 = Release|x64
 		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|x64.ActiveCfg = Release|x64
 		{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}.Release|x64.Build.0 = Release|x64
-		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Debug|x64.ActiveCfg = Debug|x64
-		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Debug|x64.Build.0 = Debug|x64
 		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Checked|Any CPU.ActiveCfg = Checked|x64
 		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Checked|Mixed Platforms.ActiveCfg = Checked|x64
 		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Checked|Mixed Platforms.Build.0 = Checked|x64
 		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Checked|x64.ActiveCfg = Checked|x64
 		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Checked|x64.Build.0 = Checked|x64
+		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Debug|x64.ActiveCfg = Debug|x64
+		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Debug|x64.Build.0 = Debug|x64
 		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Release|Any CPU.ActiveCfg = Release|x64
 		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Release|Mixed Platforms.Build.0 = Release|x64
 		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Release|x64.ActiveCfg = Release|x64
 		{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}.Release|x64.Build.0 = Release|x64
-		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Debug|x64.ActiveCfg = Debug|x64
-		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Debug|x64.Build.0 = Debug|x64
 		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Checked|Any CPU.ActiveCfg = Checked|x64
 		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Checked|Mixed Platforms.ActiveCfg = Checked|x64
 		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Checked|Mixed Platforms.Build.0 = Checked|x64
 		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Checked|x64.ActiveCfg = Checked|x64
 		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Checked|x64.Build.0 = Checked|x64
+		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Debug|Mixed Platforms.Build.0 = Debug|x64
+		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Debug|x64.ActiveCfg = Debug|x64
+		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Debug|x64.Build.0 = Debug|x64
 		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Release|Any CPU.ActiveCfg = Release|x64
 		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Release|Mixed Platforms.Build.0 = Release|x64
 		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Release|x64.ActiveCfg = Release|x64
 		{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}.Release|x64.Build.0 = Release|x64
-		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|x64.Build.0 = Debug|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Checked|x64.Build.0 = Checked|Any CPU
+		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Debug|x64.Build.0 = Debug|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Release|Any CPU.Build.0 = Release|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Release|x64.ActiveCfg = Release|Any CPU
 		{996021AF-AB49-4B39-A3C7-3D874E9B4230}.Release|x64.Build.0 = Release|Any CPU
-		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|x64.Build.0 = Debug|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Checked|x64.Build.0 = Checked|Any CPU
+		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Debug|x64.Build.0 = Debug|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Release|x64.ActiveCfg = Release|Any CPU
 		{7E5E70EB-0719-4741-99CC-095D09B90C31}.Release|x64.Build.0 = Release|Any CPU
-		{B0CF4140-812F-4877-BD71-257231472300}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0CF4140-812F-4877-BD71-257231472300}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0CF4140-812F-4877-BD71-257231472300}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B0CF4140-812F-4877-BD71-257231472300}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B0CF4140-812F-4877-BD71-257231472300}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B0CF4140-812F-4877-BD71-257231472300}.Debug|x64.Build.0 = Debug|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Checked|x64.Build.0 = Checked|Any CPU
+		{B0CF4140-812F-4877-BD71-257231472300}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0CF4140-812F-4877-BD71-257231472300}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0CF4140-812F-4877-BD71-257231472300}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B0CF4140-812F-4877-BD71-257231472300}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B0CF4140-812F-4877-BD71-257231472300}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B0CF4140-812F-4877-BD71-257231472300}.Debug|x64.Build.0 = Debug|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Release|x64.ActiveCfg = Release|Any CPU
 		{B0CF4140-812F-4877-BD71-257231472300}.Release|x64.Build.0 = Release|Any CPU
-		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Checked|x64.Build.0 = Checked|Any CPU
+		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Release|x64.ActiveCfg = Release|Any CPU
 		{3E71C420-F21A-439A-8618-B7002F0CAB6A}.Release|x64.Build.0 = Release|Any CPU
-		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|x64.Build.0 = Debug|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Checked|x64.Build.0 = Checked|Any CPU
+		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Debug|x64.Build.0 = Debug|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Release|x64.ActiveCfg = Release|Any CPU
 		{AFE05673-42FD-4147-8EBF-8960BBCEEC61}.Release|x64.Build.0 = Release|Any CPU
-		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|x64.Build.0 = Debug|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Checked|x64.Build.0 = Checked|Any CPU
+		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{539E643E-9E77-4B38-891A-E870982ECFE6}.Debug|x64.Build.0 = Debug|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Release|x64.ActiveCfg = Release|Any CPU
 		{539E643E-9E77-4B38-891A-E870982ECFE6}.Release|x64.Build.0 = Release|Any CPU
-		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|x64.Build.0 = Debug|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Checked|x64.Build.0 = Checked|Any CPU
+		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Debug|x64.Build.0 = Debug|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Release|Any CPU.Build.0 = Release|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Release|x64.ActiveCfg = Release|Any CPU
 		{082E8D5A-19E7-4970-96EA-FD665F9AEB66}.Release|x64.Build.0 = Release|Any CPU
-		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|x64.Build.0 = Debug|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Checked|x64.Build.0 = Checked|Any CPU
+		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Debug|x64.Build.0 = Debug|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Release|Any CPU.Build.0 = Release|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Release|x64.ActiveCfg = Release|Any CPU
 		{014F3DD9-D5D7-414E-B9DC-271D6753D522}.Release|x64.Build.0 = Release|Any CPU
-		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Checked|x64.Build.0 = Checked|Any CPU
+		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Release|x64.ActiveCfg = Release|Any CPU
 		{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}.Release|x64.Build.0 = Release|Any CPU
-		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|x64.Build.0 = Debug|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Checked|x64.Build.0 = Checked|Any CPU
+		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Debug|x64.Build.0 = Debug|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Release|x64.ActiveCfg = Release|Any CPU
 		{90F16A8A-0DCF-4467-A649-F69810780CCF}.Release|x64.Build.0 = Release|Any CPU
-		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|x64.Build.0 = Debug|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Checked|x64.Build.0 = Checked|Any CPU
+		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Debug|x64.Build.0 = Debug|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Release|Any CPU.Build.0 = Release|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Release|x64.ActiveCfg = Release|Any CPU
 		{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}.Release|x64.Build.0 = Release|Any CPU
-		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|x64.Build.0 = Debug|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Checked|x64.Build.0 = Checked|Any CPU
+		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{710F9A16-180B-47B3-A591-BB8E6F247073}.Debug|x64.Build.0 = Debug|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Release|Any CPU.Build.0 = Release|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Release|x64.ActiveCfg = Release|Any CPU
 		{710F9A16-180B-47B3-A591-BB8E6F247073}.Release|x64.Build.0 = Release|Any CPU
-		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Checked|x64.Build.0 = Checked|Any CPU
+		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Release|x64.ActiveCfg = Release|Any CPU
 		{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}.Release|x64.Build.0 = Release|Any CPU
-		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|x64.Build.0 = Debug|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Checked|x64.Build.0 = Checked|Any CPU
+		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4094DF83-0626-4DE0-9983-5897B13606DF}.Debug|x64.Build.0 = Debug|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Release|x64.ActiveCfg = Release|Any CPU
 		{4094DF83-0626-4DE0-9983-5897B13606DF}.Release|x64.Build.0 = Release|Any CPU
-		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|x64.Build.0 = Debug|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Checked|x64.Build.0 = Checked|Any CPU
+		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Debug|x64.Build.0 = Debug|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Release|x64.ActiveCfg = Release|Any CPU
 		{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}.Release|x64.Build.0 = Release|Any CPU
-		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|x64.Build.0 = Debug|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Checked|x64.Build.0 = Checked|Any CPU
+		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Debug|x64.Build.0 = Debug|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Release|x64.ActiveCfg = Release|Any CPU
 		{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}.Release|x64.Build.0 = Release|Any CPU
-		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|x64.Build.0 = Debug|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Checked|x64.Build.0 = Checked|Any CPU
+		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Debug|x64.Build.0 = Debug|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Release|x64.ActiveCfg = Release|Any CPU
 		{D688AD66-F57F-49F1-8E43-B2338721FBBE}.Release|x64.Build.0 = Release|Any CPU
-		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|x64.Build.0 = Debug|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Checked|x64.Build.0 = Checked|Any CPU
+		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Debug|x64.Build.0 = Debug|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Release|x64.ActiveCfg = Release|Any CPU
 		{F17002F9-D680-4162-9CE3-EF470EE9081B}.Release|x64.Build.0 = Release|Any CPU
-		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Checked|x64.Build.0 = Checked|Any CPU
+		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Release|x64.ActiveCfg = Release|Any CPU
 		{5BFB4DA5-A817-44A9-8255-DF05136261DC}.Release|x64.Build.0 = Release|Any CPU
-		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|x64.Build.0 = Debug|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Checked|x64.Build.0 = Checked|Any CPU
+		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Debug|x64.Build.0 = Debug|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Release|x64.ActiveCfg = Release|Any CPU
 		{11F40955-B8B9-4F00-8829-DD5E7F05A90E}.Release|x64.Build.0 = Release|Any CPU
-		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|x64.Build.0 = Debug|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Checked|x64.Build.0 = Checked|Any CPU
+		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{331715DB-DCAB-4F21-827A-47768BF3B800}.Debug|x64.Build.0 = Debug|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Release|Any CPU.Build.0 = Release|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Release|x64.ActiveCfg = Release|Any CPU
 		{331715DB-DCAB-4F21-827A-47768BF3B800}.Release|x64.Build.0 = Release|Any CPU
-		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|x64.Build.0 = Debug|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Checked|x64.Build.0 = Checked|Any CPU
+		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Debug|x64.Build.0 = Debug|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Release|x64.ActiveCfg = Release|Any CPU
 		{F71DBAB0-1882-4B67-AC27-16D2345D068F}.Release|x64.Build.0 = Release|Any CPU
-		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|x64.Build.0 = Debug|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Checked|x64.Build.0 = Checked|Any CPU
+		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Debug|x64.Build.0 = Debug|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Release|x64.ActiveCfg = Release|Any CPU
 		{68D03805-999C-43C6-B3A4-9BE79A1A98F0}.Release|x64.Build.0 = Release|Any CPU
-		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Checked|x64.Build.0 = Checked|Any CPU
+		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Release|x64.ActiveCfg = Release|Any CPU
 		{9DA5356F-AB1F-4921-974D-2634E644C5F1}.Release|x64.Build.0 = Release|Any CPU
-		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|x64.Build.0 = Debug|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Checked|x64.Build.0 = Checked|Any CPU
+		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Debug|x64.Build.0 = Debug|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Release|x64.ActiveCfg = Release|Any CPU
 		{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}.Release|x64.Build.0 = Release|Any CPU
-		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Checked|x64.Build.0 = Checked|Any CPU
+		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Release|x64.ActiveCfg = Release|Any CPU
 		{D5529457-208A-4D5A-AF63-091B26F6FF3C}.Release|x64.Build.0 = Release|Any CPU
-		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Checked|x64.Build.0 = Checked|Any CPU
+		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Release|x64.ActiveCfg = Release|Any CPU
 		{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}.Release|x64.Build.0 = Release|Any CPU
-		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|x64.Build.0 = Debug|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Checked|x64.Build.0 = Checked|Any CPU
+		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Debug|x64.Build.0 = Debug|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Release|x64.ActiveCfg = Release|Any CPU
 		{A57C2AC7-6CE3-4107-AE80-65BC226D532A}.Release|x64.Build.0 = Release|Any CPU
-		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Checked|x64.Build.0 = Checked|Any CPU
+		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Release|x64.ActiveCfg = Release|Any CPU
 		{55FB5BA9-22A4-4980-BC3C-904316B542E7}.Release|x64.Build.0 = Release|Any CPU
-		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|x64.Build.0 = Debug|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Checked|x64.Build.0 = Checked|Any CPU
+		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Debug|x64.Build.0 = Debug|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Release|x64.ActiveCfg = Release|Any CPU
 		{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}.Release|x64.Build.0 = Release|Any CPU
-		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|x64.Build.0 = Debug|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Checked|x64.Build.0 = Checked|Any CPU
+		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3090D664-9838-405C-8CD6-379E494AB157}.Debug|x64.Build.0 = Debug|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Release|x64.ActiveCfg = Release|Any CPU
 		{3090D664-9838-405C-8CD6-379E494AB157}.Release|x64.Build.0 = Release|Any CPU
-		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Checked|x64.Build.0 = Checked|Any CPU
+		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B8165E9-E035-439D-B548-9B8BB461299D}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Release|x64.ActiveCfg = Release|Any CPU
 		{0B8165E9-E035-439D-B548-9B8BB461299D}.Release|x64.Build.0 = Release|Any CPU
-		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|x64.Build.0 = Debug|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Checked|x64.Build.0 = Checked|Any CPU
+		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Debug|x64.Build.0 = Debug|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Release|x64.ActiveCfg = Release|Any CPU
 		{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}.Release|x64.Build.0 = Release|Any CPU
-		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Checked|x64.Build.0 = Checked|Any CPU
+		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Release|x64.ActiveCfg = Release|Any CPU
 		{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}.Release|x64.Build.0 = Release|Any CPU
-		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|x64.Build.0 = Debug|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Checked|x64.Build.0 = Checked|Any CPU
+		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Debug|x64.Build.0 = Debug|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Release|x64.ActiveCfg = Release|Any CPU
 		{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}.Release|x64.Build.0 = Release|Any CPU
-		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Checked|x64.Build.0 = Checked|Any CPU
+		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Release|x64.ActiveCfg = Release|Any CPU
 		{173CA099-7538-44C5-A3B7-4D2F8664D7E3}.Release|x64.Build.0 = Release|Any CPU
-		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|x64.Build.0 = Debug|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Checked|x64.Build.0 = Checked|Any CPU
+		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Debug|x64.Build.0 = Debug|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Release|x64.ActiveCfg = Release|Any CPU
 		{07895B46-3625-4E18-81BA-9C991A7E4A9E}.Release|x64.Build.0 = Release|Any CPU
-		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|x64.Build.0 = Debug|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Checked|x64.Build.0 = Checked|Any CPU
+		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Debug|x64.Build.0 = Debug|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Release|x64.ActiveCfg = Release|Any CPU
 		{4161D387-F20B-4288-81EA-F13C2D384DD8}.Release|x64.Build.0 = Release|Any CPU
-		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Checked|x64.Build.0 = Checked|Any CPU
+		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Release|x64.ActiveCfg = Release|Any CPU
 		{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}.Release|x64.Build.0 = Release|Any CPU
-		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|x64.Build.0 = Debug|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Checked|x64.Build.0 = Checked|Any CPU
+		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Debug|x64.Build.0 = Debug|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Release|Any CPU.Build.0 = Release|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Release|x64.ActiveCfg = Release|Any CPU
 		{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}.Release|x64.Build.0 = Release|Any CPU
-		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|x64.Build.0 = Debug|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Checked|x64.Build.0 = Checked|Any CPU
+		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Debug|x64.Build.0 = Debug|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Release|x64.ActiveCfg = Release|Any CPU
 		{F524F545-6D93-4212-B51D-5D5F26897EFC}.Release|x64.Build.0 = Release|Any CPU
-		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|x64.Build.0 = Debug|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Checked|x64.Build.0 = Checked|Any CPU
+		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E83A9A3C-3336-44A7-A167-07983121C529}.Debug|x64.Build.0 = Debug|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Release|x64.ActiveCfg = Release|Any CPU
 		{E83A9A3C-3336-44A7-A167-07983121C529}.Release|x64.Build.0 = Release|Any CPU
-		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|x64.Build.0 = Debug|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Checked|x64.Build.0 = Checked|Any CPU
+		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Debug|x64.Build.0 = Debug|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Release|x64.ActiveCfg = Release|Any CPU
 		{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}.Release|x64.Build.0 = Release|Any CPU
-		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Checked|x64.Build.0 = Checked|Any CPU
+		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Release|x64.ActiveCfg = Release|Any CPU
 		{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}.Release|x64.Build.0 = Release|Any CPU
-		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Checked|x64.Build.0 = Checked|Any CPU
+		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Release|x64.ActiveCfg = Release|Any CPU
 		{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}.Release|x64.Build.0 = Release|Any CPU
-		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|x64.Build.0 = Debug|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Checked|x64.Build.0 = Checked|Any CPU
+		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Debug|x64.Build.0 = Debug|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Release|x64.ActiveCfg = Release|Any CPU
 		{3859861E-6A53-4035-8A98-AD77F6510A6E}.Release|x64.Build.0 = Release|Any CPU
-		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|x64.Build.0 = Debug|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Checked|x64.Build.0 = Checked|Any CPU
+		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Debug|x64.Build.0 = Debug|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Release|x64.ActiveCfg = Release|Any CPU
 		{6F0362F9-F1B0-4B95-A920-52C29062C546}.Release|x64.Build.0 = Release|Any CPU
-		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|x64.Build.0 = Debug|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Checked|x64.Build.0 = Checked|Any CPU
+		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Debug|x64.Build.0 = Debug|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Release|x64.ActiveCfg = Release|Any CPU
 		{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}.Release|x64.Build.0 = Release|Any CPU
-		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|x64.Build.0 = Debug|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Checked|x64.Build.0 = Checked|Any CPU
+		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Debug|x64.Build.0 = Debug|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Release|x64.ActiveCfg = Release|Any CPU
 		{C52624DA-3555-49A1-BEB7-3462A37EFBA9}.Release|x64.Build.0 = Release|Any CPU
-		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Checked|x64.Build.0 = Checked|Any CPU
+		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Release|x64.ActiveCfg = Release|Any CPU
 		{0E2A5683-562D-486C-AA48-B1CD596B13DC}.Release|x64.Build.0 = Release|Any CPU
-		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Checked|x64.Build.0 = Checked|Any CPU
+		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Release|x64.ActiveCfg = Release|Any CPU
 		{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}.Release|x64.Build.0 = Release|Any CPU
-		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Checked|x64.Build.0 = Checked|Any CPU
+		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Release|x64.ActiveCfg = Release|Any CPU
 		{C1518A76-6C68-48EF-94E0-BE79A4514530}.Release|x64.Build.0 = Release|Any CPU
-		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Checked|x64.Build.0 = Checked|Any CPU
+		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Release|x64.ActiveCfg = Release|Any CPU
 		{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}.Release|x64.Build.0 = Release|Any CPU
-		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Checked|x64.Build.0 = Checked|Any CPU
+		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Release|x64.ActiveCfg = Release|Any CPU
 		{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}.Release|x64.Build.0 = Release|Any CPU
-		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|x64.Build.0 = Debug|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Checked|x64.Build.0 = Checked|Any CPU
+		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Debug|x64.Build.0 = Debug|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Release|x64.ActiveCfg = Release|Any CPU
 		{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}.Release|x64.Build.0 = Release|Any CPU
-		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|x64.Build.0 = Debug|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Checked|x64.Build.0 = Checked|Any CPU
+		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Debug|x64.Build.0 = Debug|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Release|Any CPU.Build.0 = Release|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Release|x64.ActiveCfg = Release|Any CPU
 		{30993D25-1F0D-4CF4-98C0-5F6470B87382}.Release|x64.Build.0 = Release|Any CPU
-		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|x64.Build.0 = Debug|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Checked|x64.Build.0 = Checked|Any CPU
+		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Debug|x64.Build.0 = Debug|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Release|x64.ActiveCfg = Release|Any CPU
 		{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}.Release|x64.Build.0 = Release|Any CPU
-		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|x64.Build.0 = Debug|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Checked|x64.Build.0 = Checked|Any CPU
+		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Debug|x64.Build.0 = Debug|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Release|x64.ActiveCfg = Release|Any CPU
 		{18FD8738-0685-482B-9D97-CEB598AAAC5A}.Release|x64.Build.0 = Release|Any CPU
-		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|x64.Build.0 = Debug|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Checked|x64.Build.0 = Checked|Any CPU
+		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Debug|x64.Build.0 = Debug|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Release|x64.ActiveCfg = Release|Any CPU
 		{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}.Release|x64.Build.0 = Release|Any CPU
-		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|x64.Build.0 = Debug|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Checked|x64.Build.0 = Checked|Any CPU
+		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Debug|x64.Build.0 = Debug|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Release|x64.ActiveCfg = Release|Any CPU
 		{DF621757-F7D5-463A-A05A-83E95C1C6A43}.Release|x64.Build.0 = Release|Any CPU
-		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|x64.Build.0 = Debug|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Checked|x64.Build.0 = Checked|Any CPU
+		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Debug|x64.Build.0 = Debug|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Release|x64.ActiveCfg = Release|Any CPU
 		{6E410935-3438-46EC-A9EC-7065F924EFF9}.Release|x64.Build.0 = Release|Any CPU
-		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|x64.Build.0 = Debug|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Checked|x64.Build.0 = Checked|Any CPU
+		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Debug|x64.Build.0 = Debug|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Release|x64.ActiveCfg = Release|Any CPU
 		{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}.Release|x64.Build.0 = Release|Any CPU
-		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|x64.Build.0 = Debug|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Checked|x64.Build.0 = Checked|Any CPU
+		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Debug|x64.Build.0 = Debug|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Release|x64.ActiveCfg = Release|Any CPU
 		{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}.Release|x64.Build.0 = Release|Any CPU
-		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|x64.Build.0 = Debug|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Checked|x64.Build.0 = Checked|Any CPU
+		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2AE191D9-FD91-4142-81CE-18D80591912F}.Debug|x64.Build.0 = Debug|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Release|x64.ActiveCfg = Release|Any CPU
 		{2AE191D9-FD91-4142-81CE-18D80591912F}.Release|x64.Build.0 = Release|Any CPU
-		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Checked|x64.Build.0 = Checked|Any CPU
+		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Release|x64.ActiveCfg = Release|Any CPU
 		{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}.Release|x64.Build.0 = Release|Any CPU
-		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|x64.Build.0 = Debug|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Checked|x64.Build.0 = Checked|Any CPU
+		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Debug|x64.Build.0 = Debug|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Release|x64.ActiveCfg = Release|Any CPU
 		{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}.Release|x64.Build.0 = Release|Any CPU
-		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Checked|x64.Build.0 = Checked|Any CPU
+		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Release|x64.ActiveCfg = Release|Any CPU
 		{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}.Release|x64.Build.0 = Release|Any CPU
-		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|x64.Build.0 = Debug|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Checked|x64.Build.0 = Checked|Any CPU
+		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Debug|x64.Build.0 = Debug|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Release|x64.ActiveCfg = Release|Any CPU
 		{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}.Release|x64.Build.0 = Release|Any CPU
-		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|x64.Build.0 = Debug|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Checked|x64.Build.0 = Checked|Any CPU
+		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Debug|x64.Build.0 = Debug|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Release|Any CPU.Build.0 = Release|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Release|x64.ActiveCfg = Release|Any CPU
 		{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}.Release|x64.Build.0 = Release|Any CPU
-		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|x64.Build.0 = Debug|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Checked|x64.Build.0 = Checked|Any CPU
+		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Debug|x64.Build.0 = Debug|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Release|x64.ActiveCfg = Release|Any CPU
 		{D02780E7-82B2-4635-9801-3E1AC43CF81E}.Release|x64.Build.0 = Release|Any CPU
-		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|x64.Build.0 = Debug|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Checked|x64.Build.0 = Checked|Any CPU
+		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Debug|x64.Build.0 = Debug|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Release|x64.ActiveCfg = Release|Any CPU
 		{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}.Release|x64.Build.0 = Release|Any CPU
-		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|x64.Build.0 = Debug|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Checked|x64.Build.0 = Checked|Any CPU
+		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0594F687-7354-477F-B288-8C641A4504D9}.Debug|x64.Build.0 = Debug|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Release|x64.ActiveCfg = Release|Any CPU
 		{0594F687-7354-477F-B288-8C641A4504D9}.Release|x64.Build.0 = Release|Any CPU
-		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Checked|x64.Build.0 = Checked|Any CPU
+		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Release|x64.ActiveCfg = Release|Any CPU
 		{AE134EB2-06E1-4561-8148-7347F0D012B0}.Release|x64.Build.0 = Release|Any CPU
-		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|x64.Build.0 = Debug|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Checked|x64.Build.0 = Checked|Any CPU
+		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Debug|x64.Build.0 = Debug|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Release|x64.ActiveCfg = Release|Any CPU
 		{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}.Release|x64.Build.0 = Release|Any CPU
-		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|x64.Build.0 = Debug|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Checked|x64.Build.0 = Checked|Any CPU
+		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6495306C-4297-411A-8241-DDD40D48B417}.Debug|x64.Build.0 = Debug|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Release|x64.ActiveCfg = Release|Any CPU
 		{6495306C-4297-411A-8241-DDD40D48B417}.Release|x64.Build.0 = Release|Any CPU
-		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|x64.Build.0 = Debug|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Checked|x64.Build.0 = Checked|Any CPU
+		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Debug|x64.Build.0 = Debug|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Release|x64.ActiveCfg = Release|Any CPU
 		{F73DF77B-3C94-4516-B306-1C2E289E27A7}.Release|x64.Build.0 = Release|Any CPU
-		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|x64.Build.0 = Debug|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Checked|x64.Build.0 = Checked|Any CPU
+		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Debug|x64.Build.0 = Debug|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Release|x64.ActiveCfg = Release|Any CPU
 		{0D34AE89-A07E-4941-BE41-7922EC86AA8B}.Release|x64.Build.0 = Release|Any CPU
-		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Checked|x64.Build.0 = Checked|Any CPU
+		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Release|x64.ActiveCfg = Release|Any CPU
 		{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}.Release|x64.Build.0 = Release|Any CPU
-		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|x64.Build.0 = Debug|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Checked|x64.Build.0 = Checked|Any CPU
+		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Debug|x64.Build.0 = Debug|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Release|x64.ActiveCfg = Release|Any CPU
 		{C06A0898-7C4E-4925-91C4-2979C4F85BC2}.Release|x64.Build.0 = Release|Any CPU
-		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|x64.Build.0 = Debug|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Checked|x64.Build.0 = Checked|Any CPU
+		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Debug|x64.Build.0 = Debug|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Release|x64.ActiveCfg = Release|Any CPU
 		{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}.Release|x64.Build.0 = Release|Any CPU
-		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|x64.Build.0 = Debug|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Checked|x64.Build.0 = Checked|Any CPU
+		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4638A427-7835-4808-9F14-29CCBC365B75}.Debug|x64.Build.0 = Debug|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Release|x64.ActiveCfg = Release|Any CPU
 		{4638A427-7835-4808-9F14-29CCBC365B75}.Release|x64.Build.0 = Release|Any CPU
-		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|x64.Build.0 = Debug|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Checked|x64.Build.0 = Checked|Any CPU
+		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31ED8057-A96E-42B4-8102-EE3078061981}.Debug|x64.Build.0 = Debug|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Release|Any CPU.Build.0 = Release|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Release|x64.ActiveCfg = Release|Any CPU
 		{31ED8057-A96E-42B4-8102-EE3078061981}.Release|x64.Build.0 = Release|Any CPU
-		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|x64.Build.0 = Debug|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Checked|x64.Build.0 = Checked|Any CPU
+		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Debug|x64.Build.0 = Debug|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Release|x64.ActiveCfg = Release|Any CPU
 		{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}.Release|x64.Build.0 = Release|Any CPU
-		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|x64.Build.0 = Debug|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Checked|x64.Build.0 = Checked|Any CPU
+		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Debug|x64.Build.0 = Debug|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Release|x64.ActiveCfg = Release|Any CPU
 		{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}.Release|x64.Build.0 = Release|Any CPU
-		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|x64.Build.0 = Debug|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Checked|x64.Build.0 = Checked|Any CPU
+		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Debug|x64.Build.0 = Debug|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Release|x64.ActiveCfg = Release|Any CPU
 		{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}.Release|x64.Build.0 = Release|Any CPU
-		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|x64.Build.0 = Debug|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Checked|x64.Build.0 = Checked|Any CPU
+		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Debug|x64.Build.0 = Debug|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Release|x64.ActiveCfg = Release|Any CPU
 		{037FCF39-2055-43DA-9C66-972DDBEB15AC}.Release|x64.Build.0 = Release|Any CPU
-		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Checked|x64.Build.0 = Checked|Any CPU
+		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Release|x64.ActiveCfg = Release|Any CPU
 		{A5293BBE-2081-4701-9F04-3A5D756325A1}.Release|x64.Build.0 = Release|Any CPU
-		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Checked|x64.Build.0 = Checked|Any CPU
+		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Release|x64.ActiveCfg = Release|Any CPU
 		{EC6FD253-5247-4D8C-887E-453B5647A0A7}.Release|x64.Build.0 = Release|Any CPU
-		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Checked|x64.Build.0 = Checked|Any CPU
+		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Release|x64.ActiveCfg = Release|Any CPU
 		{BFA9B638-76C9-4709-B18B-225B3F74B0E7}.Release|x64.Build.0 = Release|Any CPU
-		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Checked|x64.Build.0 = Checked|Any CPU
+		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{601DE23D-7202-4226-8E50-554C33D770B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Release|x64.ActiveCfg = Release|Any CPU
 		{601DE23D-7202-4226-8E50-554C33D770B3}.Release|x64.Build.0 = Release|Any CPU
-		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Checked|x64.Build.0 = Checked|Any CPU
+		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Release|x64.ActiveCfg = Release|Any CPU
 		{83E74202-B9F5-4D34-9D6E-D973704945DC}.Release|x64.Build.0 = Release|Any CPU
-		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|x64.Build.0 = Debug|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Checked|x64.Build.0 = Checked|Any CPU
+		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Debug|x64.Build.0 = Debug|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Release|x64.ActiveCfg = Release|Any CPU
 		{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}.Release|x64.Build.0 = Release|Any CPU
-		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|x64.Build.0 = Debug|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Checked|x64.Build.0 = Checked|Any CPU
+		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{770811BC-832C-498F-881C-F545A1884BCD}.Debug|x64.Build.0 = Debug|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Release|x64.ActiveCfg = Release|Any CPU
 		{770811BC-832C-498F-881C-F545A1884BCD}.Release|x64.Build.0 = Release|Any CPU
-		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|x64.Build.0 = Debug|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Checked|x64.Build.0 = Checked|Any CPU
+		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Debug|x64.Build.0 = Debug|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Release|x64.ActiveCfg = Release|Any CPU
 		{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}.Release|x64.Build.0 = Release|Any CPU
-		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|x64.Build.0 = Debug|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Checked|x64.Build.0 = Checked|Any CPU
+		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Debug|x64.Build.0 = Debug|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Release|Any CPU.Build.0 = Release|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Release|x64.ActiveCfg = Release|Any CPU
 		{16E9D09B-7144-4E01-90C8-A3DB37EF6597}.Release|x64.Build.0 = Release|Any CPU
-		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|x64.Build.0 = Debug|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Checked|x64.Build.0 = Checked|Any CPU
+		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B8479512-8916-4897-9E68-426F4A6D0F01}.Debug|x64.Build.0 = Debug|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Release|x64.ActiveCfg = Release|Any CPU
 		{B8479512-8916-4897-9E68-426F4A6D0F01}.Release|x64.Build.0 = Release|Any CPU
-		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|x64.Build.0 = Debug|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Checked|x64.Build.0 = Checked|Any CPU
+		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Debug|x64.Build.0 = Debug|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Release|x64.ActiveCfg = Release|Any CPU
 		{9760C40A-013F-47FB-861C-6BBF2D66ECB9}.Release|x64.Build.0 = Release|Any CPU
-		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Checked|x64.Build.0 = Checked|Any CPU
+		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Release|x64.ActiveCfg = Release|Any CPU
 		{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}.Release|x64.Build.0 = Release|Any CPU
-		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Checked|x64.Build.0 = Checked|Any CPU
+		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Release|x64.ActiveCfg = Release|Any CPU
 		{BA4A14E7-0679-4E85-9B24-6452FB89C775}.Release|x64.Build.0 = Release|Any CPU
-		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|x64.Build.0 = Debug|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Checked|x64.Build.0 = Checked|Any CPU
+		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Debug|x64.Build.0 = Debug|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Release|x64.ActiveCfg = Release|Any CPU
 		{00123B77-935C-4C54-9F54-A7D78398FD9C}.Release|x64.Build.0 = Release|Any CPU
-		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|x64.Build.0 = Debug|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Checked|x64.Build.0 = Checked|Any CPU
+		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Debug|x64.Build.0 = Debug|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Release|x64.ActiveCfg = Release|Any CPU
 		{39E0910F-28E2-4192-BCF5-5537C53821F8}.Release|x64.Build.0 = Release|Any CPU
-		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|x64.Build.0 = Debug|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Checked|x64.Build.0 = Checked|Any CPU
+		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Debug|x64.Build.0 = Debug|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Release|x64.ActiveCfg = Release|Any CPU
 		{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}.Release|x64.Build.0 = Release|Any CPU
-		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|x64.Build.0 = Debug|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Checked|x64.Build.0 = Checked|Any CPU
+		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Debug|x64.Build.0 = Debug|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Release|Any CPU.Build.0 = Release|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Release|x64.ActiveCfg = Release|Any CPU
 		{85DD13D6-24C0-40F1-AE6C-A37B75326B00}.Release|x64.Build.0 = Release|Any CPU
-		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Checked|x64.Build.0 = Checked|Any CPU
+		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Release|x64.ActiveCfg = Release|Any CPU
 		{F62205FB-539C-4A6D-9092-F0DD246272DE}.Release|x64.Build.0 = Release|Any CPU
-		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|x64.Build.0 = Debug|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Checked|x64.Build.0 = Checked|Any CPU
+		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Debug|x64.Build.0 = Debug|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Release|x64.ActiveCfg = Release|Any CPU
 		{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}.Release|x64.Build.0 = Release|Any CPU
-		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Checked|x64.Build.0 = Checked|Any CPU
+		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Release|x64.ActiveCfg = Release|Any CPU
 		{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}.Release|x64.Build.0 = Release|Any CPU
-		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|x64.Build.0 = Debug|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Checked|x64.Build.0 = Checked|Any CPU
+		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Debug|x64.Build.0 = Debug|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Release|x64.ActiveCfg = Release|Any CPU
 		{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}.Release|x64.Build.0 = Release|Any CPU
-		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|x64.Build.0 = Debug|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Checked|x64.Build.0 = Checked|Any CPU
+		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Debug|x64.Build.0 = Debug|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Release|x64.ActiveCfg = Release|Any CPU
 		{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}.Release|x64.Build.0 = Release|Any CPU
-		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|x64.Build.0 = Debug|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Checked|x64.Build.0 = Checked|Any CPU
+		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Debug|x64.Build.0 = Debug|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Release|x64.ActiveCfg = Release|Any CPU
 		{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}.Release|x64.Build.0 = Release|Any CPU
-		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Checked|x64.Build.0 = Checked|Any CPU
+		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Release|x64.ActiveCfg = Release|Any CPU
 		{AD783D08-47A8-4E7F-A3B6-7B63249807F1}.Release|x64.Build.0 = Release|Any CPU
-		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Checked|x64.Build.0 = Checked|Any CPU
+		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Release|x64.ActiveCfg = Release|Any CPU
 		{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}.Release|x64.Build.0 = Release|Any CPU
-		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Checked|x64.Build.0 = Checked|Any CPU
+		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Release|x64.ActiveCfg = Release|Any CPU
 		{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}.Release|x64.Build.0 = Release|Any CPU
-		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|x64.Build.0 = Debug|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Checked|x64.Build.0 = Checked|Any CPU
+		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Debug|x64.Build.0 = Debug|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Release|x64.ActiveCfg = Release|Any CPU
 		{A33856BD-BD42-47BF-A187-0077FF8C2098}.Release|x64.Build.0 = Release|Any CPU
-		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|x64.Build.0 = Debug|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Checked|x64.Build.0 = Checked|Any CPU
+		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Debug|x64.Build.0 = Debug|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Release|x64.ActiveCfg = Release|Any CPU
 		{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}.Release|x64.Build.0 = Release|Any CPU
-		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|x64.Build.0 = Debug|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Checked|x64.Build.0 = Checked|Any CPU
+		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{458ADB44-4020-4022-9C25-A439D1BCC464}.Debug|x64.Build.0 = Debug|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Release|Any CPU.Build.0 = Release|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Release|x64.ActiveCfg = Release|Any CPU
 		{458ADB44-4020-4022-9C25-A439D1BCC464}.Release|x64.Build.0 = Release|Any CPU
-		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|x64.Build.0 = Debug|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Checked|x64.Build.0 = Checked|Any CPU
+		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Debug|x64.Build.0 = Debug|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Release|x64.ActiveCfg = Release|Any CPU
 		{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}.Release|x64.Build.0 = Release|Any CPU
-		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|x64.Build.0 = Debug|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Checked|x64.Build.0 = Checked|Any CPU
+		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Debug|x64.Build.0 = Debug|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Release|x64.ActiveCfg = Release|Any CPU
 		{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}.Release|x64.Build.0 = Release|Any CPU
-		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Checked|x64.Build.0 = Checked|Any CPU
+		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0A27F4DF-A230-4627-873B-1D876608FA22}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Release|x64.ActiveCfg = Release|Any CPU
 		{0A27F4DF-A230-4627-873B-1D876608FA22}.Release|x64.Build.0 = Release|Any CPU
-		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|x64.Build.0 = Debug|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Checked|x64.Build.0 = Checked|Any CPU
+		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{702DAA7C-306F-4A97-895B-963B1028D213}.Debug|x64.Build.0 = Debug|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Release|Any CPU.Build.0 = Release|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Release|x64.ActiveCfg = Release|Any CPU
 		{702DAA7C-306F-4A97-895B-963B1028D213}.Release|x64.Build.0 = Release|Any CPU
-		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|x64.Build.0 = Debug|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Checked|x64.Build.0 = Checked|Any CPU
+		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Debug|x64.Build.0 = Debug|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Release|x64.ActiveCfg = Release|Any CPU
 		{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}.Release|x64.Build.0 = Release|Any CPU
-		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Checked|x64.Build.0 = Checked|Any CPU
+		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Release|x64.ActiveCfg = Release|Any CPU
 		{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}.Release|x64.Build.0 = Release|Any CPU
-		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|x64.Build.0 = Debug|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Checked|x64.Build.0 = Checked|Any CPU
+		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Debug|x64.Build.0 = Debug|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Release|x64.ActiveCfg = Release|Any CPU
 		{5CAE1B00-512F-400D-B309-A288BF958E7E}.Release|x64.Build.0 = Release|Any CPU
-		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|x64.Build.0 = Debug|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Checked|x64.Build.0 = Checked|Any CPU
+		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E424FF93-E659-4516-97CC-AFC137659014}.Debug|x64.Build.0 = Debug|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Release|x64.ActiveCfg = Release|Any CPU
 		{E424FF93-E659-4516-97CC-AFC137659014}.Release|x64.Build.0 = Release|Any CPU
-		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Checked|x64.Build.0 = Checked|Any CPU
+		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Release|x64.ActiveCfg = Release|Any CPU
 		{9823F80E-FE94-44AC-893F-2313ACF001D4}.Release|x64.Build.0 = Release|Any CPU
-		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|x64.Build.0 = Debug|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Checked|x64.Build.0 = Checked|Any CPU
+		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Debug|x64.Build.0 = Debug|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Release|x64.ActiveCfg = Release|Any CPU
 		{42A00689-632D-4DDC-AFAD-EDD86049802E}.Release|x64.Build.0 = Release|Any CPU
-		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|x64.Build.0 = Debug|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Checked|x64.Build.0 = Checked|Any CPU
+		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Debug|x64.Build.0 = Debug|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Release|x64.ActiveCfg = Release|Any CPU
 		{B6669424-4F8E-4154-BF4D-B74694CF722E}.Release|x64.Build.0 = Release|Any CPU
-		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|x64.Build.0 = Debug|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Checked|x64.Build.0 = Checked|Any CPU
+		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Debug|x64.Build.0 = Debug|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Release|x64.ActiveCfg = Release|Any CPU
 		{9CF5C43B-8490-4FB3-8F07-663467331AD6}.Release|x64.Build.0 = Release|Any CPU
-		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Checked|x64.Build.0 = Checked|Any CPU
+		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Release|x64.ActiveCfg = Release|Any CPU
 		{6B30834D-CDDE-4A1D-A318-9753ADB594A6}.Release|x64.Build.0 = Release|Any CPU
-		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|x64.Build.0 = Debug|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Checked|x64.Build.0 = Checked|Any CPU
+		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Debug|x64.Build.0 = Debug|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Release|x64.ActiveCfg = Release|Any CPU
 		{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}.Release|x64.Build.0 = Release|Any CPU
-		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|x64.Build.0 = Debug|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Checked|x64.Build.0 = Checked|Any CPU
+		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Debug|x64.Build.0 = Debug|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Release|x64.ActiveCfg = Release|Any CPU
 		{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}.Release|x64.Build.0 = Release|Any CPU
-		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Checked|x64.Build.0 = Checked|Any CPU
+		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Release|x64.ActiveCfg = Release|Any CPU
 		{D17EE755-3FDC-410E-B07E-3E37B5789A7C}.Release|x64.Build.0 = Release|Any CPU
-		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|x64.Build.0 = Debug|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Checked|x64.Build.0 = Checked|Any CPU
+		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70A42499-9E99-48D7-A74A-F5531CC17251}.Debug|x64.Build.0 = Debug|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Release|Any CPU.Build.0 = Release|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Release|x64.ActiveCfg = Release|Any CPU
 		{70A42499-9E99-48D7-A74A-F5531CC17251}.Release|x64.Build.0 = Release|Any CPU
-		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|x64.Build.0 = Debug|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Checked|x64.Build.0 = Checked|Any CPU
+		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Debug|x64.Build.0 = Debug|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Release|x64.ActiveCfg = Release|Any CPU
 		{07AD9B89-51A7-4138-A6F9-37F439AC85CF}.Release|x64.Build.0 = Release|Any CPU
-		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|x64.Build.0 = Debug|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Checked|x64.Build.0 = Checked|Any CPU
+		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Debug|x64.Build.0 = Debug|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Release|x64.ActiveCfg = Release|Any CPU
 		{4EAE9BB8-3DF7-4384-902B-3412CB887E01}.Release|x64.Build.0 = Release|Any CPU
-		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|x64.Build.0 = Debug|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Checked|x64.Build.0 = Checked|Any CPU
+		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Debug|x64.Build.0 = Debug|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Release|x64.ActiveCfg = Release|Any CPU
 		{5928DD1E-853B-4858-834B-0DFC7C6E26EB}.Release|x64.Build.0 = Release|Any CPU
-		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|x64.Build.0 = Debug|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Checked|x64.Build.0 = Checked|Any CPU
+		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Debug|x64.Build.0 = Debug|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Release|x64.ActiveCfg = Release|Any CPU
 		{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}.Release|x64.Build.0 = Release|Any CPU
-		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|x64.Build.0 = Debug|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Checked|x64.Build.0 = Checked|Any CPU
+		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Debug|x64.Build.0 = Debug|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Release|x64.ActiveCfg = Release|Any CPU
 		{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}.Release|x64.Build.0 = Release|Any CPU
-		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|x64.Build.0 = Debug|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Checked|x64.Build.0 = Checked|Any CPU
+		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Debug|x64.Build.0 = Debug|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Release|x64.ActiveCfg = Release|Any CPU
 		{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}.Release|x64.Build.0 = Release|Any CPU
-		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Checked|x64.Build.0 = Checked|Any CPU
+		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Release|x64.ActiveCfg = Release|Any CPU
 		{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}.Release|x64.Build.0 = Release|Any CPU
-		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|x64.Build.0 = Debug|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Checked|x64.Build.0 = Checked|Any CPU
+		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Debug|x64.Build.0 = Debug|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Release|x64.ActiveCfg = Release|Any CPU
 		{B4A2FF5F-9801-48CB-A00E-591860F7714E}.Release|x64.Build.0 = Release|Any CPU
-		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|x64.Build.0 = Debug|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Checked|x64.Build.0 = Checked|Any CPU
+		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Debug|x64.Build.0 = Debug|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Release|x64.ActiveCfg = Release|Any CPU
 		{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}.Release|x64.Build.0 = Release|Any CPU
-		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|x64.Build.0 = Debug|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Checked|x64.Build.0 = Checked|Any CPU
+		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Debug|x64.Build.0 = Debug|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Release|x64.ActiveCfg = Release|Any CPU
 		{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}.Release|x64.Build.0 = Release|Any CPU
-		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|x64.Build.0 = Debug|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Checked|x64.Build.0 = Checked|Any CPU
+		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Debug|x64.Build.0 = Debug|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Release|Any CPU.Build.0 = Release|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Release|x64.ActiveCfg = Release|Any CPU
 		{87187E04-7D15-494A-BFD5-A07D2BBB4686}.Release|x64.Build.0 = Release|Any CPU
-		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Checked|x64.Build.0 = Checked|Any CPU
+		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Release|x64.ActiveCfg = Release|Any CPU
 		{5A6D6A91-B009-46C9-9A18-4866F846241F}.Release|x64.Build.0 = Release|Any CPU
-		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|x64.Build.0 = Debug|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Checked|x64.Build.0 = Checked|Any CPU
+		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Debug|x64.Build.0 = Debug|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Release|x64.ActiveCfg = Release|Any CPU
 		{D1AC9448-46B7-4B29-9A85-8F0372E5C228}.Release|x64.Build.0 = Release|Any CPU
-		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Checked|x64.Build.0 = Checked|Any CPU
+		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{564359DF-BE79-42F2-AB6E-8518217527E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Release|x64.ActiveCfg = Release|Any CPU
 		{564359DF-BE79-42F2-AB6E-8518217527E7}.Release|x64.Build.0 = Release|Any CPU
-		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|x64.Build.0 = Debug|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Checked|x64.Build.0 = Checked|Any CPU
+		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Debug|x64.Build.0 = Debug|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Release|Any CPU.Build.0 = Release|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Release|x64.ActiveCfg = Release|Any CPU
 		{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}.Release|x64.Build.0 = Release|Any CPU
-		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|x64.Build.0 = Debug|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Checked|x64.Build.0 = Checked|Any CPU
+		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Debug|x64.Build.0 = Debug|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Release|x64.ActiveCfg = Release|Any CPU
 		{C7D855D1-A996-4112-A7E9-AD1E4E07B186}.Release|x64.Build.0 = Release|Any CPU
-		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|x64.Build.0 = Debug|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Checked|x64.Build.0 = Checked|Any CPU
+		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Debug|x64.Build.0 = Debug|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Release|x64.ActiveCfg = Release|Any CPU
 		{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}.Release|x64.Build.0 = Release|Any CPU
-		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|x64.Build.0 = Debug|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Checked|x64.Build.0 = Checked|Any CPU
+		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Debug|x64.Build.0 = Debug|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Release|x64.ActiveCfg = Release|Any CPU
 		{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}.Release|x64.Build.0 = Release|Any CPU
-		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Checked|x64.Build.0 = Checked|Any CPU
+		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Release|x64.ActiveCfg = Release|Any CPU
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632}.Release|x64.Build.0 = Release|Any CPU
-		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|x64.Build.0 = Debug|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Checked|x64.Build.0 = Checked|Any CPU
+		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Debug|x64.Build.0 = Debug|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Release|x64.ActiveCfg = Release|Any CPU
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}.Release|x64.Build.0 = Release|Any CPU
-		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|x64.Build.0 = Debug|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Checked|x64.Build.0 = Checked|Any CPU
+		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Debug|x64.Build.0 = Debug|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Release|Any CPU.Build.0 = Release|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Release|x64.ActiveCfg = Release|Any CPU
 		{650B07D3-9BC0-4EF8-8557-44200EC13261}.Release|x64.Build.0 = Release|Any CPU
-		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|x64.Build.0 = Debug|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Checked|x64.Build.0 = Checked|Any CPU
+		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Debug|x64.Build.0 = Debug|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Release|x64.ActiveCfg = Release|Any CPU
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740}.Release|x64.Build.0 = Release|Any CPU
-		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|x64.Build.0 = Debug|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Checked|x64.Build.0 = Checked|Any CPU
+		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Debug|x64.Build.0 = Debug|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Release|x64.ActiveCfg = Release|Any CPU
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}.Release|x64.Build.0 = Release|Any CPU
-		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Checked|x64.Build.0 = Checked|Any CPU
+		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A7850EBD-6701-473E-8686-99535F0794A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Release|x64.ActiveCfg = Release|Any CPU
 		{A7850EBD-6701-473E-8686-99535F0794A6}.Release|x64.Build.0 = Release|Any CPU
-		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|x64.Build.0 = Debug|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Checked|x64.Build.0 = Checked|Any CPU
+		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Debug|x64.Build.0 = Debug|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Release|x64.ActiveCfg = Release|Any CPU
 		{314823E3-7BB2-4C19-BA04-5AC565215BA3}.Release|x64.Build.0 = Release|Any CPU
-		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|x64.Build.0 = Debug|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Checked|x64.Build.0 = Checked|Any CPU
+		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Debug|x64.Build.0 = Debug|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Release|x64.ActiveCfg = Release|Any CPU
 		{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}.Release|x64.Build.0 = Release|Any CPU
-		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|x64.Build.0 = Debug|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Checked|x64.Build.0 = Checked|Any CPU
+		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Debug|x64.Build.0 = Debug|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Release|Any CPU.Build.0 = Release|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Release|x64.ActiveCfg = Release|Any CPU
 		{72FF9A1A-6612-41FD-86D2-C069608C2799}.Release|x64.Build.0 = Release|Any CPU
-		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|x64.Build.0 = Debug|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Checked|x64.Build.0 = Checked|Any CPU
+		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Debug|x64.Build.0 = Debug|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Release|x64.ActiveCfg = Release|Any CPU
 		{9EE64E0C-595B-47BF-B8C0-96BDDA260461}.Release|x64.Build.0 = Release|Any CPU
-		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|x64.Build.0 = Debug|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Checked|x64.Build.0 = Checked|Any CPU
+		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Debug|x64.Build.0 = Debug|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Release|x64.ActiveCfg = Release|Any CPU
 		{271C8E26-550D-4506-9BF8-D87805D5FEF6}.Release|x64.Build.0 = Release|Any CPU
-		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|x64.Build.0 = Debug|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Checked|x64.Build.0 = Checked|Any CPU
+		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Debug|x64.Build.0 = Debug|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Release|x64.ActiveCfg = Release|Any CPU
 		{5CE4D180-D559-4EA1-8A81-22FC79E4D255}.Release|x64.Build.0 = Release|Any CPU
-		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Checked|x64.Build.0 = Checked|Any CPU
+		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Release|x64.ActiveCfg = Release|Any CPU
 		{EBB57E43-0868-4482-86EF-8E330A10BB54}.Release|x64.Build.0 = Release|Any CPU
-		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|x64.Build.0 = Debug|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Checked|x64.Build.0 = Checked|Any CPU
+		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Debug|x64.Build.0 = Debug|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Release|x64.ActiveCfg = Release|Any CPU
 		{6D20F54D-C743-4459-A7BD-A8C631CC648A}.Release|x64.Build.0 = Release|Any CPU
-		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|x64.Build.0 = Debug|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Checked|x64.Build.0 = Checked|Any CPU
+		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Debug|x64.Build.0 = Debug|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Release|x64.ActiveCfg = Release|Any CPU
 		{17BA157B-5321-4381-94E3-BBC37B314FAF}.Release|x64.Build.0 = Release|Any CPU
-		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|x64.Build.0 = Debug|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Checked|x64.Build.0 = Checked|Any CPU
+		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Debug|x64.Build.0 = Debug|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Release|x64.ActiveCfg = Release|Any CPU
 		{DC4B97D9-D69D-4A34-899A-57AE1C949841}.Release|x64.Build.0 = Release|Any CPU
-		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|x64.Build.0 = Debug|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Checked|x64.Build.0 = Checked|Any CPU
+		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06705BB1-9365-4916-A426-7534584A1B5D}.Debug|x64.Build.0 = Debug|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Release|x64.ActiveCfg = Release|Any CPU
 		{06705BB1-9365-4916-A426-7534584A1B5D}.Release|x64.Build.0 = Release|Any CPU
-		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|x64.Build.0 = Debug|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Checked|x64.Build.0 = Checked|Any CPU
+		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF639075-28D1-4E40-808F-A181F76B7005}.Debug|x64.Build.0 = Debug|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Release|x64.ActiveCfg = Release|Any CPU
 		{BF639075-28D1-4E40-808F-A181F76B7005}.Release|x64.Build.0 = Release|Any CPU
-		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|x64.Build.0 = Debug|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Checked|x64.Build.0 = Checked|Any CPU
+		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Debug|x64.Build.0 = Debug|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Release|x64.ActiveCfg = Release|Any CPU
 		{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}.Release|x64.Build.0 = Release|Any CPU
-		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|x64.Build.0 = Debug|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Checked|x64.Build.0 = Checked|Any CPU
+		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Debug|x64.Build.0 = Debug|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Release|x64.ActiveCfg = Release|Any CPU
 		{B793D123-1F28-452A-8528-2CF812B8EEBB}.Release|x64.Build.0 = Release|Any CPU
-		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|x64.Build.0 = Debug|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Checked|x64.Build.0 = Checked|Any CPU
+		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Debug|x64.Build.0 = Debug|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Release|x64.ActiveCfg = Release|Any CPU
 		{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}.Release|x64.Build.0 = Release|Any CPU
-		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|x64.Build.0 = Debug|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Checked|x64.Build.0 = Checked|Any CPU
+		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Debug|x64.Build.0 = Debug|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Release|x64.ActiveCfg = Release|Any CPU
 		{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}.Release|x64.Build.0 = Release|Any CPU
-		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|x64.Build.0 = Debug|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Checked|x64.Build.0 = Checked|Any CPU
+		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{14A2768C-E5E0-4156-B05C-229600CC539B}.Debug|x64.Build.0 = Debug|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Release|x64.ActiveCfg = Release|Any CPU
 		{14A2768C-E5E0-4156-B05C-229600CC539B}.Release|x64.Build.0 = Release|Any CPU
-		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Checked|x64.Build.0 = Checked|Any CPU
+		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Release|x64.ActiveCfg = Release|Any CPU
 		{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}.Release|x64.Build.0 = Release|Any CPU
-		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|x64.Build.0 = Debug|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Checked|x64.Build.0 = Checked|Any CPU
+		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{136C849D-3517-40D8-BA2A-1F903377762D}.Debug|x64.Build.0 = Debug|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Release|x64.ActiveCfg = Release|Any CPU
 		{136C849D-3517-40D8-BA2A-1F903377762D}.Release|x64.Build.0 = Release|Any CPU
-		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|x64.Build.0 = Debug|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Checked|x64.Build.0 = Checked|Any CPU
+		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Debug|x64.Build.0 = Debug|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Release|x64.ActiveCfg = Release|Any CPU
 		{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}.Release|x64.Build.0 = Release|Any CPU
-		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|x64.Build.0 = Debug|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Checked|x64.Build.0 = Checked|Any CPU
+		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Debug|x64.Build.0 = Debug|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Release|x64.ActiveCfg = Release|Any CPU
 		{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}.Release|x64.Build.0 = Release|Any CPU
-		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|x64.Build.0 = Debug|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Checked|x64.Build.0 = Checked|Any CPU
+		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Debug|x64.Build.0 = Debug|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Release|x64.ActiveCfg = Release|Any CPU
 		{B9F2D613-B3BF-46D1-A762-ADE0656DF394}.Release|x64.Build.0 = Release|Any CPU
-		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|x64.Build.0 = Debug|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Checked|x64.Build.0 = Checked|Any CPU
+		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Debug|x64.Build.0 = Debug|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Release|x64.ActiveCfg = Release|Any CPU
 		{3A283369-FD98-4661-9B73-17BDAC3C2A70}.Release|x64.Build.0 = Release|Any CPU
-		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|x64.Build.0 = Debug|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Checked|x64.Build.0 = Checked|Any CPU
+		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Debug|x64.Build.0 = Debug|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Release|x64.ActiveCfg = Release|Any CPU
 		{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}.Release|x64.Build.0 = Release|Any CPU
-		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|x64.Build.0 = Debug|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Checked|x64.Build.0 = Checked|Any CPU
+		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Debug|x64.Build.0 = Debug|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Release|x64.ActiveCfg = Release|Any CPU
 		{B0409C23-6BC6-40F5-9386-36A69B746C65}.Release|x64.Build.0 = Release|Any CPU
-		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|x64.Build.0 = Debug|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Checked|x64.Build.0 = Checked|Any CPU
+		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E56C9935-95B9-498A-B221-DF044409D530}.Debug|x64.Build.0 = Debug|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Release|x64.ActiveCfg = Release|Any CPU
 		{E56C9935-95B9-498A-B221-DF044409D530}.Release|x64.Build.0 = Release|Any CPU
-		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|x64.Build.0 = Debug|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Checked|x64.Build.0 = Checked|Any CPU
+		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Debug|x64.Build.0 = Debug|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Release|x64.ActiveCfg = Release|Any CPU
 		{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}.Release|x64.Build.0 = Release|Any CPU
-		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|x64.Build.0 = Debug|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Checked|x64.Build.0 = Checked|Any CPU
+		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53C70B64-C175-43BF-A98A-719868D6D695}.Debug|x64.Build.0 = Debug|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Release|Any CPU.Build.0 = Release|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Release|x64.ActiveCfg = Release|Any CPU
 		{53C70B64-C175-43BF-A98A-719868D6D695}.Release|x64.Build.0 = Release|Any CPU
-		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|x64.Build.0 = Debug|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Checked|x64.Build.0 = Checked|Any CPU
+		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Debug|x64.Build.0 = Debug|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Release|x64.ActiveCfg = Release|Any CPU
 		{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}.Release|x64.Build.0 = Release|Any CPU
-		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|x64.Build.0 = Debug|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Checked|x64.Build.0 = Checked|Any CPU
+		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Debug|x64.Build.0 = Debug|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Release|x64.ActiveCfg = Release|Any CPU
 		{3C4D424C-B4CE-4C7F-B780-9330CBFED274}.Release|x64.Build.0 = Release|Any CPU
-		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|x64.Build.0 = Debug|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Checked|x64.Build.0 = Checked|Any CPU
+		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Debug|x64.Build.0 = Debug|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Release|x64.ActiveCfg = Release|Any CPU
 		{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}.Release|x64.Build.0 = Release|Any CPU
-		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|x64.Build.0 = Debug|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Checked|x64.Build.0 = Checked|Any CPU
+		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Debug|x64.Build.0 = Debug|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Release|x64.ActiveCfg = Release|Any CPU
 		{60284420-DDEE-40F0-AB57-A2C4011D07C2}.Release|x64.Build.0 = Release|Any CPU
-		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|x64.Build.0 = Debug|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Checked|x64.Build.0 = Checked|Any CPU
+		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Debug|x64.Build.0 = Debug|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Release|x64.ActiveCfg = Release|Any CPU
 		{C340AEBB-36A4-40E8-A453-F9D2B48F608A}.Release|x64.Build.0 = Release|Any CPU
-		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|x64.Build.0 = Debug|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Checked|x64.Build.0 = Checked|Any CPU
+		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D463FFF1-0A34-407F-88C4-4723901908DF}.Debug|x64.Build.0 = Debug|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Release|x64.ActiveCfg = Release|Any CPU
 		{D463FFF1-0A34-407F-88C4-4723901908DF}.Release|x64.Build.0 = Release|Any CPU
-		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|x64.Build.0 = Debug|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Checked|x64.Build.0 = Checked|Any CPU
+		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Debug|x64.Build.0 = Debug|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Release|x64.ActiveCfg = Release|Any CPU
 		{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}.Release|x64.Build.0 = Release|Any CPU
-		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|x64.Build.0 = Debug|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Checked|x64.Build.0 = Checked|Any CPU
+		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Debug|x64.Build.0 = Debug|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Release|x64.ActiveCfg = Release|Any CPU
 		{F45F852A-B9E9-4597-B399-ABBC969EAC91}.Release|x64.Build.0 = Release|Any CPU
-		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|x64.Build.0 = Debug|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Checked|x64.Build.0 = Checked|Any CPU
+		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Debug|x64.Build.0 = Debug|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Release|Any CPU.Build.0 = Release|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Release|x64.ActiveCfg = Release|Any CPU
 		{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}.Release|x64.Build.0 = Release|Any CPU
-		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Checked|x64.Build.0 = Checked|Any CPU
+		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Release|x64.ActiveCfg = Release|Any CPU
 		{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}.Release|x64.Build.0 = Release|Any CPU
-		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|x64.Build.0 = Debug|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Checked|x64.Build.0 = Checked|Any CPU
+		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Debug|x64.Build.0 = Debug|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Release|x64.ActiveCfg = Release|Any CPU
 		{A5CE024A-361E-410B-B204-98FDF9C81FA8}.Release|x64.Build.0 = Release|Any CPU
-		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Checked|x64.Build.0 = Checked|Any CPU
+		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Release|x64.ActiveCfg = Release|Any CPU
 		{33E41A22-DC44-48D9-8EE2-C2902F1564EE}.Release|x64.Build.0 = Release|Any CPU
-		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|x64.Build.0 = Debug|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Checked|x64.Build.0 = Checked|Any CPU
+		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Debug|x64.Build.0 = Debug|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Release|x64.ActiveCfg = Release|Any CPU
 		{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}.Release|x64.Build.0 = Release|Any CPU
-		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|x64.Build.0 = Debug|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Checked|x64.Build.0 = Checked|Any CPU
+		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Debug|x64.Build.0 = Debug|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Release|Any CPU.Build.0 = Release|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Release|x64.ActiveCfg = Release|Any CPU
 		{580234A2-D854-4FD7-B11D-4C39794E1F55}.Release|x64.Build.0 = Release|Any CPU
-		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Checked|x64.Build.0 = Checked|Any CPU
+		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Release|x64.ActiveCfg = Release|Any CPU
 		{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}.Release|x64.Build.0 = Release|Any CPU
-		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|x64.Build.0 = Debug|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Checked|x64.Build.0 = Checked|Any CPU
+		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Debug|x64.Build.0 = Debug|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Release|x64.ActiveCfg = Release|Any CPU
 		{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}.Release|x64.Build.0 = Release|Any CPU
-		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|x64.Build.0 = Debug|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Checked|x64.Build.0 = Checked|Any CPU
+		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Debug|x64.Build.0 = Debug|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Release|x64.ActiveCfg = Release|Any CPU
 		{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}.Release|x64.Build.0 = Release|Any CPU
-		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|x64.Build.0 = Debug|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Checked|x64.Build.0 = Checked|Any CPU
+		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{28415558-9857-4A66-B920-5A25CF2E31FF}.Debug|x64.Build.0 = Debug|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Release|x64.ActiveCfg = Release|Any CPU
 		{28415558-9857-4A66-B920-5A25CF2E31FF}.Release|x64.Build.0 = Release|Any CPU
-		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|x64.Build.0 = Debug|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Checked|x64.Build.0 = Checked|Any CPU
+		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Debug|x64.Build.0 = Debug|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Release|x64.ActiveCfg = Release|Any CPU
 		{EF8FB27D-5647-414A-8338-DC7EA477A1A4}.Release|x64.Build.0 = Release|Any CPU
-		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|x64.Build.0 = Debug|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Checked|x64.Build.0 = Checked|Any CPU
+		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Debug|x64.Build.0 = Debug|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Release|x64.ActiveCfg = Release|Any CPU
 		{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}.Release|x64.Build.0 = Release|Any CPU
-		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Checked|x64.Build.0 = Checked|Any CPU
+		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Release|x64.ActiveCfg = Release|Any CPU
 		{4B6D76B8-71D7-43DF-8DE3-DC1360344968}.Release|x64.Build.0 = Release|Any CPU
-		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Checked|x64.Build.0 = Checked|Any CPU
+		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Release|x64.ActiveCfg = Release|Any CPU
 		{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}.Release|x64.Build.0 = Release|Any CPU
-		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Checked|x64.Build.0 = Checked|Any CPU
+		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Release|x64.ActiveCfg = Release|Any CPU
 		{CFB3552B-D349-4AA8-BBE3-47ED82315402}.Release|x64.Build.0 = Release|Any CPU
-		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|x64.Build.0 = Debug|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Checked|x64.Build.0 = Checked|Any CPU
+		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Debug|x64.Build.0 = Debug|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Release|x64.ActiveCfg = Release|Any CPU
 		{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}.Release|x64.Build.0 = Release|Any CPU
-		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|x64.Build.0 = Debug|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Checked|x64.Build.0 = Checked|Any CPU
+		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Debug|x64.Build.0 = Debug|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Release|x64.ActiveCfg = Release|Any CPU
 		{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}.Release|x64.Build.0 = Release|Any CPU
-		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|x64.Build.0 = Debug|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Checked|x64.Build.0 = Checked|Any CPU
+		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Debug|x64.Build.0 = Debug|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Release|x64.ActiveCfg = Release|Any CPU
 		{040A8014-313A-4277-AB3D-5D6C9928AC7B}.Release|x64.Build.0 = Release|Any CPU
-		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|x64.Build.0 = Debug|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Checked|x64.Build.0 = Checked|Any CPU
+		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Debug|x64.Build.0 = Debug|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Release|x64.ActiveCfg = Release|Any CPU
 		{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}.Release|x64.Build.0 = Release|Any CPU
-		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Checked|x64.Build.0 = Checked|Any CPU
+		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Release|x64.ActiveCfg = Release|Any CPU
 		{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}.Release|x64.Build.0 = Release|Any CPU
-		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|x64.Build.0 = Debug|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Checked|x64.Build.0 = Checked|Any CPU
+		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15117C50-064B-4992-BC03-B906D93F047F}.Debug|x64.Build.0 = Debug|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Release|x64.ActiveCfg = Release|Any CPU
 		{15117C50-064B-4992-BC03-B906D93F047F}.Release|x64.Build.0 = Release|Any CPU
-		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|x64.Build.0 = Debug|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Checked|x64.Build.0 = Checked|Any CPU
+		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Debug|x64.Build.0 = Debug|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Release|x64.ActiveCfg = Release|Any CPU
 		{0D23EE48-E442-4EE5-B127-3DC280B2B889}.Release|x64.Build.0 = Release|Any CPU
-		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|x64.Build.0 = Debug|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Checked|x64.Build.0 = Checked|Any CPU
+		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Debug|x64.Build.0 = Debug|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Release|x64.ActiveCfg = Release|Any CPU
 		{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}.Release|x64.Build.0 = Release|Any CPU
-		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|x64.Build.0 = Debug|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Checked|x64.Build.0 = Checked|Any CPU
+		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{79877703-8483-436B-ACFA-BF2B50481554}.Debug|x64.Build.0 = Debug|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Release|x64.ActiveCfg = Release|Any CPU
 		{79877703-8483-436B-ACFA-BF2B50481554}.Release|x64.Build.0 = Release|Any CPU
-		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|x64.Build.0 = Debug|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Checked|x64.Build.0 = Checked|Any CPU
+		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Debug|x64.Build.0 = Debug|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Release|x64.ActiveCfg = Release|Any CPU
 		{536E8197-14E4-4CA4-B1FC-9D27262872B1}.Release|x64.Build.0 = Release|Any CPU
-		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|x64.Build.0 = Debug|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Checked|x64.Build.0 = Checked|Any CPU
+		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Debug|x64.Build.0 = Debug|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Release|x64.ActiveCfg = Release|Any CPU
 		{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}.Release|x64.Build.0 = Release|Any CPU
-		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|x64.Build.0 = Debug|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Checked|x64.Build.0 = Checked|Any CPU
+		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Debug|x64.Build.0 = Debug|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Release|x64.ActiveCfg = Release|Any CPU
 		{E042222A-C186-4FD5-BB45-E56FFAF991AA}.Release|x64.Build.0 = Release|Any CPU
-		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|x64.Build.0 = Debug|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Checked|x64.Build.0 = Checked|Any CPU
+		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E7423379-89CE-47F0-B061-4815CA6FC255}.Debug|x64.Build.0 = Debug|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Release|x64.ActiveCfg = Release|Any CPU
 		{E7423379-89CE-47F0-B061-4815CA6FC255}.Release|x64.Build.0 = Release|Any CPU
-		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|x64.Build.0 = Debug|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Checked|x64.Build.0 = Checked|Any CPU
+		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Debug|x64.Build.0 = Debug|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Release|x64.ActiveCfg = Release|Any CPU
 		{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}.Release|x64.Build.0 = Release|Any CPU
-		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|x64.Build.0 = Debug|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Checked|x64.Build.0 = Checked|Any CPU
+		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54477C8E-60C4-48D4-8429-4B1428E42367}.Debug|x64.Build.0 = Debug|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Release|Any CPU.Build.0 = Release|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Release|x64.ActiveCfg = Release|Any CPU
 		{54477C8E-60C4-48D4-8429-4B1428E42367}.Release|x64.Build.0 = Release|Any CPU
-		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|x64.Build.0 = Debug|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Checked|x64.Build.0 = Checked|Any CPU
+		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Debug|x64.Build.0 = Debug|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Release|x64.ActiveCfg = Release|Any CPU
 		{1490A130-4F0A-48E4-A1C4-CAC746323EA1}.Release|x64.Build.0 = Release|Any CPU
-		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|x64.Build.0 = Debug|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Checked|x64.Build.0 = Checked|Any CPU
+		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Debug|x64.Build.0 = Debug|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Release|x64.ActiveCfg = Release|Any CPU
 		{A8195820-0DEC-4D0A-A888-436B1A7EA86F}.Release|x64.Build.0 = Release|Any CPU
-		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|x64.Build.0 = Debug|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Checked|x64.Build.0 = Checked|Any CPU
+		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{664785E7-9173-4339-A392-29FC0C81056F}.Debug|x64.Build.0 = Debug|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Release|x64.ActiveCfg = Release|Any CPU
 		{664785E7-9173-4339-A392-29FC0C81056F}.Release|x64.Build.0 = Release|Any CPU
-		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Checked|x64.Build.0 = Checked|Any CPU
+		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Release|x64.ActiveCfg = Release|Any CPU
 		{EC9581B4-923D-4636-804D-3BA5F08BED1E}.Release|x64.Build.0 = Release|Any CPU
-		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|x64.Build.0 = Debug|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Checked|x64.Build.0 = Checked|Any CPU
+		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Debug|x64.Build.0 = Debug|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Release|x64.ActiveCfg = Release|Any CPU
 		{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}.Release|x64.Build.0 = Release|Any CPU
-		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|x64.Build.0 = Debug|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Checked|x64.Build.0 = Checked|Any CPU
+		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Debug|x64.Build.0 = Debug|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Release|x64.ActiveCfg = Release|Any CPU
 		{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}.Release|x64.Build.0 = Release|Any CPU
-		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Checked|x64.Build.0 = Checked|Any CPU
+		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Release|x64.ActiveCfg = Release|Any CPU
 		{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}.Release|x64.Build.0 = Release|Any CPU
-		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|x64.Build.0 = Debug|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Checked|x64.Build.0 = Checked|Any CPU
+		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4142D79-8996-44CE-825A-0304C3689970}.Debug|x64.Build.0 = Debug|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Release|x64.ActiveCfg = Release|Any CPU
 		{B4142D79-8996-44CE-825A-0304C3689970}.Release|x64.Build.0 = Release|Any CPU
-		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|x64.Build.0 = Debug|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Checked|x64.Build.0 = Checked|Any CPU
+		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Debug|x64.Build.0 = Debug|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Release|x64.ActiveCfg = Release|Any CPU
 		{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}.Release|x64.Build.0 = Release|Any CPU
-		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Checked|x64.Build.0 = Checked|Any CPU
+		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Release|x64.ActiveCfg = Release|Any CPU
 		{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}.Release|x64.Build.0 = Release|Any CPU
-		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|x64.Build.0 = Debug|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Checked|x64.Build.0 = Checked|Any CPU
+		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Debug|x64.Build.0 = Debug|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Release|x64.ActiveCfg = Release|Any CPU
 		{B7449C08-3EB0-4595-BB7F-309CEFE7C470}.Release|x64.Build.0 = Release|Any CPU
-		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|x64.Build.0 = Debug|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Checked|x64.Build.0 = Checked|Any CPU
+		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Debug|x64.Build.0 = Debug|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Release|x64.ActiveCfg = Release|Any CPU
 		{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}.Release|x64.Build.0 = Release|Any CPU
-		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|x64.Build.0 = Debug|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Checked|x64.Build.0 = Checked|Any CPU
+		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Debug|x64.Build.0 = Debug|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Release|x64.ActiveCfg = Release|Any CPU
 		{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}.Release|x64.Build.0 = Release|Any CPU
-		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|x64.Build.0 = Debug|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Checked|x64.Build.0 = Checked|Any CPU
+		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5322C32-4281-4593-B946-5DCD14477CF1}.Debug|x64.Build.0 = Debug|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Release|x64.ActiveCfg = Release|Any CPU
 		{E5322C32-4281-4593-B946-5DCD14477CF1}.Release|x64.Build.0 = Release|Any CPU
-		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|x64.Build.0 = Debug|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Checked|x64.Build.0 = Checked|Any CPU
+		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Debug|x64.Build.0 = Debug|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Release|x64.ActiveCfg = Release|Any CPU
 		{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}.Release|x64.Build.0 = Release|Any CPU
-		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|x64.Build.0 = Debug|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Checked|x64.Build.0 = Checked|Any CPU
+		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Debug|x64.Build.0 = Debug|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Release|x64.ActiveCfg = Release|Any CPU
 		{3D50935B-1230-47C1-8C70-377AC2E8C542}.Release|x64.Build.0 = Release|Any CPU
-		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|x64.Build.0 = Debug|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Checked|x64.Build.0 = Checked|Any CPU
+		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Debug|x64.Build.0 = Debug|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Release|x64.ActiveCfg = Release|Any CPU
 		{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}.Release|x64.Build.0 = Release|Any CPU
-		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|x64.Build.0 = Debug|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Checked|x64.Build.0 = Checked|Any CPU
+		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Debug|x64.Build.0 = Debug|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Release|x64.ActiveCfg = Release|Any CPU
 		{F5C7053B-BD47-46DE-8246-F81941FA537D}.Release|x64.Build.0 = Release|Any CPU
-		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|x64.Build.0 = Debug|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Checked|x64.Build.0 = Checked|Any CPU
+		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Debug|x64.Build.0 = Debug|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Release|x64.ActiveCfg = Release|Any CPU
 		{340B2533-5C07-4261-ABE8-0C39C62A8F2B}.Release|x64.Build.0 = Release|Any CPU
-		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|x64.Build.0 = Debug|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Checked|x64.Build.0 = Checked|Any CPU
+		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Debug|x64.Build.0 = Debug|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Release|x64.ActiveCfg = Release|Any CPU
 		{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}.Release|x64.Build.0 = Release|Any CPU
-		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Checked|x64.Build.0 = Checked|Any CPU
+		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Release|x64.ActiveCfg = Release|Any CPU
 		{80D23E5D-DB08-4B4F-913F-ED296B0500EC}.Release|x64.Build.0 = Release|Any CPU
-		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|x64.Build.0 = Debug|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Checked|x64.Build.0 = Checked|Any CPU
+		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Debug|x64.Build.0 = Debug|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Release|x64.ActiveCfg = Release|Any CPU
 		{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}.Release|x64.Build.0 = Release|Any CPU
-		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|x64.Build.0 = Debug|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Checked|x64.Build.0 = Checked|Any CPU
+		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Debug|x64.Build.0 = Debug|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Release|x64.ActiveCfg = Release|Any CPU
 		{3AF47F6E-E823-4D10-91D2-D1D2291D860D}.Release|x64.Build.0 = Release|Any CPU
-		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|x64.Build.0 = Debug|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Checked|x64.Build.0 = Checked|Any CPU
+		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Debug|x64.Build.0 = Debug|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Release|x64.ActiveCfg = Release|Any CPU
 		{5729818E-5D7B-45A0-A79F-F6F9AA782223}.Release|x64.Build.0 = Release|Any CPU
-		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|x64.Build.0 = Debug|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Checked|x64.Build.0 = Checked|Any CPU
+		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Debug|x64.Build.0 = Debug|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Release|Any CPU.Build.0 = Release|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Release|x64.ActiveCfg = Release|Any CPU
 		{234F2BCE-6D53-4033-8D90-D7A2C3262397}.Release|x64.Build.0 = Release|Any CPU
-		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|x64.Build.0 = Debug|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Checked|x64.Build.0 = Checked|Any CPU
+		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Debug|x64.Build.0 = Debug|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Release|x64.ActiveCfg = Release|Any CPU
 		{C62E1AAB-2705-440F-A499-43CA515CBE64}.Release|x64.Build.0 = Release|Any CPU
-		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|x64.Build.0 = Debug|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Checked|x64.Build.0 = Checked|Any CPU
+		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Debug|x64.Build.0 = Debug|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Release|x64.ActiveCfg = Release|Any CPU
 		{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}.Release|x64.Build.0 = Release|Any CPU
-		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|x64.Build.0 = Debug|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Checked|x64.Build.0 = Checked|Any CPU
+		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Debug|x64.Build.0 = Debug|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Release|x64.ActiveCfg = Release|Any CPU
 		{3295C952-BD8B-41B7-A94A-3B80A88832ED}.Release|x64.Build.0 = Release|Any CPU
-		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|x64.Build.0 = Debug|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Checked|x64.Build.0 = Checked|Any CPU
+		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Debug|x64.Build.0 = Debug|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Release|x64.ActiveCfg = Release|Any CPU
 		{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}.Release|x64.Build.0 = Release|Any CPU
-		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|x64.Build.0 = Debug|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Checked|x64.Build.0 = Checked|Any CPU
+		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Debug|x64.Build.0 = Debug|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Release|x64.ActiveCfg = Release|Any CPU
 		{2A0DB37C-22D9-405A-9EB5-74B5EA151067}.Release|x64.Build.0 = Release|Any CPU
-		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|x64.Build.0 = Debug|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Checked|x64.Build.0 = Checked|Any CPU
+		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Debug|x64.Build.0 = Debug|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Release|x64.ActiveCfg = Release|Any CPU
 		{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}.Release|x64.Build.0 = Release|Any CPU
-		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Checked|x64.Build.0 = Checked|Any CPU
+		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Release|x64.ActiveCfg = Release|Any CPU
 		{77488FE6-99C2-478A-BF45-76B7192B05F3}.Release|x64.Build.0 = Release|Any CPU
-		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|x64.Build.0 = Debug|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Checked|x64.Build.0 = Checked|Any CPU
+		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Debug|x64.Build.0 = Debug|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Release|x64.ActiveCfg = Release|Any CPU
 		{9AB352DA-BC41-4FD6-9974-571B2894D873}.Release|x64.Build.0 = Release|Any CPU
-		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|x64.Build.0 = Debug|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Checked|x64.Build.0 = Checked|Any CPU
+		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Debug|x64.Build.0 = Debug|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Release|x64.ActiveCfg = Release|Any CPU
 		{3683291A-FC9F-459E-87CC-25F401C2DEAA}.Release|x64.Build.0 = Release|Any CPU
-		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|x64.Build.0 = Debug|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Checked|x64.Build.0 = Checked|Any CPU
+		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Debug|x64.Build.0 = Debug|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Release|x64.ActiveCfg = Release|Any CPU
 		{5206C50D-0D7C-4593-A659-3D51FFA19454}.Release|x64.Build.0 = Release|Any CPU
-		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|x64.Build.0 = Debug|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Checked|x64.Build.0 = Checked|Any CPU
+		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Debug|x64.Build.0 = Debug|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Release|x64.ActiveCfg = Release|Any CPU
 		{B608C48E-89BD-4D20-8DA5-B1DBA234D893}.Release|x64.Build.0 = Release|Any CPU
-		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|x64.Build.0 = Debug|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Checked|x64.Build.0 = Checked|Any CPU
+		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Debug|x64.Build.0 = Debug|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Release|Any CPU.Build.0 = Release|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Release|x64.ActiveCfg = Release|Any CPU
 		{083D1F5E-6CF7-4B78-B940-439A8CCA0157}.Release|x64.Build.0 = Release|Any CPU
-		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Checked|x64.Build.0 = Checked|Any CPU
+		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4B961CFE-BB95-4937-9882-E0656590CB30}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Release|x64.ActiveCfg = Release|Any CPU
 		{4B961CFE-BB95-4937-9882-E0656590CB30}.Release|x64.Build.0 = Release|Any CPU
-		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|x64.Build.0 = Debug|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Checked|x64.Build.0 = Checked|Any CPU
+		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Debug|x64.Build.0 = Debug|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Release|x64.ActiveCfg = Release|Any CPU
 		{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}.Release|x64.Build.0 = Release|Any CPU
-		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Checked|x64.Build.0 = Checked|Any CPU
+		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Release|x64.ActiveCfg = Release|Any CPU
 		{4646A951-3BC6-4ECA-8884-A26246FA86B6}.Release|x64.Build.0 = Release|Any CPU
-		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Checked|x64.Build.0 = Checked|Any CPU
+		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Release|x64.ActiveCfg = Release|Any CPU
 		{787F11B6-3900-430B-A6FC-9FE7157625EE}.Release|x64.Build.0 = Release|Any CPU
-		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Checked|x64.Build.0 = Checked|Any CPU
+		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Release|x64.ActiveCfg = Release|Any CPU
 		{074BA388-8FD2-4B1E-B762-6A31236813C6}.Release|x64.Build.0 = Release|Any CPU
-		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|x64.Build.0 = Debug|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Checked|x64.Build.0 = Checked|Any CPU
+		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Debug|x64.Build.0 = Debug|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Release|x64.ActiveCfg = Release|Any CPU
 		{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}.Release|x64.Build.0 = Release|Any CPU
-		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|x64.Build.0 = Debug|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Checked|x64.Build.0 = Checked|Any CPU
+		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Debug|x64.Build.0 = Debug|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Release|x64.ActiveCfg = Release|Any CPU
 		{D0FE1238-7277-4663-B545-63D2A8B30F97}.Release|x64.Build.0 = Release|Any CPU
-		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Checked|x64.Build.0 = Checked|Any CPU
+		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Release|x64.ActiveCfg = Release|Any CPU
 		{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}.Release|x64.Build.0 = Release|Any CPU
-		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|x64.Build.0 = Debug|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Checked|x64.Build.0 = Checked|Any CPU
+		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Debug|x64.Build.0 = Debug|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Release|x64.ActiveCfg = Release|Any CPU
 		{D2E40B34-682E-4615-A404-DB62775DD4D0}.Release|x64.Build.0 = Release|Any CPU
-		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Checked|x64.Build.0 = Checked|Any CPU
+		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Release|x64.ActiveCfg = Release|Any CPU
 		{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}.Release|x64.Build.0 = Release|Any CPU
-		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|x64.Build.0 = Debug|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Checked|x64.Build.0 = Checked|Any CPU
+		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Debug|x64.Build.0 = Debug|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Release|x64.ActiveCfg = Release|Any CPU
 		{3AEBCD23-397B-4952-815A-BA1F23DDF951}.Release|x64.Build.0 = Release|Any CPU
-		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|x64.Build.0 = Debug|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Checked|x64.Build.0 = Checked|Any CPU
+		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Debug|x64.Build.0 = Debug|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Release|x64.ActiveCfg = Release|Any CPU
 		{139F6A41-C301-4740-A7E7-F4491588F8CF}.Release|x64.Build.0 = Release|Any CPU
-		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Checked|x64.Build.0 = Checked|Any CPU
+		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Release|x64.ActiveCfg = Release|Any CPU
 		{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}.Release|x64.Build.0 = Release|Any CPU
-		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|x64.Build.0 = Debug|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Checked|x64.Build.0 = Checked|Any CPU
+		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Debug|x64.Build.0 = Debug|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Release|x64.ActiveCfg = Release|Any CPU
 		{EAC06643-6BE2-42A5-85C3-C5D5BD463067}.Release|x64.Build.0 = Release|Any CPU
-		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|x64.Build.0 = Debug|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Checked|x64.Build.0 = Checked|Any CPU
+		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A62D095E-4206-4D11-8762-11DDD63E931E}.Debug|x64.Build.0 = Debug|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Release|x64.ActiveCfg = Release|Any CPU
 		{A62D095E-4206-4D11-8762-11DDD63E931E}.Release|x64.Build.0 = Release|Any CPU
-		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|x64.Build.0 = Debug|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Checked|x64.Build.0 = Checked|Any CPU
+		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Debug|x64.Build.0 = Debug|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Release|x64.ActiveCfg = Release|Any CPU
 		{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}.Release|x64.Build.0 = Release|Any CPU
-		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|x64.Build.0 = Debug|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Checked|x64.Build.0 = Checked|Any CPU
+		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Debug|x64.Build.0 = Debug|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Release|x64.ActiveCfg = Release|Any CPU
 		{AFBEE14D-A543-4A38-B88F-D5917D534798}.Release|x64.Build.0 = Release|Any CPU
-		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|x64.Build.0 = Debug|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Checked|x64.Build.0 = Checked|Any CPU
+		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Debug|x64.Build.0 = Debug|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Release|x64.ActiveCfg = Release|Any CPU
 		{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}.Release|x64.Build.0 = Release|Any CPU
-		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|x64.Build.0 = Debug|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Checked|x64.Build.0 = Checked|Any CPU
+		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Debug|x64.Build.0 = Debug|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Release|x64.ActiveCfg = Release|Any CPU
 		{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}.Release|x64.Build.0 = Release|Any CPU
-		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|x64.Build.0 = Debug|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Checked|x64.Build.0 = Checked|Any CPU
+		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Debug|x64.Build.0 = Debug|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Release|Any CPU.Build.0 = Release|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Release|x64.ActiveCfg = Release|Any CPU
 		{26BA48DF-909E-4139-8CDB-33B774A96D36}.Release|x64.Build.0 = Release|Any CPU
-		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Checked|x64.Build.0 = Checked|Any CPU
+		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Release|x64.ActiveCfg = Release|Any CPU
 		{BFBD12A9-470A-436D-889B-A094C4B56B5E}.Release|x64.Build.0 = Release|Any CPU
-		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|x64.Build.0 = Debug|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Checked|x64.Build.0 = Checked|Any CPU
+		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Debug|x64.Build.0 = Debug|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Release|x64.ActiveCfg = Release|Any CPU
 		{A3AD0A96-D8B7-4756-87A4-BD0322816E36}.Release|x64.Build.0 = Release|Any CPU
-		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|x64.Build.0 = Debug|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Checked|x64.Build.0 = Checked|Any CPU
+		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Debug|x64.Build.0 = Debug|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Release|x64.ActiveCfg = Release|Any CPU
 		{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}.Release|x64.Build.0 = Release|Any CPU
-		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|x64.Build.0 = Debug|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Checked|x64.Build.0 = Checked|Any CPU
+		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{49F28797-569B-46CE-BE57-F303CB612942}.Debug|x64.Build.0 = Debug|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Release|Any CPU.Build.0 = Release|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Release|x64.ActiveCfg = Release|Any CPU
 		{49F28797-569B-46CE-BE57-F303CB612942}.Release|x64.Build.0 = Release|Any CPU
-		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|x64.Build.0 = Debug|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Checked|x64.Build.0 = Checked|Any CPU
+		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C263A317-B5CA-40F1-A159-0662059DDA12}.Debug|x64.Build.0 = Debug|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Release|x64.ActiveCfg = Release|Any CPU
 		{C263A317-B5CA-40F1-A159-0662059DDA12}.Release|x64.Build.0 = Release|Any CPU
-		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|x64.Build.0 = Debug|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Checked|x64.Build.0 = Checked|Any CPU
+		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Debug|x64.Build.0 = Debug|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Release|x64.ActiveCfg = Release|Any CPU
 		{CBD9D3F5-8F73-460F-8801-D684254D45EA}.Release|x64.Build.0 = Release|Any CPU
-		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Checked|x64.Build.0 = Checked|Any CPU
+		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Release|x64.ActiveCfg = Release|Any CPU
 		{9B2CCDC2-D6CE-4568-A419-AC79613BC235}.Release|x64.Build.0 = Release|Any CPU
-		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|x64.Build.0 = Debug|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Checked|x64.Build.0 = Checked|Any CPU
+		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Debug|x64.Build.0 = Debug|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Release|x64.ActiveCfg = Release|Any CPU
 		{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}.Release|x64.Build.0 = Release|Any CPU
-		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|x64.Build.0 = Debug|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Checked|x64.Build.0 = Checked|Any CPU
+		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5B790B31-497A-486B-A30C-67F013E370CA}.Debug|x64.Build.0 = Debug|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Release|x64.ActiveCfg = Release|Any CPU
 		{5B790B31-497A-486B-A30C-67F013E370CA}.Release|x64.Build.0 = Release|Any CPU
-		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|x64.Build.0 = Debug|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Checked|x64.Build.0 = Checked|Any CPU
+		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Debug|x64.Build.0 = Debug|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Release|x64.ActiveCfg = Release|Any CPU
 		{66CF5824-3763-47A8-ABEA-E8C583DB765F}.Release|x64.Build.0 = Release|Any CPU
-		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|x64.Build.0 = Debug|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Checked|x64.Build.0 = Checked|Any CPU
+		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Debug|x64.Build.0 = Debug|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Release|x64.ActiveCfg = Release|Any CPU
 		{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}.Release|x64.Build.0 = Release|Any CPU
-		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|x64.Build.0 = Debug|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Checked|x64.Build.0 = Checked|Any CPU
+		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C17DAACE-3DBA-4199-90E2-96F991712114}.Debug|x64.Build.0 = Debug|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Release|x64.ActiveCfg = Release|Any CPU
 		{C17DAACE-3DBA-4199-90E2-96F991712114}.Release|x64.Build.0 = Release|Any CPU
-		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|x64.Build.0 = Debug|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Checked|x64.Build.0 = Checked|Any CPU
+		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Debug|x64.Build.0 = Debug|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Release|x64.ActiveCfg = Release|Any CPU
 		{5540B7B2-2011-400F-9DF6-3A35CF7C4004}.Release|x64.Build.0 = Release|Any CPU
-		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|x64.Build.0 = Debug|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Checked|x64.Build.0 = Checked|Any CPU
+		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5536EDEC-592C-4855-8560-839687B39DEF}.Debug|x64.Build.0 = Debug|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Release|x64.ActiveCfg = Release|Any CPU
 		{5536EDEC-592C-4855-8560-839687B39DEF}.Release|x64.Build.0 = Release|Any CPU
-		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|x64.Build.0 = Debug|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Checked|x64.Build.0 = Checked|Any CPU
+		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Debug|x64.Build.0 = Debug|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Release|x64.ActiveCfg = Release|Any CPU
 		{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}.Release|x64.Build.0 = Release|Any CPU
-		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|x64.Build.0 = Debug|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Checked|x64.Build.0 = Checked|Any CPU
+		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Debug|x64.Build.0 = Debug|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Release|x64.ActiveCfg = Release|Any CPU
 		{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}.Release|x64.Build.0 = Release|Any CPU
-		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|x64.Build.0 = Debug|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Checked|x64.Build.0 = Checked|Any CPU
+		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Debug|x64.Build.0 = Debug|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Release|x64.ActiveCfg = Release|Any CPU
 		{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}.Release|x64.Build.0 = Release|Any CPU
-		{692088EB-4644-4378-B391-3C06C532281C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{692088EB-4644-4378-B391-3C06C532281C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{692088EB-4644-4378-B391-3C06C532281C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{692088EB-4644-4378-B391-3C06C532281C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{692088EB-4644-4378-B391-3C06C532281C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{692088EB-4644-4378-B391-3C06C532281C}.Debug|x64.Build.0 = Debug|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Checked|x64.Build.0 = Checked|Any CPU
+		{692088EB-4644-4378-B391-3C06C532281C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{692088EB-4644-4378-B391-3C06C532281C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{692088EB-4644-4378-B391-3C06C532281C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{692088EB-4644-4378-B391-3C06C532281C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{692088EB-4644-4378-B391-3C06C532281C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{692088EB-4644-4378-B391-3C06C532281C}.Debug|x64.Build.0 = Debug|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Release|x64.ActiveCfg = Release|Any CPU
 		{692088EB-4644-4378-B391-3C06C532281C}.Release|x64.Build.0 = Release|Any CPU
-		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Checked|x64.Build.0 = Checked|Any CPU
+		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{670924CC-25CB-4669-9106-89971679F2C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Release|x64.ActiveCfg = Release|Any CPU
 		{670924CC-25CB-4669-9106-89971679F2C7}.Release|x64.Build.0 = Release|Any CPU
-		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|x64.Build.0 = Debug|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Checked|x64.Build.0 = Checked|Any CPU
+		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Debug|x64.Build.0 = Debug|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Release|x64.ActiveCfg = Release|Any CPU
 		{FFFA3954-E59A-4071-86EC-06DA7A87B349}.Release|x64.Build.0 = Release|Any CPU
-		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Checked|x64.Build.0 = Checked|Any CPU
+		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Release|x64.ActiveCfg = Release|Any CPU
 		{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}.Release|x64.Build.0 = Release|Any CPU
-		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Checked|x64.Build.0 = Checked|Any CPU
+		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Release|x64.ActiveCfg = Release|Any CPU
 		{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}.Release|x64.Build.0 = Release|Any CPU
-		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Checked|x64.Build.0 = Checked|Any CPU
+		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{01804A6B-5548-41C8-BE15-95585B0375EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Release|x64.ActiveCfg = Release|Any CPU
 		{01804A6B-5548-41C8-BE15-95585B0375EC}.Release|x64.Build.0 = Release|Any CPU
-		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|x64.Build.0 = Debug|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Checked|x64.Build.0 = Checked|Any CPU
+		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Debug|x64.Build.0 = Debug|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Release|x64.ActiveCfg = Release|Any CPU
 		{526DCCAB-BFA3-423A-AE11-A23C49639EF4}.Release|x64.Build.0 = Release|Any CPU
-		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|x64.Build.0 = Debug|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Checked|x64.Build.0 = Checked|Any CPU
+		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Debug|x64.Build.0 = Debug|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Release|x64.ActiveCfg = Release|Any CPU
 		{17AEDCD1-89CD-4206-B76C-0161143AC72F}.Release|x64.Build.0 = Release|Any CPU
-		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|x64.Build.0 = Debug|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Checked|x64.Build.0 = Checked|Any CPU
+		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Debug|x64.Build.0 = Debug|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Release|Any CPU.Build.0 = Release|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Release|x64.ActiveCfg = Release|Any CPU
 		{836AD7B3-35E6-49F0-AA37-AB051B84E559}.Release|x64.Build.0 = Release|Any CPU
-		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|x64.Build.0 = Debug|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Checked|x64.Build.0 = Checked|Any CPU
+		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Debug|x64.Build.0 = Debug|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Release|x64.ActiveCfg = Release|Any CPU
 		{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}.Release|x64.Build.0 = Release|Any CPU
-		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|x64.Build.0 = Debug|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Checked|x64.Build.0 = Checked|Any CPU
+		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{635215B3-122F-499D-8CAB-22F00651EA12}.Debug|x64.Build.0 = Debug|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Release|Any CPU.Build.0 = Release|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Release|x64.ActiveCfg = Release|Any CPU
 		{635215B3-122F-499D-8CAB-22F00651EA12}.Release|x64.Build.0 = Release|Any CPU
-		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|x64.Build.0 = Debug|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Checked|x64.Build.0 = Checked|Any CPU
+		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Debug|x64.Build.0 = Debug|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Release|x64.ActiveCfg = Release|Any CPU
 		{969159A4-B449-49AB-85BC-816C4EF69BD7}.Release|x64.Build.0 = Release|Any CPU
-		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|x64.Build.0 = Debug|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Checked|x64.Build.0 = Checked|Any CPU
+		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Debug|x64.Build.0 = Debug|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Release|x64.ActiveCfg = Release|Any CPU
 		{252285C6-BDDB-4826-9E93-7702B02E4BF9}.Release|x64.Build.0 = Release|Any CPU
-		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|x64.Build.0 = Debug|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Checked|x64.Build.0 = Checked|Any CPU
+		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Debug|x64.Build.0 = Debug|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Release|Any CPU.Build.0 = Release|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Release|x64.ActiveCfg = Release|Any CPU
 		{62C4714A-E180-41FC-B44F-9B87B2375A23}.Release|x64.Build.0 = Release|Any CPU
-		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|x64.Build.0 = Debug|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Checked|x64.Build.0 = Checked|Any CPU
+		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{66387298-3248-499D-BBC1-908CABCDC93D}.Debug|x64.Build.0 = Debug|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Release|x64.ActiveCfg = Release|Any CPU
 		{66387298-3248-499D-BBC1-908CABCDC93D}.Release|x64.Build.0 = Release|Any CPU
-		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|x64.Build.0 = Debug|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Checked|x64.Build.0 = Checked|Any CPU
+		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Debug|x64.Build.0 = Debug|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Release|x64.ActiveCfg = Release|Any CPU
 		{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}.Release|x64.Build.0 = Release|Any CPU
-		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|x64.Build.0 = Debug|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Checked|x64.Build.0 = Checked|Any CPU
+		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Debug|x64.Build.0 = Debug|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Release|x64.ActiveCfg = Release|Any CPU
 		{D2BEDF6D-C783-44FA-AADD-BC6227726261}.Release|x64.Build.0 = Release|Any CPU
-		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Checked|x64.Build.0 = Checked|Any CPU
+		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Release|x64.ActiveCfg = Release|Any CPU
 		{A4C13469-BE68-490F-8B97-F8F0D94D7121}.Release|x64.Build.0 = Release|Any CPU
-		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|x64.Build.0 = Debug|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Checked|x64.Build.0 = Checked|Any CPU
+		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Debug|x64.Build.0 = Debug|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Release|x64.ActiveCfg = Release|Any CPU
 		{FE50A648-7B41-4F1D-8B76-AF8691895B3F}.Release|x64.Build.0 = Release|Any CPU
-		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|x64.Build.0 = Debug|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Checked|x64.Build.0 = Checked|Any CPU
+		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Debug|x64.Build.0 = Debug|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Release|x64.ActiveCfg = Release|Any CPU
 		{A2B2449A-76A8-48F4-8543-AC20026C5148}.Release|x64.Build.0 = Release|Any CPU
-		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|x64.Build.0 = Debug|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Checked|x64.Build.0 = Checked|Any CPU
+		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F3421840-6516-40F1-842E-323DF63B3329}.Debug|x64.Build.0 = Debug|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Release|x64.ActiveCfg = Release|Any CPU
 		{F3421840-6516-40F1-842E-323DF63B3329}.Release|x64.Build.0 = Release|Any CPU
-		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|x64.Build.0 = Debug|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Checked|x64.Build.0 = Checked|Any CPU
+		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Debug|x64.Build.0 = Debug|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Release|x64.ActiveCfg = Release|Any CPU
 		{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}.Release|x64.Build.0 = Release|Any CPU
-		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|x64.Build.0 = Debug|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Checked|x64.Build.0 = Checked|Any CPU
+		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Debug|x64.Build.0 = Debug|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Release|x64.ActiveCfg = Release|Any CPU
 		{C311BEB7-F49A-400B-9FA9-D42156D8AF59}.Release|x64.Build.0 = Release|Any CPU
-		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|x64.Build.0 = Debug|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Checked|x64.Build.0 = Checked|Any CPU
+		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Debug|x64.Build.0 = Debug|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Release|x64.ActiveCfg = Release|Any CPU
 		{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}.Release|x64.Build.0 = Release|Any CPU
-		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|x64.Build.0 = Debug|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Checked|x64.Build.0 = Checked|Any CPU
+		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Debug|x64.Build.0 = Debug|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Release|x64.ActiveCfg = Release|Any CPU
 		{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}.Release|x64.Build.0 = Release|Any CPU
-		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Checked|x64.Build.0 = Checked|Any CPU
+		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Release|x64.ActiveCfg = Release|Any CPU
 		{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}.Release|x64.Build.0 = Release|Any CPU
-		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|x64.Build.0 = Debug|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Checked|x64.Build.0 = Checked|Any CPU
+		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Debug|x64.Build.0 = Debug|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Release|x64.ActiveCfg = Release|Any CPU
 		{6EAEA64D-0062-4D88-ADDE-4169E502FF59}.Release|x64.Build.0 = Release|Any CPU
-		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Checked|x64.Build.0 = Checked|Any CPU
+		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB831C2F-A50B-4845-895F-63626C532CFA}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Release|x64.ActiveCfg = Release|Any CPU
 		{BB831C2F-A50B-4845-895F-63626C532CFA}.Release|x64.Build.0 = Release|Any CPU
-		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Checked|x64.Build.0 = Checked|Any CPU
+		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Release|x64.ActiveCfg = Release|Any CPU
 		{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}.Release|x64.Build.0 = Release|Any CPU
-		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|x64.Build.0 = Debug|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Checked|x64.Build.0 = Checked|Any CPU
+		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Debug|x64.Build.0 = Debug|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Release|x64.ActiveCfg = Release|Any CPU
 		{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}.Release|x64.Build.0 = Release|Any CPU
-		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Checked|x64.Build.0 = Checked|Any CPU
+		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BA376677-A1BA-430A-A03F-0348CCDED059}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Release|x64.ActiveCfg = Release|Any CPU
 		{BA376677-A1BA-430A-A03F-0348CCDED059}.Release|x64.Build.0 = Release|Any CPU
-		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|x64.Build.0 = Debug|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Checked|x64.Build.0 = Checked|Any CPU
+		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Debug|x64.Build.0 = Debug|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Release|x64.ActiveCfg = Release|Any CPU
 		{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}.Release|x64.Build.0 = Release|Any CPU
-		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|x64.Build.0 = Debug|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Checked|x64.Build.0 = Checked|Any CPU
+		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Debug|x64.Build.0 = Debug|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Release|Any CPU.Build.0 = Release|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Release|x64.ActiveCfg = Release|Any CPU
 		{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}.Release|x64.Build.0 = Release|Any CPU
-		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Checked|x64.Build.0 = Checked|Any CPU
+		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Release|x64.ActiveCfg = Release|Any CPU
 		{BFB8EFE5-7236-437E-A3C2-5811D340B056}.Release|x64.Build.0 = Release|Any CPU
-		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|x64.Build.0 = Debug|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Checked|x64.Build.0 = Checked|Any CPU
+		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Debug|x64.Build.0 = Debug|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Release|x64.ActiveCfg = Release|Any CPU
 		{4F00E4F2-9957-4845-91A3-D2E903014B68}.Release|x64.Build.0 = Release|Any CPU
-		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|x64.Build.0 = Debug|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Checked|x64.Build.0 = Checked|Any CPU
+		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B310070F-A72B-49F2-B75F-09F072EE595D}.Debug|x64.Build.0 = Debug|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Release|x64.ActiveCfg = Release|Any CPU
 		{B310070F-A72B-49F2-B75F-09F072EE595D}.Release|x64.Build.0 = Release|Any CPU
-		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|x64.Build.0 = Debug|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Checked|x64.Build.0 = Checked|Any CPU
+		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Debug|x64.Build.0 = Debug|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Release|Any CPU.Build.0 = Release|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Release|x64.ActiveCfg = Release|Any CPU
 		{463BD49E-2227-483E-8E08-FCB431FC9C54}.Release|x64.Build.0 = Release|Any CPU
-		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Checked|x64.Build.0 = Checked|Any CPU
+		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Release|x64.ActiveCfg = Release|Any CPU
 		{BA483BED-BD99-4AE0-B4DC-42BF573F054D}.Release|x64.Build.0 = Release|Any CPU
-		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Checked|x64.Build.0 = Checked|Any CPU
+		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Release|x64.ActiveCfg = Release|Any CPU
 		{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}.Release|x64.Build.0 = Release|Any CPU
-		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|x64.Build.0 = Debug|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Checked|x64.Build.0 = Checked|Any CPU
+		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Debug|x64.Build.0 = Debug|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Release|x64.ActiveCfg = Release|Any CPU
 		{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}.Release|x64.Build.0 = Release|Any CPU
-		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|x64.Build.0 = Debug|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Checked|x64.Build.0 = Checked|Any CPU
+		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Debug|x64.Build.0 = Debug|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Release|Any CPU.Build.0 = Release|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Release|x64.ActiveCfg = Release|Any CPU
 		{85BA4D30-89D2-400E-87EE-16A73C104C11}.Release|x64.Build.0 = Release|Any CPU
-		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|x64.Build.0 = Debug|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Checked|x64.Build.0 = Checked|Any CPU
+		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Debug|x64.Build.0 = Debug|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Release|Any CPU.Build.0 = Release|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Release|x64.ActiveCfg = Release|Any CPU
 		{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}.Release|x64.Build.0 = Release|Any CPU
-		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|x64.Build.0 = Debug|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Checked|x64.Build.0 = Checked|Any CPU
+		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Debug|x64.Build.0 = Debug|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Release|x64.ActiveCfg = Release|Any CPU
 		{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}.Release|x64.Build.0 = Release|Any CPU
-		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|x64.Build.0 = Debug|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Checked|x64.Build.0 = Checked|Any CPU
+		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Debug|x64.Build.0 = Debug|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Release|Any CPU.Build.0 = Release|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Release|x64.ActiveCfg = Release|Any CPU
 		{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}.Release|x64.Build.0 = Release|Any CPU
-		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|x64.Build.0 = Debug|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Checked|x64.Build.0 = Checked|Any CPU
+		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Debug|x64.Build.0 = Debug|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Release|x64.ActiveCfg = Release|Any CPU
 		{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}.Release|x64.Build.0 = Release|Any CPU
-		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|x64.Build.0 = Debug|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Checked|x64.Build.0 = Checked|Any CPU
+		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Debug|x64.Build.0 = Debug|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Release|x64.ActiveCfg = Release|Any CPU
 		{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}.Release|x64.Build.0 = Release|Any CPU
-		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|x64.Build.0 = Debug|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Checked|x64.Build.0 = Checked|Any CPU
+		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Debug|x64.Build.0 = Debug|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Release|x64.ActiveCfg = Release|Any CPU
 		{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}.Release|x64.Build.0 = Release|Any CPU
-		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|x64.Build.0 = Debug|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Checked|x64.Build.0 = Checked|Any CPU
+		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Debug|x64.Build.0 = Debug|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Release|x64.ActiveCfg = Release|Any CPU
 		{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}.Release|x64.Build.0 = Release|Any CPU
-		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|x64.Build.0 = Debug|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Checked|x64.Build.0 = Checked|Any CPU
+		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Debug|x64.Build.0 = Debug|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Release|x64.ActiveCfg = Release|Any CPU
 		{D773D72F-F59F-47FE-8BC1-5B77C374CDED}.Release|x64.Build.0 = Release|Any CPU
-		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|x64.Build.0 = Debug|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Checked|x64.Build.0 = Checked|Any CPU
+		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Debug|x64.Build.0 = Debug|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Release|x64.ActiveCfg = Release|Any CPU
 		{BF7A1709-11C5-4C19-9335-946A65F7B71C}.Release|x64.Build.0 = Release|Any CPU
-		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|x64.Build.0 = Debug|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Checked|x64.Build.0 = Checked|Any CPU
+		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Debug|x64.Build.0 = Debug|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Release|x64.ActiveCfg = Release|Any CPU
 		{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}.Release|x64.Build.0 = Release|Any CPU
-		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|x64.Build.0 = Debug|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Checked|x64.Build.0 = Checked|Any CPU
+		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6FDF315A-5225-461E-895D-301CC2050F61}.Debug|x64.Build.0 = Debug|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Release|x64.ActiveCfg = Release|Any CPU
 		{6FDF315A-5225-461E-895D-301CC2050F61}.Release|x64.Build.0 = Release|Any CPU
-		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|x64.Build.0 = Debug|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Checked|x64.Build.0 = Checked|Any CPU
+		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Debug|x64.Build.0 = Debug|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Release|x64.ActiveCfg = Release|Any CPU
 		{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}.Release|x64.Build.0 = Release|Any CPU
-		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|x64.Build.0 = Debug|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Checked|x64.Build.0 = Checked|Any CPU
+		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Debug|x64.Build.0 = Debug|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Release|x64.ActiveCfg = Release|Any CPU
 		{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}.Release|x64.Build.0 = Release|Any CPU
-		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|x64.Build.0 = Debug|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Checked|x64.Build.0 = Checked|Any CPU
+		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6C120650-2F5F-497F-B549-AECD705C3298}.Debug|x64.Build.0 = Debug|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Release|x64.ActiveCfg = Release|Any CPU
 		{6C120650-2F5F-497F-B549-AECD705C3298}.Release|x64.Build.0 = Release|Any CPU
-		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|x64.Build.0 = Debug|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Checked|x64.Build.0 = Checked|Any CPU
+		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{243A642E-779B-4660-9FAE-F40A3E117598}.Debug|x64.Build.0 = Debug|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Release|Any CPU.Build.0 = Release|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Release|x64.ActiveCfg = Release|Any CPU
 		{243A642E-779B-4660-9FAE-F40A3E117598}.Release|x64.Build.0 = Release|Any CPU
-		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|x64.Build.0 = Debug|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Checked|x64.Build.0 = Checked|Any CPU
+		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Debug|x64.Build.0 = Debug|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Release|x64.ActiveCfg = Release|Any CPU
 		{89E37000-896E-4DD5-BE59-AB3AE8E0452D}.Release|x64.Build.0 = Release|Any CPU
-		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|x64.Build.0 = Debug|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Checked|x64.Build.0 = Checked|Any CPU
+		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Debug|x64.Build.0 = Debug|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Release|x64.ActiveCfg = Release|Any CPU
 		{6A409898-4C54-4952-8D10-4805CF04E3E4}.Release|x64.Build.0 = Release|Any CPU
-		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|x64.Build.0 = Debug|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Checked|x64.Build.0 = Checked|Any CPU
+		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Debug|x64.Build.0 = Debug|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Release|Any CPU.Build.0 = Release|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Release|x64.ActiveCfg = Release|Any CPU
 		{60D2F293-AE51-496E-BF9D-8220AE7E3F32}.Release|x64.Build.0 = Release|Any CPU
-		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Checked|x64.Build.0 = Checked|Any CPU
+		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Release|x64.ActiveCfg = Release|Any CPU
 		{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}.Release|x64.Build.0 = Release|Any CPU
-		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|x64.Build.0 = Debug|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Checked|x64.Build.0 = Checked|Any CPU
+		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Debug|x64.Build.0 = Debug|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Release|x64.ActiveCfg = Release|Any CPU
 		{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}.Release|x64.Build.0 = Release|Any CPU
-		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|x64.Build.0 = Debug|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Checked|x64.Build.0 = Checked|Any CPU
+		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Debug|x64.Build.0 = Debug|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Release|x64.ActiveCfg = Release|Any CPU
 		{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}.Release|x64.Build.0 = Release|Any CPU
-		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|x64.Build.0 = Debug|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Checked|x64.Build.0 = Checked|Any CPU
+		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Debug|x64.Build.0 = Debug|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Release|x64.ActiveCfg = Release|Any CPU
 		{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}.Release|x64.Build.0 = Release|Any CPU
-		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|x64.Build.0 = Debug|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Checked|x64.Build.0 = Checked|Any CPU
+		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Debug|x64.Build.0 = Debug|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Release|x64.ActiveCfg = Release|Any CPU
 		{622F3173-9D02-4B96-B9B2-0A20085CEA9F}.Release|x64.Build.0 = Release|Any CPU
-		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|x64.Build.0 = Debug|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Checked|x64.Build.0 = Checked|Any CPU
+		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4151BEBB-509B-426C-8799-5831EAB1A501}.Debug|x64.Build.0 = Debug|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Release|x64.ActiveCfg = Release|Any CPU
 		{4151BEBB-509B-426C-8799-5831EAB1A501}.Release|x64.Build.0 = Release|Any CPU
-		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Checked|x64.Build.0 = Checked|Any CPU
+		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Release|x64.ActiveCfg = Release|Any CPU
 		{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}.Release|x64.Build.0 = Release|Any CPU
-		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Checked|x64.Build.0 = Checked|Any CPU
+		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Release|x64.ActiveCfg = Release|Any CPU
 		{DA129426-1577-4548-AEFF-FA3E9DD4C238}.Release|x64.Build.0 = Release|Any CPU
-		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|x64.Build.0 = Debug|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Checked|x64.Build.0 = Checked|Any CPU
+		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D988E826-E0FF-473E-B16F-1D1361B77055}.Debug|x64.Build.0 = Debug|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Release|x64.ActiveCfg = Release|Any CPU
 		{D988E826-E0FF-473E-B16F-1D1361B77055}.Release|x64.Build.0 = Release|Any CPU
-		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Checked|x64.Build.0 = Checked|Any CPU
+		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Release|x64.ActiveCfg = Release|Any CPU
 		{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}.Release|x64.Build.0 = Release|Any CPU
-		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|x64.Build.0 = Debug|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Checked|x64.Build.0 = Checked|Any CPU
+		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Debug|x64.Build.0 = Debug|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Release|Any CPU.Build.0 = Release|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Release|x64.ActiveCfg = Release|Any CPU
 		{96C34EDA-804F-4071-B942-F5A7C4E22F15}.Release|x64.Build.0 = Release|Any CPU
-		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Checked|x64.Build.0 = Checked|Any CPU
+		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Release|x64.ActiveCfg = Release|Any CPU
 		{EBCBCA18-E205-4D9A-9337-3663A2067DCF}.Release|x64.Build.0 = Release|Any CPU
-		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|x64.Build.0 = Debug|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Checked|x64.Build.0 = Checked|Any CPU
+		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Debug|x64.Build.0 = Debug|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Release|x64.ActiveCfg = Release|Any CPU
 		{E359F45E-5837-4D77-8A21-2ED8FDD8F894}.Release|x64.Build.0 = Release|Any CPU
-		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|x64.Build.0 = Debug|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Checked|x64.Build.0 = Checked|Any CPU
+		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Debug|x64.Build.0 = Debug|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Release|x64.ActiveCfg = Release|Any CPU
 		{561C7872-03CA-44A3-A6C1-84F6C90EE90F}.Release|x64.Build.0 = Release|Any CPU
-		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|x64.Build.0 = Debug|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Checked|x64.Build.0 = Checked|Any CPU
+		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8614A72B-7562-42F2-B617-2638780BB28E}.Debug|x64.Build.0 = Debug|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Release|x64.ActiveCfg = Release|Any CPU
 		{8614A72B-7562-42F2-B617-2638780BB28E}.Release|x64.Build.0 = Release|Any CPU
-		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|x64.Build.0 = Debug|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Checked|x64.Build.0 = Checked|Any CPU
+		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Debug|x64.Build.0 = Debug|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Release|x64.ActiveCfg = Release|Any CPU
 		{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}.Release|x64.Build.0 = Release|Any CPU
-		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|x64.Build.0 = Debug|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Checked|x64.Build.0 = Checked|Any CPU
+		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Debug|x64.Build.0 = Debug|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Release|x64.ActiveCfg = Release|Any CPU
 		{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}.Release|x64.Build.0 = Release|Any CPU
-		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|x64.Build.0 = Debug|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Checked|x64.Build.0 = Checked|Any CPU
+		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Debug|x64.Build.0 = Debug|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Release|x64.ActiveCfg = Release|Any CPU
 		{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}.Release|x64.Build.0 = Release|Any CPU
-		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|x64.Build.0 = Debug|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Checked|x64.Build.0 = Checked|Any CPU
+		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Debug|x64.Build.0 = Debug|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Release|x64.ActiveCfg = Release|Any CPU
 		{D82E4648-8B61-4440-9A33-A1A573819CDA}.Release|x64.Build.0 = Release|Any CPU
-		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|x64.Build.0 = Debug|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Checked|x64.Build.0 = Checked|Any CPU
+		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77044369-D426-49C1-B738-4FBB1C88B20F}.Debug|x64.Build.0 = Debug|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Release|x64.ActiveCfg = Release|Any CPU
 		{77044369-D426-49C1-B738-4FBB1C88B20F}.Release|x64.Build.0 = Release|Any CPU
-		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|x64.Build.0 = Debug|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Checked|x64.Build.0 = Checked|Any CPU
+		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Debug|x64.Build.0 = Debug|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Release|x64.ActiveCfg = Release|Any CPU
 		{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}.Release|x64.Build.0 = Release|Any CPU
-		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|x64.Build.0 = Debug|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Checked|x64.Build.0 = Checked|Any CPU
+		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Debug|x64.Build.0 = Debug|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Release|x64.ActiveCfg = Release|Any CPU
 		{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}.Release|x64.Build.0 = Release|Any CPU
-		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|x64.Build.0 = Debug|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Checked|x64.Build.0 = Checked|Any CPU
+		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Debug|x64.Build.0 = Debug|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Release|x64.ActiveCfg = Release|Any CPU
 		{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}.Release|x64.Build.0 = Release|Any CPU
-		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Checked|x64.Build.0 = Checked|Any CPU
+		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Release|x64.ActiveCfg = Release|Any CPU
 		{6B2D1E6F-69BC-43FB-9749-376324A45285}.Release|x64.Build.0 = Release|Any CPU
-		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|x64.Build.0 = Debug|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Checked|x64.Build.0 = Checked|Any CPU
+		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Debug|x64.Build.0 = Debug|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Release|x64.ActiveCfg = Release|Any CPU
 		{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}.Release|x64.Build.0 = Release|Any CPU
-		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|x64.Build.0 = Debug|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Checked|x64.Build.0 = Checked|Any CPU
+		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Debug|x64.Build.0 = Debug|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Release|x64.ActiveCfg = Release|Any CPU
 		{B9C90B98-C141-43C4-B7AD-A80A11194326}.Release|x64.Build.0 = Release|Any CPU
-		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|x64.Build.0 = Debug|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Checked|x64.Build.0 = Checked|Any CPU
+		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FB91C947-292D-4338-89C4-CE25442BC21A}.Debug|x64.Build.0 = Debug|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Release|x64.ActiveCfg = Release|Any CPU
 		{FB91C947-292D-4338-89C4-CE25442BC21A}.Release|x64.Build.0 = Release|Any CPU
-		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|x64.Build.0 = Debug|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Checked|x64.Build.0 = Checked|Any CPU
+		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Debug|x64.Build.0 = Debug|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Release|x64.ActiveCfg = Release|Any CPU
 		{3DA358E2-D2B8-4160-AAE8-353C355FC767}.Release|x64.Build.0 = Release|Any CPU
-		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|x64.Build.0 = Debug|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Checked|x64.Build.0 = Checked|Any CPU
+		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Debug|x64.Build.0 = Debug|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Release|x64.ActiveCfg = Release|Any CPU
 		{1562736B-261A-40CC-8AFE-C0F1C2892DEB}.Release|x64.Build.0 = Release|Any CPU
-		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|x64.Build.0 = Debug|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Checked|x64.Build.0 = Checked|Any CPU
+		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Debug|x64.Build.0 = Debug|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Release|x64.ActiveCfg = Release|Any CPU
 		{8FB8C934-E5DA-4A20-930B-5C30BE80831A}.Release|x64.Build.0 = Release|Any CPU
-		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|x64.Build.0 = Debug|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Checked|x64.Build.0 = Checked|Any CPU
+		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Debug|x64.Build.0 = Debug|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Release|x64.ActiveCfg = Release|Any CPU
 		{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}.Release|x64.Build.0 = Release|Any CPU
-		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|x64.Build.0 = Debug|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Checked|x64.Build.0 = Checked|Any CPU
+		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50453737-C530-4473-8D14-123A43C9DA9F}.Debug|x64.Build.0 = Debug|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Release|x64.ActiveCfg = Release|Any CPU
 		{50453737-C530-4473-8D14-123A43C9DA9F}.Release|x64.Build.0 = Release|Any CPU
-		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|x64.Build.0 = Debug|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Checked|x64.Build.0 = Checked|Any CPU
+		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E27869B0-3B87-4C49-816E-456917FF793B}.Debug|x64.Build.0 = Debug|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Release|x64.ActiveCfg = Release|Any CPU
 		{E27869B0-3B87-4C49-816E-456917FF793B}.Release|x64.Build.0 = Release|Any CPU
-		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|x64.Build.0 = Debug|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Checked|x64.Build.0 = Checked|Any CPU
+		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Debug|x64.Build.0 = Debug|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Release|x64.ActiveCfg = Release|Any CPU
 		{6843A842-DCA4-4EA5-95FB-9164F6067A34}.Release|x64.Build.0 = Release|Any CPU
-		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|x64.Build.0 = Debug|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Checked|x64.Build.0 = Checked|Any CPU
+		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Debug|x64.Build.0 = Debug|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Release|x64.ActiveCfg = Release|Any CPU
 		{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}.Release|x64.Build.0 = Release|Any CPU
-		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|x64.Build.0 = Debug|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Checked|x64.Build.0 = Checked|Any CPU
+		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Debug|x64.Build.0 = Debug|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Release|x64.ActiveCfg = Release|Any CPU
 		{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}.Release|x64.Build.0 = Release|Any CPU
-		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|x64.Build.0 = Debug|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Checked|x64.Build.0 = Checked|Any CPU
+		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Debug|x64.Build.0 = Debug|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Release|x64.ActiveCfg = Release|Any CPU
 		{C640C7D2-7131-45B4-90DF-A8B02E394867}.Release|x64.Build.0 = Release|Any CPU
-		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|x64.Build.0 = Debug|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Checked|x64.Build.0 = Checked|Any CPU
+		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DD34B3DA-9910-497A-8475-10301F94FE15}.Debug|x64.Build.0 = Debug|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Release|x64.ActiveCfg = Release|Any CPU
 		{DD34B3DA-9910-497A-8475-10301F94FE15}.Release|x64.Build.0 = Release|Any CPU
-		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Checked|x64.Build.0 = Checked|Any CPU
+		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Release|x64.ActiveCfg = Release|Any CPU
 		{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}.Release|x64.Build.0 = Release|Any CPU
-		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|x64.Build.0 = Debug|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Checked|x64.Build.0 = Checked|Any CPU
+		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Debug|x64.Build.0 = Debug|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Release|x64.ActiveCfg = Release|Any CPU
 		{3CC950C2-CFBD-499A-8A32-AE359C46F96A}.Release|x64.Build.0 = Release|Any CPU
-		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Checked|x64.Build.0 = Checked|Any CPU
+		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Release|x64.ActiveCfg = Release|Any CPU
 		{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}.Release|x64.Build.0 = Release|Any CPU
-		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|x64.Build.0 = Debug|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Checked|x64.Build.0 = Checked|Any CPU
+		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{435C204F-7509-4599-B6C5-2DA2D362E664}.Debug|x64.Build.0 = Debug|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Release|Any CPU.Build.0 = Release|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Release|x64.ActiveCfg = Release|Any CPU
 		{435C204F-7509-4599-B6C5-2DA2D362E664}.Release|x64.Build.0 = Release|Any CPU
-		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Checked|x64.Build.0 = Checked|Any CPU
+		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1038D6D-50D2-494B-933D-74034583F3F8}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Release|x64.ActiveCfg = Release|Any CPU
 		{A1038D6D-50D2-494B-933D-74034583F3F8}.Release|x64.Build.0 = Release|Any CPU
-		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|x64.Build.0 = Debug|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Checked|x64.Build.0 = Checked|Any CPU
+		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Debug|x64.Build.0 = Debug|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Release|x64.ActiveCfg = Release|Any CPU
 		{462CD1A6-B52A-428D-91A7-026ABC26C3A9}.Release|x64.Build.0 = Release|Any CPU
-		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|x64.Build.0 = Debug|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Checked|x64.Build.0 = Checked|Any CPU
+		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Debug|x64.Build.0 = Debug|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Release|x64.ActiveCfg = Release|Any CPU
 		{B41121E9-EC15-484E-9E96-46E89CBB1EEB}.Release|x64.Build.0 = Release|Any CPU
-		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|x64.Build.0 = Debug|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Checked|x64.Build.0 = Checked|Any CPU
+		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B06A2649-0937-45B1-8B5E-7433847BB664}.Debug|x64.Build.0 = Debug|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Release|x64.ActiveCfg = Release|Any CPU
 		{B06A2649-0937-45B1-8B5E-7433847BB664}.Release|x64.Build.0 = Release|Any CPU
-		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|x64.Build.0 = Debug|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Checked|x64.Build.0 = Checked|Any CPU
+		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Debug|x64.Build.0 = Debug|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Release|x64.ActiveCfg = Release|Any CPU
 		{582ED7B9-78A9-46E2-96AD-940C44257BD9}.Release|x64.Build.0 = Release|Any CPU
-		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|x64.Build.0 = Debug|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Checked|x64.Build.0 = Checked|Any CPU
+		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Debug|x64.Build.0 = Debug|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Release|x64.ActiveCfg = Release|Any CPU
 		{041F2129-8E15-4840-8D17-08FE1B99C98A}.Release|x64.Build.0 = Release|Any CPU
-		{81036274-5786-483C-BD52-854B882B4F21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81036274-5786-483C-BD52-854B882B4F21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81036274-5786-483C-BD52-854B882B4F21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{81036274-5786-483C-BD52-854B882B4F21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{81036274-5786-483C-BD52-854B882B4F21}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{81036274-5786-483C-BD52-854B882B4F21}.Debug|x64.Build.0 = Debug|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Checked|x64.Build.0 = Checked|Any CPU
+		{81036274-5786-483C-BD52-854B882B4F21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81036274-5786-483C-BD52-854B882B4F21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81036274-5786-483C-BD52-854B882B4F21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{81036274-5786-483C-BD52-854B882B4F21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{81036274-5786-483C-BD52-854B882B4F21}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{81036274-5786-483C-BD52-854B882B4F21}.Debug|x64.Build.0 = Debug|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Release|Any CPU.Build.0 = Release|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Release|x64.ActiveCfg = Release|Any CPU
 		{81036274-5786-483C-BD52-854B882B4F21}.Release|x64.Build.0 = Release|Any CPU
-		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|x64.Build.0 = Debug|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Checked|x64.Build.0 = Checked|Any CPU
+		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Debug|x64.Build.0 = Debug|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Release|x64.ActiveCfg = Release|Any CPU
 		{8E3058EB-0198-4796-AEAD-E09965A73E00}.Release|x64.Build.0 = Release|Any CPU
-		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|x64.Build.0 = Debug|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Checked|x64.Build.0 = Checked|Any CPU
+		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Debug|x64.Build.0 = Debug|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Release|x64.ActiveCfg = Release|Any CPU
 		{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}.Release|x64.Build.0 = Release|Any CPU
-		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|x64.Build.0 = Debug|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Checked|x64.Build.0 = Checked|Any CPU
+		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Debug|x64.Build.0 = Debug|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Release|x64.ActiveCfg = Release|Any CPU
 		{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}.Release|x64.Build.0 = Release|Any CPU
-		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|x64.Build.0 = Debug|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Checked|x64.Build.0 = Checked|Any CPU
+		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Debug|x64.Build.0 = Debug|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Release|x64.ActiveCfg = Release|Any CPU
 		{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}.Release|x64.Build.0 = Release|Any CPU
-		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|x64.Build.0 = Debug|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Checked|x64.Build.0 = Checked|Any CPU
+		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Debug|x64.Build.0 = Debug|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Release|Any CPU.Build.0 = Release|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Release|x64.ActiveCfg = Release|Any CPU
 		{34026C3E-193C-45CF-B55D-8FAB068D4F79}.Release|x64.Build.0 = Release|Any CPU
-		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|x64.Build.0 = Debug|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Checked|x64.Build.0 = Checked|Any CPU
+		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Debug|x64.Build.0 = Debug|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Release|x64.ActiveCfg = Release|Any CPU
 		{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}.Release|x64.Build.0 = Release|Any CPU
-		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Checked|x64.Build.0 = Checked|Any CPU
+		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Release|x64.ActiveCfg = Release|Any CPU
 		{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}.Release|x64.Build.0 = Release|Any CPU
-		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|x64.Build.0 = Debug|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Checked|x64.Build.0 = Checked|Any CPU
+		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Debug|x64.Build.0 = Debug|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Release|x64.ActiveCfg = Release|Any CPU
 		{857EEB5A-1D43-4B59-871A-3B36121450C3}.Release|x64.Build.0 = Release|Any CPU
-		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Checked|x64.Build.0 = Checked|Any CPU
+		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Release|x64.ActiveCfg = Release|Any CPU
 		{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}.Release|x64.Build.0 = Release|Any CPU
-		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Checked|x64.Build.0 = Checked|Any CPU
+		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Release|x64.ActiveCfg = Release|Any CPU
 		{2E795F75-9DA6-4D10-9C32-C1D3FB854231}.Release|x64.Build.0 = Release|Any CPU
-		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|x64.Build.0 = Debug|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Checked|x64.Build.0 = Checked|Any CPU
+		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Debug|x64.Build.0 = Debug|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Release|x64.ActiveCfg = Release|Any CPU
 		{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}.Release|x64.Build.0 = Release|Any CPU
-		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Checked|x64.Build.0 = Checked|Any CPU
+		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Release|x64.ActiveCfg = Release|Any CPU
 		{FDFA7555-C1FF-400D-8DBC-5672E2E76494}.Release|x64.Build.0 = Release|Any CPU
-		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|x64.Build.0 = Debug|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Checked|x64.Build.0 = Checked|Any CPU
+		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Debug|x64.Build.0 = Debug|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Release|x64.ActiveCfg = Release|Any CPU
 		{4499F174-5CA5-4447-81A0-A8E3BA1908D7}.Release|x64.Build.0 = Release|Any CPU
-		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|x64.Build.0 = Debug|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Checked|x64.Build.0 = Checked|Any CPU
+		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Debug|x64.Build.0 = Debug|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Release|Any CPU.Build.0 = Release|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Release|x64.ActiveCfg = Release|Any CPU
 		{96C8C125-C97D-43D0-AA6F-817C6792C359}.Release|x64.Build.0 = Release|Any CPU
-		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Checked|x64.Build.0 = Checked|Any CPU
+		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Release|x64.ActiveCfg = Release|Any CPU
 		{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}.Release|x64.Build.0 = Release|Any CPU
-		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|x64.Build.0 = Debug|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Checked|x64.Build.0 = Checked|Any CPU
+		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Debug|x64.Build.0 = Debug|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Release|x64.ActiveCfg = Release|Any CPU
 		{5627E983-E7DD-482C-A316-F84B97EDBB81}.Release|x64.Build.0 = Release|Any CPU
-		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|x64.Build.0 = Debug|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Checked|x64.Build.0 = Checked|Any CPU
+		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6659CA3F-F648-4C54-8911-FA18239A2434}.Debug|x64.Build.0 = Debug|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Release|x64.ActiveCfg = Release|Any CPU
 		{6659CA3F-F648-4C54-8911-FA18239A2434}.Release|x64.Build.0 = Release|Any CPU
-		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Checked|x64.Build.0 = Checked|Any CPU
+		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Release|x64.ActiveCfg = Release|Any CPU
 		{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}.Release|x64.Build.0 = Release|Any CPU
-		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|x64.Build.0 = Debug|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Checked|x64.Build.0 = Checked|Any CPU
+		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{61A46528-0278-4494-8866-2B7E3D492CCB}.Debug|x64.Build.0 = Debug|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Release|x64.ActiveCfg = Release|Any CPU
 		{61A46528-0278-4494-8866-2B7E3D492CCB}.Release|x64.Build.0 = Release|Any CPU
-		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|x64.Build.0 = Debug|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Checked|x64.Build.0 = Checked|Any CPU
+		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Debug|x64.Build.0 = Debug|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Release|Any CPU.Build.0 = Release|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Release|x64.ActiveCfg = Release|Any CPU
 		{95390053-5AC5-4774-A8D5-76F4C8DBC526}.Release|x64.Build.0 = Release|Any CPU
-		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|x64.Build.0 = Debug|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Checked|x64.Build.0 = Checked|Any CPU
+		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Debug|x64.Build.0 = Debug|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Release|x64.ActiveCfg = Release|Any CPU
 		{F388A679-EDA8-4E0F-A785-267276D0AD3F}.Release|x64.Build.0 = Release|Any CPU
-		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Checked|x64.Build.0 = Checked|Any CPU
+		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Release|x64.ActiveCfg = Release|Any CPU
 		{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}.Release|x64.Build.0 = Release|Any CPU
-		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|x64.Build.0 = Debug|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Checked|x64.Build.0 = Checked|Any CPU
+		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Debug|x64.Build.0 = Debug|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Release|x64.ActiveCfg = Release|Any CPU
 		{EA83A9C9-5175-4748-A2EA-657F1062417D}.Release|x64.Build.0 = Release|Any CPU
-		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|x64.Build.0 = Debug|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Checked|x64.Build.0 = Checked|Any CPU
+		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Debug|x64.Build.0 = Debug|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Release|x64.ActiveCfg = Release|Any CPU
 		{E76172C3-533E-45BD-BCA3-AACDC1582253}.Release|x64.Build.0 = Release|Any CPU
-		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|x64.Build.0 = Debug|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Checked|x64.Build.0 = Checked|Any CPU
+		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Debug|x64.Build.0 = Debug|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Release|x64.ActiveCfg = Release|Any CPU
 		{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}.Release|x64.Build.0 = Release|Any CPU
-		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|x64.Build.0 = Debug|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Checked|x64.Build.0 = Checked|Any CPU
+		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Debug|x64.Build.0 = Debug|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Release|x64.ActiveCfg = Release|Any CPU
 		{A99284A9-472A-4267-9703-E2022CD1BCFC}.Release|x64.Build.0 = Release|Any CPU
-		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|x64.Build.0 = Debug|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Checked|x64.Build.0 = Checked|Any CPU
+		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Debug|x64.Build.0 = Debug|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Release|x64.ActiveCfg = Release|Any CPU
 		{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}.Release|x64.Build.0 = Release|Any CPU
-		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|x64.Build.0 = Debug|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Checked|x64.Build.0 = Checked|Any CPU
+		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Debug|x64.Build.0 = Debug|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Release|x64.ActiveCfg = Release|Any CPU
 		{B91FAC94-A870-4DA5-9884-3CBE91619028}.Release|x64.Build.0 = Release|Any CPU
-		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|x64.Build.0 = Debug|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Checked|x64.Build.0 = Checked|Any CPU
+		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A323618C-1BE2-4C13-835C-357550C2045B}.Debug|x64.Build.0 = Debug|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Release|x64.ActiveCfg = Release|Any CPU
 		{A323618C-1BE2-4C13-835C-357550C2045B}.Release|x64.Build.0 = Release|Any CPU
-		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|x64.Build.0 = Debug|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Checked|x64.Build.0 = Checked|Any CPU
+		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Debug|x64.Build.0 = Debug|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Release|x64.ActiveCfg = Release|Any CPU
 		{30E7FF89-D9FB-494E-B15A-D4586B0843A9}.Release|x64.Build.0 = Release|Any CPU
-		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|x64.Build.0 = Debug|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Checked|x64.Build.0 = Checked|Any CPU
+		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Debug|x64.Build.0 = Debug|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Release|x64.ActiveCfg = Release|Any CPU
 		{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}.Release|x64.Build.0 = Release|Any CPU
-		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|x64.Build.0 = Debug|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Checked|x64.Build.0 = Checked|Any CPU
+		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Debug|x64.Build.0 = Debug|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Release|x64.ActiveCfg = Release|Any CPU
 		{EF719996-B2BD-4E12-A8F5-119DD1172311}.Release|x64.Build.0 = Release|Any CPU
-		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|x64.Build.0 = Debug|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Checked|x64.Build.0 = Checked|Any CPU
+		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Debug|x64.Build.0 = Debug|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Release|x64.ActiveCfg = Release|Any CPU
 		{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}.Release|x64.Build.0 = Release|Any CPU
-		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|x64.Build.0 = Debug|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Checked|x64.Build.0 = Checked|Any CPU
+		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Debug|x64.Build.0 = Debug|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Release|x64.ActiveCfg = Release|Any CPU
 		{9341C58E-FAAC-464F-AB5D-A736111F7A98}.Release|x64.Build.0 = Release|Any CPU
-		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|x64.Build.0 = Debug|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Checked|x64.Build.0 = Checked|Any CPU
+		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{784679B0-F680-4223-9D03-5B091BC9F366}.Debug|x64.Build.0 = Debug|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Release|Any CPU.Build.0 = Release|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Release|x64.ActiveCfg = Release|Any CPU
 		{784679B0-F680-4223-9D03-5B091BC9F366}.Release|x64.Build.0 = Release|Any CPU
-		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|x64.Build.0 = Debug|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Checked|x64.Build.0 = Checked|Any CPU
+		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Debug|x64.Build.0 = Debug|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Release|x64.ActiveCfg = Release|Any CPU
 		{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}.Release|x64.Build.0 = Release|Any CPU
-		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|x64.Build.0 = Debug|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Checked|x64.Build.0 = Checked|Any CPU
+		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6993E572-EAC0-4871-BAD1-95761C88454A}.Debug|x64.Build.0 = Debug|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Release|x64.ActiveCfg = Release|Any CPU
 		{6993E572-EAC0-4871-BAD1-95761C88454A}.Release|x64.Build.0 = Release|Any CPU
-		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|x64.Build.0 = Debug|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Checked|x64.Build.0 = Checked|Any CPU
+		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{91360442-D3C0-4D74-9118-9FF487FDE584}.Debug|x64.Build.0 = Debug|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Release|Any CPU.Build.0 = Release|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Release|x64.ActiveCfg = Release|Any CPU
 		{91360442-D3C0-4D74-9118-9FF487FDE584}.Release|x64.Build.0 = Release|Any CPU
-		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|x64.Build.0 = Debug|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Checked|x64.Build.0 = Checked|Any CPU
+		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{947AFD46-4826-4369-AC2C-32D034C1A132}.Debug|x64.Build.0 = Debug|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Release|Any CPU.Build.0 = Release|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Release|x64.ActiveCfg = Release|Any CPU
 		{947AFD46-4826-4369-AC2C-32D034C1A132}.Release|x64.Build.0 = Release|Any CPU
-		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|x64.Build.0 = Debug|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Checked|x64.Build.0 = Checked|Any CPU
+		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Debug|x64.Build.0 = Debug|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Release|x64.ActiveCfg = Release|Any CPU
 		{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}.Release|x64.Build.0 = Release|Any CPU
-		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|x64.Build.0 = Debug|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Checked|x64.Build.0 = Checked|Any CPU
+		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Debug|x64.Build.0 = Debug|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Release|Any CPU.Build.0 = Release|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Release|x64.ActiveCfg = Release|Any CPU
 		{69B7D820-0D96-4E27-B1D3-D24BCE90D971}.Release|x64.Build.0 = Release|Any CPU
-		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|x64.Build.0 = Debug|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Checked|x64.Build.0 = Checked|Any CPU
+		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Debug|x64.Build.0 = Debug|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Release|x64.ActiveCfg = Release|Any CPU
 		{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}.Release|x64.Build.0 = Release|Any CPU
-		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|x64.Build.0 = Debug|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Checked|x64.Build.0 = Checked|Any CPU
+		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Debug|x64.Build.0 = Debug|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Release|x64.ActiveCfg = Release|Any CPU
 		{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}.Release|x64.Build.0 = Release|Any CPU
-		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Checked|x64.Build.0 = Checked|Any CPU
+		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Release|x64.ActiveCfg = Release|Any CPU
 		{CFD6FBC3-0829-4816-A109-DF17642EC807}.Release|x64.Build.0 = Release|Any CPU
-		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|x64.Build.0 = Debug|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Checked|x64.Build.0 = Checked|Any CPU
+		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Debug|x64.Build.0 = Debug|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Release|x64.ActiveCfg = Release|Any CPU
 		{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}.Release|x64.Build.0 = Release|Any CPU
-		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|x64.Build.0 = Debug|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Checked|x64.Build.0 = Checked|Any CPU
+		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Debug|x64.Build.0 = Debug|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Release|x64.ActiveCfg = Release|Any CPU
 		{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}.Release|x64.Build.0 = Release|Any CPU
-		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|x64.Build.0 = Debug|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Checked|x64.Build.0 = Checked|Any CPU
+		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Debug|x64.Build.0 = Debug|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Release|x64.ActiveCfg = Release|Any CPU
 		{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}.Release|x64.Build.0 = Release|Any CPU
-		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Checked|x64.Build.0 = Checked|Any CPU
+		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Release|x64.ActiveCfg = Release|Any CPU
 		{59D2FB73-8919-47E8-8D2F-39FC895542A1}.Release|x64.Build.0 = Release|Any CPU
-		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|x64.Build.0 = Debug|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Checked|x64.Build.0 = Checked|Any CPU
+		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Debug|x64.Build.0 = Debug|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Release|x64.ActiveCfg = Release|Any CPU
 		{D9C051F7-4FBB-4190-9757-5C01ABF0B689}.Release|x64.Build.0 = Release|Any CPU
-		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|x64.Build.0 = Debug|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Checked|x64.Build.0 = Checked|Any CPU
+		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Debug|x64.Build.0 = Debug|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Release|x64.ActiveCfg = Release|Any CPU
 		{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}.Release|x64.Build.0 = Release|Any CPU
-		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Checked|x64.Build.0 = Checked|Any CPU
+		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{183E5583-F710-4471-8D5F-82E8870070B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Release|x64.ActiveCfg = Release|Any CPU
 		{183E5583-F710-4471-8D5F-82E8870070B7}.Release|x64.Build.0 = Release|Any CPU
-		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|x64.Build.0 = Debug|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Checked|x64.Build.0 = Checked|Any CPU
+		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Debug|x64.Build.0 = Debug|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Release|x64.ActiveCfg = Release|Any CPU
 		{C2F9938D-F3B4-4876-B2B4-17A1D2979776}.Release|x64.Build.0 = Release|Any CPU
-		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|x64.Build.0 = Debug|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Checked|x64.Build.0 = Checked|Any CPU
+		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Debug|x64.Build.0 = Debug|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Release|x64.ActiveCfg = Release|Any CPU
 		{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}.Release|x64.Build.0 = Release|Any CPU
-		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|x64.Build.0 = Debug|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Checked|x64.Build.0 = Checked|Any CPU
+		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Debug|x64.Build.0 = Debug|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Release|x64.ActiveCfg = Release|Any CPU
 		{E27E6C51-D863-4A37-B4B5-1FA702801182}.Release|x64.Build.0 = Release|Any CPU
-		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|x64.Build.0 = Debug|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Checked|x64.Build.0 = Checked|Any CPU
+		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Debug|x64.Build.0 = Debug|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Release|x64.ActiveCfg = Release|Any CPU
 		{687B9C6A-54F5-4F7E-9377-E112DB221FD4}.Release|x64.Build.0 = Release|Any CPU
-		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|x64.Build.0 = Debug|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Checked|x64.Build.0 = Checked|Any CPU
+		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Debug|x64.Build.0 = Debug|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Release|x64.ActiveCfg = Release|Any CPU
 		{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}.Release|x64.Build.0 = Release|Any CPU
-		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|x64.Build.0 = Debug|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Checked|x64.Build.0 = Checked|Any CPU
+		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Debug|x64.Build.0 = Debug|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Release|x64.ActiveCfg = Release|Any CPU
 		{D560DC48-96BE-44B4-9888-B4E03E1B3765}.Release|x64.Build.0 = Release|Any CPU
-		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|x64.Build.0 = Debug|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Checked|x64.Build.0 = Checked|Any CPU
+		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Debug|x64.Build.0 = Debug|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Release|x64.ActiveCfg = Release|Any CPU
 		{0E65AFBB-462D-439C-963E-2C2956FA144D}.Release|x64.Build.0 = Release|Any CPU
-		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Checked|x64.Build.0 = Checked|Any CPU
+		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Release|x64.ActiveCfg = Release|Any CPU
 		{E7DBA180-50EE-4C35-993D-EE1F99A699B3}.Release|x64.Build.0 = Release|Any CPU
-		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Checked|x64.Build.0 = Checked|Any CPU
+		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Release|x64.ActiveCfg = Release|Any CPU
 		{8125B28C-071B-4CD2-A50D-DA215AA389F3}.Release|x64.Build.0 = Release|Any CPU
-		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|x64.Build.0 = Debug|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Checked|x64.Build.0 = Checked|Any CPU
+		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Debug|x64.Build.0 = Debug|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Release|x64.ActiveCfg = Release|Any CPU
 		{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}.Release|x64.Build.0 = Release|Any CPU
-		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|x64.Build.0 = Debug|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Checked|x64.Build.0 = Checked|Any CPU
+		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Debug|x64.Build.0 = Debug|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Release|x64.ActiveCfg = Release|Any CPU
 		{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}.Release|x64.Build.0 = Release|Any CPU
-		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Checked|x64.Build.0 = Checked|Any CPU
+		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Release|x64.ActiveCfg = Release|Any CPU
 		{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}.Release|x64.Build.0 = Release|Any CPU
-		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Checked|x64.Build.0 = Checked|Any CPU
+		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Release|x64.ActiveCfg = Release|Any CPU
 		{7228D6BE-7DCC-4835-9440-06B60BAF11D4}.Release|x64.Build.0 = Release|Any CPU
-		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Checked|x64.Build.0 = Checked|Any CPU
+		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Release|x64.ActiveCfg = Release|Any CPU
 		{4B6F9370-A846-4AC7-87DD-B063026CFE18}.Release|x64.Build.0 = Release|Any CPU
-		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|x64.Build.0 = Debug|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Checked|x64.Build.0 = Checked|Any CPU
+		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Debug|x64.Build.0 = Debug|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Release|x64.ActiveCfg = Release|Any CPU
 		{8846FE32-F9C4-422A-9CB3-5182BD5D499B}.Release|x64.Build.0 = Release|Any CPU
-		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|x64.Build.0 = Debug|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Checked|x64.Build.0 = Checked|Any CPU
+		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Debug|x64.Build.0 = Debug|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Release|x64.ActiveCfg = Release|Any CPU
 		{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}.Release|x64.Build.0 = Release|Any CPU
-		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|x64.Build.0 = Debug|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Checked|x64.Build.0 = Checked|Any CPU
+		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Debug|x64.Build.0 = Debug|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Release|x64.ActiveCfg = Release|Any CPU
 		{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}.Release|x64.Build.0 = Release|Any CPU
-		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|x64.Build.0 = Debug|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Checked|x64.Build.0 = Checked|Any CPU
+		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Debug|x64.Build.0 = Debug|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Release|x64.ActiveCfg = Release|Any CPU
 		{5D602420-536C-4E83-8BA8-1AC79C8D8F57}.Release|x64.Build.0 = Release|Any CPU
-		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|x64.Build.0 = Debug|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Checked|x64.Build.0 = Checked|Any CPU
+		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Debug|x64.Build.0 = Debug|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Release|x64.ActiveCfg = Release|Any CPU
 		{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}.Release|x64.Build.0 = Release|Any CPU
-		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|x64.Build.0 = Debug|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Checked|x64.Build.0 = Checked|Any CPU
+		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Debug|x64.Build.0 = Debug|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Release|x64.ActiveCfg = Release|Any CPU
 		{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}.Release|x64.Build.0 = Release|Any CPU
-		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Checked|x64.Build.0 = Checked|Any CPU
+		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Release|x64.ActiveCfg = Release|Any CPU
 		{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}.Release|x64.Build.0 = Release|Any CPU
-		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Checked|x64.Build.0 = Checked|Any CPU
+		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Release|x64.ActiveCfg = Release|Any CPU
 		{3BFD0851-EA70-4828-BBA2-0468285214E3}.Release|x64.Build.0 = Release|Any CPU
-		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|x64.Build.0 = Debug|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Checked|x64.Build.0 = Checked|Any CPU
+		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Debug|x64.Build.0 = Debug|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Release|x64.ActiveCfg = Release|Any CPU
 		{E91063A5-23D5-4C45-A7F8-89C3407973AD}.Release|x64.Build.0 = Release|Any CPU
-		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Checked|x64.Build.0 = Checked|Any CPU
+		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Release|x64.ActiveCfg = Release|Any CPU
 		{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}.Release|x64.Build.0 = Release|Any CPU
-		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|x64.Build.0 = Debug|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Checked|x64.Build.0 = Checked|Any CPU
+		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Debug|x64.Build.0 = Debug|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Release|x64.ActiveCfg = Release|Any CPU
 		{4E02BA7E-68FE-4E39-998B-27AE540E3702}.Release|x64.Build.0 = Release|Any CPU
-		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|x64.Build.0 = Debug|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Checked|x64.Build.0 = Checked|Any CPU
+		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Debug|x64.Build.0 = Debug|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Release|Any CPU.Build.0 = Release|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Release|x64.ActiveCfg = Release|Any CPU
 		{99EFDA6E-620E-42D7-8AA9-E9A892391F71}.Release|x64.Build.0 = Release|Any CPU
-		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Checked|x64.Build.0 = Checked|Any CPU
+		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Release|x64.ActiveCfg = Release|Any CPU
 		{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}.Release|x64.Build.0 = Release|Any CPU
-		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|x64.Build.0 = Debug|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Checked|x64.Build.0 = Checked|Any CPU
+		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Debug|x64.Build.0 = Debug|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Release|x64.ActiveCfg = Release|Any CPU
 		{917074AE-08B3-47F1-BC55-B1AB689F63F6}.Release|x64.Build.0 = Release|Any CPU
-		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|x64.Build.0 = Debug|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Checked|x64.Build.0 = Checked|Any CPU
+		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Debug|x64.Build.0 = Debug|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Release|Any CPU.Build.0 = Release|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Release|x64.ActiveCfg = Release|Any CPU
 		{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}.Release|x64.Build.0 = Release|Any CPU
-		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Checked|x64.Build.0 = Checked|Any CPU
+		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D34364F-BED7-4826-A45A-36E02B779647}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Release|x64.ActiveCfg = Release|Any CPU
 		{8D34364F-BED7-4826-A45A-36E02B779647}.Release|x64.Build.0 = Release|Any CPU
-		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|x64.Build.0 = Debug|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Checked|x64.Build.0 = Checked|Any CPU
+		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Debug|x64.Build.0 = Debug|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Release|x64.ActiveCfg = Release|Any CPU
 		{079BF300-6D67-4B3F-8415-112D4A8A6DE1}.Release|x64.Build.0 = Release|Any CPU
-		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Checked|x64.Build.0 = Checked|Any CPU
+		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Release|x64.ActiveCfg = Release|Any CPU
 		{D4A066AF-0A8C-4659-8964-361D312DD81F}.Release|x64.Build.0 = Release|Any CPU
-		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|x64.Build.0 = Debug|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Checked|x64.Build.0 = Checked|Any CPU
+		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Debug|x64.Build.0 = Debug|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Release|x64.ActiveCfg = Release|Any CPU
 		{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}.Release|x64.Build.0 = Release|Any CPU
-		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|x64.Build.0 = Debug|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Checked|x64.Build.0 = Checked|Any CPU
+		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Debug|x64.Build.0 = Debug|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Release|x64.ActiveCfg = Release|Any CPU
 		{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}.Release|x64.Build.0 = Release|Any CPU
-		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|x64.Build.0 = Debug|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Checked|x64.Build.0 = Checked|Any CPU
+		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Debug|x64.Build.0 = Debug|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Release|Any CPU.Build.0 = Release|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Release|x64.ActiveCfg = Release|Any CPU
 		{642CDD80-28F0-409A-84E0-0DDF40EFF966}.Release|x64.Build.0 = Release|Any CPU
-		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|x64.Build.0 = Debug|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Checked|x64.Build.0 = Checked|Any CPU
+		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31C5A706-165F-4028-A12B-24C81E821447}.Debug|x64.Build.0 = Debug|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Release|Any CPU.Build.0 = Release|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Release|x64.ActiveCfg = Release|Any CPU
 		{31C5A706-165F-4028-A12B-24C81E821447}.Release|x64.Build.0 = Release|Any CPU
-		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|x64.Build.0 = Debug|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Checked|x64.Build.0 = Checked|Any CPU
+		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Debug|x64.Build.0 = Debug|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Release|x64.ActiveCfg = Release|Any CPU
 		{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}.Release|x64.Build.0 = Release|Any CPU
-		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|x64.Build.0 = Debug|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Checked|x64.Build.0 = Checked|Any CPU
+		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Debug|x64.Build.0 = Debug|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Release|x64.ActiveCfg = Release|Any CPU
 		{8CE12894-BD33-4011-81E5-7986AC1B7AE4}.Release|x64.Build.0 = Release|Any CPU
-		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|x64.Build.0 = Debug|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Checked|x64.Build.0 = Checked|Any CPU
+		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Debug|x64.Build.0 = Debug|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Release|x64.ActiveCfg = Release|Any CPU
 		{B96F0BAB-7B39-4757-8775-E04452A4C740}.Release|x64.Build.0 = Release|Any CPU
-		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Checked|x64.Build.0 = Checked|Any CPU
+		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Release|x64.ActiveCfg = Release|Any CPU
 		{CD9BF7A2-8952-486E-A014-9C0F848E8306}.Release|x64.Build.0 = Release|Any CPU
-		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Checked|x64.Build.0 = Checked|Any CPU
+		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D8EAF760-1723-4827-A05A-D25452438C4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Release|x64.ActiveCfg = Release|Any CPU
 		{D8EAF760-1723-4827-A05A-D25452438C4D}.Release|x64.Build.0 = Release|Any CPU
-		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|x64.Build.0 = Debug|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Checked|x64.Build.0 = Checked|Any CPU
+		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Debug|x64.Build.0 = Debug|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Release|x64.ActiveCfg = Release|Any CPU
 		{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}.Release|x64.Build.0 = Release|Any CPU
-		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|x64.Build.0 = Debug|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Checked|x64.Build.0 = Checked|Any CPU
+		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Debug|x64.Build.0 = Debug|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Release|x64.ActiveCfg = Release|Any CPU
 		{C5B880B8-5F56-4167-B4F3-6D8242E32C34}.Release|x64.Build.0 = Release|Any CPU
-		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|x64.Build.0 = Debug|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Checked|x64.Build.0 = Checked|Any CPU
+		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Debug|x64.Build.0 = Debug|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Release|x64.ActiveCfg = Release|Any CPU
 		{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}.Release|x64.Build.0 = Release|Any CPU
-		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|x64.Build.0 = Debug|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Checked|x64.Build.0 = Checked|Any CPU
+		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Debug|x64.Build.0 = Debug|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Release|x64.ActiveCfg = Release|Any CPU
 		{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}.Release|x64.Build.0 = Release|Any CPU
-		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Checked|x64.Build.0 = Checked|Any CPU
+		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Release|x64.ActiveCfg = Release|Any CPU
 		{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}.Release|x64.Build.0 = Release|Any CPU
-		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Checked|x64.Build.0 = Checked|Any CPU
+		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Release|x64.ActiveCfg = Release|Any CPU
 		{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}.Release|x64.Build.0 = Release|Any CPU
-		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|x64.Build.0 = Debug|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Checked|x64.Build.0 = Checked|Any CPU
+		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Debug|x64.Build.0 = Debug|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Release|x64.ActiveCfg = Release|Any CPU
 		{789D91DC-38AC-4293-8FF3-A351CBEEA98B}.Release|x64.Build.0 = Release|Any CPU
-		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|x64.Build.0 = Debug|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Checked|x64.Build.0 = Checked|Any CPU
+		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Debug|x64.Build.0 = Debug|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Release|x64.ActiveCfg = Release|Any CPU
 		{FBEFF26E-E543-44EB-97DB-A35D529AF001}.Release|x64.Build.0 = Release|Any CPU
-		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|x64.Build.0 = Debug|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Checked|x64.Build.0 = Checked|Any CPU
+		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Debug|x64.Build.0 = Debug|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Release|x64.ActiveCfg = Release|Any CPU
 		{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}.Release|x64.Build.0 = Release|Any CPU
-		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|x64.Build.0 = Debug|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Checked|x64.Build.0 = Checked|Any CPU
+		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Debug|x64.Build.0 = Debug|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Release|x64.ActiveCfg = Release|Any CPU
 		{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}.Release|x64.Build.0 = Release|Any CPU
-		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|x64.Build.0 = Debug|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Checked|x64.Build.0 = Checked|Any CPU
+		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Debug|x64.Build.0 = Debug|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Release|x64.ActiveCfg = Release|Any CPU
 		{596F4D3B-4673-481F-9B3B-63AD94467F0E}.Release|x64.Build.0 = Release|Any CPU
-		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|x64.Build.0 = Debug|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Checked|x64.Build.0 = Checked|Any CPU
+		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Debug|x64.Build.0 = Debug|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Release|Any CPU.Build.0 = Release|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Release|x64.ActiveCfg = Release|Any CPU
 		{668CC077-E27C-4BCA-BFDC-7665BDF3A414}.Release|x64.Build.0 = Release|Any CPU
-		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|x64.Build.0 = Debug|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Checked|x64.Build.0 = Checked|Any CPU
+		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E0742648-250D-44E9-9240-315BF341E2E2}.Debug|x64.Build.0 = Debug|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Release|x64.ActiveCfg = Release|Any CPU
 		{E0742648-250D-44E9-9240-315BF341E2E2}.Release|x64.Build.0 = Release|Any CPU
-		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|x64.Build.0 = Debug|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Checked|x64.Build.0 = Checked|Any CPU
+		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Debug|x64.Build.0 = Debug|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Release|x64.ActiveCfg = Release|Any CPU
 		{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}.Release|x64.Build.0 = Release|Any CPU
-		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|x64.Build.0 = Debug|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Checked|x64.Build.0 = Checked|Any CPU
+		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Debug|x64.Build.0 = Debug|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Release|x64.ActiveCfg = Release|Any CPU
 		{184EB631-F61D-410D-8AF1-B8AE431A5AB1}.Release|x64.Build.0 = Release|Any CPU
-		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|x64.Build.0 = Debug|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Checked|x64.Build.0 = Checked|Any CPU
+		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Debug|x64.Build.0 = Debug|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Release|Any CPU.Build.0 = Release|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Release|x64.ActiveCfg = Release|Any CPU
 		{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}.Release|x64.Build.0 = Release|Any CPU
-		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|x64.Build.0 = Debug|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Checked|x64.Build.0 = Checked|Any CPU
+		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Debug|x64.Build.0 = Debug|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Release|x64.ActiveCfg = Release|Any CPU
 		{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}.Release|x64.Build.0 = Release|Any CPU
-		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Checked|x64.Build.0 = Checked|Any CPU
+		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Release|x64.ActiveCfg = Release|Any CPU
 		{EC6E2B2D-93BE-47A4-92A6-47158993402D}.Release|x64.Build.0 = Release|Any CPU
-		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Checked|x64.Build.0 = Checked|Any CPU
+		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Release|x64.ActiveCfg = Release|Any CPU
 		{1BE2429D-2C90-427D-9FA9-1102B41603BB}.Release|x64.Build.0 = Release|Any CPU
-		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|x64.Build.0 = Debug|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Checked|x64.Build.0 = Checked|Any CPU
+		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Debug|x64.Build.0 = Debug|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Release|x64.ActiveCfg = Release|Any CPU
 		{9FAE0763-0333-461C-A412-4F19A04F3D02}.Release|x64.Build.0 = Release|Any CPU
-		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|x64.Build.0 = Debug|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Checked|x64.Build.0 = Checked|Any CPU
+		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C4242908-520F-4448-B010-67B9A70FECC1}.Debug|x64.Build.0 = Debug|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Release|x64.ActiveCfg = Release|Any CPU
 		{C4242908-520F-4448-B010-67B9A70FECC1}.Release|x64.Build.0 = Release|Any CPU
-		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|x64.Build.0 = Debug|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Checked|x64.Build.0 = Checked|Any CPU
+		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F0311035-7E69-4386-8D0B-66884FAFA924}.Debug|x64.Build.0 = Debug|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Release|x64.ActiveCfg = Release|Any CPU
 		{F0311035-7E69-4386-8D0B-66884FAFA924}.Release|x64.Build.0 = Release|Any CPU
-		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|x64.Build.0 = Debug|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Checked|x64.Build.0 = Checked|Any CPU
+		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2431682E-15D7-475D-AB18-45D7CC316A22}.Debug|x64.Build.0 = Debug|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Release|x64.ActiveCfg = Release|Any CPU
 		{2431682E-15D7-475D-AB18-45D7CC316A22}.Release|x64.Build.0 = Release|Any CPU
-		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|x64.Build.0 = Debug|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Checked|x64.Build.0 = Checked|Any CPU
+		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Debug|x64.Build.0 = Debug|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Release|x64.ActiveCfg = Release|Any CPU
 		{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}.Release|x64.Build.0 = Release|Any CPU
-		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Checked|x64.Build.0 = Checked|Any CPU
+		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Release|x64.ActiveCfg = Release|Any CPU
 		{ED46394E-7DE4-49B7-A92B-B9BA54132245}.Release|x64.Build.0 = Release|Any CPU
-		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|x64.Build.0 = Debug|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Checked|x64.Build.0 = Checked|Any CPU
+		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Debug|x64.Build.0 = Debug|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Release|x64.ActiveCfg = Release|Any CPU
 		{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}.Release|x64.Build.0 = Release|Any CPU
-		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|x64.Build.0 = Debug|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Checked|x64.Build.0 = Checked|Any CPU
+		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2D062909-B106-4120-9C31-8D32F2394798}.Debug|x64.Build.0 = Debug|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Release|x64.ActiveCfg = Release|Any CPU
 		{2D062909-B106-4120-9C31-8D32F2394798}.Release|x64.Build.0 = Release|Any CPU
-		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|x64.Build.0 = Debug|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Checked|x64.Build.0 = Checked|Any CPU
+		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Debug|x64.Build.0 = Debug|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Release|x64.ActiveCfg = Release|Any CPU
 		{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}.Release|x64.Build.0 = Release|Any CPU
-		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Checked|x64.Build.0 = Checked|Any CPU
+		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Release|x64.ActiveCfg = Release|Any CPU
 		{B21C4E34-7743-4381-9B4C-99627BA8F9C6}.Release|x64.Build.0 = Release|Any CPU
-		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|x64.Build.0 = Debug|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Checked|x64.Build.0 = Checked|Any CPU
+		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0212B91B-4135-400F-BF6D-93809909496A}.Debug|x64.Build.0 = Debug|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Release|x64.ActiveCfg = Release|Any CPU
 		{0212B91B-4135-400F-BF6D-93809909496A}.Release|x64.Build.0 = Release|Any CPU
-		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|x64.Build.0 = Debug|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Checked|x64.Build.0 = Checked|Any CPU
+		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53D80023-9448-44F4-875D-575C04FF8404}.Debug|x64.Build.0 = Debug|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Release|Any CPU.Build.0 = Release|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Release|x64.ActiveCfg = Release|Any CPU
 		{53D80023-9448-44F4-875D-575C04FF8404}.Release|x64.Build.0 = Release|Any CPU
-		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|x64.Build.0 = Debug|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Checked|x64.Build.0 = Checked|Any CPU
+		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Debug|x64.Build.0 = Debug|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Release|x64.ActiveCfg = Release|Any CPU
 		{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}.Release|x64.Build.0 = Release|Any CPU
-		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Checked|x64.Build.0 = Checked|Any CPU
+		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Release|x64.ActiveCfg = Release|Any CPU
 		{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}.Release|x64.Build.0 = Release|Any CPU
-		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|x64.Build.0 = Debug|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Checked|x64.Build.0 = Checked|Any CPU
+		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E1771D57-4628-444F-B838-8F12E6012BA5}.Debug|x64.Build.0 = Debug|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Release|x64.ActiveCfg = Release|Any CPU
 		{E1771D57-4628-444F-B838-8F12E6012BA5}.Release|x64.Build.0 = Release|Any CPU
-		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|x64.Build.0 = Debug|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Checked|x64.Build.0 = Checked|Any CPU
+		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Debug|x64.Build.0 = Debug|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Release|Any CPU.Build.0 = Release|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Release|x64.ActiveCfg = Release|Any CPU
 		{089FC866-7DF2-41A0-8094-8A524C4FC713}.Release|x64.Build.0 = Release|Any CPU
-		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|x64.Build.0 = Debug|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Checked|x64.Build.0 = Checked|Any CPU
+		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Debug|x64.Build.0 = Debug|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Release|x64.ActiveCfg = Release|Any CPU
 		{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}.Release|x64.Build.0 = Release|Any CPU
-		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|x64.Build.0 = Debug|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Checked|x64.Build.0 = Checked|Any CPU
+		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Debug|x64.Build.0 = Debug|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Release|x64.ActiveCfg = Release|Any CPU
 		{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}.Release|x64.Build.0 = Release|Any CPU
-		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|x64.Build.0 = Debug|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Checked|x64.Build.0 = Checked|Any CPU
+		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Debug|x64.Build.0 = Debug|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Release|x64.ActiveCfg = Release|Any CPU
 		{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}.Release|x64.Build.0 = Release|Any CPU
-		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|x64.Build.0 = Debug|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Checked|x64.Build.0 = Checked|Any CPU
+		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Debug|x64.Build.0 = Debug|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Release|x64.ActiveCfg = Release|Any CPU
 		{B5EB8015-3E35-434C-8ACB-0DC8948A3187}.Release|x64.Build.0 = Release|Any CPU
-		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Checked|x64.Build.0 = Checked|Any CPU
+		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Release|x64.ActiveCfg = Release|Any CPU
 		{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}.Release|x64.Build.0 = Release|Any CPU
-		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Checked|x64.Build.0 = Checked|Any CPU
+		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Release|x64.ActiveCfg = Release|Any CPU
 		{6C323F5A-B563-4F00-8311-1F3A3989CC4D}.Release|x64.Build.0 = Release|Any CPU
-		{95327237-D435-434B-AE93-5C30115C7663}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95327237-D435-434B-AE93-5C30115C7663}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95327237-D435-434B-AE93-5C30115C7663}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{95327237-D435-434B-AE93-5C30115C7663}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{95327237-D435-434B-AE93-5C30115C7663}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{95327237-D435-434B-AE93-5C30115C7663}.Debug|x64.Build.0 = Debug|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Checked|x64.Build.0 = Checked|Any CPU
+		{95327237-D435-434B-AE93-5C30115C7663}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95327237-D435-434B-AE93-5C30115C7663}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95327237-D435-434B-AE93-5C30115C7663}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{95327237-D435-434B-AE93-5C30115C7663}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{95327237-D435-434B-AE93-5C30115C7663}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{95327237-D435-434B-AE93-5C30115C7663}.Debug|x64.Build.0 = Debug|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Release|Any CPU.Build.0 = Release|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Release|x64.ActiveCfg = Release|Any CPU
 		{95327237-D435-434B-AE93-5C30115C7663}.Release|x64.Build.0 = Release|Any CPU
-		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Checked|x64.Build.0 = Checked|Any CPU
+		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Release|x64.ActiveCfg = Release|Any CPU
 		{4996DF71-4E47-49C5-9857-F0942487F4B3}.Release|x64.Build.0 = Release|Any CPU
-		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|x64.Build.0 = Debug|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Checked|x64.Build.0 = Checked|Any CPU
+		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Debug|x64.Build.0 = Debug|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Release|x64.ActiveCfg = Release|Any CPU
 		{E0C3F30B-3B05-4390-A7CE-C70432E26861}.Release|x64.Build.0 = Release|Any CPU
-		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|x64.Build.0 = Debug|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Checked|x64.Build.0 = Checked|Any CPU
+		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Debug|x64.Build.0 = Debug|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Release|x64.ActiveCfg = Release|Any CPU
 		{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}.Release|x64.Build.0 = Release|Any CPU
-		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|x64.Build.0 = Debug|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Checked|x64.Build.0 = Checked|Any CPU
+		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Debug|x64.Build.0 = Debug|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Release|x64.ActiveCfg = Release|Any CPU
 		{9F603CE5-AED2-40FD-8034-D7FF005DA40E}.Release|x64.Build.0 = Release|Any CPU
-		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|x64.Build.0 = Debug|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Checked|x64.Build.0 = Checked|Any CPU
+		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Debug|x64.Build.0 = Debug|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Release|x64.ActiveCfg = Release|Any CPU
 		{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}.Release|x64.Build.0 = Release|Any CPU
-		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|x64.Build.0 = Debug|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Checked|x64.Build.0 = Checked|Any CPU
+		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Debug|x64.Build.0 = Debug|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Release|x64.ActiveCfg = Release|Any CPU
 		{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}.Release|x64.Build.0 = Release|Any CPU
-		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Checked|x64.Build.0 = Checked|Any CPU
+		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Release|x64.ActiveCfg = Release|Any CPU
 		{6FE98154-4239-4D39-A665-9D7EFD4961BB}.Release|x64.Build.0 = Release|Any CPU
-		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|x64.Build.0 = Debug|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Checked|x64.Build.0 = Checked|Any CPU
+		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Debug|x64.Build.0 = Debug|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Release|x64.ActiveCfg = Release|Any CPU
 		{934DF959-89A7-4AD1-B2E7-68DE53A3305F}.Release|x64.Build.0 = Release|Any CPU
-		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|x64.Build.0 = Debug|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Checked|x64.Build.0 = Checked|Any CPU
+		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5DF9C78F-2147-439B-A9A1-485662343D02}.Debug|x64.Build.0 = Debug|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Release|x64.ActiveCfg = Release|Any CPU
 		{5DF9C78F-2147-439B-A9A1-485662343D02}.Release|x64.Build.0 = Release|Any CPU
-		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|x64.Build.0 = Debug|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Checked|x64.Build.0 = Checked|Any CPU
+		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DCFBA03F-4498-4E6E-B389-820E87341927}.Debug|x64.Build.0 = Debug|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Release|x64.ActiveCfg = Release|Any CPU
 		{DCFBA03F-4498-4E6E-B389-820E87341927}.Release|x64.Build.0 = Release|Any CPU
-		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|x64.Build.0 = Debug|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Checked|x64.Build.0 = Checked|Any CPU
+		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Debug|x64.Build.0 = Debug|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Release|x64.ActiveCfg = Release|Any CPU
 		{5DA3DA67-3157-46FB-82FA-74DCC51C298E}.Release|x64.Build.0 = Release|Any CPU
-		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|x64.Build.0 = Debug|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Checked|x64.Build.0 = Checked|Any CPU
+		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Debug|x64.Build.0 = Debug|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Release|x64.ActiveCfg = Release|Any CPU
 		{E6003279-D6B5-4E63-9237-244D96C5E1D1}.Release|x64.Build.0 = Release|Any CPU
-		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Checked|x64.Build.0 = Checked|Any CPU
+		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Release|x64.ActiveCfg = Release|Any CPU
 		{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}.Release|x64.Build.0 = Release|Any CPU
-		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|x64.Build.0 = Debug|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Checked|x64.Build.0 = Checked|Any CPU
+		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Debug|x64.Build.0 = Debug|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Release|x64.ActiveCfg = Release|Any CPU
 		{415582ED-14CB-41F9-891B-07F0E1AFE02A}.Release|x64.Build.0 = Release|Any CPU
-		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Checked|x64.Build.0 = Checked|Any CPU
+		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Release|x64.ActiveCfg = Release|Any CPU
 		{70617D82-107B-4AB4-A336-3B729B9B62B4}.Release|x64.Build.0 = Release|Any CPU
-		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|x64.Build.0 = Debug|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Checked|x64.Build.0 = Checked|Any CPU
+		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Debug|x64.Build.0 = Debug|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Release|x64.ActiveCfg = Release|Any CPU
 		{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}.Release|x64.Build.0 = Release|Any CPU
-		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|x64.Build.0 = Debug|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Checked|x64.Build.0 = Checked|Any CPU
+		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{73AA459B-430A-4296-9AAA-62E62615F28D}.Debug|x64.Build.0 = Debug|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Release|x64.ActiveCfg = Release|Any CPU
 		{73AA459B-430A-4296-9AAA-62E62615F28D}.Release|x64.Build.0 = Release|Any CPU
-		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|x64.Build.0 = Debug|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Checked|x64.Build.0 = Checked|Any CPU
+		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Debug|x64.Build.0 = Debug|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Release|x64.ActiveCfg = Release|Any CPU
 		{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}.Release|x64.Build.0 = Release|Any CPU
-		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|x64.Build.0 = Debug|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Checked|x64.Build.0 = Checked|Any CPU
+		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Debug|x64.Build.0 = Debug|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Release|x64.ActiveCfg = Release|Any CPU
 		{E136E2BC-AD99-48C2-801C-0396F29391CC}.Release|x64.Build.0 = Release|Any CPU
-		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|x64.Build.0 = Debug|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Checked|x64.Build.0 = Checked|Any CPU
+		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Debug|x64.Build.0 = Debug|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Release|x64.ActiveCfg = Release|Any CPU
 		{29C0EC2A-D599-43CA-84D9-C8C95C72136D}.Release|x64.Build.0 = Release|Any CPU
-		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|x64.Build.0 = Debug|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Checked|x64.Build.0 = Checked|Any CPU
+		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{92127EE1-C096-4417-9A2E-94C34053A379}.Debug|x64.Build.0 = Debug|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Release|Any CPU.Build.0 = Release|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Release|x64.ActiveCfg = Release|Any CPU
 		{92127EE1-C096-4417-9A2E-94C34053A379}.Release|x64.Build.0 = Release|Any CPU
-		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Checked|x64.Build.0 = Checked|Any CPU
+		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Release|x64.ActiveCfg = Release|Any CPU
 		{3A0259CC-C707-4A88-802C-36AB169E56FD}.Release|x64.Build.0 = Release|Any CPU
-		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|x64.Build.0 = Debug|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Checked|x64.Build.0 = Checked|Any CPU
+		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Debug|x64.Build.0 = Debug|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Release|x64.ActiveCfg = Release|Any CPU
 		{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}.Release|x64.Build.0 = Release|Any CPU
-		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|x64.Build.0 = Debug|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Checked|x64.Build.0 = Checked|Any CPU
+		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Debug|x64.Build.0 = Debug|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Release|x64.ActiveCfg = Release|Any CPU
 		{CCD0AB75-D346-403E-A6B2-3679C980B66A}.Release|x64.Build.0 = Release|Any CPU
-		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Checked|x64.Build.0 = Checked|Any CPU
+		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Release|x64.ActiveCfg = Release|Any CPU
 		{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}.Release|x64.Build.0 = Release|Any CPU
-		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|x64.Build.0 = Debug|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Checked|x64.Build.0 = Checked|Any CPU
+		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83011DC7-382E-4573-BA09-10DFC377BA80}.Debug|x64.Build.0 = Debug|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Release|Any CPU.Build.0 = Release|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Release|x64.ActiveCfg = Release|Any CPU
 		{83011DC7-382E-4573-BA09-10DFC377BA80}.Release|x64.Build.0 = Release|Any CPU
-		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Checked|x64.Build.0 = Checked|Any CPU
+		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Release|x64.ActiveCfg = Release|Any CPU
 		{4A9D343C-6CD5-428E-BE71-F6532244A629}.Release|x64.Build.0 = Release|Any CPU
-		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|x64.Build.0 = Debug|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Checked|x64.Build.0 = Checked|Any CPU
+		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Debug|x64.Build.0 = Debug|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Release|Any CPU.Build.0 = Release|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Release|x64.ActiveCfg = Release|Any CPU
 		{511EDC7B-13C5-40AD-AD87-A99272CAE138}.Release|x64.Build.0 = Release|Any CPU
-		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|x64.Build.0 = Debug|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Checked|x64.Build.0 = Checked|Any CPU
+		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Debug|x64.Build.0 = Debug|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Release|Any CPU.Build.0 = Release|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Release|x64.ActiveCfg = Release|Any CPU
 		{08FBD8EC-642B-4283-987D-3544FFF55A65}.Release|x64.Build.0 = Release|Any CPU
-		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|x64.Build.0 = Debug|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Checked|x64.Build.0 = Checked|Any CPU
+		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Debug|x64.Build.0 = Debug|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Release|x64.ActiveCfg = Release|Any CPU
 		{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}.Release|x64.Build.0 = Release|Any CPU
-		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|x64.Build.0 = Debug|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Checked|x64.Build.0 = Checked|Any CPU
+		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Debug|x64.Build.0 = Debug|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Release|x64.ActiveCfg = Release|Any CPU
 		{C87C2962-EA62-4535-9DB2-77420B6D3BE7}.Release|x64.Build.0 = Release|Any CPU
-		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|x64.Build.0 = Debug|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Checked|x64.Build.0 = Checked|Any CPU
+		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Debug|x64.Build.0 = Debug|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Release|x64.ActiveCfg = Release|Any CPU
 		{3ED661B5-319B-48F4-9967-0CBABE8EBE73}.Release|x64.Build.0 = Release|Any CPU
-		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|x64.Build.0 = Debug|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Checked|x64.Build.0 = Checked|Any CPU
+		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{865955A1-6602-4193-8987-345C4EF8356A}.Debug|x64.Build.0 = Debug|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Release|x64.ActiveCfg = Release|Any CPU
 		{865955A1-6602-4193-8987-345C4EF8356A}.Release|x64.Build.0 = Release|Any CPU
-		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|x64.Build.0 = Debug|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Checked|x64.Build.0 = Checked|Any CPU
+		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Debug|x64.Build.0 = Debug|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Release|x64.ActiveCfg = Release|Any CPU
 		{B228E862-A53D-4F11-BCD6-D8D272F0C66C}.Release|x64.Build.0 = Release|Any CPU
-		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Checked|x64.Build.0 = Checked|Any CPU
+		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Release|x64.ActiveCfg = Release|Any CPU
 		{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}.Release|x64.Build.0 = Release|Any CPU
-		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|x64.Build.0 = Debug|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Checked|x64.Build.0 = Checked|Any CPU
+		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Debug|x64.Build.0 = Debug|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Release|x64.ActiveCfg = Release|Any CPU
 		{63E99969-750E-464D-899E-6EEE9EA67F9A}.Release|x64.Build.0 = Release|Any CPU
-		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|x64.Build.0 = Debug|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Checked|x64.Build.0 = Checked|Any CPU
+		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BE135661-BB2B-45D4-824E-29C5F824C046}.Debug|x64.Build.0 = Debug|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Release|x64.ActiveCfg = Release|Any CPU
 		{BE135661-BB2B-45D4-824E-29C5F824C046}.Release|x64.Build.0 = Release|Any CPU
-		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Checked|x64.Build.0 = Checked|Any CPU
+		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Release|x64.ActiveCfg = Release|Any CPU
 		{A4D62CDE-4698-44AD-AD64-3DBF9332C254}.Release|x64.Build.0 = Release|Any CPU
-		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|x64.Build.0 = Debug|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Checked|x64.Build.0 = Checked|Any CPU
+		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Debug|x64.Build.0 = Debug|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Release|x64.ActiveCfg = Release|Any CPU
 		{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}.Release|x64.Build.0 = Release|Any CPU
-		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Checked|x64.Build.0 = Checked|Any CPU
+		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Release|x64.ActiveCfg = Release|Any CPU
 		{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}.Release|x64.Build.0 = Release|Any CPU
-		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|x64.Build.0 = Debug|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Checked|x64.Build.0 = Checked|Any CPU
+		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{25259293-8AB2-41F9-A85A-287B67A92F47}.Debug|x64.Build.0 = Debug|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Release|Any CPU.Build.0 = Release|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Release|x64.ActiveCfg = Release|Any CPU
 		{25259293-8AB2-41F9-A85A-287B67A92F47}.Release|x64.Build.0 = Release|Any CPU
-		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|x64.Build.0 = Debug|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Checked|x64.Build.0 = Checked|Any CPU
+		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{80432680-467C-44B5-B7F1-93AC39D576E5}.Debug|x64.Build.0 = Debug|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Release|x64.ActiveCfg = Release|Any CPU
 		{80432680-467C-44B5-B7F1-93AC39D576E5}.Release|x64.Build.0 = Release|Any CPU
-		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|x64.Build.0 = Debug|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Checked|x64.Build.0 = Checked|Any CPU
+		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Debug|x64.Build.0 = Debug|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Release|Any CPU.Build.0 = Release|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Release|x64.ActiveCfg = Release|Any CPU
 		{32092B1E-6593-44B9-97E6-5EAED24DA728}.Release|x64.Build.0 = Release|Any CPU
-		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|x64.Build.0 = Debug|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Checked|x64.Build.0 = Checked|Any CPU
+		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Debug|x64.Build.0 = Debug|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Release|x64.ActiveCfg = Release|Any CPU
 		{243B71CD-1777-47D9-9FBA-1600979C9CAD}.Release|x64.Build.0 = Release|Any CPU
-		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|x64.Build.0 = Debug|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Checked|x64.Build.0 = Checked|Any CPU
+		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Debug|x64.Build.0 = Debug|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Release|Any CPU.Build.0 = Release|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Release|x64.ActiveCfg = Release|Any CPU
 		{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}.Release|x64.Build.0 = Release|Any CPU
-		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Checked|x64.Build.0 = Checked|Any CPU
+		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Release|x64.ActiveCfg = Release|Any CPU
 		{DB27E434-7BF3-40DC-8EE8-45E221D021B6}.Release|x64.Build.0 = Release|Any CPU
-		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Checked|x64.Build.0 = Checked|Any CPU
+		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Release|x64.ActiveCfg = Release|Any CPU
 		{518679EE-E7BD-4C43-A1AA-49EC99884AB5}.Release|x64.Build.0 = Release|Any CPU
-		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|x64.Build.0 = Debug|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Checked|x64.Build.0 = Checked|Any CPU
+		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{577F22AF-E8A2-4F30-B334-52C472E00218}.Debug|x64.Build.0 = Debug|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Release|Any CPU.Build.0 = Release|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Release|x64.ActiveCfg = Release|Any CPU
 		{577F22AF-E8A2-4F30-B334-52C472E00218}.Release|x64.Build.0 = Release|Any CPU
-		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|x64.Build.0 = Debug|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Checked|x64.Build.0 = Checked|Any CPU
+		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Debug|x64.Build.0 = Debug|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Release|x64.ActiveCfg = Release|Any CPU
 		{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}.Release|x64.Build.0 = Release|Any CPU
-		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|x64.Build.0 = Debug|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Checked|x64.Build.0 = Checked|Any CPU
+		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Debug|x64.Build.0 = Debug|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Release|x64.ActiveCfg = Release|Any CPU
 		{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}.Release|x64.Build.0 = Release|Any CPU
-		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|x64.Build.0 = Debug|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Checked|x64.Build.0 = Checked|Any CPU
+		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Debug|x64.Build.0 = Debug|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Release|x64.ActiveCfg = Release|Any CPU
 		{574638AF-F419-4A9C-AB48-C2E4E4FA871E}.Release|x64.Build.0 = Release|Any CPU
-		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|x64.Build.0 = Debug|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Checked|x64.Build.0 = Checked|Any CPU
+		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D460199-5067-44D8-AF25-63FC56C328CD}.Debug|x64.Build.0 = Debug|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Release|x64.ActiveCfg = Release|Any CPU
 		{7D460199-5067-44D8-AF25-63FC56C328CD}.Release|x64.Build.0 = Release|Any CPU
-		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Checked|x64.Build.0 = Checked|Any CPU
+		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Release|x64.ActiveCfg = Release|Any CPU
 		{EC1E4B63-F569-4AED-951E-6AD70E068837}.Release|x64.Build.0 = Release|Any CPU
-		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|x64.Build.0 = Debug|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Checked|x64.Build.0 = Checked|Any CPU
+		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Debug|x64.Build.0 = Debug|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Release|x64.ActiveCfg = Release|Any CPU
 		{7819D99D-5521-41F5-B6E0-002C176B64D1}.Release|x64.Build.0 = Release|Any CPU
-		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|x64.Build.0 = Debug|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Checked|x64.Build.0 = Checked|Any CPU
+		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Debug|x64.Build.0 = Debug|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Release|x64.ActiveCfg = Release|Any CPU
 		{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}.Release|x64.Build.0 = Release|Any CPU
-		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Checked|x64.Build.0 = Checked|Any CPU
+		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Release|x64.ActiveCfg = Release|Any CPU
 		{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}.Release|x64.Build.0 = Release|Any CPU
-		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Checked|x64.Build.0 = Checked|Any CPU
+		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B939809-FCC2-45FE-A420-F39FA207713C}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Release|x64.ActiveCfg = Release|Any CPU
 		{1B939809-FCC2-45FE-A420-F39FA207713C}.Release|x64.Build.0 = Release|Any CPU
-		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|x64.Build.0 = Debug|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Checked|x64.Build.0 = Checked|Any CPU
+		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Debug|x64.Build.0 = Debug|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Release|x64.ActiveCfg = Release|Any CPU
 		{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}.Release|x64.Build.0 = Release|Any CPU
-		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|x64.Build.0 = Debug|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Checked|x64.Build.0 = Checked|Any CPU
+		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Debug|x64.Build.0 = Debug|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Release|x64.ActiveCfg = Release|Any CPU
 		{415E8598-01F0-484D-9B87-A9DB65DFACF8}.Release|x64.Build.0 = Release|Any CPU
-		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Checked|x64.Build.0 = Checked|Any CPU
+		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Release|x64.ActiveCfg = Release|Any CPU
 		{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}.Release|x64.Build.0 = Release|Any CPU
-		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|x64.Build.0 = Debug|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Checked|x64.Build.0 = Checked|Any CPU
+		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Debug|x64.Build.0 = Debug|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Release|x64.ActiveCfg = Release|Any CPU
 		{3AB2ED60-231C-4C23-820F-43B89362AB37}.Release|x64.Build.0 = Release|Any CPU
-		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|x64.Build.0 = Debug|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Checked|x64.Build.0 = Checked|Any CPU
+		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Debug|x64.Build.0 = Debug|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Release|x64.ActiveCfg = Release|Any CPU
 		{835C8533-31E5-46BD-9328-7C13BCBDFA3B}.Release|x64.Build.0 = Release|Any CPU
-		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|x64.Build.0 = Debug|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Checked|x64.Build.0 = Checked|Any CPU
+		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Debug|x64.Build.0 = Debug|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Release|x64.ActiveCfg = Release|Any CPU
 		{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}.Release|x64.Build.0 = Release|Any CPU
-		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|x64.Build.0 = Debug|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Checked|x64.Build.0 = Checked|Any CPU
+		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Debug|x64.Build.0 = Debug|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Release|x64.ActiveCfg = Release|Any CPU
 		{D57D7CFC-1AD8-44FB-A234-78C6126C5894}.Release|x64.Build.0 = Release|Any CPU
-		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|x64.Build.0 = Debug|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Checked|x64.Build.0 = Checked|Any CPU
+		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Debug|x64.Build.0 = Debug|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Release|x64.ActiveCfg = Release|Any CPU
 		{2A843792-C6EE-41E9-8A85-0EDA1052287A}.Release|x64.Build.0 = Release|Any CPU
-		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|x64.Build.0 = Debug|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Checked|x64.Build.0 = Checked|Any CPU
+		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Debug|x64.Build.0 = Debug|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Release|x64.ActiveCfg = Release|Any CPU
 		{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}.Release|x64.Build.0 = Release|Any CPU
-		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Checked|x64.Build.0 = Checked|Any CPU
+		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Release|x64.ActiveCfg = Release|Any CPU
 		{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}.Release|x64.Build.0 = Release|Any CPU
-		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|x64.Build.0 = Debug|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Checked|x64.Build.0 = Checked|Any CPU
+		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Debug|x64.Build.0 = Debug|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Release|Any CPU.Build.0 = Release|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Release|x64.ActiveCfg = Release|Any CPU
 		{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}.Release|x64.Build.0 = Release|Any CPU
-		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Checked|x64.Build.0 = Checked|Any CPU
+		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5E785831-90A1-467A-BC23-5A20376C53CA}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Release|x64.ActiveCfg = Release|Any CPU
 		{5E785831-90A1-467A-BC23-5A20376C53CA}.Release|x64.Build.0 = Release|Any CPU
-		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Checked|x64.Build.0 = Checked|Any CPU
+		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{93A9E752-E897-4AC3-9300-1D13448718F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Release|x64.ActiveCfg = Release|Any CPU
 		{93A9E752-E897-4AC3-9300-1D13448718F5}.Release|x64.Build.0 = Release|Any CPU
-		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|x64.Build.0 = Debug|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Checked|x64.Build.0 = Checked|Any CPU
+		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2D8E4374-328F-4F65-A292-FD15174C849C}.Debug|x64.Build.0 = Debug|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Release|x64.ActiveCfg = Release|Any CPU
 		{2D8E4374-328F-4F65-A292-FD15174C849C}.Release|x64.Build.0 = Release|Any CPU
-		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Checked|x64.Build.0 = Checked|Any CPU
+		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Release|x64.ActiveCfg = Release|Any CPU
 		{D530EB76-9464-46BE-9361-70D8ADF04C1C}.Release|x64.Build.0 = Release|Any CPU
-		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|x64.Build.0 = Debug|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Checked|x64.Build.0 = Checked|Any CPU
+		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Debug|x64.Build.0 = Debug|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Release|x64.ActiveCfg = Release|Any CPU
 		{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}.Release|x64.Build.0 = Release|Any CPU
-		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Checked|x64.Build.0 = Checked|Any CPU
+		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Release|x64.ActiveCfg = Release|Any CPU
 		{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}.Release|x64.Build.0 = Release|Any CPU
-		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|x64.Build.0 = Debug|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Checked|x64.Build.0 = Checked|Any CPU
+		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Debug|x64.Build.0 = Debug|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Release|x64.ActiveCfg = Release|Any CPU
 		{06A7C6C6-9B9B-4299-9D67-575E496D832A}.Release|x64.Build.0 = Release|Any CPU
-		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|x64.Build.0 = Debug|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Checked|x64.Build.0 = Checked|Any CPU
+		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Debug|x64.Build.0 = Debug|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Release|x64.ActiveCfg = Release|Any CPU
 		{CADE5351-B017-4FEE-BE92-EFD112DC2603}.Release|x64.Build.0 = Release|Any CPU
-		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Checked|x64.Build.0 = Checked|Any CPU
+		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Release|x64.ActiveCfg = Release|Any CPU
 		{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}.Release|x64.Build.0 = Release|Any CPU
-		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Checked|x64.Build.0 = Checked|Any CPU
+		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Release|x64.ActiveCfg = Release|Any CPU
 		{A4F38D33-E204-4736-A17A-A2EE4A595365}.Release|x64.Build.0 = Release|Any CPU
-		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|x64.Build.0 = Debug|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Checked|x64.Build.0 = Checked|Any CPU
+		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Debug|x64.Build.0 = Debug|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Release|x64.ActiveCfg = Release|Any CPU
 		{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}.Release|x64.Build.0 = Release|Any CPU
-		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|x64.Build.0 = Debug|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Checked|x64.Build.0 = Checked|Any CPU
+		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Debug|x64.Build.0 = Debug|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Release|x64.ActiveCfg = Release|Any CPU
 		{02955291-75B3-40FF-8F78-B2CC05C6F9BA}.Release|x64.Build.0 = Release|Any CPU
-		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|x64.Build.0 = Debug|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Checked|x64.Build.0 = Checked|Any CPU
+		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Debug|x64.Build.0 = Debug|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Release|x64.ActiveCfg = Release|Any CPU
 		{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}.Release|x64.Build.0 = Release|Any CPU
-		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|x64.Build.0 = Debug|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Checked|x64.Build.0 = Checked|Any CPU
+		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Debug|x64.Build.0 = Debug|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Release|x64.ActiveCfg = Release|Any CPU
 		{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}.Release|x64.Build.0 = Release|Any CPU
-		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|x64.Build.0 = Debug|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Checked|x64.Build.0 = Checked|Any CPU
+		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Debug|x64.Build.0 = Debug|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Release|x64.ActiveCfg = Release|Any CPU
 		{301BDE42-EF25-40DD-82EC-3D599E309CA2}.Release|x64.Build.0 = Release|Any CPU
-		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|x64.Build.0 = Debug|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Checked|x64.Build.0 = Checked|Any CPU
+		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Debug|x64.Build.0 = Debug|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Release|x64.ActiveCfg = Release|Any CPU
 		{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}.Release|x64.Build.0 = Release|Any CPU
-		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|x64.Build.0 = Debug|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Checked|x64.Build.0 = Checked|Any CPU
+		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Debug|x64.Build.0 = Debug|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Release|x64.ActiveCfg = Release|Any CPU
 		{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}.Release|x64.Build.0 = Release|Any CPU
-		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|x64.Build.0 = Debug|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Checked|x64.Build.0 = Checked|Any CPU
+		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Debug|x64.Build.0 = Debug|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Release|x64.ActiveCfg = Release|Any CPU
 		{E1F35D93-E1D2-4CC3-887F-D9E83D765588}.Release|x64.Build.0 = Release|Any CPU
-		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|x64.Build.0 = Debug|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Checked|x64.Build.0 = Checked|Any CPU
+		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Debug|x64.Build.0 = Debug|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Release|Any CPU.Build.0 = Release|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Release|x64.ActiveCfg = Release|Any CPU
 		{82C15ECD-27A9-4029-8097-3E15DD3FD949}.Release|x64.Build.0 = Release|Any CPU
-		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|x64.Build.0 = Debug|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Checked|x64.Build.0 = Checked|Any CPU
+		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Debug|x64.Build.0 = Debug|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Release|x64.ActiveCfg = Release|Any CPU
 		{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}.Release|x64.Build.0 = Release|Any CPU
-		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|x64.Build.0 = Debug|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Checked|x64.Build.0 = Checked|Any CPU
+		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Debug|x64.Build.0 = Debug|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Release|x64.ActiveCfg = Release|Any CPU
 		{DFF216BA-CE50-45EA-9C53-96A57D23240C}.Release|x64.Build.0 = Release|Any CPU
-		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|x64.Build.0 = Debug|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Checked|x64.Build.0 = Checked|Any CPU
+		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Debug|x64.Build.0 = Debug|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Release|x64.ActiveCfg = Release|Any CPU
 		{BAF4C82D-B91F-4469-9483-FBC7950B825E}.Release|x64.Build.0 = Release|Any CPU
-		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Checked|x64.Build.0 = Checked|Any CPU
+		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Release|x64.ActiveCfg = Release|Any CPU
 		{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}.Release|x64.Build.0 = Release|Any CPU
-		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|x64.Build.0 = Debug|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Checked|x64.Build.0 = Checked|Any CPU
+		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Debug|x64.Build.0 = Debug|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Release|Any CPU.Build.0 = Release|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Release|x64.ActiveCfg = Release|Any CPU
 		{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}.Release|x64.Build.0 = Release|Any CPU
-		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Checked|x64.Build.0 = Checked|Any CPU
+		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Release|x64.ActiveCfg = Release|Any CPU
 		{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}.Release|x64.Build.0 = Release|Any CPU
-		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|x64.Build.0 = Debug|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Checked|x64.Build.0 = Checked|Any CPU
+		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E0F6F130-5083-4088-B095-8E33BE269C85}.Debug|x64.Build.0 = Debug|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Release|x64.ActiveCfg = Release|Any CPU
 		{E0F6F130-5083-4088-B095-8E33BE269C85}.Release|x64.Build.0 = Release|Any CPU
-		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|x64.Build.0 = Debug|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Checked|x64.Build.0 = Checked|Any CPU
+		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43F24741-6FD9-4593-92FA-D3252B540A92}.Debug|x64.Build.0 = Debug|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Release|Any CPU.Build.0 = Release|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Release|x64.ActiveCfg = Release|Any CPU
 		{43F24741-6FD9-4593-92FA-D3252B540A92}.Release|x64.Build.0 = Release|Any CPU
-		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|x64.Build.0 = Debug|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Checked|x64.Build.0 = Checked|Any CPU
+		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A8BFCD41-6773-4700-8092-70369FDE6125}.Debug|x64.Build.0 = Debug|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Release|x64.ActiveCfg = Release|Any CPU
 		{A8BFCD41-6773-4700-8092-70369FDE6125}.Release|x64.Build.0 = Release|Any CPU
-		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|x64.Build.0 = Debug|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Checked|x64.Build.0 = Checked|Any CPU
+		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Debug|x64.Build.0 = Debug|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Release|x64.ActiveCfg = Release|Any CPU
 		{1CF36D39-C343-4842-BBD6-8A170BBEABAC}.Release|x64.Build.0 = Release|Any CPU
-		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|x64.Build.0 = Debug|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Checked|x64.Build.0 = Checked|Any CPU
+		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Debug|x64.Build.0 = Debug|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Release|x64.ActiveCfg = Release|Any CPU
 		{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}.Release|x64.Build.0 = Release|Any CPU
-		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|x64.Build.0 = Debug|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Checked|x64.Build.0 = Checked|Any CPU
+		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Debug|x64.Build.0 = Debug|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Release|Any CPU.Build.0 = Release|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Release|x64.ActiveCfg = Release|Any CPU
 		{568DC68E-8321-4B98-AE6C-F4877B2C6E21}.Release|x64.Build.0 = Release|Any CPU
-		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Checked|x64.Build.0 = Checked|Any CPU
+		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Release|x64.ActiveCfg = Release|Any CPU
 		{6531BCBB-6286-4989-ADF0-8C24C6D3490C}.Release|x64.Build.0 = Release|Any CPU
-		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Checked|x64.Build.0 = Checked|Any CPU
+		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Release|x64.ActiveCfg = Release|Any CPU
 		{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}.Release|x64.Build.0 = Release|Any CPU
-		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|x64.Build.0 = Debug|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Checked|x64.Build.0 = Checked|Any CPU
+		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Debug|x64.Build.0 = Debug|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Release|Any CPU.Build.0 = Release|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Release|x64.ActiveCfg = Release|Any CPU
 		{84AC84B6-357C-4D39-8C62-E9B78C3D8198}.Release|x64.Build.0 = Release|Any CPU
-		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Checked|x64.Build.0 = Checked|Any CPU
+		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Release|x64.ActiveCfg = Release|Any CPU
 		{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}.Release|x64.Build.0 = Release|Any CPU
-		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|x64.Build.0 = Debug|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Checked|x64.Build.0 = Checked|Any CPU
+		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Debug|x64.Build.0 = Debug|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Release|x64.ActiveCfg = Release|Any CPU
 		{BE711884-16DD-41D3-8EE8-07DE371D3DD2}.Release|x64.Build.0 = Release|Any CPU
-		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|x64.Build.0 = Debug|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Checked|x64.Build.0 = Checked|Any CPU
+		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Debug|x64.Build.0 = Debug|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Release|x64.ActiveCfg = Release|Any CPU
 		{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}.Release|x64.Build.0 = Release|Any CPU
-		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|x64.Build.0 = Debug|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Checked|x64.Build.0 = Checked|Any CPU
+		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Debug|x64.Build.0 = Debug|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Release|x64.ActiveCfg = Release|Any CPU
 		{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}.Release|x64.Build.0 = Release|Any CPU
-		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|x64.Build.0 = Debug|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Checked|x64.Build.0 = Checked|Any CPU
+		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Debug|x64.Build.0 = Debug|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Release|x64.ActiveCfg = Release|Any CPU
 		{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}.Release|x64.Build.0 = Release|Any CPU
-		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Checked|x64.Build.0 = Checked|Any CPU
+		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6EE6750-296C-4545-8484-7BE877285357}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Release|x64.ActiveCfg = Release|Any CPU
 		{A6EE6750-296C-4545-8484-7BE877285357}.Release|x64.Build.0 = Release|Any CPU
-		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|x64.Build.0 = Debug|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Checked|x64.Build.0 = Checked|Any CPU
+		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Debug|x64.Build.0 = Debug|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Release|x64.ActiveCfg = Release|Any CPU
 		{1041EDB6-3F75-4892-9306-C0BF9C9D0584}.Release|x64.Build.0 = Release|Any CPU
-		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Checked|x64.Build.0 = Checked|Any CPU
+		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Release|x64.ActiveCfg = Release|Any CPU
 		{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}.Release|x64.Build.0 = Release|Any CPU
-		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|x64.Build.0 = Debug|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Checked|x64.Build.0 = Checked|Any CPU
+		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Debug|x64.Build.0 = Debug|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Release|x64.ActiveCfg = Release|Any CPU
 		{C10068FD-69FE-4DC7-B9EF-8973C193B354}.Release|x64.Build.0 = Release|Any CPU
-		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|x64.Build.0 = Debug|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Checked|x64.Build.0 = Checked|Any CPU
+		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{900795A5-A96E-4E6B-9C09-87617F444F05}.Debug|x64.Build.0 = Debug|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Release|Any CPU.Build.0 = Release|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Release|x64.ActiveCfg = Release|Any CPU
 		{900795A5-A96E-4E6B-9C09-87617F444F05}.Release|x64.Build.0 = Release|Any CPU
-		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|x64.Build.0 = Debug|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Checked|x64.Build.0 = Checked|Any CPU
+		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Debug|x64.Build.0 = Debug|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Release|x64.ActiveCfg = Release|Any CPU
 		{630CD41D-B922-4064-B5CD-B77FF2C09B4C}.Release|x64.Build.0 = Release|Any CPU
-		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|x64.Build.0 = Debug|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Checked|x64.Build.0 = Checked|Any CPU
+		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Debug|x64.Build.0 = Debug|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Release|Any CPU.Build.0 = Release|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Release|x64.ActiveCfg = Release|Any CPU
 		{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}.Release|x64.Build.0 = Release|Any CPU
-		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|x64.Build.0 = Debug|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Checked|x64.Build.0 = Checked|Any CPU
+		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Debug|x64.Build.0 = Debug|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Release|x64.ActiveCfg = Release|Any CPU
 		{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}.Release|x64.Build.0 = Release|Any CPU
-		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|x64.Build.0 = Debug|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Checked|x64.Build.0 = Checked|Any CPU
+		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Debug|x64.Build.0 = Debug|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Release|x64.ActiveCfg = Release|Any CPU
 		{2646F7D3-291C-4892-AEF1-6B14840F0E05}.Release|x64.Build.0 = Release|Any CPU
-		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|x64.Build.0 = Debug|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Checked|x64.Build.0 = Checked|Any CPU
+		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{88289879-FE00-45B2-A561-783022B8BDEA}.Debug|x64.Build.0 = Debug|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Release|x64.ActiveCfg = Release|Any CPU
 		{88289879-FE00-45B2-A561-783022B8BDEA}.Release|x64.Build.0 = Release|Any CPU
-		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|x64.Build.0 = Debug|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Checked|x64.Build.0 = Checked|Any CPU
+		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Debug|x64.Build.0 = Debug|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Release|Any CPU.Build.0 = Release|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Release|x64.ActiveCfg = Release|Any CPU
 		{80F8F357-E85D-49BA-9065-AE13D7A79839}.Release|x64.Build.0 = Release|Any CPU
-		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Checked|x64.Build.0 = Checked|Any CPU
+		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Release|x64.ActiveCfg = Release|Any CPU
 		{551CDF76-46AD-435B-851E-12C74ACC72A6}.Release|x64.Build.0 = Release|Any CPU
-		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|x64.Build.0 = Debug|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Checked|x64.Build.0 = Checked|Any CPU
+		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15426961-0948-487F-ABE5-08BE8E6C7607}.Debug|x64.Build.0 = Debug|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Release|Any CPU.Build.0 = Release|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Release|x64.ActiveCfg = Release|Any CPU
 		{15426961-0948-487F-ABE5-08BE8E6C7607}.Release|x64.Build.0 = Release|Any CPU
-		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Checked|x64.Build.0 = Checked|Any CPU
+		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Release|x64.ActiveCfg = Release|Any CPU
 		{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}.Release|x64.Build.0 = Release|Any CPU
-		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|x64.Build.0 = Debug|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Checked|x64.Build.0 = Checked|Any CPU
+		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Debug|x64.Build.0 = Debug|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Release|x64.ActiveCfg = Release|Any CPU
 		{15184247-1A78-454F-A645-0ED2CE0DD16B}.Release|x64.Build.0 = Release|Any CPU
-		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Checked|x64.Build.0 = Checked|Any CPU
+		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Release|x64.ActiveCfg = Release|Any CPU
 		{3E16855F-8CAE-4985-9C6E-B988472145E3}.Release|x64.Build.0 = Release|Any CPU
-		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|x64.Build.0 = Debug|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Checked|x64.Build.0 = Checked|Any CPU
+		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Debug|x64.Build.0 = Debug|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Release|x64.ActiveCfg = Release|Any CPU
 		{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}.Release|x64.Build.0 = Release|Any CPU
-		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|x64.Build.0 = Debug|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Checked|x64.Build.0 = Checked|Any CPU
+		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Debug|x64.Build.0 = Debug|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Release|Any CPU.Build.0 = Release|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Release|x64.ActiveCfg = Release|Any CPU
 		{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}.Release|x64.Build.0 = Release|Any CPU
-		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Checked|x64.Build.0 = Checked|Any CPU
+		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Release|x64.ActiveCfg = Release|Any CPU
 		{0C050436-7B93-427D-AD59-CDEE94BA5D24}.Release|x64.Build.0 = Release|Any CPU
-		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Checked|x64.Build.0 = Checked|Any CPU
+		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Release|x64.ActiveCfg = Release|Any CPU
 		{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}.Release|x64.Build.0 = Release|Any CPU
-		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|x64.Build.0 = Debug|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Checked|x64.Build.0 = Checked|Any CPU
+		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Debug|x64.Build.0 = Debug|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Release|Any CPU.Build.0 = Release|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Release|x64.ActiveCfg = Release|Any CPU
 		{43B411FE-E26C-4D00-88A8-A98ADA16F601}.Release|x64.Build.0 = Release|Any CPU
-		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|x64.Build.0 = Debug|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Checked|x64.Build.0 = Checked|Any CPU
+		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Debug|x64.Build.0 = Debug|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Release|x64.ActiveCfg = Release|Any CPU
 		{F816AF23-8AAE-442C-A396-4F22F49CA0C1}.Release|x64.Build.0 = Release|Any CPU
-		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|x64.Build.0 = Debug|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Checked|x64.Build.0 = Checked|Any CPU
+		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Debug|x64.Build.0 = Debug|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Release|x64.ActiveCfg = Release|Any CPU
 		{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}.Release|x64.Build.0 = Release|Any CPU
-		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|x64.Build.0 = Debug|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Checked|x64.Build.0 = Checked|Any CPU
+		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Debug|x64.Build.0 = Debug|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Release|Any CPU.Build.0 = Release|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Release|x64.ActiveCfg = Release|Any CPU
 		{04DFA156-2A8C-44F7-9C60-17F8526D0C22}.Release|x64.Build.0 = Release|Any CPU
-		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Checked|x64.Build.0 = Checked|Any CPU
+		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Release|x64.ActiveCfg = Release|Any CPU
 		{57320B45-E97C-4175-BED3-44F846FEF3C7}.Release|x64.Build.0 = Release|Any CPU
-		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|x64.Build.0 = Debug|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Checked|x64.Build.0 = Checked|Any CPU
+		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Debug|x64.Build.0 = Debug|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Release|x64.ActiveCfg = Release|Any CPU
 		{64DBC670-FAC2-481D-A0E0-3B4D775B409A}.Release|x64.Build.0 = Release|Any CPU
-		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Checked|x64.Build.0 = Checked|Any CPU
+		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Release|x64.ActiveCfg = Release|Any CPU
 		{0C798FB6-34BF-4197-AA0E-0800181B8E45}.Release|x64.Build.0 = Release|Any CPU
-		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|x64.Build.0 = Debug|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Checked|x64.Build.0 = Checked|Any CPU
+		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Debug|x64.Build.0 = Debug|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Release|x64.ActiveCfg = Release|Any CPU
 		{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}.Release|x64.Build.0 = Release|Any CPU
-		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|x64.Build.0 = Debug|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Checked|x64.Build.0 = Checked|Any CPU
+		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Debug|x64.Build.0 = Debug|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Release|x64.ActiveCfg = Release|Any CPU
 		{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}.Release|x64.Build.0 = Release|Any CPU
-		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Checked|x64.Build.0 = Checked|Any CPU
+		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Release|x64.ActiveCfg = Release|Any CPU
 		{A6C49C29-BD23-4564-91B7-968BE5E34265}.Release|x64.Build.0 = Release|Any CPU
-		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|x64.Build.0 = Debug|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Checked|x64.Build.0 = Checked|Any CPU
+		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FA37EF21-043D-418E-A302-7A661B69B376}.Debug|x64.Build.0 = Debug|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Release|x64.ActiveCfg = Release|Any CPU
 		{FA37EF21-043D-418E-A302-7A661B69B376}.Release|x64.Build.0 = Release|Any CPU
-		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|x64.Build.0 = Debug|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Checked|x64.Build.0 = Checked|Any CPU
+		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Debug|x64.Build.0 = Debug|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Release|x64.ActiveCfg = Release|Any CPU
 		{C10FB01B-9979-44D5-891C-20B8BFD8E697}.Release|x64.Build.0 = Release|Any CPU
-		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|x64.Build.0 = Debug|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Checked|x64.Build.0 = Checked|Any CPU
+		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C31FA060-E800-4659-AB66-FE0E905D725B}.Debug|x64.Build.0 = Debug|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Release|x64.ActiveCfg = Release|Any CPU
 		{C31FA060-E800-4659-AB66-FE0E905D725B}.Release|x64.Build.0 = Release|Any CPU
-		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|x64.Build.0 = Debug|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Checked|x64.Build.0 = Checked|Any CPU
+		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0E052551-4819-46F0-9E6E-9C825465DA99}.Debug|x64.Build.0 = Debug|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Release|x64.ActiveCfg = Release|Any CPU
 		{0E052551-4819-46F0-9E6E-9C825465DA99}.Release|x64.Build.0 = Release|Any CPU
-		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|x64.Build.0 = Debug|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Checked|x64.Build.0 = Checked|Any CPU
+		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{69DC5D6B-6361-494D-9829-4911027EF14E}.Debug|x64.Build.0 = Debug|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Release|x64.ActiveCfg = Release|Any CPU
 		{69DC5D6B-6361-494D-9829-4911027EF14E}.Release|x64.Build.0 = Release|Any CPU
-		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|x64.Build.0 = Debug|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Checked|x64.Build.0 = Checked|Any CPU
+		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Debug|x64.Build.0 = Debug|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Release|x64.ActiveCfg = Release|Any CPU
 		{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}.Release|x64.Build.0 = Release|Any CPU
-		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|x64.Build.0 = Debug|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Checked|x64.Build.0 = Checked|Any CPU
+		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Debug|x64.Build.0 = Debug|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Release|x64.ActiveCfg = Release|Any CPU
 		{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}.Release|x64.Build.0 = Release|Any CPU
-		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|x64.Build.0 = Debug|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Checked|x64.Build.0 = Checked|Any CPU
+		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Debug|x64.Build.0 = Debug|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Release|x64.ActiveCfg = Release|Any CPU
 		{273CE762-D3A2-4241-8548-CEB666C4C3A7}.Release|x64.Build.0 = Release|Any CPU
-		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Checked|x64.Build.0 = Checked|Any CPU
+		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Release|x64.ActiveCfg = Release|Any CPU
 		{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}.Release|x64.Build.0 = Release|Any CPU
-		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|x64.Build.0 = Debug|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Checked|x64.Build.0 = Checked|Any CPU
+		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Debug|x64.Build.0 = Debug|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Release|x64.ActiveCfg = Release|Any CPU
 		{8C27FFEF-8C5F-4381-A667-E278C0F38967}.Release|x64.Build.0 = Release|Any CPU
-		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|x64.Build.0 = Debug|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Checked|x64.Build.0 = Checked|Any CPU
+		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Debug|x64.Build.0 = Debug|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Release|x64.ActiveCfg = Release|Any CPU
 		{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}.Release|x64.Build.0 = Release|Any CPU
-		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Checked|x64.Build.0 = Checked|Any CPU
+		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF75F01F-0296-4071-83F1-63F2164557E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Release|x64.ActiveCfg = Release|Any CPU
 		{AF75F01F-0296-4071-83F1-63F2164557E7}.Release|x64.Build.0 = Release|Any CPU
-		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Checked|x64.Build.0 = Checked|Any CPU
+		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Release|x64.ActiveCfg = Release|Any CPU
 		{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}.Release|x64.Build.0 = Release|Any CPU
-		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|x64.Build.0 = Debug|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Checked|x64.Build.0 = Checked|Any CPU
+		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{87CA352D-1673-403F-BDC9-5B833E21F424}.Debug|x64.Build.0 = Debug|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Release|Any CPU.Build.0 = Release|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Release|x64.ActiveCfg = Release|Any CPU
 		{87CA352D-1673-403F-BDC9-5B833E21F424}.Release|x64.Build.0 = Release|Any CPU
-		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|x64.Build.0 = Debug|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Checked|x64.Build.0 = Checked|Any CPU
+		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Debug|x64.Build.0 = Debug|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Release|x64.ActiveCfg = Release|Any CPU
 		{0EFA0FB8-380C-4789-84CF-4B7E4870E119}.Release|x64.Build.0 = Release|Any CPU
-		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|x64.Build.0 = Debug|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Checked|x64.Build.0 = Checked|Any CPU
+		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{62885220-F137-4C74-83D2-42AFA04C9B13}.Debug|x64.Build.0 = Debug|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Release|Any CPU.Build.0 = Release|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Release|x64.ActiveCfg = Release|Any CPU
 		{62885220-F137-4C74-83D2-42AFA04C9B13}.Release|x64.Build.0 = Release|Any CPU
-		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|x64.Build.0 = Debug|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Checked|x64.Build.0 = Checked|Any CPU
+		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{89779DFA-1BFA-4512-B0C2-349405F82973}.Debug|x64.Build.0 = Debug|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Release|Any CPU.Build.0 = Release|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Release|x64.ActiveCfg = Release|Any CPU
 		{89779DFA-1BFA-4512-B0C2-349405F82973}.Release|x64.Build.0 = Release|Any CPU
-		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|x64.Build.0 = Debug|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Checked|x64.Build.0 = Checked|Any CPU
+		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Debug|x64.Build.0 = Debug|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Release|x64.ActiveCfg = Release|Any CPU
 		{D5610C53-ED8A-45D0-84D9-936BA74BE001}.Release|x64.Build.0 = Release|Any CPU
-		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|x64.Build.0 = Debug|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Checked|x64.Build.0 = Checked|Any CPU
+		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Debug|x64.Build.0 = Debug|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Release|x64.ActiveCfg = Release|Any CPU
 		{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}.Release|x64.Build.0 = Release|Any CPU
-		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Checked|x64.Build.0 = Checked|Any CPU
+		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Release|x64.ActiveCfg = Release|Any CPU
 		{CF9EA97C-71A5-4602-BD58-5B451494A9B7}.Release|x64.Build.0 = Release|Any CPU
-		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Checked|x64.Build.0 = Checked|Any CPU
+		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Release|x64.ActiveCfg = Release|Any CPU
 		{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}.Release|x64.Build.0 = Release|Any CPU
-		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Checked|x64.Build.0 = Checked|Any CPU
+		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Release|x64.ActiveCfg = Release|Any CPU
 		{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}.Release|x64.Build.0 = Release|Any CPU
-		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|x64.Build.0 = Debug|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Checked|x64.Build.0 = Checked|Any CPU
+		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Debug|x64.Build.0 = Debug|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Release|x64.ActiveCfg = Release|Any CPU
 		{492BDD0F-092E-41DD-99C4-618D350EBDB4}.Release|x64.Build.0 = Release|Any CPU
-		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Checked|x64.Build.0 = Checked|Any CPU
+		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Release|x64.ActiveCfg = Release|Any CPU
 		{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}.Release|x64.Build.0 = Release|Any CPU
-		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Checked|x64.Build.0 = Checked|Any CPU
+		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Release|x64.ActiveCfg = Release|Any CPU
 		{6A95068C-44EE-4FAF-B190-80E013E626EC}.Release|x64.Build.0 = Release|Any CPU
-		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|x64.Build.0 = Debug|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Checked|x64.Build.0 = Checked|Any CPU
+		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Debug|x64.Build.0 = Debug|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Release|x64.ActiveCfg = Release|Any CPU
 		{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}.Release|x64.Build.0 = Release|Any CPU
-		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|x64.Build.0 = Debug|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Checked|x64.Build.0 = Checked|Any CPU
+		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Debug|x64.Build.0 = Debug|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Release|x64.ActiveCfg = Release|Any CPU
 		{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}.Release|x64.Build.0 = Release|Any CPU
-		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|x64.Build.0 = Debug|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Checked|x64.Build.0 = Checked|Any CPU
+		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Debug|x64.Build.0 = Debug|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Release|Any CPU.Build.0 = Release|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Release|x64.ActiveCfg = Release|Any CPU
 		{634D2580-8121-454C-B00D-6E9DCB6FA047}.Release|x64.Build.0 = Release|Any CPU
-		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Checked|x64.Build.0 = Checked|Any CPU
+		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Release|x64.ActiveCfg = Release|Any CPU
 		{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}.Release|x64.Build.0 = Release|Any CPU
-		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|x64.Build.0 = Debug|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Checked|x64.Build.0 = Checked|Any CPU
+		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Debug|x64.Build.0 = Debug|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Release|x64.ActiveCfg = Release|Any CPU
 		{97DA5467-6E6C-40FD-ABFE-34B0791B439B}.Release|x64.Build.0 = Release|Any CPU
-		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|x64.Build.0 = Debug|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Checked|x64.Build.0 = Checked|Any CPU
+		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Debug|x64.Build.0 = Debug|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Release|x64.ActiveCfg = Release|Any CPU
 		{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}.Release|x64.Build.0 = Release|Any CPU
-		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|x64.Build.0 = Debug|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Checked|x64.Build.0 = Checked|Any CPU
+		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Debug|x64.Build.0 = Debug|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Release|x64.ActiveCfg = Release|Any CPU
 		{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}.Release|x64.Build.0 = Release|Any CPU
-		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|x64.Build.0 = Debug|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Checked|x64.Build.0 = Checked|Any CPU
+		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Debug|x64.Build.0 = Debug|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Release|x64.ActiveCfg = Release|Any CPU
 		{AA90CACB-C386-4419-804A-B6A1A7AC1255}.Release|x64.Build.0 = Release|Any CPU
-		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|x64.Build.0 = Debug|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Checked|x64.Build.0 = Checked|Any CPU
+		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Debug|x64.Build.0 = Debug|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Release|x64.ActiveCfg = Release|Any CPU
 		{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}.Release|x64.Build.0 = Release|Any CPU
-		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|x64.Build.0 = Debug|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Checked|x64.Build.0 = Checked|Any CPU
+		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{116602E5-7873-4F65-8829-F32E8A705EDE}.Debug|x64.Build.0 = Debug|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Release|x64.ActiveCfg = Release|Any CPU
 		{116602E5-7873-4F65-8829-F32E8A705EDE}.Release|x64.Build.0 = Release|Any CPU
-		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|x64.Build.0 = Debug|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Checked|x64.Build.0 = Checked|Any CPU
+		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Debug|x64.Build.0 = Debug|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Release|x64.ActiveCfg = Release|Any CPU
 		{BAFE9AF0-E836-4F28-871F-C08294A69522}.Release|x64.Build.0 = Release|Any CPU
-		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Checked|x64.Build.0 = Checked|Any CPU
+		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{87405971-B126-4000-977F-9AD22B6FF9A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Release|x64.ActiveCfg = Release|Any CPU
 		{87405971-B126-4000-977F-9AD22B6FF9A6}.Release|x64.Build.0 = Release|Any CPU
-		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|x64.Build.0 = Debug|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Checked|x64.Build.0 = Checked|Any CPU
+		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Debug|x64.Build.0 = Debug|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Release|x64.ActiveCfg = Release|Any CPU
 		{C834B32F-C575-491D-9EB9-574A6DB9FF95}.Release|x64.Build.0 = Release|Any CPU
-		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|x64.Build.0 = Debug|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Checked|x64.Build.0 = Checked|Any CPU
+		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{671883C2-8AC6-447D-B213-A378D6A81A91}.Debug|x64.Build.0 = Debug|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Release|Any CPU.Build.0 = Release|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Release|x64.ActiveCfg = Release|Any CPU
 		{671883C2-8AC6-447D-B213-A378D6A81A91}.Release|x64.Build.0 = Release|Any CPU
-		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|x64.Build.0 = Debug|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Checked|x64.Build.0 = Checked|Any CPU
+		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Debug|x64.Build.0 = Debug|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Release|x64.ActiveCfg = Release|Any CPU
 		{0422E973-CD19-492C-ABA8-5A5C3C482503}.Release|x64.Build.0 = Release|Any CPU
-		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|x64.Build.0 = Debug|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Checked|x64.Build.0 = Checked|Any CPU
+		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90A26425-4848-4F9F-945F-1204722317AC}.Debug|x64.Build.0 = Debug|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Release|x64.ActiveCfg = Release|Any CPU
 		{90A26425-4848-4F9F-945F-1204722317AC}.Release|x64.Build.0 = Release|Any CPU
-		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|x64.Build.0 = Debug|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Checked|x64.Build.0 = Checked|Any CPU
+		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Debug|x64.Build.0 = Debug|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Release|x64.ActiveCfg = Release|Any CPU
 		{8ED41591-8FDF-419B-8FAA-24631C103BBB}.Release|x64.Build.0 = Release|Any CPU
-		{65964B68-E893-4C78-B7FB-590452343116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65964B68-E893-4C78-B7FB-590452343116}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65964B68-E893-4C78-B7FB-590452343116}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{65964B68-E893-4C78-B7FB-590452343116}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{65964B68-E893-4C78-B7FB-590452343116}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{65964B68-E893-4C78-B7FB-590452343116}.Debug|x64.Build.0 = Debug|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Checked|x64.Build.0 = Checked|Any CPU
+		{65964B68-E893-4C78-B7FB-590452343116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65964B68-E893-4C78-B7FB-590452343116}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65964B68-E893-4C78-B7FB-590452343116}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{65964B68-E893-4C78-B7FB-590452343116}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{65964B68-E893-4C78-B7FB-590452343116}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{65964B68-E893-4C78-B7FB-590452343116}.Debug|x64.Build.0 = Debug|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Release|Any CPU.Build.0 = Release|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Release|x64.ActiveCfg = Release|Any CPU
 		{65964B68-E893-4C78-B7FB-590452343116}.Release|x64.Build.0 = Release|Any CPU
-		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Checked|x64.Build.0 = Checked|Any CPU
+		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Release|x64.ActiveCfg = Release|Any CPU
 		{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}.Release|x64.Build.0 = Release|Any CPU
-		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|x64.Build.0 = Debug|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Checked|x64.Build.0 = Checked|Any CPU
+		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Debug|x64.Build.0 = Debug|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Release|Any CPU.Build.0 = Release|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Release|x64.ActiveCfg = Release|Any CPU
 		{78363C03-BB50-47E6-80C0-119F5D56AF21}.Release|x64.Build.0 = Release|Any CPU
-		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|x64.Build.0 = Debug|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Checked|x64.Build.0 = Checked|Any CPU
+		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Debug|x64.Build.0 = Debug|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Release|x64.ActiveCfg = Release|Any CPU
 		{D36A6FEC-097F-4209-845C-5B247BDE96F6}.Release|x64.Build.0 = Release|Any CPU
-		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Checked|x64.Build.0 = Checked|Any CPU
+		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Release|x64.ActiveCfg = Release|Any CPU
 		{6B9DA00A-8C8A-4349-9E8E-D400292B541C}.Release|x64.Build.0 = Release|Any CPU
-		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|x64.Build.0 = Debug|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Checked|x64.Build.0 = Checked|Any CPU
+		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Debug|x64.Build.0 = Debug|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Release|x64.ActiveCfg = Release|Any CPU
 		{80A667A7-90BD-4406-8EC6-CCE1BD19487B}.Release|x64.Build.0 = Release|Any CPU
-		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|x64.Build.0 = Debug|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Checked|x64.Build.0 = Checked|Any CPU
+		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Debug|x64.Build.0 = Debug|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Release|x64.ActiveCfg = Release|Any CPU
 		{B67D36A4-F3EB-4978-91F8-55D9B7944694}.Release|x64.Build.0 = Release|Any CPU
-		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|x64.Build.0 = Debug|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Checked|x64.Build.0 = Checked|Any CPU
+		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Debug|x64.Build.0 = Debug|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Release|x64.ActiveCfg = Release|Any CPU
 		{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}.Release|x64.Build.0 = Release|Any CPU
-		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|x64.Build.0 = Debug|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Checked|x64.Build.0 = Checked|Any CPU
+		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Debug|x64.Build.0 = Debug|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Release|x64.ActiveCfg = Release|Any CPU
 		{6A6EE264-2A23-4A18-87B9-06671E767CFD}.Release|x64.Build.0 = Release|Any CPU
-		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|x64.Build.0 = Debug|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Checked|x64.Build.0 = Checked|Any CPU
+		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Debug|x64.Build.0 = Debug|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Release|x64.ActiveCfg = Release|Any CPU
 		{2C13C549-98C0-43D9-8158-C1AC58502BE3}.Release|x64.Build.0 = Release|Any CPU
-		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|x64.Build.0 = Debug|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Checked|x64.Build.0 = Checked|Any CPU
+		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Debug|x64.Build.0 = Debug|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Release|Any CPU.Build.0 = Release|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Release|x64.ActiveCfg = Release|Any CPU
 		{61661F6A-1746-41E6-B1D7-90AE1401F425}.Release|x64.Build.0 = Release|Any CPU
-		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|x64.Build.0 = Debug|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Checked|x64.Build.0 = Checked|Any CPU
+		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Debug|x64.Build.0 = Debug|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Release|x64.ActiveCfg = Release|Any CPU
 		{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}.Release|x64.Build.0 = Release|Any CPU
-		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|x64.Build.0 = Debug|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Checked|x64.Build.0 = Checked|Any CPU
+		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Debug|x64.Build.0 = Debug|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Release|x64.ActiveCfg = Release|Any CPU
 		{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}.Release|x64.Build.0 = Release|Any CPU
-		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|x64.Build.0 = Debug|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Checked|x64.Build.0 = Checked|Any CPU
+		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Debug|x64.Build.0 = Debug|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Release|x64.ActiveCfg = Release|Any CPU
 		{50331B28-2970-44B1-A6F9-C8624121F3D8}.Release|x64.Build.0 = Release|Any CPU
-		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Checked|x64.Build.0 = Checked|Any CPU
+		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Release|x64.ActiveCfg = Release|Any CPU
 		{9E76E186-AB38-476B-8327-CB879B7E2C1D}.Release|x64.Build.0 = Release|Any CPU
-		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|x64.Build.0 = Debug|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Checked|x64.Build.0 = Checked|Any CPU
+		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29259C4C-5480-4F10-B220-978491F86B3A}.Debug|x64.Build.0 = Debug|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Release|x64.ActiveCfg = Release|Any CPU
 		{29259C4C-5480-4F10-B220-978491F86B3A}.Release|x64.Build.0 = Release|Any CPU
-		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|x64.Build.0 = Debug|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Checked|x64.Build.0 = Checked|Any CPU
+		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Debug|x64.Build.0 = Debug|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Release|x64.ActiveCfg = Release|Any CPU
 		{8FA646F7-470B-4549-A701-AA6EB28DFDBE}.Release|x64.Build.0 = Release|Any CPU
-		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|x64.Build.0 = Debug|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Checked|x64.Build.0 = Checked|Any CPU
+		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Debug|x64.Build.0 = Debug|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Release|x64.ActiveCfg = Release|Any CPU
 		{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}.Release|x64.Build.0 = Release|Any CPU
-		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|x64.Build.0 = Debug|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Checked|x64.Build.0 = Checked|Any CPU
+		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Debug|x64.Build.0 = Debug|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Release|x64.ActiveCfg = Release|Any CPU
 		{6EAD1037-4170-4F97-8705-84872FB6BECB}.Release|x64.Build.0 = Release|Any CPU
-		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|x64.Build.0 = Debug|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Checked|x64.Build.0 = Checked|Any CPU
+		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Debug|x64.Build.0 = Debug|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Release|x64.ActiveCfg = Release|Any CPU
 		{ECC7983D-6775-4E8A-820B-83A2837B4ABD}.Release|x64.Build.0 = Release|Any CPU
-		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Checked|x64.Build.0 = Checked|Any CPU
+		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Debug|x64.Build.0 = Debug|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Release|x64.ActiveCfg = Release|Any CPU
 		{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}.Release|x64.Build.0 = Release|Any CPU
-		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|x64.Build.0 = Debug|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Checked|x64.Build.0 = Checked|Any CPU
+		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Debug|x64.Build.0 = Debug|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Release|x64.ActiveCfg = Release|Any CPU
 		{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}.Release|x64.Build.0 = Release|Any CPU
-		{2637E314-B16C-440D-9604-93E240720049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2637E314-B16C-440D-9604-93E240720049}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2637E314-B16C-440D-9604-93E240720049}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2637E314-B16C-440D-9604-93E240720049}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2637E314-B16C-440D-9604-93E240720049}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2637E314-B16C-440D-9604-93E240720049}.Debug|x64.Build.0 = Debug|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Checked|x64.Build.0 = Checked|Any CPU
+		{2637E314-B16C-440D-9604-93E240720049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2637E314-B16C-440D-9604-93E240720049}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2637E314-B16C-440D-9604-93E240720049}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2637E314-B16C-440D-9604-93E240720049}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2637E314-B16C-440D-9604-93E240720049}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2637E314-B16C-440D-9604-93E240720049}.Debug|x64.Build.0 = Debug|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Release|x64.ActiveCfg = Release|Any CPU
 		{2637E314-B16C-440D-9604-93E240720049}.Release|x64.Build.0 = Release|Any CPU
-		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|x64.Build.0 = Debug|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Checked|x64.Build.0 = Checked|Any CPU
+		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Debug|x64.Build.0 = Debug|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Release|x64.ActiveCfg = Release|Any CPU
 		{080C313F-7B4A-4258-AC75-EE444F9E2FCA}.Release|x64.Build.0 = Release|Any CPU
-		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Checked|x64.Build.0 = Checked|Any CPU
+		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Release|x64.ActiveCfg = Release|Any CPU
 		{3E24A354-39F8-45EB-AD75-2A5550E11C3E}.Release|x64.Build.0 = Release|Any CPU
-		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|x64.Build.0 = Debug|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Checked|x64.Build.0 = Checked|Any CPU
+		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{544383DE-F284-4664-9E08-40D5B3597B12}.Debug|x64.Build.0 = Debug|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Release|Any CPU.Build.0 = Release|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Release|x64.ActiveCfg = Release|Any CPU
 		{544383DE-F284-4664-9E08-40D5B3597B12}.Release|x64.Build.0 = Release|Any CPU
-		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|x64.Build.0 = Debug|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Checked|x64.Build.0 = Checked|Any CPU
+		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Debug|x64.Build.0 = Debug|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Release|x64.ActiveCfg = Release|Any CPU
 		{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}.Release|x64.Build.0 = Release|Any CPU
-		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|x64.Build.0 = Debug|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Checked|x64.Build.0 = Checked|Any CPU
+		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Debug|x64.Build.0 = Debug|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Release|x64.ActiveCfg = Release|Any CPU
 		{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}.Release|x64.Build.0 = Release|Any CPU
-		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|x64.Build.0 = Debug|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Checked|x64.Build.0 = Checked|Any CPU
+		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Debug|x64.Build.0 = Debug|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Release|x64.ActiveCfg = Release|Any CPU
 		{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}.Release|x64.Build.0 = Release|Any CPU
-		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Checked|x64.Build.0 = Checked|Any CPU
+		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FF8C611B-C071-4576-B41D-687D62B14530}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Release|x64.ActiveCfg = Release|Any CPU
 		{FF8C611B-C071-4576-B41D-687D62B14530}.Release|x64.Build.0 = Release|Any CPU
-		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|x64.Build.0 = Debug|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Checked|x64.Build.0 = Checked|Any CPU
+		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06A83189-481B-4203-9EC5-57188005EF54}.Debug|x64.Build.0 = Debug|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Release|Any CPU.Build.0 = Release|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Release|x64.ActiveCfg = Release|Any CPU
 		{06A83189-481B-4203-9EC5-57188005EF54}.Release|x64.Build.0 = Release|Any CPU
-		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|x64.Build.0 = Debug|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Checked|x64.Build.0 = Checked|Any CPU
+		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6449AF25-EE12-4317-A4A6-0678FE363346}.Debug|x64.Build.0 = Debug|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Release|x64.ActiveCfg = Release|Any CPU
 		{6449AF25-EE12-4317-A4A6-0678FE363346}.Release|x64.Build.0 = Release|Any CPU
-		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|x64.Build.0 = Debug|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Checked|x64.Build.0 = Checked|Any CPU
+		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Debug|x64.Build.0 = Debug|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Release|x64.ActiveCfg = Release|Any CPU
 		{7211B39F-6B28-4929-9BE1-A151E52F9531}.Release|x64.Build.0 = Release|Any CPU
-		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|x64.Build.0 = Debug|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Checked|x64.Build.0 = Checked|Any CPU
+		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Debug|x64.Build.0 = Debug|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Release|Any CPU.Build.0 = Release|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Release|x64.ActiveCfg = Release|Any CPU
 		{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}.Release|x64.Build.0 = Release|Any CPU
-		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|x64.Build.0 = Debug|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Checked|x64.Build.0 = Checked|Any CPU
+		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Debug|x64.Build.0 = Debug|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Release|x64.ActiveCfg = Release|Any CPU
 		{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}.Release|x64.Build.0 = Release|Any CPU
-		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|x64.Build.0 = Debug|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Checked|x64.Build.0 = Checked|Any CPU
+		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Debug|x64.Build.0 = Debug|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Release|x64.ActiveCfg = Release|Any CPU
 		{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}.Release|x64.Build.0 = Release|Any CPU
-		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Checked|x64.Build.0 = Checked|Any CPU
+		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{14DB2210-9F88-4341-8A84-824049CE04C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Release|x64.ActiveCfg = Release|Any CPU
 		{14DB2210-9F88-4341-8A84-824049CE04C6}.Release|x64.Build.0 = Release|Any CPU
-		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|x64.Build.0 = Debug|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Checked|x64.Build.0 = Checked|Any CPU
+		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Debug|x64.Build.0 = Debug|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Release|x64.ActiveCfg = Release|Any CPU
 		{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}.Release|x64.Build.0 = Release|Any CPU
-		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|x64.Build.0 = Debug|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Checked|x64.Build.0 = Checked|Any CPU
+		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{320804D0-53D4-4799-95CF-AE10C670C032}.Debug|x64.Build.0 = Debug|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Release|Any CPU.Build.0 = Release|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Release|x64.ActiveCfg = Release|Any CPU
 		{320804D0-53D4-4799-95CF-AE10C670C032}.Release|x64.Build.0 = Release|Any CPU
-		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|x64.Build.0 = Debug|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Checked|x64.Build.0 = Checked|Any CPU
+		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Debug|x64.Build.0 = Debug|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Release|Any CPU.Build.0 = Release|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Release|x64.ActiveCfg = Release|Any CPU
 		{644FEF8A-38C9-40A6-8067-6746B1FD9309}.Release|x64.Build.0 = Release|Any CPU
-		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Checked|x64.Build.0 = Checked|Any CPU
+		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Release|x64.ActiveCfg = Release|Any CPU
 		{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}.Release|x64.Build.0 = Release|Any CPU
-		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Checked|x64.Build.0 = Checked|Any CPU
+		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{80F3A588-555A-4075-8360-9203E5F99AC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Release|x64.ActiveCfg = Release|Any CPU
 		{80F3A588-555A-4075-8360-9203E5F99AC9}.Release|x64.Build.0 = Release|Any CPU
-		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Checked|x64.Build.0 = Checked|Any CPU
+		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Release|x64.ActiveCfg = Release|Any CPU
 		{C6F29CCA-DE86-40C5-885D-3914F5D5751E}.Release|x64.Build.0 = Release|Any CPU
-		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Checked|x64.Build.0 = Checked|Any CPU
+		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Release|x64.ActiveCfg = Release|Any CPU
 		{2E883F72-1D4F-4636-84BE-3BBDD60B592D}.Release|x64.Build.0 = Release|Any CPU
-		{016189CD-6895-44C3-8441-DA074A996004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{016189CD-6895-44C3-8441-DA074A996004}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{016189CD-6895-44C3-8441-DA074A996004}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{016189CD-6895-44C3-8441-DA074A996004}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{016189CD-6895-44C3-8441-DA074A996004}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{016189CD-6895-44C3-8441-DA074A996004}.Debug|x64.Build.0 = Debug|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Checked|x64.Build.0 = Checked|Any CPU
+		{016189CD-6895-44C3-8441-DA074A996004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{016189CD-6895-44C3-8441-DA074A996004}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{016189CD-6895-44C3-8441-DA074A996004}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{016189CD-6895-44C3-8441-DA074A996004}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{016189CD-6895-44C3-8441-DA074A996004}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{016189CD-6895-44C3-8441-DA074A996004}.Debug|x64.Build.0 = Debug|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Release|Any CPU.Build.0 = Release|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Release|x64.ActiveCfg = Release|Any CPU
 		{016189CD-6895-44C3-8441-DA074A996004}.Release|x64.Build.0 = Release|Any CPU
-		{6449D13D-837E-4072-95F8-54227372136D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6449D13D-837E-4072-95F8-54227372136D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6449D13D-837E-4072-95F8-54227372136D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6449D13D-837E-4072-95F8-54227372136D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6449D13D-837E-4072-95F8-54227372136D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6449D13D-837E-4072-95F8-54227372136D}.Debug|x64.Build.0 = Debug|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Checked|x64.Build.0 = Checked|Any CPU
+		{6449D13D-837E-4072-95F8-54227372136D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6449D13D-837E-4072-95F8-54227372136D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6449D13D-837E-4072-95F8-54227372136D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6449D13D-837E-4072-95F8-54227372136D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6449D13D-837E-4072-95F8-54227372136D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6449D13D-837E-4072-95F8-54227372136D}.Debug|x64.Build.0 = Debug|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Release|x64.ActiveCfg = Release|Any CPU
 		{6449D13D-837E-4072-95F8-54227372136D}.Release|x64.Build.0 = Release|Any CPU
-		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|x64.Build.0 = Debug|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Checked|x64.Build.0 = Checked|Any CPU
+		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Debug|x64.Build.0 = Debug|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Release|x64.ActiveCfg = Release|Any CPU
 		{6632E517-7D60-492F-A9AA-64ABA4120E1B}.Release|x64.Build.0 = Release|Any CPU
-		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|x64.Build.0 = Debug|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Checked|x64.Build.0 = Checked|Any CPU
+		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Debug|x64.Build.0 = Debug|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Release|x64.ActiveCfg = Release|Any CPU
 		{62A6CD3D-7157-47A6-88D0-42C3C57879F6}.Release|x64.Build.0 = Release|Any CPU
-		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|x64.Build.0 = Debug|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Checked|x64.Build.0 = Checked|Any CPU
+		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Debug|x64.Build.0 = Debug|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Release|x64.ActiveCfg = Release|Any CPU
 		{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}.Release|x64.Build.0 = Release|Any CPU
-		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|x64.Build.0 = Debug|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Checked|x64.Build.0 = Checked|Any CPU
+		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Debug|x64.Build.0 = Debug|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Release|Any CPU.Build.0 = Release|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Release|x64.ActiveCfg = Release|Any CPU
 		{43AB92CB-19B3-4D71-837E-49A2300C5F11}.Release|x64.Build.0 = Release|Any CPU
-		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|x64.Build.0 = Debug|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Checked|x64.Build.0 = Checked|Any CPU
+		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{35A22E14-307A-4221-AADB-06F74A77FB42}.Debug|x64.Build.0 = Debug|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Release|Any CPU.Build.0 = Release|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Release|x64.ActiveCfg = Release|Any CPU
 		{35A22E14-307A-4221-AADB-06F74A77FB42}.Release|x64.Build.0 = Release|Any CPU
-		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|x64.Build.0 = Debug|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Checked|x64.Build.0 = Checked|Any CPU
+		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Debug|x64.Build.0 = Debug|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Release|x64.ActiveCfg = Release|Any CPU
 		{8767FA06-4489-404B-AB3C-C45C50EC5D25}.Release|x64.Build.0 = Release|Any CPU
-		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|x64.Build.0 = Debug|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Checked|x64.Build.0 = Checked|Any CPU
+		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Debug|x64.Build.0 = Debug|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Release|x64.ActiveCfg = Release|Any CPU
 		{CE813D5E-3B67-4077-9014-BAD9D5757D57}.Release|x64.Build.0 = Release|Any CPU
-		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|x64.Build.0 = Debug|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Checked|x64.Build.0 = Checked|Any CPU
+		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Debug|x64.Build.0 = Debug|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Release|x64.ActiveCfg = Release|Any CPU
 		{B2F82E87-534F-417A-8709-B0B6EDF67E40}.Release|x64.Build.0 = Release|Any CPU
-		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|x64.Build.0 = Debug|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Checked|x64.Build.0 = Checked|Any CPU
+		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Debug|x64.Build.0 = Debug|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Release|x64.ActiveCfg = Release|Any CPU
 		{363A0211-B3EB-4E66-B939-B1742AF9B9D8}.Release|x64.Build.0 = Release|Any CPU
-		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|x64.Build.0 = Debug|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Checked|x64.Build.0 = Checked|Any CPU
+		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Debug|x64.Build.0 = Debug|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Release|x64.ActiveCfg = Release|Any CPU
 		{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}.Release|x64.Build.0 = Release|Any CPU
-		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|x64.Build.0 = Debug|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Checked|x64.Build.0 = Checked|Any CPU
+		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Debug|x64.Build.0 = Debug|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Release|x64.ActiveCfg = Release|Any CPU
 		{9291DC28-F3E6-42C4-B2ED-924385BF29DD}.Release|x64.Build.0 = Release|Any CPU
-		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Checked|x64.Build.0 = Checked|Any CPU
+		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Release|x64.ActiveCfg = Release|Any CPU
 		{7A73F51B-46FA-437C-956D-4B493763B0F1}.Release|x64.Build.0 = Release|Any CPU
-		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|x64.Build.0 = Debug|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Checked|x64.Build.0 = Checked|Any CPU
+		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Debug|x64.Build.0 = Debug|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Release|x64.ActiveCfg = Release|Any CPU
 		{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}.Release|x64.Build.0 = Release|Any CPU
-		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|x64.Build.0 = Debug|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Checked|x64.Build.0 = Checked|Any CPU
+		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Debug|x64.Build.0 = Debug|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Release|x64.ActiveCfg = Release|Any CPU
 		{22E3B002-7E30-4262-98DE-88544DD5DFBA}.Release|x64.Build.0 = Release|Any CPU
-		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|x64.Build.0 = Debug|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Checked|x64.Build.0 = Checked|Any CPU
+		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Debug|x64.Build.0 = Debug|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Release|x64.ActiveCfg = Release|Any CPU
 		{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}.Release|x64.Build.0 = Release|Any CPU
-		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Checked|x64.Build.0 = Checked|Any CPU
+		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C67E548-6B13-4924-A623-41991D858EC8}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Release|x64.ActiveCfg = Release|Any CPU
 		{0C67E548-6B13-4924-A623-41991D858EC8}.Release|x64.Build.0 = Release|Any CPU
-		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|x64.Build.0 = Debug|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Checked|x64.Build.0 = Checked|Any CPU
+		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Debug|x64.Build.0 = Debug|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Release|x64.ActiveCfg = Release|Any CPU
 		{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}.Release|x64.Build.0 = Release|Any CPU
-		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Checked|x64.Build.0 = Checked|Any CPU
+		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Release|x64.ActiveCfg = Release|Any CPU
 		{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}.Release|x64.Build.0 = Release|Any CPU
-		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Checked|x64.Build.0 = Checked|Any CPU
+		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Debug|x64.Build.0 = Debug|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Release|x64.ActiveCfg = Release|Any CPU
 		{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}.Release|x64.Build.0 = Release|Any CPU
-		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|x64.Build.0 = Debug|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Checked|x64.Build.0 = Checked|Any CPU
+		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{548A85F7-5474-483F-A5F8-57E8B4238642}.Debug|x64.Build.0 = Debug|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Release|Any CPU.Build.0 = Release|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Release|x64.ActiveCfg = Release|Any CPU
 		{548A85F7-5474-483F-A5F8-57E8B4238642}.Release|x64.Build.0 = Release|Any CPU
-		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Checked|x64.Build.0 = Checked|Any CPU
+		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1B079F4-6571-4462-861C-3600D5A324CD}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Release|x64.ActiveCfg = Release|Any CPU
 		{F1B079F4-6571-4462-861C-3600D5A324CD}.Release|x64.Build.0 = Release|Any CPU
-		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|x64.Build.0 = Debug|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Checked|x64.Build.0 = Checked|Any CPU
+		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Debug|x64.Build.0 = Debug|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Release|x64.ActiveCfg = Release|Any CPU
 		{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}.Release|x64.Build.0 = Release|Any CPU
-		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Checked|x64.Build.0 = Checked|Any CPU
+		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Release|x64.ActiveCfg = Release|Any CPU
 		{C1076745-44FF-46F8-A6C6-E469BFE9E409}.Release|x64.Build.0 = Release|Any CPU
-		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Checked|x64.Build.0 = Checked|Any CPU
+		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Release|x64.ActiveCfg = Release|Any CPU
 		{8A767943-C04E-4E9B-81E6-F41A49E027B0}.Release|x64.Build.0 = Release|Any CPU
-		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|x64.Build.0 = Debug|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Checked|x64.Build.0 = Checked|Any CPU
+		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Debug|x64.Build.0 = Debug|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Release|x64.ActiveCfg = Release|Any CPU
 		{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}.Release|x64.Build.0 = Release|Any CPU
-		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Checked|x64.Build.0 = Checked|Any CPU
+		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Release|x64.ActiveCfg = Release|Any CPU
 		{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}.Release|x64.Build.0 = Release|Any CPU
-		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|x64.Build.0 = Debug|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Checked|x64.Build.0 = Checked|Any CPU
+		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Debug|x64.Build.0 = Debug|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Release|x64.ActiveCfg = Release|Any CPU
 		{DC245710-E244-4AAD-840A-4F19DEBDBC98}.Release|x64.Build.0 = Release|Any CPU
-		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|x64.Build.0 = Debug|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Checked|x64.Build.0 = Checked|Any CPU
+		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Debug|x64.Build.0 = Debug|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Release|x64.ActiveCfg = Release|Any CPU
 		{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}.Release|x64.Build.0 = Release|Any CPU
-		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|x64.Build.0 = Debug|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Checked|x64.Build.0 = Checked|Any CPU
+		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Debug|x64.Build.0 = Debug|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Release|x64.ActiveCfg = Release|Any CPU
 		{F907FD44-6193-4A3D-8452-92CEAF46B919}.Release|x64.Build.0 = Release|Any CPU
-		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|x64.Build.0 = Debug|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Checked|x64.Build.0 = Checked|Any CPU
+		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Debug|x64.Build.0 = Debug|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Release|x64.ActiveCfg = Release|Any CPU
 		{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}.Release|x64.Build.0 = Release|Any CPU
-		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|x64.Build.0 = Debug|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Checked|x64.Build.0 = Checked|Any CPU
+		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Debug|x64.Build.0 = Debug|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Release|x64.ActiveCfg = Release|Any CPU
 		{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}.Release|x64.Build.0 = Release|Any CPU
-		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Checked|x64.Build.0 = Checked|Any CPU
+		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Release|x64.ActiveCfg = Release|Any CPU
 		{FF49C039-4515-478E-A148-6A28A1AC38D9}.Release|x64.Build.0 = Release|Any CPU
-		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|x64.Build.0 = Debug|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Checked|x64.Build.0 = Checked|Any CPU
+		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Debug|x64.Build.0 = Debug|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Release|x64.ActiveCfg = Release|Any CPU
 		{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}.Release|x64.Build.0 = Release|Any CPU
-		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|x64.Build.0 = Debug|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Checked|x64.Build.0 = Checked|Any CPU
+		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Debug|x64.Build.0 = Debug|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Release|x64.ActiveCfg = Release|Any CPU
 		{1A9C53C6-CEA3-49D6-9345-4F6016899183}.Release|x64.Build.0 = Release|Any CPU
-		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|x64.Build.0 = Debug|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Checked|x64.Build.0 = Checked|Any CPU
+		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Debug|x64.Build.0 = Debug|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Release|x64.ActiveCfg = Release|Any CPU
 		{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}.Release|x64.Build.0 = Release|Any CPU
-		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|x64.Build.0 = Debug|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Checked|x64.Build.0 = Checked|Any CPU
+		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{42630210-72E2-463F-8507-49F4D78E60C9}.Debug|x64.Build.0 = Debug|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Release|x64.ActiveCfg = Release|Any CPU
 		{42630210-72E2-463F-8507-49F4D78E60C9}.Release|x64.Build.0 = Release|Any CPU
-		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Checked|x64.Build.0 = Checked|Any CPU
+		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Release|x64.ActiveCfg = Release|Any CPU
 		{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}.Release|x64.Build.0 = Release|Any CPU
-		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Checked|x64.Build.0 = Checked|Any CPU
+		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FF308555-4509-40A5-B990-66378FC9BE3F}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Release|x64.ActiveCfg = Release|Any CPU
 		{FF308555-4509-40A5-B990-66378FC9BE3F}.Release|x64.Build.0 = Release|Any CPU
-		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Checked|x64.Build.0 = Checked|Any CPU
+		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Release|x64.ActiveCfg = Release|Any CPU
 		{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}.Release|x64.Build.0 = Release|Any CPU
-		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|x64.Build.0 = Debug|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Checked|x64.Build.0 = Checked|Any CPU
+		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Debug|x64.Build.0 = Debug|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Release|x64.ActiveCfg = Release|Any CPU
 		{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}.Release|x64.Build.0 = Release|Any CPU
-		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Checked|x64.Build.0 = Checked|Any CPU
+		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Release|x64.ActiveCfg = Release|Any CPU
 		{CF43C188-347D-48F9-A579-DA44539A0FF9}.Release|x64.Build.0 = Release|Any CPU
-		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|x64.Build.0 = Debug|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Checked|x64.Build.0 = Checked|Any CPU
+		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Debug|x64.Build.0 = Debug|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Release|x64.ActiveCfg = Release|Any CPU
 		{C5003221-20FB-4B11-ADFF-9B74AB85E644}.Release|x64.Build.0 = Release|Any CPU
-		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|x64.Build.0 = Debug|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Checked|x64.Build.0 = Checked|Any CPU
+		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Debug|x64.Build.0 = Debug|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Release|x64.ActiveCfg = Release|Any CPU
 		{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}.Release|x64.Build.0 = Release|Any CPU
-		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|x64.Build.0 = Debug|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Checked|x64.Build.0 = Checked|Any CPU
+		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Debug|x64.Build.0 = Debug|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Release|Any CPU.Build.0 = Release|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Release|x64.ActiveCfg = Release|Any CPU
 		{27EF2574-85F6-4344-A8FB-53FF676B2B35}.Release|x64.Build.0 = Release|Any CPU
-		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Checked|x64.Build.0 = Checked|Any CPU
+		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Release|x64.ActiveCfg = Release|Any CPU
 		{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}.Release|x64.Build.0 = Release|Any CPU
-		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Checked|x64.Build.0 = Checked|Any CPU
+		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Release|x64.ActiveCfg = Release|Any CPU
 		{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}.Release|x64.Build.0 = Release|Any CPU
-		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|x64.Build.0 = Debug|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Checked|x64.Build.0 = Checked|Any CPU
+		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Debug|x64.Build.0 = Debug|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Release|x64.ActiveCfg = Release|Any CPU
 		{B1777F72-B4F9-4163-934D-01C5FE94C3A0}.Release|x64.Build.0 = Release|Any CPU
-		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|x64.Build.0 = Debug|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Checked|x64.Build.0 = Checked|Any CPU
+		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Debug|x64.Build.0 = Debug|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Release|x64.ActiveCfg = Release|Any CPU
 		{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}.Release|x64.Build.0 = Release|Any CPU
-		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Checked|x64.Build.0 = Checked|Any CPU
+		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5E080301-62C6-473A-A81E-B6CA4660D910}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Release|x64.ActiveCfg = Release|Any CPU
 		{5E080301-62C6-473A-A81E-B6CA4660D910}.Release|x64.Build.0 = Release|Any CPU
-		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|x64.Build.0 = Debug|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Checked|x64.Build.0 = Checked|Any CPU
+		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Debug|x64.Build.0 = Debug|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Release|x64.ActiveCfg = Release|Any CPU
 		{4C6B201D-B3CB-4532-90CC-BD168C55245B}.Release|x64.Build.0 = Release|Any CPU
-		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|x64.Build.0 = Debug|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Checked|x64.Build.0 = Checked|Any CPU
+		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Debug|x64.Build.0 = Debug|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Release|x64.ActiveCfg = Release|Any CPU
 		{E3B35BC3-48A5-49CF-A7AF-6482668C7925}.Release|x64.Build.0 = Release|Any CPU
-		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|x64.Build.0 = Debug|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Checked|x64.Build.0 = Checked|Any CPU
+		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{616C74B4-061C-4397-B353-55EFA946A066}.Debug|x64.Build.0 = Debug|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Release|Any CPU.Build.0 = Release|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Release|x64.ActiveCfg = Release|Any CPU
 		{616C74B4-061C-4397-B353-55EFA946A066}.Release|x64.Build.0 = Release|Any CPU
-		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|x64.Build.0 = Debug|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Checked|x64.Build.0 = Checked|Any CPU
+		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Debug|x64.Build.0 = Debug|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Release|x64.ActiveCfg = Release|Any CPU
 		{43052CE7-B86C-4348-A8DF-F36649824AF2}.Release|x64.Build.0 = Release|Any CPU
-		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|x64.Build.0 = Debug|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Checked|x64.Build.0 = Checked|Any CPU
+		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{208C8119-B194-4496-B8CE-10792F48127B}.Debug|x64.Build.0 = Debug|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Release|x64.ActiveCfg = Release|Any CPU
 		{208C8119-B194-4496-B8CE-10792F48127B}.Release|x64.Build.0 = Release|Any CPU
-		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Checked|x64.Build.0 = Checked|Any CPU
+		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Release|x64.ActiveCfg = Release|Any CPU
 		{83836C23-C48E-43D3-B4FE-D6B87038B4F3}.Release|x64.Build.0 = Release|Any CPU
-		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|x64.Build.0 = Debug|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Checked|x64.Build.0 = Checked|Any CPU
+		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Debug|x64.Build.0 = Debug|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Release|x64.ActiveCfg = Release|Any CPU
 		{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}.Release|x64.Build.0 = Release|Any CPU
-		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Checked|x64.Build.0 = Checked|Any CPU
+		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Release|x64.ActiveCfg = Release|Any CPU
 		{DA85578A-95B0-46E2-9B6A-9CC632F47468}.Release|x64.Build.0 = Release|Any CPU
-		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|x64.Build.0 = Debug|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Checked|x64.Build.0 = Checked|Any CPU
+		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Debug|x64.Build.0 = Debug|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Release|x64.ActiveCfg = Release|Any CPU
 		{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}.Release|x64.Build.0 = Release|Any CPU
-		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|x64.Build.0 = Debug|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Checked|x64.Build.0 = Checked|Any CPU
+		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Debug|x64.Build.0 = Debug|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Release|x64.ActiveCfg = Release|Any CPU
 		{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}.Release|x64.Build.0 = Release|Any CPU
-		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Checked|x64.Build.0 = Checked|Any CPU
+		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Release|x64.ActiveCfg = Release|Any CPU
 		{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}.Release|x64.Build.0 = Release|Any CPU
-		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Checked|x64.Build.0 = Checked|Any CPU
+		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Release|x64.ActiveCfg = Release|Any CPU
 		{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}.Release|x64.Build.0 = Release|Any CPU
-		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|x64.Build.0 = Debug|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Checked|x64.Build.0 = Checked|Any CPU
+		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Debug|x64.Build.0 = Debug|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Release|x64.ActiveCfg = Release|Any CPU
 		{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}.Release|x64.Build.0 = Release|Any CPU
-		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|x64.Build.0 = Debug|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Checked|x64.Build.0 = Checked|Any CPU
+		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Debug|x64.Build.0 = Debug|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Release|x64.ActiveCfg = Release|Any CPU
 		{59FAFAB9-B2D5-4357-92F2-07529D10D29E}.Release|x64.Build.0 = Release|Any CPU
-		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|x64.Build.0 = Debug|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Checked|x64.Build.0 = Checked|Any CPU
+		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Debug|x64.Build.0 = Debug|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Release|x64.ActiveCfg = Release|Any CPU
 		{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}.Release|x64.Build.0 = Release|Any CPU
-		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|x64.Build.0 = Debug|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Checked|x64.Build.0 = Checked|Any CPU
+		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Debug|x64.Build.0 = Debug|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Release|x64.ActiveCfg = Release|Any CPU
 		{0CB356F0-5EEB-46EA-BA75-E44007B6A527}.Release|x64.Build.0 = Release|Any CPU
-		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|x64.Build.0 = Debug|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Checked|x64.Build.0 = Checked|Any CPU
+		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10344C2D-626F-4D00-81AE-600152A08826}.Debug|x64.Build.0 = Debug|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Release|x64.ActiveCfg = Release|Any CPU
 		{10344C2D-626F-4D00-81AE-600152A08826}.Release|x64.Build.0 = Release|Any CPU
-		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Checked|x64.Build.0 = Checked|Any CPU
+		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Release|x64.ActiveCfg = Release|Any CPU
 		{C6695D0A-0449-45C2-9410-0FA0467594FE}.Release|x64.Build.0 = Release|Any CPU
-		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Checked|x64.Build.0 = Checked|Any CPU
+		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Release|x64.ActiveCfg = Release|Any CPU
 		{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}.Release|x64.Build.0 = Release|Any CPU
-		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|x64.Build.0 = Debug|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Checked|x64.Build.0 = Checked|Any CPU
+		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4DDE0784-48C0-43D0-9104-A3819391E088}.Debug|x64.Build.0 = Debug|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Release|x64.ActiveCfg = Release|Any CPU
 		{4DDE0784-48C0-43D0-9104-A3819391E088}.Release|x64.Build.0 = Release|Any CPU
-		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|x64.Build.0 = Debug|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Checked|x64.Build.0 = Checked|Any CPU
+		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Debug|x64.Build.0 = Debug|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Release|Any CPU.Build.0 = Release|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Release|x64.ActiveCfg = Release|Any CPU
 		{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}.Release|x64.Build.0 = Release|Any CPU
-		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|x64.Build.0 = Debug|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Checked|x64.Build.0 = Checked|Any CPU
+		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Debug|x64.Build.0 = Debug|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Release|x64.ActiveCfg = Release|Any CPU
 		{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}.Release|x64.Build.0 = Release|Any CPU
-		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|x64.Build.0 = Debug|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Checked|x64.Build.0 = Checked|Any CPU
+		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{56492795-B082-4C4D-9754-DA229027FA72}.Debug|x64.Build.0 = Debug|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Release|Any CPU.Build.0 = Release|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Release|x64.ActiveCfg = Release|Any CPU
 		{56492795-B082-4C4D-9754-DA229027FA72}.Release|x64.Build.0 = Release|Any CPU
-		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Checked|x64.Build.0 = Checked|Any CPU
+		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Release|x64.ActiveCfg = Release|Any CPU
 		{E850C367-E4F9-45CF-AD86-003E3147B8B7}.Release|x64.Build.0 = Release|Any CPU
-		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|x64.Build.0 = Debug|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Checked|x64.Build.0 = Checked|Any CPU
+		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Debug|x64.Build.0 = Debug|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Release|x64.ActiveCfg = Release|Any CPU
 		{525ADEB5-7FAF-48B4-B400-65FD55F513A8}.Release|x64.Build.0 = Release|Any CPU
-		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|x64.Build.0 = Debug|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Checked|x64.Build.0 = Checked|Any CPU
+		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7600B247-46FE-42D8-B836-802F3D554EA6}.Debug|x64.Build.0 = Debug|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Release|x64.ActiveCfg = Release|Any CPU
 		{7600B247-46FE-42D8-B836-802F3D554EA6}.Release|x64.Build.0 = Release|Any CPU
-		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|x64.Build.0 = Debug|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Checked|x64.Build.0 = Checked|Any CPU
+		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Debug|x64.Build.0 = Debug|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Release|x64.ActiveCfg = Release|Any CPU
 		{29866FDB-13E5-4263-8C83-C1281A60CFC8}.Release|x64.Build.0 = Release|Any CPU
-		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Checked|x64.Build.0 = Checked|Any CPU
+		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Release|x64.ActiveCfg = Release|Any CPU
 		{A2046A98-4DCF-41E9-8C9A-3255762568BB}.Release|x64.Build.0 = Release|Any CPU
-		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Checked|x64.Build.0 = Checked|Any CPU
+		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Release|x64.ActiveCfg = Release|Any CPU
 		{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}.Release|x64.Build.0 = Release|Any CPU
-		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Checked|x64.Build.0 = Checked|Any CPU
+		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Release|x64.ActiveCfg = Release|Any CPU
 		{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}.Release|x64.Build.0 = Release|Any CPU
-		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|x64.Build.0 = Debug|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Checked|x64.Build.0 = Checked|Any CPU
+		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6761286C-C56B-4249-BB07-12F71A3560E6}.Debug|x64.Build.0 = Debug|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Release|x64.ActiveCfg = Release|Any CPU
 		{6761286C-C56B-4249-BB07-12F71A3560E6}.Release|x64.Build.0 = Release|Any CPU
-		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|x64.Build.0 = Debug|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Checked|x64.Build.0 = Checked|Any CPU
+		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A14EB7B1-D53D-413B-A605-308B16365797}.Debug|x64.Build.0 = Debug|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Release|x64.ActiveCfg = Release|Any CPU
 		{A14EB7B1-D53D-413B-A605-308B16365797}.Release|x64.Build.0 = Release|Any CPU
-		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|x64.Build.0 = Debug|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Checked|x64.Build.0 = Checked|Any CPU
+		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Debug|x64.Build.0 = Debug|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Release|Any CPU.Build.0 = Release|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Release|x64.ActiveCfg = Release|Any CPU
 		{483F68B7-0346-4C1D-BFD8-2438CDA4E216}.Release|x64.Build.0 = Release|Any CPU
-		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|x64.Build.0 = Debug|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Checked|x64.Build.0 = Checked|Any CPU
+		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Debug|x64.Build.0 = Debug|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Release|x64.ActiveCfg = Release|Any CPU
 		{AC13ED14-FCED-40A6-A689-87B847A71A44}.Release|x64.Build.0 = Release|Any CPU
-		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|x64.Build.0 = Debug|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Checked|x64.Build.0 = Checked|Any CPU
+		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8144FE5F-7A00-43F6-8F40-C33951625630}.Debug|x64.Build.0 = Debug|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Release|x64.ActiveCfg = Release|Any CPU
 		{8144FE5F-7A00-43F6-8F40-C33951625630}.Release|x64.Build.0 = Release|Any CPU
-		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|x64.Build.0 = Debug|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Checked|x64.Build.0 = Checked|Any CPU
+		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Debug|x64.Build.0 = Debug|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Release|x64.ActiveCfg = Release|Any CPU
 		{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}.Release|x64.Build.0 = Release|Any CPU
-		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|x64.Build.0 = Debug|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Checked|x64.Build.0 = Checked|Any CPU
+		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{273951C4-81A9-4326-BF46-31D56CA3B416}.Debug|x64.Build.0 = Debug|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Release|Any CPU.Build.0 = Release|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Release|x64.ActiveCfg = Release|Any CPU
 		{273951C4-81A9-4326-BF46-31D56CA3B416}.Release|x64.Build.0 = Release|Any CPU
-		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|x64.Build.0 = Debug|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Checked|x64.Build.0 = Checked|Any CPU
+		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Debug|x64.Build.0 = Debug|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Release|x64.ActiveCfg = Release|Any CPU
 		{0D30946A-1C07-4347-9C85-E62D017B6F58}.Release|x64.Build.0 = Release|Any CPU
-		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|x64.Build.0 = Debug|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Checked|x64.Build.0 = Checked|Any CPU
+		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1F808F80-1B46-476A-8129-60B93DAE2301}.Debug|x64.Build.0 = Debug|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Release|x64.ActiveCfg = Release|Any CPU
 		{1F808F80-1B46-476A-8129-60B93DAE2301}.Release|x64.Build.0 = Release|Any CPU
-		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|x64.Build.0 = Debug|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Checked|x64.Build.0 = Checked|Any CPU
+		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Debug|x64.Build.0 = Debug|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Release|x64.ActiveCfg = Release|Any CPU
 		{4473117B-E775-4328-8F5D-B6AB38774AB2}.Release|x64.Build.0 = Release|Any CPU
-		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Checked|x64.Build.0 = Checked|Any CPU
+		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FF309582-6138-4A73-B058-C5DD57C5E796}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Release|x64.ActiveCfg = Release|Any CPU
 		{FF309582-6138-4A73-B058-C5DD57C5E796}.Release|x64.Build.0 = Release|Any CPU
-		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|x64.Build.0 = Debug|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Checked|x64.Build.0 = Checked|Any CPU
+		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Debug|x64.Build.0 = Debug|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Release|x64.ActiveCfg = Release|Any CPU
 		{AB9A667E-75FC-41E7-B521-CE80A3340C39}.Release|x64.Build.0 = Release|Any CPU
-		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|x64.Build.0 = Debug|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Checked|x64.Build.0 = Checked|Any CPU
+		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{151EC427-404B-4583-950C-10DCB25FFB8B}.Debug|x64.Build.0 = Debug|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Release|x64.ActiveCfg = Release|Any CPU
 		{151EC427-404B-4583-950C-10DCB25FFB8B}.Release|x64.Build.0 = Release|Any CPU
-		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Checked|x64.Build.0 = Checked|Any CPU
+		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Release|x64.ActiveCfg = Release|Any CPU
 		{666A1E0A-7B7E-4FEA-A709-89B8106126B7}.Release|x64.Build.0 = Release|Any CPU
-		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|x64.Build.0 = Debug|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Checked|x64.Build.0 = Checked|Any CPU
+		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Debug|x64.Build.0 = Debug|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Release|Any CPU.Build.0 = Release|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Release|x64.ActiveCfg = Release|Any CPU
 		{949C72E3-78EF-4A5F-A435-B6A9178FC764}.Release|x64.Build.0 = Release|Any CPU
-		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Checked|x64.Build.0 = Checked|Any CPU
+		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Release|x64.ActiveCfg = Release|Any CPU
 		{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}.Release|x64.Build.0 = Release|Any CPU
-		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|x64.Build.0 = Debug|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Checked|x64.Build.0 = Checked|Any CPU
+		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Debug|x64.Build.0 = Debug|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Release|x64.ActiveCfg = Release|Any CPU
 		{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}.Release|x64.Build.0 = Release|Any CPU
-		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|x64.Build.0 = Debug|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Checked|x64.Build.0 = Checked|Any CPU
+		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{65F673F3-86E3-4876-A411-A51B45D54F85}.Debug|x64.Build.0 = Debug|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Release|Any CPU.Build.0 = Release|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Release|x64.ActiveCfg = Release|Any CPU
 		{65F673F3-86E3-4876-A411-A51B45D54F85}.Release|x64.Build.0 = Release|Any CPU
-		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|x64.Build.0 = Debug|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Checked|x64.Build.0 = Checked|Any CPU
+		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23702DA7-B13D-41CD-B371-C85937BF8120}.Debug|x64.Build.0 = Debug|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Release|Any CPU.Build.0 = Release|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Release|x64.ActiveCfg = Release|Any CPU
 		{23702DA7-B13D-41CD-B371-C85937BF8120}.Release|x64.Build.0 = Release|Any CPU
-		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|x64.Build.0 = Debug|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Checked|x64.Build.0 = Checked|Any CPU
+		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Debug|x64.Build.0 = Debug|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Release|x64.ActiveCfg = Release|Any CPU
 		{FD0D2C89-B029-4737-B625-93523ADBA96E}.Release|x64.Build.0 = Release|Any CPU
-		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|x64.Build.0 = Debug|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Checked|x64.Build.0 = Checked|Any CPU
+		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Debug|x64.Build.0 = Debug|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Release|x64.ActiveCfg = Release|Any CPU
 		{A356404D-40C5-4839-843B-B3D23B38F4F6}.Release|x64.Build.0 = Release|Any CPU
-		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|x64.Build.0 = Debug|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Checked|x64.Build.0 = Checked|Any CPU
+		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Debug|x64.Build.0 = Debug|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Release|x64.ActiveCfg = Release|Any CPU
 		{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}.Release|x64.Build.0 = Release|Any CPU
-		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|x64.Build.0 = Debug|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Checked|x64.Build.0 = Checked|Any CPU
+		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Debug|x64.Build.0 = Debug|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Release|x64.ActiveCfg = Release|Any CPU
 		{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}.Release|x64.Build.0 = Release|Any CPU
-		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|x64.Build.0 = Debug|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Checked|x64.Build.0 = Checked|Any CPU
+		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Debug|x64.Build.0 = Debug|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Release|x64.ActiveCfg = Release|Any CPU
 		{1A799F59-EED6-41DA-9952-B2999E4548C9}.Release|x64.Build.0 = Release|Any CPU
-		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|x64.Build.0 = Debug|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Checked|x64.Build.0 = Checked|Any CPU
+		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Debug|x64.Build.0 = Debug|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Release|x64.ActiveCfg = Release|Any CPU
 		{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}.Release|x64.Build.0 = Release|Any CPU
-		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Checked|x64.Build.0 = Checked|Any CPU
+		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Release|x64.ActiveCfg = Release|Any CPU
 		{E712666D-E63C-4FB8-99A6-B690ECEC64E3}.Release|x64.Build.0 = Release|Any CPU
-		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|x64.Build.0 = Debug|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Checked|x64.Build.0 = Checked|Any CPU
+		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C69F3959-C027-439B-B851-253BBCF71E0C}.Debug|x64.Build.0 = Debug|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Release|x64.ActiveCfg = Release|Any CPU
 		{C69F3959-C027-439B-B851-253BBCF71E0C}.Release|x64.Build.0 = Release|Any CPU
-		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Checked|x64.Build.0 = Checked|Any CPU
+		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Release|x64.ActiveCfg = Release|Any CPU
 		{20DD6027-635F-409C-8313-6A6E89AE71C6}.Release|x64.Build.0 = Release|Any CPU
-		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|x64.Build.0 = Debug|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Checked|x64.Build.0 = Checked|Any CPU
+		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Debug|x64.Build.0 = Debug|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Release|x64.ActiveCfg = Release|Any CPU
 		{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}.Release|x64.Build.0 = Release|Any CPU
-		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|x64.Build.0 = Debug|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Checked|x64.Build.0 = Checked|Any CPU
+		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Debug|x64.Build.0 = Debug|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Release|x64.ActiveCfg = Release|Any CPU
 		{211C7C2F-8474-4BA6-B46E-DA820B1992B5}.Release|x64.Build.0 = Release|Any CPU
-		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|x64.Build.0 = Debug|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Checked|x64.Build.0 = Checked|Any CPU
+		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2798FCA2-258E-4E32-BB71-95518A239579}.Debug|x64.Build.0 = Debug|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Release|x64.ActiveCfg = Release|Any CPU
 		{2798FCA2-258E-4E32-BB71-95518A239579}.Release|x64.Build.0 = Release|Any CPU
-		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|x64.Build.0 = Debug|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Checked|x64.Build.0 = Checked|Any CPU
+		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Debug|x64.Build.0 = Debug|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Release|Any CPU.Build.0 = Release|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Release|x64.ActiveCfg = Release|Any CPU
 		{37B10A10-D699-4CB0-A5C0-B5A949AC2304}.Release|x64.Build.0 = Release|Any CPU
-		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|x64.Build.0 = Debug|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Checked|x64.Build.0 = Checked|Any CPU
+		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Debug|x64.Build.0 = Debug|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Release|x64.ActiveCfg = Release|Any CPU
 		{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}.Release|x64.Build.0 = Release|Any CPU
-		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|x64.Build.0 = Debug|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Checked|x64.Build.0 = Checked|Any CPU
+		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Debug|x64.Build.0 = Debug|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Release|Any CPU.Build.0 = Release|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Release|x64.ActiveCfg = Release|Any CPU
 		{299750E6-91B0-4E77-BEEB-1AB96761D860}.Release|x64.Build.0 = Release|Any CPU
-		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|x64.Build.0 = Debug|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Checked|x64.Build.0 = Checked|Any CPU
+		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Debug|x64.Build.0 = Debug|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Release|x64.ActiveCfg = Release|Any CPU
 		{76CBC4E9-4702-4709-B739-FC928AEE879B}.Release|x64.Build.0 = Release|Any CPU
-		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|x64.Build.0 = Debug|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Checked|x64.Build.0 = Checked|Any CPU
+		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3AB92143-46C6-4678-83CA-08998544B96A}.Debug|x64.Build.0 = Debug|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Release|x64.ActiveCfg = Release|Any CPU
 		{3AB92143-46C6-4678-83CA-08998544B96A}.Release|x64.Build.0 = Release|Any CPU
-		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|x64.Build.0 = Debug|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Checked|x64.Build.0 = Checked|Any CPU
+		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Debug|x64.Build.0 = Debug|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Release|x64.ActiveCfg = Release|Any CPU
 		{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}.Release|x64.Build.0 = Release|Any CPU
-		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Checked|x64.Build.0 = Checked|Any CPU
+		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFB05742-010A-43FC-999C-6BBE0E195108}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Release|x64.ActiveCfg = Release|Any CPU
 		{BFB05742-010A-43FC-999C-6BBE0E195108}.Release|x64.Build.0 = Release|Any CPU
-		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|x64.Build.0 = Debug|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Checked|x64.Build.0 = Checked|Any CPU
+		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Debug|x64.Build.0 = Debug|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Release|x64.ActiveCfg = Release|Any CPU
 		{C5E60D76-6428-472C-A893-234B58ABC3A7}.Release|x64.Build.0 = Release|Any CPU
-		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|x64.Build.0 = Debug|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Checked|x64.Build.0 = Checked|Any CPU
+		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Debug|x64.Build.0 = Debug|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Release|x64.ActiveCfg = Release|Any CPU
 		{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}.Release|x64.Build.0 = Release|Any CPU
-		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|x64.Build.0 = Debug|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Checked|x64.Build.0 = Checked|Any CPU
+		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB357669-6C23-4F7E-933F-677B2B83023D}.Debug|x64.Build.0 = Debug|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Release|x64.ActiveCfg = Release|Any CPU
 		{DB357669-6C23-4F7E-933F-677B2B83023D}.Release|x64.Build.0 = Release|Any CPU
-		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|x64.Build.0 = Debug|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Checked|x64.Build.0 = Checked|Any CPU
+		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Debug|x64.Build.0 = Debug|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Release|x64.ActiveCfg = Release|Any CPU
 		{B346CE86-77B4-46BB-9D1E-0206B64F2210}.Release|x64.Build.0 = Release|Any CPU
-		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Checked|x64.Build.0 = Checked|Any CPU
+		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Release|x64.ActiveCfg = Release|Any CPU
 		{4A4C968D-35A0-4577-A68F-BD0122B53C68}.Release|x64.Build.0 = Release|Any CPU
-		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|x64.Build.0 = Debug|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Checked|x64.Build.0 = Checked|Any CPU
+		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F625B760-9258-4469-BB48-D9458E67612D}.Debug|x64.Build.0 = Debug|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Release|x64.ActiveCfg = Release|Any CPU
 		{F625B760-9258-4469-BB48-D9458E67612D}.Release|x64.Build.0 = Release|Any CPU
-		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|x64.Build.0 = Debug|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Checked|x64.Build.0 = Checked|Any CPU
+		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{878B4003-5746-4FD8-AB71-576EB6747746}.Debug|x64.Build.0 = Debug|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Release|Any CPU.Build.0 = Release|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Release|x64.ActiveCfg = Release|Any CPU
 		{878B4003-5746-4FD8-AB71-576EB6747746}.Release|x64.Build.0 = Release|Any CPU
-		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|x64.Build.0 = Debug|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Checked|x64.Build.0 = Checked|Any CPU
+		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Debug|x64.Build.0 = Debug|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Release|Any CPU.Build.0 = Release|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Release|x64.ActiveCfg = Release|Any CPU
 		{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}.Release|x64.Build.0 = Release|Any CPU
-		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|x64.Build.0 = Debug|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Checked|x64.Build.0 = Checked|Any CPU
+		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D1795849-657A-4479-B5A3-F20431C63A72}.Debug|x64.Build.0 = Debug|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Release|x64.ActiveCfg = Release|Any CPU
 		{D1795849-657A-4479-B5A3-F20431C63A72}.Release|x64.Build.0 = Release|Any CPU
-		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|x64.Build.0 = Debug|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Checked|x64.Build.0 = Checked|Any CPU
+		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Debug|x64.Build.0 = Debug|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Release|x64.ActiveCfg = Release|Any CPU
 		{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}.Release|x64.Build.0 = Release|Any CPU
-		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|x64.Build.0 = Debug|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Checked|x64.Build.0 = Checked|Any CPU
+		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Debug|x64.Build.0 = Debug|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Release|x64.ActiveCfg = Release|Any CPU
 		{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}.Release|x64.Build.0 = Release|Any CPU
-		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|x64.Build.0 = Debug|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Checked|x64.Build.0 = Checked|Any CPU
+		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Debug|x64.Build.0 = Debug|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Release|x64.ActiveCfg = Release|Any CPU
 		{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}.Release|x64.Build.0 = Release|Any CPU
-		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|x64.Build.0 = Debug|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Checked|x64.Build.0 = Checked|Any CPU
+		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Debug|x64.Build.0 = Debug|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Release|x64.ActiveCfg = Release|Any CPU
 		{7BC300A1-FD27-4485-9E8E-E065E82F6393}.Release|x64.Build.0 = Release|Any CPU
-		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|x64.Build.0 = Debug|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Checked|x64.Build.0 = Checked|Any CPU
+		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Debug|x64.Build.0 = Debug|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Release|Any CPU.Build.0 = Release|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Release|x64.ActiveCfg = Release|Any CPU
 		{83885718-D3DC-4E70-AC83-6D0A83891D35}.Release|x64.Build.0 = Release|Any CPU
-		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|x64.Build.0 = Debug|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Checked|x64.Build.0 = Checked|Any CPU
+		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Debug|x64.Build.0 = Debug|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Release|x64.ActiveCfg = Release|Any CPU
 		{07A629B8-C886-4581-BBDD-E02F27834E7D}.Release|x64.Build.0 = Release|Any CPU
-		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Checked|x64.Build.0 = Checked|Any CPU
+		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Release|x64.ActiveCfg = Release|Any CPU
 		{0B6A35C1-A609-4C38-BF28-8B91393FFD96}.Release|x64.Build.0 = Release|Any CPU
-		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|x64.Build.0 = Debug|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Checked|x64.Build.0 = Checked|Any CPU
+		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Debug|x64.Build.0 = Debug|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Release|x64.ActiveCfg = Release|Any CPU
 		{290E6251-A87B-4D85-A45D-8036E1B2499F}.Release|x64.Build.0 = Release|Any CPU
-		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Checked|x64.Build.0 = Checked|Any CPU
+		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Release|x64.ActiveCfg = Release|Any CPU
 		{DBA3CBE0-5201-4FA5-B75E-641110A8667C}.Release|x64.Build.0 = Release|Any CPU
-		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|x64.Build.0 = Debug|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Checked|x64.Build.0 = Checked|Any CPU
+		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Debug|x64.Build.0 = Debug|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Release|x64.ActiveCfg = Release|Any CPU
 		{5AA71946-DB07-4B6A-9BAE-596BED827F8D}.Release|x64.Build.0 = Release|Any CPU
-		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|x64.Build.0 = Debug|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Checked|x64.Build.0 = Checked|Any CPU
+		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B423676C-EB2B-491A-B464-BD7DA461079A}.Debug|x64.Build.0 = Debug|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Release|x64.ActiveCfg = Release|Any CPU
 		{B423676C-EB2B-491A-B464-BD7DA461079A}.Release|x64.Build.0 = Release|Any CPU
-		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|x64.Build.0 = Debug|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Checked|x64.Build.0 = Checked|Any CPU
+		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7B091221-8500-461F-8AB8-0C446D4BB605}.Debug|x64.Build.0 = Debug|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Release|x64.ActiveCfg = Release|Any CPU
 		{7B091221-8500-461F-8AB8-0C446D4BB605}.Release|x64.Build.0 = Release|Any CPU
-		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Checked|x64.Build.0 = Checked|Any CPU
+		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Release|x64.ActiveCfg = Release|Any CPU
 		{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}.Release|x64.Build.0 = Release|Any CPU
-		{391BE933-E506-48E6-AD43-866852E16602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{391BE933-E506-48E6-AD43-866852E16602}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{391BE933-E506-48E6-AD43-866852E16602}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{391BE933-E506-48E6-AD43-866852E16602}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{391BE933-E506-48E6-AD43-866852E16602}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{391BE933-E506-48E6-AD43-866852E16602}.Debug|x64.Build.0 = Debug|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Checked|x64.Build.0 = Checked|Any CPU
+		{391BE933-E506-48E6-AD43-866852E16602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{391BE933-E506-48E6-AD43-866852E16602}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{391BE933-E506-48E6-AD43-866852E16602}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{391BE933-E506-48E6-AD43-866852E16602}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{391BE933-E506-48E6-AD43-866852E16602}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{391BE933-E506-48E6-AD43-866852E16602}.Debug|x64.Build.0 = Debug|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Release|Any CPU.Build.0 = Release|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Release|x64.ActiveCfg = Release|Any CPU
 		{391BE933-E506-48E6-AD43-866852E16602}.Release|x64.Build.0 = Release|Any CPU
-		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|x64.Build.0 = Debug|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Checked|x64.Build.0 = Checked|Any CPU
+		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Debug|x64.Build.0 = Debug|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Release|x64.ActiveCfg = Release|Any CPU
 		{708E31E2-7DDD-42D7-8DC9-8E32514A006B}.Release|x64.Build.0 = Release|Any CPU
-		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|x64.Build.0 = Debug|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Checked|x64.Build.0 = Checked|Any CPU
+		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Debug|x64.Build.0 = Debug|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Release|x64.ActiveCfg = Release|Any CPU
 		{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}.Release|x64.Build.0 = Release|Any CPU
-		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|x64.Build.0 = Debug|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Checked|x64.Build.0 = Checked|Any CPU
+		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{32B9796D-5D11-4642-8DE0-45C149041059}.Debug|x64.Build.0 = Debug|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Release|Any CPU.Build.0 = Release|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Release|x64.ActiveCfg = Release|Any CPU
 		{32B9796D-5D11-4642-8DE0-45C149041059}.Release|x64.Build.0 = Release|Any CPU
-		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|x64.Build.0 = Debug|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Checked|x64.Build.0 = Checked|Any CPU
+		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Debug|x64.Build.0 = Debug|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Release|x64.ActiveCfg = Release|Any CPU
 		{5539D57F-8648-4E7A-91A2-2A2A06C538AA}.Release|x64.Build.0 = Release|Any CPU
-		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|x64.Build.0 = Debug|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Checked|x64.Build.0 = Checked|Any CPU
+		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Debug|x64.Build.0 = Debug|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Release|x64.ActiveCfg = Release|Any CPU
 		{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}.Release|x64.Build.0 = Release|Any CPU
-		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|x64.Build.0 = Debug|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Checked|x64.Build.0 = Checked|Any CPU
+		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Debug|x64.Build.0 = Debug|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Release|x64.ActiveCfg = Release|Any CPU
 		{507762C5-DC51-47AB-AADB-5B44ABE0B01B}.Release|x64.Build.0 = Release|Any CPU
-		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|x64.Build.0 = Debug|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Checked|x64.Build.0 = Checked|Any CPU
+		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Debug|x64.Build.0 = Debug|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Release|x64.ActiveCfg = Release|Any CPU
 		{BD7E4344-FEE5-43C9-A9BD-43F75583C030}.Release|x64.Build.0 = Release|Any CPU
-		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Checked|x64.Build.0 = Checked|Any CPU
+		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Release|x64.ActiveCfg = Release|Any CPU
 		{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}.Release|x64.Build.0 = Release|Any CPU
-		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|x64.Build.0 = Debug|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Checked|x64.Build.0 = Checked|Any CPU
+		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Debug|x64.Build.0 = Debug|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Release|x64.ActiveCfg = Release|Any CPU
 		{4D7B3353-6E2F-4B1F-9C71-C67109413257}.Release|x64.Build.0 = Release|Any CPU
-		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Checked|x64.Build.0 = Checked|Any CPU
+		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Release|x64.ActiveCfg = Release|Any CPU
 		{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}.Release|x64.Build.0 = Release|Any CPU
-		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|x64.Build.0 = Debug|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Checked|x64.Build.0 = Checked|Any CPU
+		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Debug|x64.Build.0 = Debug|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Release|x64.ActiveCfg = Release|Any CPU
 		{E847FF15-94E0-46F8-AC9B-9337D5433F82}.Release|x64.Build.0 = Release|Any CPU
-		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|x64.Build.0 = Debug|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Checked|x64.Build.0 = Checked|Any CPU
+		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Debug|x64.Build.0 = Debug|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Release|x64.ActiveCfg = Release|Any CPU
 		{8AAC1E98-E824-4F45-9976-B6C45573EA79}.Release|x64.Build.0 = Release|Any CPU
-		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Checked|x64.Build.0 = Checked|Any CPU
+		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Release|x64.ActiveCfg = Release|Any CPU
 		{8D757677-B479-4E9E-9FCC-9FE05FBC6093}.Release|x64.Build.0 = Release|Any CPU
-		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|x64.Build.0 = Debug|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Checked|x64.Build.0 = Checked|Any CPU
+		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Debug|x64.Build.0 = Debug|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Release|x64.ActiveCfg = Release|Any CPU
 		{C00BD68E-BF60-4A02-9386-C0D811E1098A}.Release|x64.Build.0 = Release|Any CPU
-		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Checked|x64.Build.0 = Checked|Any CPU
+		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Release|x64.ActiveCfg = Release|Any CPU
 		{A0A700E5-A48E-4F89-B247-C2150472B1FD}.Release|x64.Build.0 = Release|Any CPU
-		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|x64.Build.0 = Debug|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Checked|x64.Build.0 = Checked|Any CPU
+		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{842BD77D-3500-409C-B61C-B48C4203CD79}.Debug|x64.Build.0 = Debug|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Release|Any CPU.Build.0 = Release|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Release|x64.ActiveCfg = Release|Any CPU
 		{842BD77D-3500-409C-B61C-B48C4203CD79}.Release|x64.Build.0 = Release|Any CPU
-		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|x64.Build.0 = Debug|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Checked|x64.Build.0 = Checked|Any CPU
+		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Debug|x64.Build.0 = Debug|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Release|x64.ActiveCfg = Release|Any CPU
 		{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}.Release|x64.Build.0 = Release|Any CPU
-		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Checked|x64.Build.0 = Checked|Any CPU
+		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Release|x64.ActiveCfg = Release|Any CPU
 		{6FB5F31D-7D7E-4708-8454-4BDA558499B6}.Release|x64.Build.0 = Release|Any CPU
-		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|x64.Build.0 = Debug|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Checked|x64.Build.0 = Checked|Any CPU
+		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Debug|x64.Build.0 = Debug|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Release|Any CPU.Build.0 = Release|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Release|x64.ActiveCfg = Release|Any CPU
 		{51B02585-4E58-47F9-A0AC-1A71E48B8D40}.Release|x64.Build.0 = Release|Any CPU
-		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|x64.Build.0 = Debug|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Checked|x64.Build.0 = Checked|Any CPU
+		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{746ED3A3-E1C1-4815-961F-217A95876E08}.Debug|x64.Build.0 = Debug|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Release|Any CPU.Build.0 = Release|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Release|x64.ActiveCfg = Release|Any CPU
 		{746ED3A3-E1C1-4815-961F-217A95876E08}.Release|x64.Build.0 = Release|Any CPU
-		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|x64.Build.0 = Debug|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Checked|x64.Build.0 = Checked|Any CPU
+		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Debug|x64.Build.0 = Debug|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Release|x64.ActiveCfg = Release|Any CPU
 		{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}.Release|x64.Build.0 = Release|Any CPU
-		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|x64.Build.0 = Debug|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Checked|x64.Build.0 = Checked|Any CPU
+		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{055505F2-8161-4968-82CF-BB5DAC090C81}.Debug|x64.Build.0 = Debug|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Release|Any CPU.Build.0 = Release|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Release|x64.ActiveCfg = Release|Any CPU
 		{055505F2-8161-4968-82CF-BB5DAC090C81}.Release|x64.Build.0 = Release|Any CPU
-		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|x64.Build.0 = Debug|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Checked|x64.Build.0 = Checked|Any CPU
+		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Debug|x64.Build.0 = Debug|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Release|x64.ActiveCfg = Release|Any CPU
 		{03FC92DA-B0B0-4211-AFF9-77CEF912942E}.Release|x64.Build.0 = Release|Any CPU
-		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|x64.Build.0 = Debug|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Checked|x64.Build.0 = Checked|Any CPU
+		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9FF725EF-6847-445D-AB69-343E35543CAB}.Debug|x64.Build.0 = Debug|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Release|x64.ActiveCfg = Release|Any CPU
 		{9FF725EF-6847-445D-AB69-343E35543CAB}.Release|x64.Build.0 = Release|Any CPU
-		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|x64.Build.0 = Debug|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Checked|x64.Build.0 = Checked|Any CPU
+		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Debug|x64.Build.0 = Debug|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Release|x64.ActiveCfg = Release|Any CPU
 		{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}.Release|x64.Build.0 = Release|Any CPU
-		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|x64.Build.0 = Debug|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Checked|x64.Build.0 = Checked|Any CPU
+		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Debug|x64.Build.0 = Debug|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Release|x64.ActiveCfg = Release|Any CPU
 		{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}.Release|x64.Build.0 = Release|Any CPU
-		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Checked|x64.Build.0 = Checked|Any CPU
+		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{500FBE98-A9F7-4958-948D-D161E96796B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Release|x64.ActiveCfg = Release|Any CPU
 		{500FBE98-A9F7-4958-948D-D161E96796B4}.Release|x64.Build.0 = Release|Any CPU
-		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Checked|x64.Build.0 = Checked|Any CPU
+		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Release|x64.ActiveCfg = Release|Any CPU
 		{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}.Release|x64.Build.0 = Release|Any CPU
-		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|x64.Build.0 = Debug|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Checked|x64.Build.0 = Checked|Any CPU
+		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Debug|x64.Build.0 = Debug|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Release|x64.ActiveCfg = Release|Any CPU
 		{60BD58AE-B377-4AA5-82F3-49484A8A995A}.Release|x64.Build.0 = Release|Any CPU
-		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|x64.Build.0 = Debug|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Checked|x64.Build.0 = Checked|Any CPU
+		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Debug|x64.Build.0 = Debug|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Release|Any CPU.Build.0 = Release|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Release|x64.ActiveCfg = Release|Any CPU
 		{068F2B0A-443C-491D-87E0-89A4D9F12923}.Release|x64.Build.0 = Release|Any CPU
-		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|x64.Build.0 = Debug|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Checked|x64.Build.0 = Checked|Any CPU
+		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4574F673-D343-4EA2-A466-6B9424620B3E}.Debug|x64.Build.0 = Debug|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Release|x64.ActiveCfg = Release|Any CPU
 		{4574F673-D343-4EA2-A466-6B9424620B3E}.Release|x64.Build.0 = Release|Any CPU
-		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|x64.Build.0 = Debug|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Checked|x64.Build.0 = Checked|Any CPU
+		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Debug|x64.Build.0 = Debug|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Release|x64.ActiveCfg = Release|Any CPU
 		{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}.Release|x64.Build.0 = Release|Any CPU
-		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|x64.Build.0 = Debug|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Checked|x64.Build.0 = Checked|Any CPU
+		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Debug|x64.Build.0 = Debug|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Release|x64.ActiveCfg = Release|Any CPU
 		{8F6D34BF-B0BC-4A54-884E-46BAD7906979}.Release|x64.Build.0 = Release|Any CPU
-		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|x64.Build.0 = Debug|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Checked|x64.Build.0 = Checked|Any CPU
+		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{37B4859A-768F-49D4-992B-74F745A1B76F}.Debug|x64.Build.0 = Debug|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Release|x64.ActiveCfg = Release|Any CPU
 		{37B4859A-768F-49D4-992B-74F745A1B76F}.Release|x64.Build.0 = Release|Any CPU
-		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Checked|x64.Build.0 = Checked|Any CPU
+		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Debug|x64.Build.0 = Debug|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Release|x64.ActiveCfg = Release|Any CPU
 		{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}.Release|x64.Build.0 = Release|Any CPU
-		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|x64.Build.0 = Debug|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Checked|x64.Build.0 = Checked|Any CPU
+		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{93353512-05DF-470D-9E61-EC736AED7CBB}.Debug|x64.Build.0 = Debug|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Release|x64.ActiveCfg = Release|Any CPU
 		{93353512-05DF-470D-9E61-EC736AED7CBB}.Release|x64.Build.0 = Release|Any CPU
-		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Checked|x64.Build.0 = Checked|Any CPU
+		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Release|x64.ActiveCfg = Release|Any CPU
 		{D43FA9C7-1EAA-4A51-9527-0497780EE28C}.Release|x64.Build.0 = Release|Any CPU
-		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|x64.Build.0 = Debug|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Checked|x64.Build.0 = Checked|Any CPU
+		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Debug|x64.Build.0 = Debug|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Release|x64.ActiveCfg = Release|Any CPU
 		{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}.Release|x64.Build.0 = Release|Any CPU
-		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|x64.Build.0 = Debug|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Checked|x64.Build.0 = Checked|Any CPU
+		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Debug|x64.Build.0 = Debug|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Release|x64.ActiveCfg = Release|Any CPU
 		{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}.Release|x64.Build.0 = Release|Any CPU
-		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Checked|x64.Build.0 = Checked|Any CPU
+		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Release|x64.ActiveCfg = Release|Any CPU
 		{C16861BF-4E41-4938-B299-23ACACC9BD4D}.Release|x64.Build.0 = Release|Any CPU
-		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|x64.Build.0 = Debug|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Checked|x64.Build.0 = Checked|Any CPU
+		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Debug|x64.Build.0 = Debug|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Release|x64.ActiveCfg = Release|Any CPU
 		{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}.Release|x64.Build.0 = Release|Any CPU
-		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|x64.Build.0 = Debug|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Checked|x64.Build.0 = Checked|Any CPU
+		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Debug|x64.Build.0 = Debug|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Release|x64.ActiveCfg = Release|Any CPU
 		{B4C7EC4E-86E7-4971-936A-E026CD1030FA}.Release|x64.Build.0 = Release|Any CPU
-		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|x64.Build.0 = Debug|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Checked|x64.Build.0 = Checked|Any CPU
+		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Debug|x64.Build.0 = Debug|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Release|x64.ActiveCfg = Release|Any CPU
 		{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}.Release|x64.Build.0 = Release|Any CPU
-		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|x64.Build.0 = Debug|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Checked|x64.Build.0 = Checked|Any CPU
+		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D01798FD-2762-4684-B994-5A9E62401B09}.Debug|x64.Build.0 = Debug|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Release|x64.ActiveCfg = Release|Any CPU
 		{D01798FD-2762-4684-B994-5A9E62401B09}.Release|x64.Build.0 = Release|Any CPU
-		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|x64.Build.0 = Debug|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Checked|x64.Build.0 = Checked|Any CPU
+		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Debug|x64.Build.0 = Debug|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Release|x64.ActiveCfg = Release|Any CPU
 		{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}.Release|x64.Build.0 = Release|Any CPU
-		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|x64.Build.0 = Debug|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Checked|x64.Build.0 = Checked|Any CPU
+		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Debug|x64.Build.0 = Debug|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Release|x64.ActiveCfg = Release|Any CPU
 		{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}.Release|x64.Build.0 = Release|Any CPU
-		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Checked|x64.Build.0 = Checked|Any CPU
+		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Release|x64.ActiveCfg = Release|Any CPU
 		{3E236884-A6EF-4B33-9FFC-D42E4B012405}.Release|x64.Build.0 = Release|Any CPU
-		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|x64.Build.0 = Debug|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Checked|x64.Build.0 = Checked|Any CPU
+		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Debug|x64.Build.0 = Debug|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Release|x64.ActiveCfg = Release|Any CPU
 		{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}.Release|x64.Build.0 = Release|Any CPU
-		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Checked|x64.Build.0 = Checked|Any CPU
+		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Release|x64.ActiveCfg = Release|Any CPU
 		{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}.Release|x64.Build.0 = Release|Any CPU
-		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Checked|x64.Build.0 = Checked|Any CPU
+		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Release|x64.ActiveCfg = Release|Any CPU
 		{AC25B4EE-B099-488B-9A81-CCC51080D5C7}.Release|x64.Build.0 = Release|Any CPU
-		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|x64.Build.0 = Debug|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Checked|x64.Build.0 = Checked|Any CPU
+		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Debug|x64.Build.0 = Debug|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Release|x64.ActiveCfg = Release|Any CPU
 		{E33CA01E-20FC-48A3-817C-1B199F30D03B}.Release|x64.Build.0 = Release|Any CPU
-		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Checked|x64.Build.0 = Checked|Any CPU
+		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Debug|x64.Build.0 = Debug|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Release|x64.ActiveCfg = Release|Any CPU
 		{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}.Release|x64.Build.0 = Release|Any CPU
-		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Checked|x64.Build.0 = Checked|Any CPU
+		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Release|x64.ActiveCfg = Release|Any CPU
 		{CFAAAF11-8C97-4ED2-A398-08444A50486A}.Release|x64.Build.0 = Release|Any CPU
-		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|x64.Build.0 = Debug|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Checked|x64.Build.0 = Checked|Any CPU
+		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Debug|x64.Build.0 = Debug|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Release|x64.ActiveCfg = Release|Any CPU
 		{1DB4EE50-5094-47D6-9D94-061E10DF69D5}.Release|x64.Build.0 = Release|Any CPU
-		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|x64.Build.0 = Debug|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Checked|x64.Build.0 = Checked|Any CPU
+		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Debug|x64.Build.0 = Debug|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Release|x64.ActiveCfg = Release|Any CPU
 		{E9CCED78-232F-4EB5-90A1-023A41274B58}.Release|x64.Build.0 = Release|Any CPU
-		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|x64.Build.0 = Debug|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Checked|x64.Build.0 = Checked|Any CPU
+		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Debug|x64.Build.0 = Debug|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Release|x64.ActiveCfg = Release|Any CPU
 		{1E5221ED-2048-4FC9-BA16-00F38544CC72}.Release|x64.Build.0 = Release|Any CPU
-		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|x64.Build.0 = Debug|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Checked|x64.Build.0 = Checked|Any CPU
+		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Debug|x64.Build.0 = Debug|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Release|x64.ActiveCfg = Release|Any CPU
 		{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}.Release|x64.Build.0 = Release|Any CPU
-		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|x64.Build.0 = Debug|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Checked|x64.Build.0 = Checked|Any CPU
+		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FB579738-9498-4881-A32C-694CF37A697C}.Debug|x64.Build.0 = Debug|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Release|x64.ActiveCfg = Release|Any CPU
 		{FB579738-9498-4881-A32C-694CF37A697C}.Release|x64.Build.0 = Release|Any CPU
-		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|x64.Build.0 = Debug|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Checked|x64.Build.0 = Checked|Any CPU
+		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4FF01844-7091-4256-8188-DDD701C6F87E}.Debug|x64.Build.0 = Debug|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Release|x64.ActiveCfg = Release|Any CPU
 		{4FF01844-7091-4256-8188-DDD701C6F87E}.Release|x64.Build.0 = Release|Any CPU
-		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|x64.Build.0 = Debug|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Checked|x64.Build.0 = Checked|Any CPU
+		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Debug|x64.Build.0 = Debug|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Release|x64.ActiveCfg = Release|Any CPU
 		{3756C837-8E90-43EA-B4F3-E075AF783EB0}.Release|x64.Build.0 = Release|Any CPU
-		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|x64.Build.0 = Debug|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Checked|x64.Build.0 = Checked|Any CPU
+		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{954ADAD4-8861-47A3-A106-510F631315DB}.Debug|x64.Build.0 = Debug|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Release|x64.ActiveCfg = Release|Any CPU
 		{954ADAD4-8861-47A3-A106-510F631315DB}.Release|x64.Build.0 = Release|Any CPU
-		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|x64.Build.0 = Debug|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Checked|x64.Build.0 = Checked|Any CPU
+		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Debug|x64.Build.0 = Debug|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Release|x64.ActiveCfg = Release|Any CPU
 		{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}.Release|x64.Build.0 = Release|Any CPU
-		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|x64.Build.0 = Debug|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Checked|x64.Build.0 = Checked|Any CPU
+		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Debug|x64.Build.0 = Debug|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Release|x64.ActiveCfg = Release|Any CPU
 		{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}.Release|x64.Build.0 = Release|Any CPU
-		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|x64.Build.0 = Debug|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Checked|x64.Build.0 = Checked|Any CPU
+		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Debug|x64.Build.0 = Debug|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Release|x64.ActiveCfg = Release|Any CPU
 		{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}.Release|x64.Build.0 = Release|Any CPU
-		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Checked|x64.Build.0 = Checked|Any CPU
+		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Release|x64.ActiveCfg = Release|Any CPU
 		{1B4E9C42-7E89-4763-B701-AC4BBE830565}.Release|x64.Build.0 = Release|Any CPU
-		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Checked|x64.Build.0 = Checked|Any CPU
+		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Release|x64.ActiveCfg = Release|Any CPU
 		{3002F383-353A-4535-A7F6-A175A4CEF8DC}.Release|x64.Build.0 = Release|Any CPU
-		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|x64.Build.0 = Debug|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Checked|x64.Build.0 = Checked|Any CPU
+		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Debug|x64.Build.0 = Debug|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Release|x64.ActiveCfg = Release|Any CPU
 		{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}.Release|x64.Build.0 = Release|Any CPU
-		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Checked|x64.Build.0 = Checked|Any CPU
+		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Release|x64.ActiveCfg = Release|Any CPU
 		{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}.Release|x64.Build.0 = Release|Any CPU
-		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|x64.Build.0 = Debug|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Checked|x64.Build.0 = Checked|Any CPU
+		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Debug|x64.Build.0 = Debug|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Release|x64.ActiveCfg = Release|Any CPU
 		{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}.Release|x64.Build.0 = Release|Any CPU
-		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|x64.Build.0 = Debug|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Checked|x64.Build.0 = Checked|Any CPU
+		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Debug|x64.Build.0 = Debug|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Release|x64.ActiveCfg = Release|Any CPU
 		{03A68991-465F-4E1A-8DBF-3D61A31122BD}.Release|x64.Build.0 = Release|Any CPU
-		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Checked|x64.Build.0 = Checked|Any CPU
+		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Release|x64.ActiveCfg = Release|Any CPU
 		{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}.Release|x64.Build.0 = Release|Any CPU
-		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|x64.Build.0 = Debug|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Checked|x64.Build.0 = Checked|Any CPU
+		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5286AA16-A28B-4619-8842-73A9D89234B1}.Debug|x64.Build.0 = Debug|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Release|x64.ActiveCfg = Release|Any CPU
 		{5286AA16-A28B-4619-8842-73A9D89234B1}.Release|x64.Build.0 = Release|Any CPU
-		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Checked|x64.Build.0 = Checked|Any CPU
+		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Release|x64.ActiveCfg = Release|Any CPU
 		{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}.Release|x64.Build.0 = Release|Any CPU
-		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Checked|x64.Build.0 = Checked|Any CPU
+		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1242903-9B22-4575-BEB9-D0300420705F}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Release|x64.ActiveCfg = Release|Any CPU
 		{F1242903-9B22-4575-BEB9-D0300420705F}.Release|x64.Build.0 = Release|Any CPU
-		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|x64.Build.0 = Debug|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Checked|x64.Build.0 = Checked|Any CPU
+		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Debug|x64.Build.0 = Debug|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Release|x64.ActiveCfg = Release|Any CPU
 		{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}.Release|x64.Build.0 = Release|Any CPU
-		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|x64.Build.0 = Debug|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Checked|x64.Build.0 = Checked|Any CPU
+		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Debug|x64.Build.0 = Debug|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Release|x64.ActiveCfg = Release|Any CPU
 		{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}.Release|x64.Build.0 = Release|Any CPU
-		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Checked|x64.Build.0 = Checked|Any CPU
+		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Release|x64.ActiveCfg = Release|Any CPU
 		{D70C99ED-C081-4812-9B65-9B32B12ADC2C}.Release|x64.Build.0 = Release|Any CPU
-		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|x64.Build.0 = Debug|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Checked|x64.Build.0 = Checked|Any CPU
+		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Debug|x64.Build.0 = Debug|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Release|Any CPU.Build.0 = Release|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Release|x64.ActiveCfg = Release|Any CPU
 		{229C7705-C14C-455D-9D7B-BED5F44DA541}.Release|x64.Build.0 = Release|Any CPU
-		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|x64.Build.0 = Debug|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Checked|x64.Build.0 = Checked|Any CPU
+		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Debug|x64.Build.0 = Debug|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Release|x64.ActiveCfg = Release|Any CPU
 		{8F624618-F2BC-4CF6-A29C-F55B62508180}.Release|x64.Build.0 = Release|Any CPU
-		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|x64.Build.0 = Debug|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Checked|x64.Build.0 = Checked|Any CPU
+		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Debug|x64.Build.0 = Debug|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Release|x64.ActiveCfg = Release|Any CPU
 		{F6030F53-7EA9-4F85-93EE-583C70D4E382}.Release|x64.Build.0 = Release|Any CPU
-		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Checked|x64.Build.0 = Checked|Any CPU
+		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Release|x64.ActiveCfg = Release|Any CPU
 		{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}.Release|x64.Build.0 = Release|Any CPU
-		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|x64.Build.0 = Debug|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Checked|x64.Build.0 = Checked|Any CPU
+		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Debug|x64.Build.0 = Debug|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Release|Any CPU.Build.0 = Release|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Release|x64.ActiveCfg = Release|Any CPU
 		{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}.Release|x64.Build.0 = Release|Any CPU
-		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|x64.Build.0 = Debug|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Checked|x64.Build.0 = Checked|Any CPU
+		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Debug|x64.Build.0 = Debug|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Release|x64.ActiveCfg = Release|Any CPU
 		{EB3126F9-9BAD-4402-B05C-D4911647914D}.Release|x64.Build.0 = Release|Any CPU
-		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|x64.Build.0 = Debug|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Checked|x64.Build.0 = Checked|Any CPU
+		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Debug|x64.Build.0 = Debug|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Release|x64.ActiveCfg = Release|Any CPU
 		{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}.Release|x64.Build.0 = Release|Any CPU
-		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|x64.Build.0 = Debug|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Checked|x64.Build.0 = Checked|Any CPU
+		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Debug|x64.Build.0 = Debug|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Release|x64.ActiveCfg = Release|Any CPU
 		{04507495-DE8E-4FDE-98BF-323CE49114CC}.Release|x64.Build.0 = Release|Any CPU
-		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Checked|x64.Build.0 = Checked|Any CPU
+		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Release|x64.ActiveCfg = Release|Any CPU
 		{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}.Release|x64.Build.0 = Release|Any CPU
-		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|x64.Build.0 = Debug|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Checked|x64.Build.0 = Checked|Any CPU
+		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Debug|x64.Build.0 = Debug|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Release|x64.ActiveCfg = Release|Any CPU
 		{6D59C069-4635-4971-9C44-C0FD0AB478FE}.Release|x64.Build.0 = Release|Any CPU
-		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|x64.Build.0 = Debug|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Checked|x64.Build.0 = Checked|Any CPU
+		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7F2BE09E-FB70-4867-8510-92CB72423557}.Debug|x64.Build.0 = Debug|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Release|x64.ActiveCfg = Release|Any CPU
 		{7F2BE09E-FB70-4867-8510-92CB72423557}.Release|x64.Build.0 = Release|Any CPU
-		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Checked|x64.Build.0 = Checked|Any CPU
+		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Release|x64.ActiveCfg = Release|Any CPU
 		{CFCB5240-B25C-4731-B438-901AA0A46CA3}.Release|x64.Build.0 = Release|Any CPU
-		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|x64.Build.0 = Debug|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Checked|x64.Build.0 = Checked|Any CPU
+		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Debug|x64.Build.0 = Debug|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Release|x64.ActiveCfg = Release|Any CPU
 		{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}.Release|x64.Build.0 = Release|Any CPU
-		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|x64.Build.0 = Debug|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Checked|x64.Build.0 = Checked|Any CPU
+		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Debug|x64.Build.0 = Debug|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Release|x64.ActiveCfg = Release|Any CPU
 		{2047CED4-FC91-4429-9FA3-B1AA18B92617}.Release|x64.Build.0 = Release|Any CPU
-		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|x64.Build.0 = Debug|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Checked|x64.Build.0 = Checked|Any CPU
+		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Debug|x64.Build.0 = Debug|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Release|x64.ActiveCfg = Release|Any CPU
 		{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}.Release|x64.Build.0 = Release|Any CPU
-		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Checked|x64.Build.0 = Checked|Any CPU
+		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Release|x64.ActiveCfg = Release|Any CPU
 		{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}.Release|x64.Build.0 = Release|Any CPU
-		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|x64.Build.0 = Debug|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Checked|x64.Build.0 = Checked|Any CPU
+		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Debug|x64.Build.0 = Debug|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Release|x64.ActiveCfg = Release|Any CPU
 		{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}.Release|x64.Build.0 = Release|Any CPU
-		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|x64.Build.0 = Debug|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Checked|x64.Build.0 = Checked|Any CPU
+		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Debug|x64.Build.0 = Debug|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Release|x64.ActiveCfg = Release|Any CPU
 		{1A8C3540-503A-4515-9D4A-174F2E7D970B}.Release|x64.Build.0 = Release|Any CPU
-		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|x64.Build.0 = Debug|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Checked|x64.Build.0 = Checked|Any CPU
+		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Debug|x64.Build.0 = Debug|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Release|x64.ActiveCfg = Release|Any CPU
 		{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}.Release|x64.Build.0 = Release|Any CPU
-		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Checked|x64.Build.0 = Checked|Any CPU
+		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Release|x64.ActiveCfg = Release|Any CPU
 		{BA2B856D-9A08-423B-A166-43DF59F3C357}.Release|x64.Build.0 = Release|Any CPU
-		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|x64.Build.0 = Debug|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Checked|x64.Build.0 = Checked|Any CPU
+		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Debug|x64.Build.0 = Debug|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Release|x64.ActiveCfg = Release|Any CPU
 		{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}.Release|x64.Build.0 = Release|Any CPU
-		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|x64.Build.0 = Debug|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Checked|x64.Build.0 = Checked|Any CPU
+		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Debug|x64.Build.0 = Debug|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Release|x64.ActiveCfg = Release|Any CPU
 		{9CE7B008-52BD-4C42-A786-0319CD610C78}.Release|x64.Build.0 = Release|Any CPU
-		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|x64.Build.0 = Debug|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Checked|x64.Build.0 = Checked|Any CPU
+		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Debug|x64.Build.0 = Debug|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Release|x64.ActiveCfg = Release|Any CPU
 		{0950132C-BFC2-4F19-8125-07CE50FA340F}.Release|x64.Build.0 = Release|Any CPU
-		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|x64.Build.0 = Debug|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Checked|x64.Build.0 = Checked|Any CPU
+		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Debug|x64.Build.0 = Debug|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Release|Any CPU.Build.0 = Release|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Release|x64.ActiveCfg = Release|Any CPU
 		{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}.Release|x64.Build.0 = Release|Any CPU
-		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|x64.Build.0 = Debug|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Checked|x64.Build.0 = Checked|Any CPU
+		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Debug|x64.Build.0 = Debug|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Release|x64.ActiveCfg = Release|Any CPU
 		{3170D5EE-2113-4606-ABAB-B3B2B95D0395}.Release|x64.Build.0 = Release|Any CPU
-		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|x64.Build.0 = Debug|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Checked|x64.Build.0 = Checked|Any CPU
+		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5D42974-3541-42FB-9C75-3770270E5D94}.Debug|x64.Build.0 = Debug|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Release|x64.ActiveCfg = Release|Any CPU
 		{F5D42974-3541-42FB-9C75-3770270E5D94}.Release|x64.Build.0 = Release|Any CPU
-		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|x64.Build.0 = Debug|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Checked|x64.Build.0 = Checked|Any CPU
+		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Debug|x64.Build.0 = Debug|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Release|x64.ActiveCfg = Release|Any CPU
 		{EEC386C8-76E2-4D97-8D5F-11413554DA38}.Release|x64.Build.0 = Release|Any CPU
-		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Checked|x64.Build.0 = Checked|Any CPU
+		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Release|x64.ActiveCfg = Release|Any CPU
 		{BA6C694F-CA16-4648-A162-19928FEA4AB7}.Release|x64.Build.0 = Release|Any CPU
-		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|x64.Build.0 = Debug|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Checked|x64.Build.0 = Checked|Any CPU
+		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Debug|x64.Build.0 = Debug|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Release|x64.ActiveCfg = Release|Any CPU
 		{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}.Release|x64.Build.0 = Release|Any CPU
-		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|x64.Build.0 = Debug|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Checked|x64.Build.0 = Checked|Any CPU
+		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Debug|x64.Build.0 = Debug|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Release|x64.ActiveCfg = Release|Any CPU
 		{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}.Release|x64.Build.0 = Release|Any CPU
-		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|x64.Build.0 = Debug|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Checked|x64.Build.0 = Checked|Any CPU
+		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Debug|x64.Build.0 = Debug|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Release|x64.ActiveCfg = Release|Any CPU
 		{52B653E7-69BC-4FD4-B124-A673C88BB72E}.Release|x64.Build.0 = Release|Any CPU
-		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|x64.Build.0 = Debug|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Checked|x64.Build.0 = Checked|Any CPU
+		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Debug|x64.Build.0 = Debug|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Release|Any CPU.Build.0 = Release|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Release|x64.ActiveCfg = Release|Any CPU
 		{859EDDFE-5EDE-4772-888F-27000A56AA11}.Release|x64.Build.0 = Release|Any CPU
-		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|x64.Build.0 = Debug|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Checked|x64.Build.0 = Checked|Any CPU
+		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Debug|x64.Build.0 = Debug|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Release|x64.ActiveCfg = Release|Any CPU
 		{B5006B72-624F-496F-A429-4AE7E50AEB82}.Release|x64.Build.0 = Release|Any CPU
-		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|x64.Build.0 = Debug|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Checked|x64.Build.0 = Checked|Any CPU
+		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Debug|x64.Build.0 = Debug|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Release|x64.ActiveCfg = Release|Any CPU
 		{F92F1679-95B9-488E-A378-7ADF531B2D01}.Release|x64.Build.0 = Release|Any CPU
-		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|x64.Build.0 = Debug|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Checked|x64.Build.0 = Checked|Any CPU
+		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Debug|x64.Build.0 = Debug|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Release|x64.ActiveCfg = Release|Any CPU
 		{C8051056-1A85-4BEF-9408-3EAB51DCF52E}.Release|x64.Build.0 = Release|Any CPU
-		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|x64.Build.0 = Debug|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Checked|x64.Build.0 = Checked|Any CPU
+		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Debug|x64.Build.0 = Debug|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Release|x64.ActiveCfg = Release|Any CPU
 		{E07778FA-E591-4470-BD28-FBA0B45C880F}.Release|x64.Build.0 = Release|Any CPU
-		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Checked|x64.Build.0 = Checked|Any CPU
+		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A836F00-9458-403C-A88F-D974F2B39F61}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Release|x64.ActiveCfg = Release|Any CPU
 		{5A836F00-9458-403C-A88F-D974F2B39F61}.Release|x64.Build.0 = Release|Any CPU
-		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|x64.Build.0 = Debug|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Checked|x64.Build.0 = Checked|Any CPU
+		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Debug|x64.Build.0 = Debug|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Release|x64.ActiveCfg = Release|Any CPU
 		{B04EBCD4-E07A-461A-9ACF-922288EF3917}.Release|x64.Build.0 = Release|Any CPU
-		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|x64.Build.0 = Debug|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Checked|x64.Build.0 = Checked|Any CPU
+		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Debug|x64.Build.0 = Debug|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Release|Any CPU.Build.0 = Release|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Release|x64.ActiveCfg = Release|Any CPU
 		{14163169-6FB4-4A2B-8A4A-A021D006D717}.Release|x64.Build.0 = Release|Any CPU
-		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|x64.Build.0 = Debug|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Checked|x64.Build.0 = Checked|Any CPU
+		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Debug|x64.Build.0 = Debug|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Release|x64.ActiveCfg = Release|Any CPU
 		{7D321758-1C83-4DB3-B51D-27F6FA57AE64}.Release|x64.Build.0 = Release|Any CPU
-		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|x64.Build.0 = Debug|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Checked|x64.Build.0 = Checked|Any CPU
+		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Debug|x64.Build.0 = Debug|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Release|x64.ActiveCfg = Release|Any CPU
 		{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}.Release|x64.Build.0 = Release|Any CPU
-		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|x64.Build.0 = Debug|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Checked|x64.Build.0 = Checked|Any CPU
+		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Debug|x64.Build.0 = Debug|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Release|x64.ActiveCfg = Release|Any CPU
 		{7B540E45-BDAB-46BC-8657-D6CBCBE61831}.Release|x64.Build.0 = Release|Any CPU
-		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|x64.Build.0 = Debug|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Checked|x64.Build.0 = Checked|Any CPU
+		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Debug|x64.Build.0 = Debug|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Release|x64.ActiveCfg = Release|Any CPU
 		{6EAF444E-55CF-473C-99E0-38176828C2D6}.Release|x64.Build.0 = Release|Any CPU
-		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|x64.Build.0 = Debug|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Checked|x64.Build.0 = Checked|Any CPU
+		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Debug|x64.Build.0 = Debug|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Release|x64.ActiveCfg = Release|Any CPU
 		{10E5D6DB-A089-4539-8A17-6216BD6F98B8}.Release|x64.Build.0 = Release|Any CPU
-		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|x64.Build.0 = Debug|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Checked|x64.Build.0 = Checked|Any CPU
+		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Debug|x64.Build.0 = Debug|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Release|x64.ActiveCfg = Release|Any CPU
 		{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}.Release|x64.Build.0 = Release|Any CPU
-		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|x64.Build.0 = Debug|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Checked|x64.Build.0 = Checked|Any CPU
+		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Debug|x64.Build.0 = Debug|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Release|x64.ActiveCfg = Release|Any CPU
 		{C84C8426-642F-4DFD-BF02-7A6E9F708756}.Release|x64.Build.0 = Release|Any CPU
-		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|x64.Build.0 = Debug|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Checked|x64.Build.0 = Checked|Any CPU
+		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Debug|x64.Build.0 = Debug|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Release|Any CPU.Build.0 = Release|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Release|x64.ActiveCfg = Release|Any CPU
 		{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}.Release|x64.Build.0 = Release|Any CPU
-		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|x64.Build.0 = Debug|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Checked|x64.Build.0 = Checked|Any CPU
+		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Debug|x64.Build.0 = Debug|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Release|Any CPU.Build.0 = Release|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Release|x64.ActiveCfg = Release|Any CPU
 		{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}.Release|x64.Build.0 = Release|Any CPU
-		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|x64.Build.0 = Debug|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Checked|x64.Build.0 = Checked|Any CPU
+		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Debug|x64.Build.0 = Debug|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Release|x64.ActiveCfg = Release|Any CPU
 		{21007222-B4B1-49D7-9AE6-D9A4C915A20A}.Release|x64.Build.0 = Release|Any CPU
-		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|x64.Build.0 = Debug|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Checked|x64.Build.0 = Checked|Any CPU
+		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Debug|x64.Build.0 = Debug|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Release|x64.ActiveCfg = Release|Any CPU
 		{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}.Release|x64.Build.0 = Release|Any CPU
-		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|x64.Build.0 = Debug|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Checked|x64.Build.0 = Checked|Any CPU
+		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{293FE611-8ECE-473A-913C-7CF09977A544}.Debug|x64.Build.0 = Debug|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Release|Any CPU.Build.0 = Release|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Release|x64.ActiveCfg = Release|Any CPU
 		{293FE611-8ECE-473A-913C-7CF09977A544}.Release|x64.Build.0 = Release|Any CPU
-		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Checked|x64.Build.0 = Checked|Any CPU
+		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Release|x64.ActiveCfg = Release|Any CPU
 		{A6038A0C-F7A9-4511-A080-22E10146CFF4}.Release|x64.Build.0 = Release|Any CPU
-		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|x64.Build.0 = Debug|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Checked|x64.Build.0 = Checked|Any CPU
+		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Debug|x64.Build.0 = Debug|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Release|x64.ActiveCfg = Release|Any CPU
 		{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}.Release|x64.Build.0 = Release|Any CPU
-		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|x64.Build.0 = Debug|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Checked|x64.Build.0 = Checked|Any CPU
+		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F743004C-99B4-4580-80AE-33EA97834AB9}.Debug|x64.Build.0 = Debug|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Release|x64.ActiveCfg = Release|Any CPU
 		{F743004C-99B4-4580-80AE-33EA97834AB9}.Release|x64.Build.0 = Release|Any CPU
-		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Checked|x64.Build.0 = Checked|Any CPU
+		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Release|x64.ActiveCfg = Release|Any CPU
 		{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}.Release|x64.Build.0 = Release|Any CPU
-		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|x64.Build.0 = Debug|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Checked|x64.Build.0 = Checked|Any CPU
+		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Debug|x64.Build.0 = Debug|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Release|x64.ActiveCfg = Release|Any CPU
 		{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}.Release|x64.Build.0 = Release|Any CPU
-		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Checked|x64.Build.0 = Checked|Any CPU
+		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Debug|x64.Build.0 = Debug|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Release|x64.ActiveCfg = Release|Any CPU
 		{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}.Release|x64.Build.0 = Release|Any CPU
-		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|x64.Build.0 = Debug|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Checked|x64.Build.0 = Checked|Any CPU
+		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Debug|x64.Build.0 = Debug|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Release|x64.ActiveCfg = Release|Any CPU
 		{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}.Release|x64.Build.0 = Release|Any CPU
-		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|x64.Build.0 = Debug|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Checked|x64.Build.0 = Checked|Any CPU
+		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Debug|x64.Build.0 = Debug|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Release|x64.ActiveCfg = Release|Any CPU
 		{83C230E5-DE57-4F98-90A2-5E434A64071E}.Release|x64.Build.0 = Release|Any CPU
-		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|x64.Build.0 = Debug|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Checked|x64.Build.0 = Checked|Any CPU
+		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Debug|x64.Build.0 = Debug|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Release|x64.ActiveCfg = Release|Any CPU
 		{019B6706-6421-4BFA-BC71-9CF043491C3B}.Release|x64.Build.0 = Release|Any CPU
-		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|x64.Build.0 = Debug|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Checked|x64.Build.0 = Checked|Any CPU
+		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Debug|x64.Build.0 = Debug|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Release|x64.ActiveCfg = Release|Any CPU
 		{70351EE6-B46D-45D4-81BB-E48E359D49A8}.Release|x64.Build.0 = Release|Any CPU
-		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|x64.Build.0 = Debug|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Checked|x64.Build.0 = Checked|Any CPU
+		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Debug|x64.Build.0 = Debug|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Release|x64.ActiveCfg = Release|Any CPU
 		{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}.Release|x64.Build.0 = Release|Any CPU
-		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Checked|x64.Build.0 = Checked|Any CPU
+		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Release|x64.ActiveCfg = Release|Any CPU
 		{38B47509-08E5-4BEE-B112-14528D0C48F3}.Release|x64.Build.0 = Release|Any CPU
-		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|x64.Build.0 = Debug|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Checked|x64.Build.0 = Checked|Any CPU
+		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Debug|x64.Build.0 = Debug|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Release|x64.ActiveCfg = Release|Any CPU
 		{A30B47AA-3D05-47ED-86E6-836946DBE693}.Release|x64.Build.0 = Release|Any CPU
-		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|x64.Build.0 = Debug|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Checked|x64.Build.0 = Checked|Any CPU
+		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Debug|x64.Build.0 = Debug|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Release|x64.ActiveCfg = Release|Any CPU
 		{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}.Release|x64.Build.0 = Release|Any CPU
-		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|x64.Build.0 = Debug|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Checked|x64.Build.0 = Checked|Any CPU
+		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Debug|x64.Build.0 = Debug|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Release|x64.ActiveCfg = Release|Any CPU
 		{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}.Release|x64.Build.0 = Release|Any CPU
-		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|x64.Build.0 = Debug|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Checked|x64.Build.0 = Checked|Any CPU
+		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Debug|x64.Build.0 = Debug|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Release|x64.ActiveCfg = Release|Any CPU
 		{149D8B69-2B5C-4F25-8853-991A4BF08DB4}.Release|x64.Build.0 = Release|Any CPU
-		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|x64.Build.0 = Debug|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Checked|x64.Build.0 = Checked|Any CPU
+		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Debug|x64.Build.0 = Debug|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Release|x64.ActiveCfg = Release|Any CPU
 		{5269AD90-8679-4AEA-8C2A-906CDA9F056F}.Release|x64.Build.0 = Release|Any CPU
-		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|x64.Build.0 = Debug|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Checked|x64.Build.0 = Checked|Any CPU
+		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Debug|x64.Build.0 = Debug|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Release|x64.ActiveCfg = Release|Any CPU
 		{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}.Release|x64.Build.0 = Release|Any CPU
-		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Checked|x64.Build.0 = Checked|Any CPU
+		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Release|x64.ActiveCfg = Release|Any CPU
 		{9B133BDC-48C6-4E11-906C-FDEAF818309F}.Release|x64.Build.0 = Release|Any CPU
-		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Checked|x64.Build.0 = Checked|Any CPU
+		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Release|x64.ActiveCfg = Release|Any CPU
 		{1078159A-0ADF-4196-8910-17C460B6B9C4}.Release|x64.Build.0 = Release|Any CPU
-		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|x64.Build.0 = Debug|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Checked|x64.Build.0 = Checked|Any CPU
+		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Debug|x64.Build.0 = Debug|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Release|x64.ActiveCfg = Release|Any CPU
 		{32EFE30D-5B7F-4660-8F73-F1D533004FCD}.Release|x64.Build.0 = Release|Any CPU
-		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Checked|x64.Build.0 = Checked|Any CPU
+		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Release|x64.ActiveCfg = Release|Any CPU
 		{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}.Release|x64.Build.0 = Release|Any CPU
-		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|x64.Build.0 = Debug|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Checked|x64.Build.0 = Checked|Any CPU
+		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E1EFF632-5803-4922-8556-047D321ACDD6}.Debug|x64.Build.0 = Debug|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Release|x64.ActiveCfg = Release|Any CPU
 		{E1EFF632-5803-4922-8556-047D321ACDD6}.Release|x64.Build.0 = Release|Any CPU
-		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|x64.Build.0 = Debug|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Checked|x64.Build.0 = Checked|Any CPU
+		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Debug|x64.Build.0 = Debug|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Release|x64.ActiveCfg = Release|Any CPU
 		{DD3CD0A1-DF96-4AD5-B363-94E216361C80}.Release|x64.Build.0 = Release|Any CPU
-		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|x64.Build.0 = Debug|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Checked|x64.Build.0 = Checked|Any CPU
+		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Debug|x64.Build.0 = Debug|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Release|x64.ActiveCfg = Release|Any CPU
 		{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}.Release|x64.Build.0 = Release|Any CPU
-		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|x64.Build.0 = Debug|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Checked|x64.Build.0 = Checked|Any CPU
+		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{61121819-B7F9-474B-85EB-040490EF3D0A}.Debug|x64.Build.0 = Debug|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Release|x64.ActiveCfg = Release|Any CPU
 		{61121819-B7F9-474B-85EB-040490EF3D0A}.Release|x64.Build.0 = Release|Any CPU
-		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|x64.Build.0 = Debug|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Checked|x64.Build.0 = Checked|Any CPU
+		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Debug|x64.Build.0 = Debug|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Release|x64.ActiveCfg = Release|Any CPU
 		{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}.Release|x64.Build.0 = Release|Any CPU
-		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Checked|x64.Build.0 = Checked|Any CPU
+		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Release|x64.ActiveCfg = Release|Any CPU
 		{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}.Release|x64.Build.0 = Release|Any CPU
-		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|x64.Build.0 = Debug|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Checked|x64.Build.0 = Checked|Any CPU
+		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Debug|x64.Build.0 = Debug|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Release|x64.ActiveCfg = Release|Any CPU
 		{7BD9A24F-20E4-4515-9514-0029E4A485C0}.Release|x64.Build.0 = Release|Any CPU
-		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|x64.Build.0 = Debug|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Checked|x64.Build.0 = Checked|Any CPU
+		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Debug|x64.Build.0 = Debug|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Release|x64.ActiveCfg = Release|Any CPU
 		{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}.Release|x64.Build.0 = Release|Any CPU
-		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|x64.Build.0 = Debug|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Checked|x64.Build.0 = Checked|Any CPU
+		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Debug|x64.Build.0 = Debug|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Release|x64.ActiveCfg = Release|Any CPU
 		{50E37C5A-A812-4C7B-8299-C5A973E99C91}.Release|x64.Build.0 = Release|Any CPU
-		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Checked|x64.Build.0 = Checked|Any CPU
+		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC462D6D-429B-4032-9C16-8124B636F52E}.Debug|x64.Build.0 = Debug|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Release|x64.ActiveCfg = Release|Any CPU
 		{EC462D6D-429B-4032-9C16-8124B636F52E}.Release|x64.Build.0 = Release|Any CPU
-		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Checked|x64.Build.0 = Checked|Any CPU
+		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{47DB4011-8390-4971-A4B0-614D877753E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Release|x64.ActiveCfg = Release|Any CPU
 		{47DB4011-8390-4971-A4B0-614D877753E3}.Release|x64.Build.0 = Release|Any CPU
-		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Checked|x64.Build.0 = Checked|Any CPU
+		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Release|x64.ActiveCfg = Release|Any CPU
 		{CFD0A615-8DFB-4BE7-9447-8B40B669F358}.Release|x64.Build.0 = Release|Any CPU
-		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|x64.Build.0 = Debug|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Checked|x64.Build.0 = Checked|Any CPU
+		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Debug|x64.Build.0 = Debug|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Release|x64.ActiveCfg = Release|Any CPU
 		{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}.Release|x64.Build.0 = Release|Any CPU
-		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|x64.Build.0 = Debug|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Checked|x64.Build.0 = Checked|Any CPU
+		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Debug|x64.Build.0 = Debug|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Release|x64.ActiveCfg = Release|Any CPU
 		{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}.Release|x64.Build.0 = Release|Any CPU
-		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|x64.Build.0 = Debug|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Checked|x64.Build.0 = Checked|Any CPU
+		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Debug|x64.Build.0 = Debug|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Release|x64.ActiveCfg = Release|Any CPU
 		{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}.Release|x64.Build.0 = Release|Any CPU
-		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Checked|x64.Build.0 = Checked|Any CPU
+		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Release|x64.ActiveCfg = Release|Any CPU
 		{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}.Release|x64.Build.0 = Release|Any CPU
-		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|x64.Build.0 = Debug|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Checked|x64.Build.0 = Checked|Any CPU
+		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Debug|x64.Build.0 = Debug|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Release|x64.ActiveCfg = Release|Any CPU
 		{87F99B82-CC31-4C2B-B516-E4FF5B14850B}.Release|x64.Build.0 = Release|Any CPU
-		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Checked|x64.Build.0 = Checked|Any CPU
+		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Debug|x64.Build.0 = Debug|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Release|x64.ActiveCfg = Release|Any CPU
 		{EBF644A9-39CC-438A-BA2C-C5442D126964}.Release|x64.Build.0 = Release|Any CPU
-		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|x64.Build.0 = Debug|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Checked|x64.Build.0 = Checked|Any CPU
+		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Debug|x64.Build.0 = Debug|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Release|x64.ActiveCfg = Release|Any CPU
 		{2C09812A-1591-447F-94C5-F33FB0346B4B}.Release|x64.Build.0 = Release|Any CPU
-		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Checked|x64.Build.0 = Checked|Any CPU
+		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Release|x64.ActiveCfg = Release|Any CPU
 		{5A8FDFCD-343D-481D-8488-0143733DD0C7}.Release|x64.Build.0 = Release|Any CPU
-		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|x64.Build.0 = Debug|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Checked|x64.Build.0 = Checked|Any CPU
+		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Debug|x64.Build.0 = Debug|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Release|x64.ActiveCfg = Release|Any CPU
 		{D5CFB37E-ECFE-444A-B190-F51ABA65B445}.Release|x64.Build.0 = Release|Any CPU
-		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|x64.Build.0 = Debug|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Checked|x64.Build.0 = Checked|Any CPU
+		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Debug|x64.Build.0 = Debug|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Release|x64.ActiveCfg = Release|Any CPU
 		{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}.Release|x64.Build.0 = Release|Any CPU
-		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|x64.Build.0 = Debug|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Checked|x64.Build.0 = Checked|Any CPU
+		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Debug|x64.Build.0 = Debug|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Release|x64.ActiveCfg = Release|Any CPU
 		{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}.Release|x64.Build.0 = Release|Any CPU
-		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|x64.Build.0 = Debug|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Checked|x64.Build.0 = Checked|Any CPU
+		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Debug|x64.Build.0 = Debug|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Release|x64.ActiveCfg = Release|Any CPU
 		{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}.Release|x64.Build.0 = Release|Any CPU
-		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|x64.Build.0 = Debug|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Checked|x64.Build.0 = Checked|Any CPU
+		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Debug|x64.Build.0 = Debug|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Release|x64.ActiveCfg = Release|Any CPU
 		{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}.Release|x64.Build.0 = Release|Any CPU
-		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Checked|x64.Build.0 = Checked|Any CPU
+		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Debug|x64.Build.0 = Debug|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Release|x64.ActiveCfg = Release|Any CPU
 		{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}.Release|x64.Build.0 = Release|Any CPU
-		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|x64.Build.0 = Debug|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Checked|x64.Build.0 = Checked|Any CPU
+		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{610C682C-0742-4385-AB31-C5ECD325FE18}.Debug|x64.Build.0 = Debug|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Release|Any CPU.Build.0 = Release|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Release|x64.ActiveCfg = Release|Any CPU
 		{610C682C-0742-4385-AB31-C5ECD325FE18}.Release|x64.Build.0 = Release|Any CPU
-		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|x64.Build.0 = Debug|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Checked|x64.Build.0 = Checked|Any CPU
+		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Debug|x64.Build.0 = Debug|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Release|x64.ActiveCfg = Release|Any CPU
 		{4F03B20F-FF85-47CC-98D0-9FA1019DD791}.Release|x64.Build.0 = Release|Any CPU
-		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|x64.Build.0 = Debug|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Checked|x64.Build.0 = Checked|Any CPU
+		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Debug|x64.Build.0 = Debug|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Release|x64.ActiveCfg = Release|Any CPU
 		{8BD76585-0793-42D2-8C56-44BD7FAEA618}.Release|x64.Build.0 = Release|Any CPU
-		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|x64.Build.0 = Debug|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Checked|x64.Build.0 = Checked|Any CPU
+		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Debug|x64.Build.0 = Debug|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Release|x64.ActiveCfg = Release|Any CPU
 		{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}.Release|x64.Build.0 = Release|Any CPU
-		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|x64.Build.0 = Debug|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Checked|x64.Build.0 = Checked|Any CPU
+		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E013FA53-3402-4527-A67C-BCAF01906006}.Debug|x64.Build.0 = Debug|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Release|x64.ActiveCfg = Release|Any CPU
 		{E013FA53-3402-4527-A67C-BCAF01906006}.Release|x64.Build.0 = Release|Any CPU
-		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Checked|x64.Build.0 = Checked|Any CPU
+		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Release|x64.ActiveCfg = Release|Any CPU
 		{96242A32-C8B7-443A-8CA7-2834487DDD4D}.Release|x64.Build.0 = Release|Any CPU
-		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|x64.Build.0 = Debug|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Checked|x64.Build.0 = Checked|Any CPU
+		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BC757971-447D-476E-A471-FB7AD31F05D5}.Debug|x64.Build.0 = Debug|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Release|x64.ActiveCfg = Release|Any CPU
 		{BC757971-447D-476E-A471-FB7AD31F05D5}.Release|x64.Build.0 = Release|Any CPU
-		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Checked|x64.Build.0 = Checked|Any CPU
+		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Release|x64.ActiveCfg = Release|Any CPU
 		{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}.Release|x64.Build.0 = Release|Any CPU
-		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Checked|x64.Build.0 = Checked|Any CPU
+		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Release|x64.ActiveCfg = Release|Any CPU
 		{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}.Release|x64.Build.0 = Release|Any CPU
-		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|x64.Build.0 = Debug|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Checked|x64.Build.0 = Checked|Any CPU
+		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Debug|x64.Build.0 = Debug|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Release|x64.ActiveCfg = Release|Any CPU
 		{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}.Release|x64.Build.0 = Release|Any CPU
-		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Checked|x64.Build.0 = Checked|Any CPU
+		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Release|x64.ActiveCfg = Release|Any CPU
 		{8D3F8332-7C3A-4539-8D78-D908D9715214}.Release|x64.Build.0 = Release|Any CPU
-		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|x64.Build.0 = Debug|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Checked|x64.Build.0 = Checked|Any CPU
+		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Debug|x64.Build.0 = Debug|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Release|x64.ActiveCfg = Release|Any CPU
 		{9A448D03-472D-4B82-BBFF-A9067F38DDC0}.Release|x64.Build.0 = Release|Any CPU
-		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Checked|x64.Build.0 = Checked|Any CPU
+		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Release|x64.ActiveCfg = Release|Any CPU
 		{17062F31-5AA0-44BE-A095-F70ACDA913EE}.Release|x64.Build.0 = Release|Any CPU
-		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Checked|x64.Build.0 = Checked|Any CPU
+		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Release|x64.ActiveCfg = Release|Any CPU
 		{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}.Release|x64.Build.0 = Release|Any CPU
-		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Checked|x64.Build.0 = Checked|Any CPU
+		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Release|x64.ActiveCfg = Release|Any CPU
 		{A6275C7C-33EE-4265-B0A0-79A03D5C9160}.Release|x64.Build.0 = Release|Any CPU
-		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Checked|x64.Build.0 = Checked|Any CPU
+		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Release|x64.ActiveCfg = Release|Any CPU
 		{CF86105B-1DC7-44E0-87EE-76F509A7423D}.Release|x64.Build.0 = Release|Any CPU
-		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|x64.Build.0 = Debug|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Checked|x64.Build.0 = Checked|Any CPU
+		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Debug|x64.Build.0 = Debug|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Release|x64.ActiveCfg = Release|Any CPU
 		{73978DEA-5BFF-4F42-A98B-53C49110A405}.Release|x64.Build.0 = Release|Any CPU
-		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|x64.Build.0 = Debug|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Checked|x64.Build.0 = Checked|Any CPU
+		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A8E4763-D08B-4C38-B529-3051062FF267}.Debug|x64.Build.0 = Debug|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Release|x64.ActiveCfg = Release|Any CPU
 		{9A8E4763-D08B-4C38-B529-3051062FF267}.Release|x64.Build.0 = Release|Any CPU
-		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|x64.Build.0 = Debug|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Checked|x64.Build.0 = Checked|Any CPU
+		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Debug|x64.Build.0 = Debug|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Release|x64.ActiveCfg = Release|Any CPU
 		{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}.Release|x64.Build.0 = Release|Any CPU
-		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|x64.Build.0 = Debug|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Checked|x64.Build.0 = Checked|Any CPU
+		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{73592109-1E40-4998-ABD4-B067DC8743C5}.Debug|x64.Build.0 = Debug|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Release|x64.ActiveCfg = Release|Any CPU
 		{73592109-1E40-4998-ABD4-B067DC8743C5}.Release|x64.Build.0 = Release|Any CPU
-		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Checked|x64.Build.0 = Checked|Any CPU
+		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Release|x64.ActiveCfg = Release|Any CPU
 		{45913162-0814-48BD-BB47-A3FC01EB66A1}.Release|x64.Build.0 = Release|Any CPU
-		{53999106-094B-4E18-BA77-D8498D398376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53999106-094B-4E18-BA77-D8498D398376}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53999106-094B-4E18-BA77-D8498D398376}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{53999106-094B-4E18-BA77-D8498D398376}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{53999106-094B-4E18-BA77-D8498D398376}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{53999106-094B-4E18-BA77-D8498D398376}.Debug|x64.Build.0 = Debug|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Checked|x64.Build.0 = Checked|Any CPU
+		{53999106-094B-4E18-BA77-D8498D398376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53999106-094B-4E18-BA77-D8498D398376}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53999106-094B-4E18-BA77-D8498D398376}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{53999106-094B-4E18-BA77-D8498D398376}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{53999106-094B-4E18-BA77-D8498D398376}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53999106-094B-4E18-BA77-D8498D398376}.Debug|x64.Build.0 = Debug|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Release|Any CPU.Build.0 = Release|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Release|x64.ActiveCfg = Release|Any CPU
 		{53999106-094B-4E18-BA77-D8498D398376}.Release|x64.Build.0 = Release|Any CPU
-		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|x64.Build.0 = Debug|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Checked|x64.Build.0 = Checked|Any CPU
+		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Debug|x64.Build.0 = Debug|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Release|x64.ActiveCfg = Release|Any CPU
 		{AAEADD3D-8607-40C0-B852-FE268A309DC8}.Release|x64.Build.0 = Release|Any CPU
-		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|x64.Build.0 = Debug|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Checked|x64.Build.0 = Checked|Any CPU
+		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Debug|x64.Build.0 = Debug|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Release|Any CPU.Build.0 = Release|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Release|x64.ActiveCfg = Release|Any CPU
 		{87F222B0-EE89-41DB-A9ED-0123DDF67749}.Release|x64.Build.0 = Release|Any CPU
-		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Checked|x64.Build.0 = Checked|Any CPU
+		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Release|x64.ActiveCfg = Release|Any CPU
 		{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}.Release|x64.Build.0 = Release|Any CPU
-		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Checked|x64.Build.0 = Checked|Any CPU
+		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Release|x64.ActiveCfg = Release|Any CPU
 		{C189A69F-0DDC-4415-8733-7BCC228293F5}.Release|x64.Build.0 = Release|Any CPU
-		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Checked|x64.Build.0 = Checked|Any CPU
+		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Release|x64.ActiveCfg = Release|Any CPU
 		{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}.Release|x64.Build.0 = Release|Any CPU
-		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|x64.Build.0 = Debug|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Checked|x64.Build.0 = Checked|Any CPU
+		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Debug|x64.Build.0 = Debug|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Release|x64.ActiveCfg = Release|Any CPU
 		{4179CA63-8CD0-445C-83E1-64E534A0E471}.Release|x64.Build.0 = Release|Any CPU
-		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|x64.Build.0 = Debug|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Checked|x64.Build.0 = Checked|Any CPU
+		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Debug|x64.Build.0 = Debug|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Release|x64.ActiveCfg = Release|Any CPU
 		{47AF9833-5788-4D1A-BF71-1902E8B9BE59}.Release|x64.Build.0 = Release|Any CPU
-		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Checked|x64.Build.0 = Checked|Any CPU
+		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Release|x64.ActiveCfg = Release|Any CPU
 		{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}.Release|x64.Build.0 = Release|Any CPU
-		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|x64.Build.0 = Debug|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Checked|x64.Build.0 = Checked|Any CPU
+		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Debug|x64.Build.0 = Debug|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Release|Any CPU.Build.0 = Release|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Release|x64.ActiveCfg = Release|Any CPU
 		{89AE94AA-DF13-41D6-9673-1FBCA7727162}.Release|x64.Build.0 = Release|Any CPU
-		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|x64.Build.0 = Debug|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Checked|x64.Build.0 = Checked|Any CPU
+		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Debug|x64.Build.0 = Debug|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Release|x64.ActiveCfg = Release|Any CPU
 		{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}.Release|x64.Build.0 = Release|Any CPU
-		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|x64.Build.0 = Debug|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Checked|x64.Build.0 = Checked|Any CPU
+		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Debug|x64.Build.0 = Debug|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Release|x64.ActiveCfg = Release|Any CPU
 		{8C128213-9AA8-4025-8EE7-6FDF47DD544A}.Release|x64.Build.0 = Release|Any CPU
-		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|x64.Build.0 = Debug|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Checked|x64.Build.0 = Checked|Any CPU
+		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Debug|x64.Build.0 = Debug|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Release|x64.ActiveCfg = Release|Any CPU
 		{4DFBCA5D-68C7-4512-A880-079C2C6074E1}.Release|x64.Build.0 = Release|Any CPU
-		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|x64.Build.0 = Debug|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Checked|x64.Build.0 = Checked|Any CPU
+		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Debug|x64.Build.0 = Debug|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Release|x64.ActiveCfg = Release|Any CPU
 		{C696F969-2AA1-4289-8576-CAAB8748F4C3}.Release|x64.Build.0 = Release|Any CPU
-		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|x64.Build.0 = Debug|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Checked|x64.Build.0 = Checked|Any CPU
+		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Debug|x64.Build.0 = Debug|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Release|x64.ActiveCfg = Release|Any CPU
 		{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}.Release|x64.Build.0 = Release|Any CPU
-		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|x64.Build.0 = Debug|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Checked|x64.Build.0 = Checked|Any CPU
+		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Debug|x64.Build.0 = Debug|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Release|x64.ActiveCfg = Release|Any CPU
 		{54A922D9-D2B1-4969-A811-1EBE820FB5BF}.Release|x64.Build.0 = Release|Any CPU
-		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|x64.Build.0 = Debug|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Checked|x64.Build.0 = Checked|Any CPU
+		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Debug|x64.Build.0 = Debug|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Release|x64.ActiveCfg = Release|Any CPU
 		{F9740EEE-763B-4CDE-AE92-5876DF3E9468}.Release|x64.Build.0 = Release|Any CPU
-		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|x64.Build.0 = Debug|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Checked|x64.Build.0 = Checked|Any CPU
+		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Debug|x64.Build.0 = Debug|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Release|x64.ActiveCfg = Release|Any CPU
 		{1847231C-A265-425B-B58B-9B8FDA2B0783}.Release|x64.Build.0 = Release|Any CPU
-		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Checked|x64.Build.0 = Checked|Any CPU
+		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E123581-790A-4E86-A7AC-0A09F790B058}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Release|x64.ActiveCfg = Release|Any CPU
 		{3E123581-790A-4E86-A7AC-0A09F790B058}.Release|x64.Build.0 = Release|Any CPU
-		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Checked|x64.Build.0 = Checked|Any CPU
+		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{821703F9-4217-4040-B5BB-F1002E4949B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Release|x64.ActiveCfg = Release|Any CPU
 		{821703F9-4217-4040-B5BB-F1002E4949B3}.Release|x64.Build.0 = Release|Any CPU
-		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|x64.Build.0 = Debug|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Checked|x64.Build.0 = Checked|Any CPU
+		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Debug|x64.Build.0 = Debug|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Release|x64.ActiveCfg = Release|Any CPU
 		{E4D96FB0-C02E-4475-A719-FA7B65195C81}.Release|x64.Build.0 = Release|Any CPU
-		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|x64.Build.0 = Debug|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Checked|x64.Build.0 = Checked|Any CPU
+		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Debug|x64.Build.0 = Debug|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Release|x64.ActiveCfg = Release|Any CPU
 		{09F506EA-4CBB-40BF-8A7E-68F9870996BA}.Release|x64.Build.0 = Release|Any CPU
-		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|x64.Build.0 = Debug|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Checked|x64.Build.0 = Checked|Any CPU
+		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96D54F48-B900-4CA4-AA41-D6195774E529}.Debug|x64.Build.0 = Debug|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Release|Any CPU.Build.0 = Release|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Release|x64.ActiveCfg = Release|Any CPU
 		{96D54F48-B900-4CA4-AA41-D6195774E529}.Release|x64.Build.0 = Release|Any CPU
-		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Checked|x64.Build.0 = Checked|Any CPU
+		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B15721F4-238B-4A65-9C72-57FB609402A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Release|x64.ActiveCfg = Release|Any CPU
 		{B15721F4-238B-4A65-9C72-57FB609402A1}.Release|x64.Build.0 = Release|Any CPU
-		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|x64.Build.0 = Debug|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Checked|x64.Build.0 = Checked|Any CPU
+		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Debug|x64.Build.0 = Debug|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Release|x64.ActiveCfg = Release|Any CPU
 		{8074FD34-7426-4CCC-B82F-98FFC649E91B}.Release|x64.Build.0 = Release|Any CPU
-		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|x64.Build.0 = Debug|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Checked|x64.Build.0 = Checked|Any CPU
+		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Debug|x64.Build.0 = Debug|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Release|x64.ActiveCfg = Release|Any CPU
 		{C2414151-E272-4E72-B8F8-E735C686BEFA}.Release|x64.Build.0 = Release|Any CPU
-		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|x64.Build.0 = Debug|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Checked|x64.Build.0 = Checked|Any CPU
+		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4533D06F-382E-49F3-9486-B41E12EA2378}.Debug|x64.Build.0 = Debug|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Release|x64.ActiveCfg = Release|Any CPU
 		{4533D06F-382E-49F3-9486-B41E12EA2378}.Release|x64.Build.0 = Release|Any CPU
-		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|x64.Build.0 = Debug|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Checked|x64.Build.0 = Checked|Any CPU
+		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Debug|x64.Build.0 = Debug|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Release|x64.ActiveCfg = Release|Any CPU
 		{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}.Release|x64.Build.0 = Release|Any CPU
-		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|x64.Build.0 = Debug|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Checked|x64.Build.0 = Checked|Any CPU
+		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Debug|x64.Build.0 = Debug|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Release|Any CPU.Build.0 = Release|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Release|x64.ActiveCfg = Release|Any CPU
 		{05D8DDDA-6741-4FFC-BB91-629E45A29E46}.Release|x64.Build.0 = Release|Any CPU
-		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|x64.Build.0 = Debug|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Checked|x64.Build.0 = Checked|Any CPU
+		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Debug|x64.Build.0 = Debug|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Release|x64.ActiveCfg = Release|Any CPU
 		{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}.Release|x64.Build.0 = Release|Any CPU
-		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|x64.Build.0 = Debug|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Checked|x64.Build.0 = Checked|Any CPU
+		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Debug|x64.Build.0 = Debug|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Release|x64.ActiveCfg = Release|Any CPU
 		{DD2256C6-B7D6-4239-98A9-A63E694E93E2}.Release|x64.Build.0 = Release|Any CPU
-		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|x64.Build.0 = Debug|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Checked|x64.Build.0 = Checked|Any CPU
+		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Debug|x64.Build.0 = Debug|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Release|x64.ActiveCfg = Release|Any CPU
 		{0F5F1532-DDC8-4803-A39F-102F65ACD806}.Release|x64.Build.0 = Release|Any CPU
-		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|x64.Build.0 = Debug|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Checked|x64.Build.0 = Checked|Any CPU
+		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Debug|x64.Build.0 = Debug|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Release|x64.ActiveCfg = Release|Any CPU
 		{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}.Release|x64.Build.0 = Release|Any CPU
-		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|x64.Build.0 = Debug|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Checked|x64.Build.0 = Checked|Any CPU
+		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Debug|x64.Build.0 = Debug|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Release|x64.ActiveCfg = Release|Any CPU
 		{8CE48E50-0F9E-4DA2-87C3-2645659C8379}.Release|x64.Build.0 = Release|Any CPU
-		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|x64.Build.0 = Debug|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Checked|x64.Build.0 = Checked|Any CPU
+		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Debug|x64.Build.0 = Debug|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Release|x64.ActiveCfg = Release|Any CPU
 		{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}.Release|x64.Build.0 = Release|Any CPU
-		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Checked|x64.Build.0 = Checked|Any CPU
+		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Release|x64.ActiveCfg = Release|Any CPU
 		{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}.Release|x64.Build.0 = Release|Any CPU
-		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Checked|x64.Build.0 = Checked|Any CPU
+		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Release|x64.ActiveCfg = Release|Any CPU
 		{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}.Release|x64.Build.0 = Release|Any CPU
-		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|x64.Build.0 = Debug|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Checked|x64.Build.0 = Checked|Any CPU
+		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Debug|x64.Build.0 = Debug|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Release|x64.ActiveCfg = Release|Any CPU
 		{76A2BDAD-760E-45AE-A7A9-9778753092B9}.Release|x64.Build.0 = Release|Any CPU
-		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|x64.Build.0 = Debug|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Checked|x64.Build.0 = Checked|Any CPU
+		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FA9512A5-92B8-4508-8579-2B0568155602}.Debug|x64.Build.0 = Debug|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Release|x64.ActiveCfg = Release|Any CPU
 		{FA9512A5-92B8-4508-8579-2B0568155602}.Release|x64.Build.0 = Release|Any CPU
-		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|x64.Build.0 = Debug|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Checked|x64.Build.0 = Checked|Any CPU
+		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Debug|x64.Build.0 = Debug|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Release|x64.ActiveCfg = Release|Any CPU
 		{AD35C91C-EC29-4560-AC15-60CAFFC639D7}.Release|x64.Build.0 = Release|Any CPU
-		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|x64.Build.0 = Debug|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Checked|x64.Build.0 = Checked|Any CPU
+		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Debug|x64.Build.0 = Debug|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Release|x64.ActiveCfg = Release|Any CPU
 		{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}.Release|x64.Build.0 = Release|Any CPU
-		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Checked|x64.Build.0 = Checked|Any CPU
+		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Release|x64.ActiveCfg = Release|Any CPU
 		{22C1826A-A04D-4669-983E-6679BDEBC5E7}.Release|x64.Build.0 = Release|Any CPU
-		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|x64.Build.0 = Debug|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Checked|x64.Build.0 = Checked|Any CPU
+		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{363331BD-4648-4BC9-99C2-D63044C13C83}.Debug|x64.Build.0 = Debug|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Release|Any CPU.Build.0 = Release|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Release|x64.ActiveCfg = Release|Any CPU
 		{363331BD-4648-4BC9-99C2-D63044C13C83}.Release|x64.Build.0 = Release|Any CPU
-		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Checked|x64.Build.0 = Checked|Any CPU
+		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Release|x64.ActiveCfg = Release|Any CPU
 		{4A81DA45-79DE-4101-96F1-8FF12227DFDC}.Release|x64.Build.0 = Release|Any CPU
-		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|x64.Build.0 = Debug|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Checked|x64.Build.0 = Checked|Any CPU
+		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Debug|x64.Build.0 = Debug|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Release|x64.ActiveCfg = Release|Any CPU
 		{C28A4049-C64B-48EC-A7C8-0823F4167308}.Release|x64.Build.0 = Release|Any CPU
-		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|x64.Build.0 = Debug|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Checked|x64.Build.0 = Checked|Any CPU
+		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Debug|x64.Build.0 = Debug|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Release|x64.ActiveCfg = Release|Any CPU
 		{5354026F-2CCB-4547-A33E-D80FA0615FF2}.Release|x64.Build.0 = Release|Any CPU
-		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|x64.Build.0 = Debug|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Checked|x64.Build.0 = Checked|Any CPU
+		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Debug|x64.Build.0 = Debug|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Release|x64.ActiveCfg = Release|Any CPU
 		{50C047DC-A854-4B09-9D8C-61121ADF7B81}.Release|x64.Build.0 = Release|Any CPU
-		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Checked|x64.Build.0 = Checked|Any CPU
+		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Release|x64.ActiveCfg = Release|Any CPU
 		{9E197F07-4741-4FE5-B984-AD5D866B5B39}.Release|x64.Build.0 = Release|Any CPU
-		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|x64.Build.0 = Debug|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Checked|x64.Build.0 = Checked|Any CPU
+		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Debug|x64.Build.0 = Debug|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Release|x64.ActiveCfg = Release|Any CPU
 		{BE12D59E-CEEE-4697-98E1-119F292F7894}.Release|x64.Build.0 = Release|Any CPU
-		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Checked|x64.Build.0 = Checked|Any CPU
+		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Debug|x64.Build.0 = Debug|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Release|x64.ActiveCfg = Release|Any CPU
 		{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}.Release|x64.Build.0 = Release|Any CPU
-		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Checked|x64.Build.0 = Checked|Any CPU
+		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Release|x64.ActiveCfg = Release|Any CPU
 		{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}.Release|x64.Build.0 = Release|Any CPU
-		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|x64.Build.0 = Debug|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Checked|x64.Build.0 = Checked|Any CPU
+		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Debug|x64.Build.0 = Debug|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Release|x64.ActiveCfg = Release|Any CPU
 		{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}.Release|x64.Build.0 = Release|Any CPU
-		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Checked|x64.Build.0 = Checked|Any CPU
+		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Release|x64.ActiveCfg = Release|Any CPU
 		{B756347C-04AE-45B1-A646-9E0BB01F23E3}.Release|x64.Build.0 = Release|Any CPU
-		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Checked|x64.Build.0 = Checked|Any CPU
+		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Release|x64.ActiveCfg = Release|Any CPU
 		{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}.Release|x64.Build.0 = Release|Any CPU
-		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Checked|x64.Build.0 = Checked|Any CPU
+		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CD6EA305-5025-431B-910D-93512B81AA30}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Release|x64.ActiveCfg = Release|Any CPU
 		{CD6EA305-5025-431B-910D-93512B81AA30}.Release|x64.Build.0 = Release|Any CPU
-		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|x64.Build.0 = Debug|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Checked|x64.Build.0 = Checked|Any CPU
+		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Debug|x64.Build.0 = Debug|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Release|x64.ActiveCfg = Release|Any CPU
 		{D48A27DA-5609-4218-A5D9-87C9E7B621FE}.Release|x64.Build.0 = Release|Any CPU
-		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Checked|x64.Build.0 = Checked|Any CPU
+		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9E44E821-9E0A-4024-8700-474B370765D7}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Release|x64.ActiveCfg = Release|Any CPU
 		{9E44E821-9E0A-4024-8700-474B370765D7}.Release|x64.Build.0 = Release|Any CPU
-		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|x64.Build.0 = Debug|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Checked|x64.Build.0 = Checked|Any CPU
+		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{47398E20-1072-4B0C-8FA1-C81F53620699}.Debug|x64.Build.0 = Debug|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Release|x64.ActiveCfg = Release|Any CPU
 		{47398E20-1072-4B0C-8FA1-C81F53620699}.Release|x64.Build.0 = Release|Any CPU
-		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|x64.Build.0 = Debug|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Checked|x64.Build.0 = Checked|Any CPU
+		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Debug|x64.Build.0 = Debug|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Release|x64.ActiveCfg = Release|Any CPU
 		{2FE13806-29EA-496E-AB35-6880A97D04C5}.Release|x64.Build.0 = Release|Any CPU
-		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|x64.Build.0 = Debug|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Checked|x64.Build.0 = Checked|Any CPU
+		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Debug|x64.Build.0 = Debug|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Release|x64.ActiveCfg = Release|Any CPU
 		{4CBA35C7-C345-43A4-BF80-F8C7B5147330}.Release|x64.Build.0 = Release|Any CPU
-		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|x64.Build.0 = Debug|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Checked|x64.Build.0 = Checked|Any CPU
+		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Debug|x64.Build.0 = Debug|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Release|Any CPU.Build.0 = Release|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Release|x64.ActiveCfg = Release|Any CPU
 		{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}.Release|x64.Build.0 = Release|Any CPU
-		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|x64.Build.0 = Debug|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Checked|x64.Build.0 = Checked|Any CPU
+		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E838E359-9791-4399-B90D-08BCF7B6759A}.Debug|x64.Build.0 = Debug|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Release|x64.ActiveCfg = Release|Any CPU
 		{E838E359-9791-4399-B90D-08BCF7B6759A}.Release|x64.Build.0 = Release|Any CPU
-		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|x64.Build.0 = Debug|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Checked|x64.Build.0 = Checked|Any CPU
+		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29A6979F-FF0F-4E64-B484-39512815C58A}.Debug|x64.Build.0 = Debug|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Release|x64.ActiveCfg = Release|Any CPU
 		{29A6979F-FF0F-4E64-B484-39512815C58A}.Release|x64.Build.0 = Release|Any CPU
-		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|x64.Build.0 = Debug|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Checked|x64.Build.0 = Checked|Any CPU
+		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Debug|x64.Build.0 = Debug|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Release|x64.ActiveCfg = Release|Any CPU
 		{3480389B-CAEC-4077-843B-A915E8DE6CCF}.Release|x64.Build.0 = Release|Any CPU
-		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|x64.Build.0 = Debug|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Checked|x64.Build.0 = Checked|Any CPU
+		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Debug|x64.Build.0 = Debug|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Release|x64.ActiveCfg = Release|Any CPU
 		{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}.Release|x64.Build.0 = Release|Any CPU
-		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Checked|x64.Build.0 = Checked|Any CPU
+		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{071C86E8-527E-4DEF-9547-C71212A776DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Release|x64.ActiveCfg = Release|Any CPU
 		{071C86E8-527E-4DEF-9547-C71212A776DE}.Release|x64.Build.0 = Release|Any CPU
-		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|x64.Build.0 = Debug|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Checked|x64.Build.0 = Checked|Any CPU
+		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Debug|x64.Build.0 = Debug|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Release|Any CPU.Build.0 = Release|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Release|x64.ActiveCfg = Release|Any CPU
 		{95E53FE5-6FEC-46D2-A05F-3740B5096693}.Release|x64.Build.0 = Release|Any CPU
-		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|x64.Build.0 = Debug|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Checked|x64.Build.0 = Checked|Any CPU
+		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Debug|x64.Build.0 = Debug|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Release|x64.ActiveCfg = Release|Any CPU
 		{AB8065FD-01A2-4791-9044-E26FF8C97DD3}.Release|x64.Build.0 = Release|Any CPU
-		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|x64.Build.0 = Debug|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Checked|x64.Build.0 = Checked|Any CPU
+		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Debug|x64.Build.0 = Debug|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Release|Any CPU.Build.0 = Release|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Release|x64.ActiveCfg = Release|Any CPU
 		{019C42A8-9635-40FC-BC6A-EE2C41996E83}.Release|x64.Build.0 = Release|Any CPU
-		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|x64.Build.0 = Debug|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Checked|x64.Build.0 = Checked|Any CPU
+		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Debug|x64.Build.0 = Debug|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Release|Any CPU.Build.0 = Release|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Release|x64.ActiveCfg = Release|Any CPU
 		{56FF3771-7CDF-4828-AEB0-9EEDACA09346}.Release|x64.Build.0 = Release|Any CPU
-		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|x64.Build.0 = Debug|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Checked|x64.Build.0 = Checked|Any CPU
+		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78774AFC-E717-4828-BB45-B910295200A4}.Debug|x64.Build.0 = Debug|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Release|x64.ActiveCfg = Release|Any CPU
 		{78774AFC-E717-4828-BB45-B910295200A4}.Release|x64.Build.0 = Release|Any CPU
-		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|x64.Build.0 = Debug|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Checked|x64.Build.0 = Checked|Any CPU
+		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Debug|x64.Build.0 = Debug|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Release|x64.ActiveCfg = Release|Any CPU
 		{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}.Release|x64.Build.0 = Release|Any CPU
-		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Checked|x64.Build.0 = Checked|Any CPU
+		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Release|x64.ActiveCfg = Release|Any CPU
 		{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}.Release|x64.Build.0 = Release|Any CPU
-		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|x64.Build.0 = Debug|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Checked|x64.Build.0 = Checked|Any CPU
+		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Debug|x64.Build.0 = Debug|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Release|x64.ActiveCfg = Release|Any CPU
 		{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}.Release|x64.Build.0 = Release|Any CPU
-		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|x64.Build.0 = Debug|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Checked|x64.Build.0 = Checked|Any CPU
+		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Debug|x64.Build.0 = Debug|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Release|x64.ActiveCfg = Release|Any CPU
 		{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}.Release|x64.Build.0 = Release|Any CPU
-		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|x64.Build.0 = Debug|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Checked|x64.Build.0 = Checked|Any CPU
+		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3312A13F-DED5-47B2-8166-160B156E0E39}.Debug|x64.Build.0 = Debug|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Release|x64.ActiveCfg = Release|Any CPU
 		{3312A13F-DED5-47B2-8166-160B156E0E39}.Release|x64.Build.0 = Release|Any CPU
-		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Checked|x64.Build.0 = Checked|Any CPU
+		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Release|x64.ActiveCfg = Release|Any CPU
 		{6B94184B-A46A-4121-BD93-C653CEC64E88}.Release|x64.Build.0 = Release|Any CPU
-		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|x64.Build.0 = Debug|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Checked|x64.Build.0 = Checked|Any CPU
+		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Debug|x64.Build.0 = Debug|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Release|x64.ActiveCfg = Release|Any CPU
 		{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}.Release|x64.Build.0 = Release|Any CPU
-		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|x64.Build.0 = Debug|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Checked|x64.Build.0 = Checked|Any CPU
+		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Debug|x64.Build.0 = Debug|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Release|x64.ActiveCfg = Release|Any CPU
 		{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}.Release|x64.Build.0 = Release|Any CPU
-		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Checked|x64.Build.0 = Checked|Any CPU
+		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Debug|x64.Build.0 = Debug|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Release|x64.ActiveCfg = Release|Any CPU
 		{8D598B51-ED43-4661-BC93-E5FE26557F53}.Release|x64.Build.0 = Release|Any CPU
-		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Checked|x64.Build.0 = Checked|Any CPU
+		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Release|x64.ActiveCfg = Release|Any CPU
 		{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}.Release|x64.Build.0 = Release|Any CPU
-		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|x64.Build.0 = Debug|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Checked|x64.Build.0 = Checked|Any CPU
+		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Debug|x64.Build.0 = Debug|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Release|Any CPU.Build.0 = Release|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Release|x64.ActiveCfg = Release|Any CPU
 		{191A3D78-6BF7-4244-8000-F9444CBD9323}.Release|x64.Build.0 = Release|Any CPU
-		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|x64.Build.0 = Debug|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Checked|x64.Build.0 = Checked|Any CPU
+		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Debug|x64.Build.0 = Debug|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Release|x64.ActiveCfg = Release|Any CPU
 		{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}.Release|x64.Build.0 = Release|Any CPU
-		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|x64.Build.0 = Debug|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Checked|x64.Build.0 = Checked|Any CPU
+		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Debug|x64.Build.0 = Debug|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Release|x64.ActiveCfg = Release|Any CPU
 		{B798D96F-A8DA-42F8-A91F-5CF606557041}.Release|x64.Build.0 = Release|Any CPU
-		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|x64.Build.0 = Debug|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Checked|x64.Build.0 = Checked|Any CPU
+		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Debug|x64.Build.0 = Debug|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Release|x64.ActiveCfg = Release|Any CPU
 		{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}.Release|x64.Build.0 = Release|Any CPU
-		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|x64.Build.0 = Debug|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Checked|x64.Build.0 = Checked|Any CPU
+		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Debug|x64.Build.0 = Debug|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Release|x64.ActiveCfg = Release|Any CPU
 		{50EF1878-1A99-4A7D-AB2A-48253984442C}.Release|x64.Build.0 = Release|Any CPU
-		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|x64.Build.0 = Debug|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Checked|x64.Build.0 = Checked|Any CPU
+		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Debug|x64.Build.0 = Debug|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Release|Any CPU.Build.0 = Release|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Release|x64.ActiveCfg = Release|Any CPU
 		{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}.Release|x64.Build.0 = Release|Any CPU
-		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|x64.Build.0 = Debug|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Checked|x64.Build.0 = Checked|Any CPU
+		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{919C114C-F977-45F0-9877-BFA66D3EA063}.Debug|x64.Build.0 = Debug|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Release|Any CPU.Build.0 = Release|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Release|x64.ActiveCfg = Release|Any CPU
 		{919C114C-F977-45F0-9877-BFA66D3EA063}.Release|x64.Build.0 = Release|Any CPU
-		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|x64.Build.0 = Debug|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Checked|x64.Build.0 = Checked|Any CPU
+		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Debug|x64.Build.0 = Debug|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Release|x64.ActiveCfg = Release|Any CPU
 		{AC48EED6-19D5-475D-BEB9-2E884F027A7A}.Release|x64.Build.0 = Release|Any CPU
-		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|x64.Build.0 = Debug|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Checked|x64.Build.0 = Checked|Any CPU
+		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Debug|x64.Build.0 = Debug|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Release|x64.ActiveCfg = Release|Any CPU
 		{0FC11856-26BE-4361-B267-28CAA7BE5CAC}.Release|x64.Build.0 = Release|Any CPU
-		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|x64.Build.0 = Debug|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Checked|x64.Build.0 = Checked|Any CPU
+		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Debug|x64.Build.0 = Debug|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Release|x64.ActiveCfg = Release|Any CPU
 		{B22ABFEA-9859-4C97-A166-52C420C39FEF}.Release|x64.Build.0 = Release|Any CPU
-		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|x64.Build.0 = Debug|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Checked|x64.Build.0 = Checked|Any CPU
+		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Debug|x64.Build.0 = Debug|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Release|Any CPU.Build.0 = Release|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Release|x64.ActiveCfg = Release|Any CPU
 		{19C43397-A7B7-4E2D-B2F2-D302C13A0715}.Release|x64.Build.0 = Release|Any CPU
-		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|x64.Build.0 = Debug|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Checked|x64.Build.0 = Checked|Any CPU
+		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Debug|x64.Build.0 = Debug|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Release|x64.ActiveCfg = Release|Any CPU
 		{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}.Release|x64.Build.0 = Release|Any CPU
-		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|x64.Build.0 = Debug|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Checked|x64.Build.0 = Checked|Any CPU
+		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9426D669-315D-4940-BB26-EE3709A7802A}.Debug|x64.Build.0 = Debug|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Release|x64.ActiveCfg = Release|Any CPU
 		{9426D669-315D-4940-BB26-EE3709A7802A}.Release|x64.Build.0 = Release|Any CPU
-		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|x64.Build.0 = Debug|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Checked|x64.Build.0 = Checked|Any CPU
+		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Debug|x64.Build.0 = Debug|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Release|x64.ActiveCfg = Release|Any CPU
 		{0F547F76-8657-44EF-9AC0-FE81153E4B22}.Release|x64.Build.0 = Release|Any CPU
-		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|x64.Build.0 = Debug|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Checked|x64.Build.0 = Checked|Any CPU
+		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Debug|x64.Build.0 = Debug|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Release|Any CPU.Build.0 = Release|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Release|x64.ActiveCfg = Release|Any CPU
 		{43996CEE-7608-49CD-A31F-68F3DD5B0C61}.Release|x64.Build.0 = Release|Any CPU
-		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Checked|x64.Build.0 = Checked|Any CPU
+		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{740B75E4-4B74-4735-98E3-679E181869BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Release|x64.ActiveCfg = Release|Any CPU
 		{740B75E4-4B74-4735-98E3-679E181869BB}.Release|x64.Build.0 = Release|Any CPU
-		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|x64.Build.0 = Debug|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Checked|x64.Build.0 = Checked|Any CPU
+		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Debug|x64.Build.0 = Debug|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Release|x64.ActiveCfg = Release|Any CPU
 		{315270DE-3D17-4865-8217-2F4C3A3553E2}.Release|x64.Build.0 = Release|Any CPU
-		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Checked|x64.Build.0 = Checked|Any CPU
+		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1FA3C71-3005-413C-8874-2D944567215B}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Release|x64.ActiveCfg = Release|Any CPU
 		{A1FA3C71-3005-413C-8874-2D944567215B}.Release|x64.Build.0 = Release|Any CPU
-		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|x64.Build.0 = Debug|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Checked|x64.Build.0 = Checked|Any CPU
+		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Debug|x64.Build.0 = Debug|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Release|x64.ActiveCfg = Release|Any CPU
 		{D84625F2-F0FF-42B9-BE7F-6C3322B92970}.Release|x64.Build.0 = Release|Any CPU
-		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|x64.Build.0 = Debug|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Checked|x64.Build.0 = Checked|Any CPU
+		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9103B277-05CF-4063-8C10-9106474A2FD5}.Debug|x64.Build.0 = Debug|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Release|x64.ActiveCfg = Release|Any CPU
 		{9103B277-05CF-4063-8C10-9106474A2FD5}.Release|x64.Build.0 = Release|Any CPU
-		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|x64.Build.0 = Debug|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Checked|x64.Build.0 = Checked|Any CPU
+		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Debug|x64.Build.0 = Debug|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Release|x64.ActiveCfg = Release|Any CPU
 		{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}.Release|x64.Build.0 = Release|Any CPU
-		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|x64.Build.0 = Debug|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Checked|x64.Build.0 = Checked|Any CPU
+		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Debug|x64.Build.0 = Debug|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Release|Any CPU.Build.0 = Release|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Release|x64.ActiveCfg = Release|Any CPU
 		{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}.Release|x64.Build.0 = Release|Any CPU
-		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Checked|x64.Build.0 = Checked|Any CPU
+		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Release|x64.ActiveCfg = Release|Any CPU
 		{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}.Release|x64.Build.0 = Release|Any CPU
-		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|x64.Build.0 = Debug|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Checked|x64.Build.0 = Checked|Any CPU
+		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Debug|x64.Build.0 = Debug|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Release|x64.ActiveCfg = Release|Any CPU
 		{5EB85BED-9B18-486F-980C-1E16A15D4F35}.Release|x64.Build.0 = Release|Any CPU
-		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|x64.Build.0 = Debug|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Checked|x64.Build.0 = Checked|Any CPU
+		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Debug|x64.Build.0 = Debug|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Release|x64.ActiveCfg = Release|Any CPU
 		{29B438CE-3CF8-4BCC-817C-7BC806BA235C}.Release|x64.Build.0 = Release|Any CPU
-		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|x64.Build.0 = Debug|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Checked|x64.Build.0 = Checked|Any CPU
+		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Debug|x64.Build.0 = Debug|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Release|x64.ActiveCfg = Release|Any CPU
 		{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}.Release|x64.Build.0 = Release|Any CPU
-		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Checked|x64.Build.0 = Checked|Any CPU
+		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Release|x64.ActiveCfg = Release|Any CPU
 		{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}.Release|x64.Build.0 = Release|Any CPU
-		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|x64.Build.0 = Debug|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Checked|x64.Build.0 = Checked|Any CPU
+		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Debug|x64.Build.0 = Debug|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Release|x64.ActiveCfg = Release|Any CPU
 		{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}.Release|x64.Build.0 = Release|Any CPU
-		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|x64.Build.0 = Debug|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Checked|x64.Build.0 = Checked|Any CPU
+		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Debug|x64.Build.0 = Debug|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Release|x64.ActiveCfg = Release|Any CPU
 		{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}.Release|x64.Build.0 = Release|Any CPU
-		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|x64.Build.0 = Debug|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Checked|x64.Build.0 = Checked|Any CPU
+		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Debug|x64.Build.0 = Debug|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Release|x64.ActiveCfg = Release|Any CPU
 		{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}.Release|x64.Build.0 = Release|Any CPU
-		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Checked|x64.Build.0 = Checked|Any CPU
+		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Debug|x64.Build.0 = Debug|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Release|x64.ActiveCfg = Release|Any CPU
 		{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}.Release|x64.Build.0 = Release|Any CPU
-		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|x64.Build.0 = Debug|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Checked|x64.Build.0 = Checked|Any CPU
+		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Debug|x64.Build.0 = Debug|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Release|x64.ActiveCfg = Release|Any CPU
 		{0EF9D522-85FC-47E7-B073-6CF7EF35D887}.Release|x64.Build.0 = Release|Any CPU
-		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|x64.Build.0 = Debug|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Checked|x64.Build.0 = Checked|Any CPU
+		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8603865F-ED03-4B83-88F4-13960697AC22}.Debug|x64.Build.0 = Debug|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Release|x64.ActiveCfg = Release|Any CPU
 		{8603865F-ED03-4B83-88F4-13960697AC22}.Release|x64.Build.0 = Release|Any CPU
-		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|x64.Build.0 = Debug|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Checked|x64.Build.0 = Checked|Any CPU
+		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Debug|x64.Build.0 = Debug|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Release|x64.ActiveCfg = Release|Any CPU
 		{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}.Release|x64.Build.0 = Release|Any CPU
-		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Checked|x64.Build.0 = Checked|Any CPU
+		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Debug|x64.Build.0 = Debug|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Release|x64.ActiveCfg = Release|Any CPU
 		{979D89AA-7B08-4A81-A210-A78152FCFEC9}.Release|x64.Build.0 = Release|Any CPU
-		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|x64.Build.0 = Debug|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Checked|x64.Build.0 = Checked|Any CPU
+		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Debug|x64.Build.0 = Debug|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Release|x64.ActiveCfg = Release|Any CPU
 		{DABA4519-FAA5-4920-ADA9-14C97643F9E9}.Release|x64.Build.0 = Release|Any CPU
-		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|x64.Build.0 = Debug|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Checked|x64.Build.0 = Checked|Any CPU
+		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Debug|x64.Build.0 = Debug|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Release|x64.ActiveCfg = Release|Any CPU
 		{E754D107-EFF0-484B-92CA-4A1813E74CF7}.Release|x64.Build.0 = Release|Any CPU
-		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|x64.Build.0 = Debug|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Checked|x64.Build.0 = Checked|Any CPU
+		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B442D811-8360-4821-A993-F3370E1A4706}.Debug|x64.Build.0 = Debug|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Release|x64.ActiveCfg = Release|Any CPU
 		{B442D811-8360-4821-A993-F3370E1A4706}.Release|x64.Build.0 = Release|Any CPU
-		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Checked|x64.Build.0 = Checked|Any CPU
+		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Release|x64.ActiveCfg = Release|Any CPU
 		{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}.Release|x64.Build.0 = Release|Any CPU
-		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|x64.Build.0 = Debug|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Checked|x64.Build.0 = Checked|Any CPU
+		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Debug|x64.Build.0 = Debug|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Release|x64.ActiveCfg = Release|Any CPU
 		{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}.Release|x64.Build.0 = Release|Any CPU
-		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Checked|x64.Build.0 = Checked|Any CPU
+		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Release|x64.ActiveCfg = Release|Any CPU
 		{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}.Release|x64.Build.0 = Release|Any CPU
-		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Checked|x64.Build.0 = Checked|Any CPU
+		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Release|x64.ActiveCfg = Release|Any CPU
 		{C1097342-3E8F-41E5-BF2F-27632CFEB916}.Release|x64.Build.0 = Release|Any CPU
-		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Checked|x64.Build.0 = Checked|Any CPU
+		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Release|x64.ActiveCfg = Release|Any CPU
 		{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}.Release|x64.Build.0 = Release|Any CPU
-		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Checked|x64.Build.0 = Checked|Any CPU
+		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Release|x64.ActiveCfg = Release|Any CPU
 		{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}.Release|x64.Build.0 = Release|Any CPU
-		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Checked|x64.Build.0 = Checked|Any CPU
+		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Release|x64.ActiveCfg = Release|Any CPU
 		{9B56074F-2439-4551-A6FD-1FE930CAAEB2}.Release|x64.Build.0 = Release|Any CPU
-		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|x64.Build.0 = Debug|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Checked|x64.Build.0 = Checked|Any CPU
+		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Debug|x64.Build.0 = Debug|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Release|x64.ActiveCfg = Release|Any CPU
 		{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}.Release|x64.Build.0 = Release|Any CPU
-		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Checked|x64.Build.0 = Checked|Any CPU
+		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Release|x64.ActiveCfg = Release|Any CPU
 		{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}.Release|x64.Build.0 = Release|Any CPU
-		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|x64.Build.0 = Debug|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Checked|x64.Build.0 = Checked|Any CPU
+		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Debug|x64.Build.0 = Debug|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Release|Any CPU.Build.0 = Release|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Release|x64.ActiveCfg = Release|Any CPU
 		{60E2DAC3-00D4-468D-A9E8-756F7F07E792}.Release|x64.Build.0 = Release|Any CPU
-		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|x64.Build.0 = Debug|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Checked|x64.Build.0 = Checked|Any CPU
+		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Debug|x64.Build.0 = Debug|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Release|x64.ActiveCfg = Release|Any CPU
 		{A0191131-99CA-4D0A-BBED-0C348E5AAC98}.Release|x64.Build.0 = Release|Any CPU
-		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|x64.Build.0 = Debug|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Checked|x64.Build.0 = Checked|Any CPU
+		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{970BD1E0-DB96-45B0-8482-B04D83198210}.Debug|x64.Build.0 = Debug|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Release|Any CPU.Build.0 = Release|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Release|x64.ActiveCfg = Release|Any CPU
 		{970BD1E0-DB96-45B0-8482-B04D83198210}.Release|x64.Build.0 = Release|Any CPU
-		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|x64.Build.0 = Debug|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Checked|x64.Build.0 = Checked|Any CPU
+		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Debug|x64.Build.0 = Debug|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Release|x64.ActiveCfg = Release|Any CPU
 		{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}.Release|x64.Build.0 = Release|Any CPU
-		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|x64.Build.0 = Debug|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Checked|x64.Build.0 = Checked|Any CPU
+		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Debug|x64.Build.0 = Debug|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Release|x64.ActiveCfg = Release|Any CPU
 		{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}.Release|x64.Build.0 = Release|Any CPU
-		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Checked|x64.Build.0 = Checked|Any CPU
+		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CD736B39-3BCC-4328-A022-1958860C747C}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Release|x64.ActiveCfg = Release|Any CPU
 		{CD736B39-3BCC-4328-A022-1958860C747C}.Release|x64.Build.0 = Release|Any CPU
-		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|x64.Build.0 = Debug|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Checked|x64.Build.0 = Checked|Any CPU
+		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Debug|x64.Build.0 = Debug|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Release|x64.ActiveCfg = Release|Any CPU
 		{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}.Release|x64.Build.0 = Release|Any CPU
-		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|x64.Build.0 = Debug|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Checked|x64.Build.0 = Checked|Any CPU
+		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Debug|x64.Build.0 = Debug|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Release|x64.ActiveCfg = Release|Any CPU
 		{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}.Release|x64.Build.0 = Release|Any CPU
-		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Checked|x64.Build.0 = Checked|Any CPU
+		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Release|x64.ActiveCfg = Release|Any CPU
 		{BB807CC1-C13E-496F-9427-760F9D24E4A5}.Release|x64.Build.0 = Release|Any CPU
-		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|x64.Build.0 = Debug|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Checked|x64.Build.0 = Checked|Any CPU
+		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Debug|x64.Build.0 = Debug|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Release|x64.ActiveCfg = Release|Any CPU
 		{D152BC64-BF23-43D2-8599-A1B150EF901F}.Release|x64.Build.0 = Release|Any CPU
-		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|x64.Build.0 = Debug|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Checked|x64.Build.0 = Checked|Any CPU
+		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Debug|x64.Build.0 = Debug|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Release|x64.ActiveCfg = Release|Any CPU
 		{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}.Release|x64.Build.0 = Release|Any CPU
-		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|x64.Build.0 = Debug|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Checked|x64.Build.0 = Checked|Any CPU
+		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Debug|x64.Build.0 = Debug|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Release|x64.ActiveCfg = Release|Any CPU
 		{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}.Release|x64.Build.0 = Release|Any CPU
-		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|x64.Build.0 = Debug|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Checked|x64.Build.0 = Checked|Any CPU
+		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Debug|x64.Build.0 = Debug|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Release|x64.ActiveCfg = Release|Any CPU
 		{CA25FE8B-ED22-4717-BCF1-9038C1025531}.Release|x64.Build.0 = Release|Any CPU
-		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|x64.Build.0 = Debug|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Checked|x64.Build.0 = Checked|Any CPU
+		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Debug|x64.Build.0 = Debug|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Release|x64.ActiveCfg = Release|Any CPU
 		{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}.Release|x64.Build.0 = Release|Any CPU
-		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|x64.Build.0 = Debug|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Checked|x64.Build.0 = Checked|Any CPU
+		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50915858-F3A0-4A59-A472-19DD972E12BD}.Debug|x64.Build.0 = Debug|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Release|x64.ActiveCfg = Release|Any CPU
 		{50915858-F3A0-4A59-A472-19DD972E12BD}.Release|x64.Build.0 = Release|Any CPU
-		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|x64.Build.0 = Debug|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Checked|x64.Build.0 = Checked|Any CPU
+		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{55A905BA-153E-470E-B43E-83B83F2A4076}.Debug|x64.Build.0 = Debug|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Release|Any CPU.Build.0 = Release|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Release|x64.ActiveCfg = Release|Any CPU
 		{55A905BA-153E-470E-B43E-83B83F2A4076}.Release|x64.Build.0 = Release|Any CPU
-		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|x64.Build.0 = Debug|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Checked|x64.Build.0 = Checked|Any CPU
+		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Debug|x64.Build.0 = Debug|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Release|Any CPU.Build.0 = Release|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Release|x64.ActiveCfg = Release|Any CPU
 		{25C5CB08-72E4-410B-9668-55EC29A3F014}.Release|x64.Build.0 = Release|Any CPU
-		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|x64.Build.0 = Debug|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Checked|x64.Build.0 = Checked|Any CPU
+		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{86D05636-6F57-464F-BA67-58052EB5D261}.Debug|x64.Build.0 = Debug|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Release|Any CPU.Build.0 = Release|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Release|x64.ActiveCfg = Release|Any CPU
 		{86D05636-6F57-464F-BA67-58052EB5D261}.Release|x64.Build.0 = Release|Any CPU
-		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|x64.Build.0 = Debug|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Checked|x64.Build.0 = Checked|Any CPU
+		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Debug|x64.Build.0 = Debug|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Release|x64.ActiveCfg = Release|Any CPU
 		{9DCD37F3-0AC9-4B60-A149-C319029AB84C}.Release|x64.Build.0 = Release|Any CPU
-		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|x64.Build.0 = Debug|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Checked|x64.Build.0 = Checked|Any CPU
+		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Debug|x64.Build.0 = Debug|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Release|x64.ActiveCfg = Release|Any CPU
 		{8FF63B36-14E7-4C4B-B099-594D645323FC}.Release|x64.Build.0 = Release|Any CPU
-		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|x64.Build.0 = Debug|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Checked|x64.Build.0 = Checked|Any CPU
+		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Debug|x64.Build.0 = Debug|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Release|x64.ActiveCfg = Release|Any CPU
 		{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}.Release|x64.Build.0 = Release|Any CPU
-		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|x64.Build.0 = Debug|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Checked|x64.Build.0 = Checked|Any CPU
+		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Debug|x64.Build.0 = Debug|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Release|x64.ActiveCfg = Release|Any CPU
 		{11C8526B-518D-4138-9B36-779D7BC58EAB}.Release|x64.Build.0 = Release|Any CPU
-		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|x64.Build.0 = Debug|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Checked|x64.Build.0 = Checked|Any CPU
+		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Debug|x64.Build.0 = Debug|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Release|x64.ActiveCfg = Release|Any CPU
 		{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}.Release|x64.Build.0 = Release|Any CPU
-		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|x64.Build.0 = Debug|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Checked|x64.Build.0 = Checked|Any CPU
+		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Debug|x64.Build.0 = Debug|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Release|x64.ActiveCfg = Release|Any CPU
 		{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}.Release|x64.Build.0 = Release|Any CPU
-		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|x64.Build.0 = Debug|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Checked|x64.Build.0 = Checked|Any CPU
+		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Debug|x64.Build.0 = Debug|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Release|x64.ActiveCfg = Release|Any CPU
 		{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}.Release|x64.Build.0 = Release|Any CPU
-		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Checked|x64.Build.0 = Checked|Any CPU
+		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Release|x64.ActiveCfg = Release|Any CPU
 		{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}.Release|x64.Build.0 = Release|Any CPU
-		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|x64.Build.0 = Debug|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Checked|x64.Build.0 = Checked|Any CPU
+		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Debug|x64.Build.0 = Debug|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Release|x64.ActiveCfg = Release|Any CPU
 		{4ABC5E77-9279-413B-9BEC-D6513A782256}.Release|x64.Build.0 = Release|Any CPU
-		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|x64.Build.0 = Debug|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Checked|x64.Build.0 = Checked|Any CPU
+		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D71F6CCC-0D67-401C-916C-0529571FC431}.Debug|x64.Build.0 = Debug|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Release|x64.ActiveCfg = Release|Any CPU
 		{D71F6CCC-0D67-401C-916C-0529571FC431}.Release|x64.Build.0 = Release|Any CPU
-		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|x64.Build.0 = Debug|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Checked|x64.Build.0 = Checked|Any CPU
+		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Debug|x64.Build.0 = Debug|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Release|Any CPU.Build.0 = Release|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Release|x64.ActiveCfg = Release|Any CPU
 		{88B9A0E6-0ADB-4EB5-85A1-652233306A79}.Release|x64.Build.0 = Release|Any CPU
-		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|x64.Build.0 = Debug|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Checked|x64.Build.0 = Checked|Any CPU
+		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{68DAD312-A648-424D-A134-922AEFA15413}.Debug|x64.Build.0 = Debug|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Release|Any CPU.Build.0 = Release|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Release|x64.ActiveCfg = Release|Any CPU
 		{68DAD312-A648-424D-A134-922AEFA15413}.Release|x64.Build.0 = Release|Any CPU
-		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Checked|x64.Build.0 = Checked|Any CPU
+		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Release|x64.ActiveCfg = Release|Any CPU
 		{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}.Release|x64.Build.0 = Release|Any CPU
-		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Checked|x64.Build.0 = Checked|Any CPU
+		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Release|x64.ActiveCfg = Release|Any CPU
 		{DBC6F9F2-7364-46FE-8694-1D135DF355A0}.Release|x64.Build.0 = Release|Any CPU
-		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|x64.Build.0 = Debug|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Checked|x64.Build.0 = Checked|Any CPU
+		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{45333B47-E509-41CF-9627-4EF137D9B249}.Debug|x64.Build.0 = Debug|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Release|Any CPU.Build.0 = Release|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Release|x64.ActiveCfg = Release|Any CPU
 		{45333B47-E509-41CF-9627-4EF137D9B249}.Release|x64.Build.0 = Release|Any CPU
-		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|x64.Build.0 = Debug|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Checked|x64.Build.0 = Checked|Any CPU
+		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{22B4CD80-3644-4D24-A67D-645FE3844927}.Debug|x64.Build.0 = Debug|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Release|Any CPU.Build.0 = Release|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Release|x64.ActiveCfg = Release|Any CPU
 		{22B4CD80-3644-4D24-A67D-645FE3844927}.Release|x64.Build.0 = Release|Any CPU
-		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|x64.Build.0 = Debug|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Checked|x64.Build.0 = Checked|Any CPU
+		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Debug|x64.Build.0 = Debug|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Release|x64.ActiveCfg = Release|Any CPU
 		{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}.Release|x64.Build.0 = Release|Any CPU
-		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|x64.Build.0 = Debug|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Checked|x64.Build.0 = Checked|Any CPU
+		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D699CFA0-477E-4107-8C40-FF40583040C9}.Debug|x64.Build.0 = Debug|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Release|x64.ActiveCfg = Release|Any CPU
 		{D699CFA0-477E-4107-8C40-FF40583040C9}.Release|x64.Build.0 = Release|Any CPU
-		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|x64.Build.0 = Debug|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Checked|x64.Build.0 = Checked|Any CPU
+		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Debug|x64.Build.0 = Debug|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Release|x64.ActiveCfg = Release|Any CPU
 		{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}.Release|x64.Build.0 = Release|Any CPU
-		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|x64.Build.0 = Debug|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Checked|x64.Build.0 = Checked|Any CPU
+		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Debug|x64.Build.0 = Debug|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Release|Any CPU.Build.0 = Release|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Release|x64.ActiveCfg = Release|Any CPU
 		{867151F8-7CC6-42A8-AA43-56FAA17C5765}.Release|x64.Build.0 = Release|Any CPU
-		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Checked|x64.Build.0 = Checked|Any CPU
+		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Debug|x64.Build.0 = Debug|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Release|x64.ActiveCfg = Release|Any CPU
 		{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}.Release|x64.Build.0 = Release|Any CPU
-		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|x64.Build.0 = Debug|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Checked|x64.Build.0 = Checked|Any CPU
+		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Debug|x64.Build.0 = Debug|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Release|x64.ActiveCfg = Release|Any CPU
 		{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}.Release|x64.Build.0 = Release|Any CPU
-		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|x64.Build.0 = Debug|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Checked|x64.Build.0 = Checked|Any CPU
+		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Debug|x64.Build.0 = Debug|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Release|x64.ActiveCfg = Release|Any CPU
 		{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}.Release|x64.Build.0 = Release|Any CPU
-		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|x64.Build.0 = Debug|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Checked|x64.Build.0 = Checked|Any CPU
+		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0D793897-35AF-4F89-AE80-764E25987B68}.Debug|x64.Build.0 = Debug|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Release|x64.ActiveCfg = Release|Any CPU
 		{0D793897-35AF-4F89-AE80-764E25987B68}.Release|x64.Build.0 = Release|Any CPU
-		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|x64.Build.0 = Debug|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Checked|x64.Build.0 = Checked|Any CPU
+		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Debug|x64.Build.0 = Debug|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Release|x64.ActiveCfg = Release|Any CPU
 		{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}.Release|x64.Build.0 = Release|Any CPU
-		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|x64.Build.0 = Debug|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Checked|x64.Build.0 = Checked|Any CPU
+		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Debug|x64.Build.0 = Debug|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Release|x64.ActiveCfg = Release|Any CPU
 		{533A348E-8B43-4135-9C11-ADC4D0A9A99B}.Release|x64.Build.0 = Release|Any CPU
-		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|x64.Build.0 = Debug|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Checked|x64.Build.0 = Checked|Any CPU
+		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Debug|x64.Build.0 = Debug|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Release|x64.ActiveCfg = Release|Any CPU
 		{CA713167-3F0D-4B7B-896C-8AF75F707D7E}.Release|x64.Build.0 = Release|Any CPU
-		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|x64.Build.0 = Debug|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Checked|x64.Build.0 = Checked|Any CPU
+		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Debug|x64.Build.0 = Debug|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Release|x64.ActiveCfg = Release|Any CPU
 		{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}.Release|x64.Build.0 = Release|Any CPU
-		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|x64.Build.0 = Debug|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Checked|x64.Build.0 = Checked|Any CPU
+		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Debug|x64.Build.0 = Debug|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Release|x64.ActiveCfg = Release|Any CPU
 		{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}.Release|x64.Build.0 = Release|Any CPU
-		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|x64.Build.0 = Debug|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Checked|x64.Build.0 = Checked|Any CPU
+		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Debug|x64.Build.0 = Debug|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Release|x64.ActiveCfg = Release|Any CPU
 		{9D7C6C0B-67C9-4EBA-812C-427B2747786C}.Release|x64.Build.0 = Release|Any CPU
-		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|x64.Build.0 = Debug|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Checked|x64.Build.0 = Checked|Any CPU
+		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06D52326-FE15-410B-83CA-E9296A80664A}.Debug|x64.Build.0 = Debug|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Release|x64.ActiveCfg = Release|Any CPU
 		{06D52326-FE15-410B-83CA-E9296A80664A}.Release|x64.Build.0 = Release|Any CPU
-		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|x64.Build.0 = Debug|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Checked|x64.Build.0 = Checked|Any CPU
+		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Debug|x64.Build.0 = Debug|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Release|x64.ActiveCfg = Release|Any CPU
 		{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}.Release|x64.Build.0 = Release|Any CPU
-		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|x64.Build.0 = Debug|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Checked|x64.Build.0 = Checked|Any CPU
+		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Debug|x64.Build.0 = Debug|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Release|x64.ActiveCfg = Release|Any CPU
 		{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}.Release|x64.Build.0 = Release|Any CPU
-		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|x64.Build.0 = Debug|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Checked|x64.Build.0 = Checked|Any CPU
+		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Debug|x64.Build.0 = Debug|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Release|x64.ActiveCfg = Release|Any CPU
 		{B201911C-100F-4BBF-AC74-37A7A6E29240}.Release|x64.Build.0 = Release|Any CPU
-		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|x64.Build.0 = Debug|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Checked|x64.Build.0 = Checked|Any CPU
+		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Debug|x64.Build.0 = Debug|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Release|x64.ActiveCfg = Release|Any CPU
 		{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}.Release|x64.Build.0 = Release|Any CPU
-		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Checked|x64.Build.0 = Checked|Any CPU
+		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Release|x64.ActiveCfg = Release|Any CPU
 		{9E38776B-AA0D-4B79-AD1B-8B49628748B4}.Release|x64.Build.0 = Release|Any CPU
-		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|x64.Build.0 = Debug|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Checked|x64.Build.0 = Checked|Any CPU
+		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E72EAA3F-8428-4A2E-A079-26519312086A}.Debug|x64.Build.0 = Debug|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Release|x64.ActiveCfg = Release|Any CPU
 		{E72EAA3F-8428-4A2E-A079-26519312086A}.Release|x64.Build.0 = Release|Any CPU
-		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Checked|x64.Build.0 = Checked|Any CPU
+		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Release|x64.ActiveCfg = Release|Any CPU
 		{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}.Release|x64.Build.0 = Release|Any CPU
-		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|x64.Build.0 = Debug|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Checked|x64.Build.0 = Checked|Any CPU
+		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Debug|x64.Build.0 = Debug|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Release|x64.ActiveCfg = Release|Any CPU
 		{D480AED3-2286-4034-A5E2-42C7A0014DC6}.Release|x64.Build.0 = Release|Any CPU
-		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|x64.Build.0 = Debug|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Checked|x64.Build.0 = Checked|Any CPU
+		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Debug|x64.Build.0 = Debug|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Release|Any CPU.Build.0 = Release|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Release|x64.ActiveCfg = Release|Any CPU
 		{23D00E82-5CE3-4C54-AE96-7A2D53811791}.Release|x64.Build.0 = Release|Any CPU
-		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|x64.Build.0 = Debug|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Checked|x64.Build.0 = Checked|Any CPU
+		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Debug|x64.Build.0 = Debug|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Release|x64.ActiveCfg = Release|Any CPU
 		{E17FE022-D37B-4739-BAE4-BED63DE3837F}.Release|x64.Build.0 = Release|Any CPU
-		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|x64.Build.0 = Debug|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Checked|x64.Build.0 = Checked|Any CPU
+		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Debug|x64.Build.0 = Debug|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Release|Any CPU.Build.0 = Release|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Release|x64.ActiveCfg = Release|Any CPU
 		{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}.Release|x64.Build.0 = Release|Any CPU
-		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|x64.Build.0 = Debug|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Checked|x64.Build.0 = Checked|Any CPU
+		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Debug|x64.Build.0 = Debug|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Release|x64.ActiveCfg = Release|Any CPU
 		{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}.Release|x64.Build.0 = Release|Any CPU
-		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|x64.Build.0 = Debug|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Checked|x64.Build.0 = Checked|Any CPU
+		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Debug|x64.Build.0 = Debug|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Release|x64.ActiveCfg = Release|Any CPU
 		{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}.Release|x64.Build.0 = Release|Any CPU
-		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Checked|x64.Build.0 = Checked|Any CPU
+		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Release|x64.ActiveCfg = Release|Any CPU
 		{9B5AD16F-BD22-4238-B2D6-4257177929A5}.Release|x64.Build.0 = Release|Any CPU
-		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Checked|x64.Build.0 = Checked|Any CPU
+		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Release|x64.ActiveCfg = Release|Any CPU
 		{57A93F23-5D4F-4B04-B0BD-78C0470733B6}.Release|x64.Build.0 = Release|Any CPU
-		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|x64.Build.0 = Debug|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Checked|x64.Build.0 = Checked|Any CPU
+		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5264C5D-3734-459D-B50E-AAC29135C045}.Debug|x64.Build.0 = Debug|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Release|x64.ActiveCfg = Release|Any CPU
 		{E5264C5D-3734-459D-B50E-AAC29135C045}.Release|x64.Build.0 = Release|Any CPU
-		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|x64.Build.0 = Debug|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Checked|x64.Build.0 = Checked|Any CPU
+		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Debug|x64.Build.0 = Debug|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Release|x64.ActiveCfg = Release|Any CPU
 		{E6160387-CF75-4ED6-8E20-53C1033E20B8}.Release|x64.Build.0 = Release|Any CPU
-		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|x64.Build.0 = Debug|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Checked|x64.Build.0 = Checked|Any CPU
+		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Debug|x64.Build.0 = Debug|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Release|Any CPU.Build.0 = Release|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Release|x64.ActiveCfg = Release|Any CPU
 		{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}.Release|x64.Build.0 = Release|Any CPU
-		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|x64.Build.0 = Debug|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Checked|x64.Build.0 = Checked|Any CPU
+		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Debug|x64.Build.0 = Debug|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Release|x64.ActiveCfg = Release|Any CPU
 		{7C847559-14F1-43D2-BD8D-8F9680655C31}.Release|x64.Build.0 = Release|Any CPU
-		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|x64.Build.0 = Debug|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Checked|x64.Build.0 = Checked|Any CPU
+		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Debug|x64.Build.0 = Debug|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Release|x64.ActiveCfg = Release|Any CPU
 		{8A4CA30B-F404-439B-AFE9-056BCD22E27E}.Release|x64.Build.0 = Release|Any CPU
-		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|x64.Build.0 = Debug|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Checked|x64.Build.0 = Checked|Any CPU
+		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Debug|x64.Build.0 = Debug|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Release|x64.ActiveCfg = Release|Any CPU
 		{5080B3C4-69B5-41BF-9283-E081CBAF94D5}.Release|x64.Build.0 = Release|Any CPU
-		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|x64.Build.0 = Debug|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Checked|x64.Build.0 = Checked|Any CPU
+		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Debug|x64.Build.0 = Debug|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Release|x64.ActiveCfg = Release|Any CPU
 		{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}.Release|x64.Build.0 = Release|Any CPU
-		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Checked|x64.Build.0 = Checked|Any CPU
+		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Release|x64.ActiveCfg = Release|Any CPU
 		{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}.Release|x64.Build.0 = Release|Any CPU
-		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|x64.Build.0 = Debug|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Checked|x64.Build.0 = Checked|Any CPU
+		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Debug|x64.Build.0 = Debug|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Release|x64.ActiveCfg = Release|Any CPU
 		{DE8466D8-73FC-4F24-BACA-F501645D7F24}.Release|x64.Build.0 = Release|Any CPU
-		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|x64.Build.0 = Debug|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Checked|x64.Build.0 = Checked|Any CPU
+		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Debug|x64.Build.0 = Debug|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Release|Any CPU.Build.0 = Release|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Release|x64.ActiveCfg = Release|Any CPU
 		{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}.Release|x64.Build.0 = Release|Any CPU
-		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|x64.Build.0 = Debug|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Checked|x64.Build.0 = Checked|Any CPU
+		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Debug|x64.Build.0 = Debug|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Release|Any CPU.Build.0 = Release|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Release|x64.ActiveCfg = Release|Any CPU
 		{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}.Release|x64.Build.0 = Release|Any CPU
-		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|x64.Build.0 = Debug|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Checked|x64.Build.0 = Checked|Any CPU
+		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Debug|x64.Build.0 = Debug|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Release|x64.ActiveCfg = Release|Any CPU
 		{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}.Release|x64.Build.0 = Release|Any CPU
-		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|x64.Build.0 = Debug|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Checked|x64.Build.0 = Checked|Any CPU
+		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Debug|x64.Build.0 = Debug|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Release|x64.ActiveCfg = Release|Any CPU
 		{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}.Release|x64.Build.0 = Release|Any CPU
-		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|x64.Build.0 = Debug|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Checked|x64.Build.0 = Checked|Any CPU
+		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Debug|x64.Build.0 = Debug|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Release|x64.ActiveCfg = Release|Any CPU
 		{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}.Release|x64.Build.0 = Release|Any CPU
-		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Checked|x64.Build.0 = Checked|Any CPU
+		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Debug|x64.Build.0 = Debug|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Release|x64.ActiveCfg = Release|Any CPU
 		{BD949E3E-C280-48EE-8184-87DAC8A703DC}.Release|x64.Build.0 = Release|Any CPU
-		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|x64.Build.0 = Debug|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Checked|x64.Build.0 = Checked|Any CPU
+		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Debug|x64.Build.0 = Debug|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Release|x64.ActiveCfg = Release|Any CPU
 		{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}.Release|x64.Build.0 = Release|Any CPU
-		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|x64.Build.0 = Debug|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Checked|x64.Build.0 = Checked|Any CPU
+		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Debug|x64.Build.0 = Debug|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Release|x64.ActiveCfg = Release|Any CPU
 		{7E653F52-E821-4AD7-84B9-FBD13E0C1308}.Release|x64.Build.0 = Release|Any CPU
-		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|x64.Build.0 = Debug|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Checked|x64.Build.0 = Checked|Any CPU
+		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Debug|x64.Build.0 = Debug|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Release|x64.ActiveCfg = Release|Any CPU
 		{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}.Release|x64.Build.0 = Release|Any CPU
-		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|x64.Build.0 = Debug|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Checked|x64.Build.0 = Checked|Any CPU
+		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Debug|x64.Build.0 = Debug|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Release|x64.ActiveCfg = Release|Any CPU
 		{A57CD20C-BC08-49F1-88CD-AB3609C76C68}.Release|x64.Build.0 = Release|Any CPU
-		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|x64.Build.0 = Debug|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Checked|x64.Build.0 = Checked|Any CPU
+		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Debug|x64.Build.0 = Debug|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Release|x64.ActiveCfg = Release|Any CPU
 		{387A2A16-9BD0-4E49-B934-9F725CEB810E}.Release|x64.Build.0 = Release|Any CPU
-		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|x64.Build.0 = Debug|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Checked|x64.Build.0 = Checked|Any CPU
+		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E0103068-EB46-4656-87E3-CF19AE878B11}.Debug|x64.Build.0 = Debug|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Release|x64.ActiveCfg = Release|Any CPU
 		{E0103068-EB46-4656-87E3-CF19AE878B11}.Release|x64.Build.0 = Release|Any CPU
-		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|x64.Build.0 = Debug|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Checked|x64.Build.0 = Checked|Any CPU
+		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Debug|x64.Build.0 = Debug|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Release|x64.ActiveCfg = Release|Any CPU
 		{F93B7BB2-940E-431E-8839-27BA4B19A37D}.Release|x64.Build.0 = Release|Any CPU
-		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|x64.Build.0 = Debug|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Checked|x64.Build.0 = Checked|Any CPU
+		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Debug|x64.Build.0 = Debug|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Release|x64.ActiveCfg = Release|Any CPU
 		{8690FDA6-ED8B-476B-B425-11B537AD3D1F}.Release|x64.Build.0 = Release|Any CPU
-		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Checked|x64.Build.0 = Checked|Any CPU
+		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Release|x64.ActiveCfg = Release|Any CPU
 		{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}.Release|x64.Build.0 = Release|Any CPU
-		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|x64.Build.0 = Debug|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Checked|x64.Build.0 = Checked|Any CPU
+		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B37628B7-CE24-421E-ADD9-8891841089F4}.Debug|x64.Build.0 = Debug|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Release|x64.ActiveCfg = Release|Any CPU
 		{B37628B7-CE24-421E-ADD9-8891841089F4}.Release|x64.Build.0 = Release|Any CPU
-		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|x64.Build.0 = Debug|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Checked|x64.Build.0 = Checked|Any CPU
+		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Debug|x64.Build.0 = Debug|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Release|x64.ActiveCfg = Release|Any CPU
 		{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}.Release|x64.Build.0 = Release|Any CPU
-		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Checked|x64.Build.0 = Checked|Any CPU
+		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Debug|x64.Build.0 = Debug|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Release|x64.ActiveCfg = Release|Any CPU
 		{3E50722A-00C5-4325-9725-B3ED27E7C68B}.Release|x64.Build.0 = Release|Any CPU
-		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|x64.Build.0 = Debug|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Checked|x64.Build.0 = Checked|Any CPU
+		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Debug|x64.Build.0 = Debug|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Release|Any CPU.Build.0 = Release|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Release|x64.ActiveCfg = Release|Any CPU
 		{27089AED-EA60-4CCE-B935-6DE8E6B1A493}.Release|x64.Build.0 = Release|Any CPU
-		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|x64.Build.0 = Debug|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Checked|x64.Build.0 = Checked|Any CPU
+		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10E43853-92BC-4942-87E4-552668E7D79A}.Debug|x64.Build.0 = Debug|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Release|x64.ActiveCfg = Release|Any CPU
 		{10E43853-92BC-4942-87E4-552668E7D79A}.Release|x64.Build.0 = Release|Any CPU
-		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|x64.Build.0 = Debug|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Checked|x64.Build.0 = Checked|Any CPU
+		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Debug|x64.Build.0 = Debug|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Release|Any CPU.Build.0 = Release|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Release|x64.ActiveCfg = Release|Any CPU
 		{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}.Release|x64.Build.0 = Release|Any CPU
-		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Checked|x64.Build.0 = Checked|Any CPU
+		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Debug|x64.Build.0 = Debug|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Release|x64.ActiveCfg = Release|Any CPU
 		{DBFE118D-00F9-482C-9805-F1A2B41F4A28}.Release|x64.Build.0 = Release|Any CPU
-		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|x64.Build.0 = Debug|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Checked|x64.Build.0 = Checked|Any CPU
+		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Debug|x64.Build.0 = Debug|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Release|x64.ActiveCfg = Release|Any CPU
 		{1A5C747A-F17C-4AB3-823F-48066B124D66}.Release|x64.Build.0 = Release|Any CPU
-		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|x64.Build.0 = Debug|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Checked|x64.Build.0 = Checked|Any CPU
+		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{02B9E9A9-A095-453D-BE57-77322656E398}.Debug|x64.Build.0 = Debug|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Release|Any CPU.Build.0 = Release|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Release|x64.ActiveCfg = Release|Any CPU
 		{02B9E9A9-A095-453D-BE57-77322656E398}.Release|x64.Build.0 = Release|Any CPU
-		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|x64.Build.0 = Debug|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Checked|x64.Build.0 = Checked|Any CPU
+		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Debug|x64.Build.0 = Debug|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Release|x64.ActiveCfg = Release|Any CPU
 		{C15DE2D2-D511-4E8B-99EC-310AB048ED78}.Release|x64.Build.0 = Release|Any CPU
-		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Checked|x64.Build.0 = Checked|Any CPU
+		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Release|x64.ActiveCfg = Release|Any CPU
 		{FDCA396E-8F47-4D7B-A217-9A58C89906D4}.Release|x64.Build.0 = Release|Any CPU
-		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|x64.Build.0 = Debug|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Checked|x64.Build.0 = Checked|Any CPU
+		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F429DB17-B746-49A5-867D-E1B01743506B}.Debug|x64.Build.0 = Debug|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Release|x64.ActiveCfg = Release|Any CPU
 		{F429DB17-B746-49A5-867D-E1B01743506B}.Release|x64.Build.0 = Release|Any CPU
-		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Checked|x64.Build.0 = Checked|Any CPU
+		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Release|x64.ActiveCfg = Release|Any CPU
 		{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}.Release|x64.Build.0 = Release|Any CPU
-		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|x64.Build.0 = Debug|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Checked|x64.Build.0 = Checked|Any CPU
+		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Debug|x64.Build.0 = Debug|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Release|x64.ActiveCfg = Release|Any CPU
 		{A9202F62-6B02-46A0-A746-3AB1642FAA32}.Release|x64.Build.0 = Release|Any CPU
-		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|x64.Build.0 = Debug|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Checked|x64.Build.0 = Checked|Any CPU
+		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Debug|x64.Build.0 = Debug|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Release|x64.ActiveCfg = Release|Any CPU
 		{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}.Release|x64.Build.0 = Release|Any CPU
-		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Checked|x64.Build.0 = Checked|Any CPU
+		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Release|x64.ActiveCfg = Release|Any CPU
 		{D4659BB2-3194-4E72-8F96-90D1D4C376E6}.Release|x64.Build.0 = Release|Any CPU
-		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|x64.Build.0 = Debug|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Checked|x64.Build.0 = Checked|Any CPU
+		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{99A9FC6E-8554-442E-A563-79C591CD6080}.Debug|x64.Build.0 = Debug|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Release|Any CPU.Build.0 = Release|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Release|x64.ActiveCfg = Release|Any CPU
 		{99A9FC6E-8554-442E-A563-79C591CD6080}.Release|x64.Build.0 = Release|Any CPU
-		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Checked|x64.Build.0 = Checked|Any CPU
+		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Release|x64.ActiveCfg = Release|Any CPU
 		{F252D0B3-0048-42F4-BBEB-D383F580C8A1}.Release|x64.Build.0 = Release|Any CPU
-		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|x64.Build.0 = Debug|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Checked|x64.Build.0 = Checked|Any CPU
+		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3668BBD3-D327-454E-993C-A21C14CF0681}.Debug|x64.Build.0 = Debug|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Release|x64.ActiveCfg = Release|Any CPU
 		{3668BBD3-D327-454E-993C-A21C14CF0681}.Release|x64.Build.0 = Release|Any CPU
-		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|x64.Build.0 = Debug|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Checked|x64.Build.0 = Checked|Any CPU
+		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Debug|x64.Build.0 = Debug|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Release|x64.ActiveCfg = Release|Any CPU
 		{60D4A110-1B71-4533-B2B0-ADBA05183FCA}.Release|x64.Build.0 = Release|Any CPU
-		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|x64.Build.0 = Debug|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Checked|x64.Build.0 = Checked|Any CPU
+		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Debug|x64.Build.0 = Debug|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Release|x64.ActiveCfg = Release|Any CPU
 		{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}.Release|x64.Build.0 = Release|Any CPU
-		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|x64.Build.0 = Debug|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Checked|x64.Build.0 = Checked|Any CPU
+		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Debug|x64.Build.0 = Debug|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Release|x64.ActiveCfg = Release|Any CPU
 		{019C9789-1053-4D7E-9E50-9B0EEE6A185C}.Release|x64.Build.0 = Release|Any CPU
-		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|x64.Build.0 = Debug|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Checked|x64.Build.0 = Checked|Any CPU
+		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Debug|x64.Build.0 = Debug|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Release|x64.ActiveCfg = Release|Any CPU
 		{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}.Release|x64.Build.0 = Release|Any CPU
-		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|x64.Build.0 = Debug|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Checked|x64.Build.0 = Checked|Any CPU
+		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Debug|x64.Build.0 = Debug|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Release|x64.ActiveCfg = Release|Any CPU
 		{D5770801-F36C-4DA4-8A58-69AE5CC4E888}.Release|x64.Build.0 = Release|Any CPU
-		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Checked|x64.Build.0 = Checked|Any CPU
+		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Release|x64.ActiveCfg = Release|Any CPU
 		{F1996DA9-E707-4E7A-81FC-03DEB87378BD}.Release|x64.Build.0 = Release|Any CPU
-		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|x64.Build.0 = Debug|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Checked|x64.Build.0 = Checked|Any CPU
+		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Debug|x64.Build.0 = Debug|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Release|x64.ActiveCfg = Release|Any CPU
 		{2533F191-FA8A-4FA9-873F-79B6804AD2C8}.Release|x64.Build.0 = Release|Any CPU
-		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|x64.Build.0 = Debug|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Checked|x64.Build.0 = Checked|Any CPU
+		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Debug|x64.Build.0 = Debug|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Release|x64.ActiveCfg = Release|Any CPU
 		{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}.Release|x64.Build.0 = Release|Any CPU
-		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|x64.Build.0 = Debug|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Checked|x64.Build.0 = Checked|Any CPU
+		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Debug|x64.Build.0 = Debug|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Release|x64.ActiveCfg = Release|Any CPU
 		{691593C3-E183-48E0-8D91-65E0201D7C0C}.Release|x64.Build.0 = Release|Any CPU
-		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|x64.Build.0 = Debug|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Checked|x64.Build.0 = Checked|Any CPU
+		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Debug|x64.Build.0 = Debug|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Release|x64.ActiveCfg = Release|Any CPU
 		{D84D3EEE-222D-4927-A323-D0C224F3E573}.Release|x64.Build.0 = Release|Any CPU
-		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Checked|x64.Build.0 = Checked|Any CPU
+		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Release|x64.ActiveCfg = Release|Any CPU
 		{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}.Release|x64.Build.0 = Release|Any CPU
-		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Checked|x64.Build.0 = Checked|Any CPU
+		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Release|x64.ActiveCfg = Release|Any CPU
 		{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}.Release|x64.Build.0 = Release|Any CPU
-		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|x64.Build.0 = Debug|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Checked|x64.Build.0 = Checked|Any CPU
+		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Debug|x64.Build.0 = Debug|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Release|x64.ActiveCfg = Release|Any CPU
 		{20A55E8F-A15F-498E-9C96-A21D548CFF5B}.Release|x64.Build.0 = Release|Any CPU
-		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|x64.Build.0 = Debug|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Checked|x64.Build.0 = Checked|Any CPU
+		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Debug|x64.Build.0 = Debug|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Release|x64.ActiveCfg = Release|Any CPU
 		{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}.Release|x64.Build.0 = Release|Any CPU
-		{3F998112-300D-4E91-A63C-629716549E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F998112-300D-4E91-A63C-629716549E08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F998112-300D-4E91-A63C-629716549E08}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3F998112-300D-4E91-A63C-629716549E08}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3F998112-300D-4E91-A63C-629716549E08}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3F998112-300D-4E91-A63C-629716549E08}.Debug|x64.Build.0 = Debug|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Checked|x64.Build.0 = Checked|Any CPU
+		{3F998112-300D-4E91-A63C-629716549E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F998112-300D-4E91-A63C-629716549E08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F998112-300D-4E91-A63C-629716549E08}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3F998112-300D-4E91-A63C-629716549E08}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3F998112-300D-4E91-A63C-629716549E08}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3F998112-300D-4E91-A63C-629716549E08}.Debug|x64.Build.0 = Debug|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Release|x64.ActiveCfg = Release|Any CPU
 		{3F998112-300D-4E91-A63C-629716549E08}.Release|x64.Build.0 = Release|Any CPU
-		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|x64.Build.0 = Debug|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Checked|x64.Build.0 = Checked|Any CPU
+		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{057C217E-A1F3-47E7-90EF-1381FA776873}.Debug|x64.Build.0 = Debug|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Release|Any CPU.Build.0 = Release|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Release|x64.ActiveCfg = Release|Any CPU
 		{057C217E-A1F3-47E7-90EF-1381FA776873}.Release|x64.Build.0 = Release|Any CPU
-		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|x64.Build.0 = Debug|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Checked|x64.Build.0 = Checked|Any CPU
+		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Debug|x64.Build.0 = Debug|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Release|x64.ActiveCfg = Release|Any CPU
 		{DFF5F310-3B12-4EBA-9238-62676EB60880}.Release|x64.Build.0 = Release|Any CPU
-		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Checked|x64.Build.0 = Checked|Any CPU
+		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Release|x64.ActiveCfg = Release|Any CPU
 		{0785FDAB-4D31-4685-B367-761E05C9D0EC}.Release|x64.Build.0 = Release|Any CPU
-		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|x64.Build.0 = Debug|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Checked|x64.Build.0 = Checked|Any CPU
+		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Debug|x64.Build.0 = Debug|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Release|x64.ActiveCfg = Release|Any CPU
 		{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}.Release|x64.Build.0 = Release|Any CPU
-		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|x64.Build.0 = Debug|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Checked|x64.Build.0 = Checked|Any CPU
+		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Debug|x64.Build.0 = Debug|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Release|x64.ActiveCfg = Release|Any CPU
 		{739A4E16-C0EE-441D-94F4-ABCE480099D6}.Release|x64.Build.0 = Release|Any CPU
-		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|x64.Build.0 = Debug|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Checked|x64.Build.0 = Checked|Any CPU
+		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Debug|x64.Build.0 = Debug|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Release|x64.ActiveCfg = Release|Any CPU
 		{B83094A3-CB33-4B53-8EC4-86D621B94969}.Release|x64.Build.0 = Release|Any CPU
-		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|x64.Build.0 = Debug|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Checked|x64.Build.0 = Checked|Any CPU
+		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Debug|x64.Build.0 = Debug|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Release|x64.ActiveCfg = Release|Any CPU
 		{7A66B167-954F-4759-9AD4-DF4646BD0FD1}.Release|x64.Build.0 = Release|Any CPU
-		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|x64.Build.0 = Debug|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Checked|x64.Build.0 = Checked|Any CPU
+		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Debug|x64.Build.0 = Debug|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Release|x64.ActiveCfg = Release|Any CPU
 		{3D92D0C7-EB79-442A-8FAE-2062967BB071}.Release|x64.Build.0 = Release|Any CPU
-		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|x64.Build.0 = Debug|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Checked|x64.Build.0 = Checked|Any CPU
+		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Debug|x64.Build.0 = Debug|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Release|x64.ActiveCfg = Release|Any CPU
 		{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}.Release|x64.Build.0 = Release|Any CPU
-		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Checked|x64.Build.0 = Checked|Any CPU
+		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Release|x64.ActiveCfg = Release|Any CPU
 		{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}.Release|x64.Build.0 = Release|Any CPU
-		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Checked|x64.Build.0 = Checked|Any CPU
+		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Release|x64.ActiveCfg = Release|Any CPU
 		{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}.Release|x64.Build.0 = Release|Any CPU
-		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Checked|x64.Build.0 = Checked|Any CPU
+		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Release|x64.ActiveCfg = Release|Any CPU
 		{0B633E06-28C1-4B74-9689-A8FBA27B8E16}.Release|x64.Build.0 = Release|Any CPU
-		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|x64.Build.0 = Debug|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Checked|x64.Build.0 = Checked|Any CPU
+		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Debug|x64.Build.0 = Debug|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Release|x64.ActiveCfg = Release|Any CPU
 		{79415AB2-2446-4237-B3C4-A7FFD441771A}.Release|x64.Build.0 = Release|Any CPU
-		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|x64.Build.0 = Debug|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Checked|x64.Build.0 = Checked|Any CPU
+		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Debug|x64.Build.0 = Debug|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Release|x64.ActiveCfg = Release|Any CPU
 		{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}.Release|x64.Build.0 = Release|Any CPU
-		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|x64.Build.0 = Debug|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Checked|x64.Build.0 = Checked|Any CPU
+		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Debug|x64.Build.0 = Debug|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Release|x64.ActiveCfg = Release|Any CPU
 		{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}.Release|x64.Build.0 = Release|Any CPU
-		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|x64.Build.0 = Debug|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Checked|x64.Build.0 = Checked|Any CPU
+		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4C56766C-B273-40B9-83A3-864587B27DCF}.Debug|x64.Build.0 = Debug|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Release|x64.ActiveCfg = Release|Any CPU
 		{4C56766C-B273-40B9-83A3-864587B27DCF}.Release|x64.Build.0 = Release|Any CPU
-		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Checked|x64.Build.0 = Checked|Any CPU
+		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Debug|x64.Build.0 = Debug|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Release|x64.ActiveCfg = Release|Any CPU
 		{9B09D580-688C-453E-8117-D3DE0CAA0C1C}.Release|x64.Build.0 = Release|Any CPU
-		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Checked|x64.Build.0 = Checked|Any CPU
+		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Release|x64.ActiveCfg = Release|Any CPU
 		{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}.Release|x64.Build.0 = Release|Any CPU
-		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|x64.Build.0 = Debug|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Checked|x64.Build.0 = Checked|Any CPU
+		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Debug|x64.Build.0 = Debug|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Release|x64.ActiveCfg = Release|Any CPU
 		{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}.Release|x64.Build.0 = Release|Any CPU
-		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Checked|x64.Build.0 = Checked|Any CPU
+		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Release|x64.ActiveCfg = Release|Any CPU
 		{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}.Release|x64.Build.0 = Release|Any CPU
-		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|x64.Build.0 = Debug|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Checked|x64.Build.0 = Checked|Any CPU
+		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Debug|x64.Build.0 = Debug|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Release|x64.ActiveCfg = Release|Any CPU
 		{108844DD-995F-48F3-AF3F-F97FEECF9EF3}.Release|x64.Build.0 = Release|Any CPU
-		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|x64.Build.0 = Debug|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Checked|x64.Build.0 = Checked|Any CPU
+		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Debug|x64.Build.0 = Debug|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Release|x64.ActiveCfg = Release|Any CPU
 		{11D3DC9A-3154-4968-8D52-FE25D4A460E5}.Release|x64.Build.0 = Release|Any CPU
-		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|x64.Build.0 = Debug|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Checked|x64.Build.0 = Checked|Any CPU
+		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Debug|x64.Build.0 = Debug|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Release|x64.ActiveCfg = Release|Any CPU
 		{2F5EE036-F784-49AE-B95C-5615AB7F47D3}.Release|x64.Build.0 = Release|Any CPU
-		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|x64.Build.0 = Debug|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Checked|x64.Build.0 = Checked|Any CPU
+		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Debug|x64.Build.0 = Debug|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Release|x64.ActiveCfg = Release|Any CPU
 		{F07227A9-C305-42FE-969D-D1461D6BEF6F}.Release|x64.Build.0 = Release|Any CPU
-		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|x64.Build.0 = Debug|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Checked|x64.Build.0 = Checked|Any CPU
+		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{85F114AE-6238-4E30-B579-7BB0D658922E}.Debug|x64.Build.0 = Debug|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Release|x64.ActiveCfg = Release|Any CPU
 		{85F114AE-6238-4E30-B579-7BB0D658922E}.Release|x64.Build.0 = Release|Any CPU
-		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|x64.Build.0 = Debug|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Checked|x64.Build.0 = Checked|Any CPU
+		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Debug|x64.Build.0 = Debug|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Release|x64.ActiveCfg = Release|Any CPU
 		{18DCAA00-850D-41AF-9B12-DD8E99B150BA}.Release|x64.Build.0 = Release|Any CPU
-		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Checked|x64.Build.0 = Checked|Any CPU
+		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Debug|x64.Build.0 = Debug|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Release|x64.ActiveCfg = Release|Any CPU
 		{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}.Release|x64.Build.0 = Release|Any CPU
-		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Checked|x64.Build.0 = Checked|Any CPU
+		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDC30F95-BA55-472A-A295-D483565435C4}.Debug|x64.Build.0 = Debug|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Release|x64.ActiveCfg = Release|Any CPU
 		{FDC30F95-BA55-472A-A295-D483565435C4}.Release|x64.Build.0 = Release|Any CPU
-		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|x64.Build.0 = Debug|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Checked|x64.Build.0 = Checked|Any CPU
+		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{36E5B901-463B-47BB-A693-AFE10FC21395}.Debug|x64.Build.0 = Debug|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Release|Any CPU.Build.0 = Release|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Release|x64.ActiveCfg = Release|Any CPU
 		{36E5B901-463B-47BB-A693-AFE10FC21395}.Release|x64.Build.0 = Release|Any CPU
-		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|x64.Build.0 = Debug|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Checked|x64.Build.0 = Checked|Any CPU
+		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Debug|x64.Build.0 = Debug|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Release|x64.ActiveCfg = Release|Any CPU
 		{268C28E6-0F65-45A5-978A-C7BC947E2C2A}.Release|x64.Build.0 = Release|Any CPU
-		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|x64.Build.0 = Debug|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Checked|x64.Build.0 = Checked|Any CPU
+		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Debug|x64.Build.0 = Debug|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Release|x64.ActiveCfg = Release|Any CPU
 		{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}.Release|x64.Build.0 = Release|Any CPU
-		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Checked|x64.Build.0 = Checked|Any CPU
+		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Release|x64.ActiveCfg = Release|Any CPU
 		{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}.Release|x64.Build.0 = Release|Any CPU
-		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|x64.Build.0 = Debug|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Checked|x64.Build.0 = Checked|Any CPU
+		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96AD2682-4F41-4067-BCB4-F1B164154159}.Debug|x64.Build.0 = Debug|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Release|Any CPU.Build.0 = Release|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Release|x64.ActiveCfg = Release|Any CPU
 		{96AD2682-4F41-4067-BCB4-F1B164154159}.Release|x64.Build.0 = Release|Any CPU
-		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|x64.Build.0 = Debug|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Checked|x64.Build.0 = Checked|Any CPU
+		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Debug|x64.Build.0 = Debug|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Release|x64.ActiveCfg = Release|Any CPU
 		{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}.Release|x64.Build.0 = Release|Any CPU
-		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|x64.Build.0 = Debug|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Checked|x64.Build.0 = Checked|Any CPU
+		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FE92C687-9D99-4CAA-8991-122492761722}.Debug|x64.Build.0 = Debug|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Release|x64.ActiveCfg = Release|Any CPU
 		{FE92C687-9D99-4CAA-8991-122492761722}.Release|x64.Build.0 = Release|Any CPU
-		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|x64.Build.0 = Debug|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Checked|x64.Build.0 = Checked|Any CPU
+		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Debug|x64.Build.0 = Debug|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Release|x64.ActiveCfg = Release|Any CPU
 		{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}.Release|x64.Build.0 = Release|Any CPU
-		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Checked|x64.Build.0 = Checked|Any CPU
+		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Release|x64.ActiveCfg = Release|Any CPU
 		{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}.Release|x64.Build.0 = Release|Any CPU
-		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|x64.Build.0 = Debug|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Checked|x64.Build.0 = Checked|Any CPU
+		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Debug|x64.Build.0 = Debug|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Release|x64.ActiveCfg = Release|Any CPU
 		{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}.Release|x64.Build.0 = Release|Any CPU
-		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|x64.Build.0 = Debug|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Checked|x64.Build.0 = Checked|Any CPU
+		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Debug|x64.Build.0 = Debug|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Release|x64.ActiveCfg = Release|Any CPU
 		{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}.Release|x64.Build.0 = Release|Any CPU
-		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|x64.Build.0 = Debug|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Checked|x64.Build.0 = Checked|Any CPU
+		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Debug|x64.Build.0 = Debug|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Release|x64.ActiveCfg = Release|Any CPU
 		{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}.Release|x64.Build.0 = Release|Any CPU
-		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|x64.Build.0 = Debug|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Checked|x64.Build.0 = Checked|Any CPU
+		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Debug|x64.Build.0 = Debug|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Release|x64.ActiveCfg = Release|Any CPU
 		{DCD83293-D516-40DF-B9F0-3C6A06E027F9}.Release|x64.Build.0 = Release|Any CPU
-		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|x64.Build.0 = Debug|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Checked|x64.Build.0 = Checked|Any CPU
+		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Debug|x64.Build.0 = Debug|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Release|x64.ActiveCfg = Release|Any CPU
 		{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}.Release|x64.Build.0 = Release|Any CPU
-		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|x64.Build.0 = Debug|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Checked|x64.Build.0 = Checked|Any CPU
+		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Debug|x64.Build.0 = Debug|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Release|x64.ActiveCfg = Release|Any CPU
 		{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}.Release|x64.Build.0 = Release|Any CPU
-		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Checked|x64.Build.0 = Checked|Any CPU
+		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Release|x64.ActiveCfg = Release|Any CPU
 		{0A98D022-18A7-45C3-85D6-CD563D7FB748}.Release|x64.Build.0 = Release|Any CPU
-		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|x64.Build.0 = Debug|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Checked|x64.Build.0 = Checked|Any CPU
+		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5AD565C4-D90A-4F4C-961F-852208988029}.Debug|x64.Build.0 = Debug|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Release|x64.ActiveCfg = Release|Any CPU
 		{5AD565C4-D90A-4F4C-961F-852208988029}.Release|x64.Build.0 = Release|Any CPU
-		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|x64.Build.0 = Debug|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Checked|x64.Build.0 = Checked|Any CPU
+		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Debug|x64.Build.0 = Debug|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Release|Any CPU.Build.0 = Release|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Release|x64.ActiveCfg = Release|Any CPU
 		{14ABED61-9399-49A8-8E7E-F3C7A53AA097}.Release|x64.Build.0 = Release|Any CPU
-		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|x64.Build.0 = Debug|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Checked|x64.Build.0 = Checked|Any CPU
+		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Debug|x64.Build.0 = Debug|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Release|x64.ActiveCfg = Release|Any CPU
 		{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}.Release|x64.Build.0 = Release|Any CPU
-		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|x64.Build.0 = Debug|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Checked|x64.Build.0 = Checked|Any CPU
+		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Debug|x64.Build.0 = Debug|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Release|x64.ActiveCfg = Release|Any CPU
 		{4281C0B9-B4D5-473D-A790-310FBBB40A65}.Release|x64.Build.0 = Release|Any CPU
-		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Checked|x64.Build.0 = Checked|Any CPU
+		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Release|x64.ActiveCfg = Release|Any CPU
 		{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}.Release|x64.Build.0 = Release|Any CPU
-		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Checked|x64.Build.0 = Checked|Any CPU
+		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Release|x64.ActiveCfg = Release|Any CPU
 		{A1E821F6-07CF-46C5-AF96-3454B80436D2}.Release|x64.Build.0 = Release|Any CPU
-		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|x64.Build.0 = Debug|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Checked|x64.Build.0 = Checked|Any CPU
+		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{077010A8-4A52-4E5C-9392-C21B684A8375}.Debug|x64.Build.0 = Debug|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Release|Any CPU.Build.0 = Release|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Release|x64.ActiveCfg = Release|Any CPU
 		{077010A8-4A52-4E5C-9392-C21B684A8375}.Release|x64.Build.0 = Release|Any CPU
-		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|x64.Build.0 = Debug|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Checked|x64.Build.0 = Checked|Any CPU
+		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Debug|x64.Build.0 = Debug|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Release|x64.ActiveCfg = Release|Any CPU
 		{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}.Release|x64.Build.0 = Release|Any CPU
-		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|x64.Build.0 = Debug|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Checked|x64.Build.0 = Checked|Any CPU
+		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Debug|x64.Build.0 = Debug|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Release|x64.ActiveCfg = Release|Any CPU
 		{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}.Release|x64.Build.0 = Release|Any CPU
-		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|x64.Build.0 = Debug|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Checked|x64.Build.0 = Checked|Any CPU
+		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Debug|x64.Build.0 = Debug|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Release|x64.ActiveCfg = Release|Any CPU
 		{765B8DAE-C0A8-4247-B89C-A945693622D6}.Release|x64.Build.0 = Release|Any CPU
-		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Checked|x64.Build.0 = Checked|Any CPU
+		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Debug|x64.Build.0 = Debug|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Release|x64.ActiveCfg = Release|Any CPU
 		{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}.Release|x64.Build.0 = Release|Any CPU
-		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Checked|x64.Build.0 = Checked|Any CPU
+		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Release|x64.ActiveCfg = Release|Any CPU
 		{0A6812BB-B1ED-4946-985A-59D6BA337C02}.Release|x64.Build.0 = Release|Any CPU
-		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|x64.Build.0 = Debug|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Checked|x64.Build.0 = Checked|Any CPU
+		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Debug|x64.Build.0 = Debug|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Release|x64.ActiveCfg = Release|Any CPU
 		{C75CD0A5-EC50-4758-934C-6556DB3ABB56}.Release|x64.Build.0 = Release|Any CPU
-		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|x64.Build.0 = Debug|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Checked|x64.Build.0 = Checked|Any CPU
+		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Debug|x64.Build.0 = Debug|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Release|x64.ActiveCfg = Release|Any CPU
 		{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}.Release|x64.Build.0 = Release|Any CPU
-		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|x64.Build.0 = Debug|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Checked|x64.Build.0 = Checked|Any CPU
+		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D3D87C1-CFFE-4C30-B840-166734802351}.Debug|x64.Build.0 = Debug|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Release|x64.ActiveCfg = Release|Any CPU
 		{5D3D87C1-CFFE-4C30-B840-166734802351}.Release|x64.Build.0 = Release|Any CPU
-		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|x64.Build.0 = Debug|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Checked|x64.Build.0 = Checked|Any CPU
+		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{066648D8-5CC3-4237-B749-6EEF50933525}.Debug|x64.Build.0 = Debug|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Release|Any CPU.Build.0 = Release|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Release|x64.ActiveCfg = Release|Any CPU
 		{066648D8-5CC3-4237-B749-6EEF50933525}.Release|x64.Build.0 = Release|Any CPU
-		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|x64.Build.0 = Debug|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Checked|x64.Build.0 = Checked|Any CPU
+		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{55B6A522-0226-4155-8C65-07876D6A9860}.Debug|x64.Build.0 = Debug|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Release|Any CPU.Build.0 = Release|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Release|x64.ActiveCfg = Release|Any CPU
 		{55B6A522-0226-4155-8C65-07876D6A9860}.Release|x64.Build.0 = Release|Any CPU
-		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|x64.Build.0 = Debug|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Checked|x64.Build.0 = Checked|Any CPU
+		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Debug|x64.Build.0 = Debug|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Release|x64.ActiveCfg = Release|Any CPU
 		{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}.Release|x64.Build.0 = Release|Any CPU
-		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|x64.Build.0 = Debug|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Checked|x64.Build.0 = Checked|Any CPU
+		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Debug|x64.Build.0 = Debug|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Release|x64.ActiveCfg = Release|Any CPU
 		{0AAAF581-8DA8-43B4-AEF0-66F55292813E}.Release|x64.Build.0 = Release|Any CPU
-		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|x64.Build.0 = Debug|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Checked|x64.Build.0 = Checked|Any CPU
+		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8B3226D1-019E-4374-9D7A-984AFF660832}.Debug|x64.Build.0 = Debug|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Release|x64.ActiveCfg = Release|Any CPU
 		{8B3226D1-019E-4374-9D7A-984AFF660832}.Release|x64.Build.0 = Release|Any CPU
-		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|x64.Build.0 = Debug|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Checked|x64.Build.0 = Checked|Any CPU
+		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Debug|x64.Build.0 = Debug|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Release|x64.ActiveCfg = Release|Any CPU
 		{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}.Release|x64.Build.0 = Release|Any CPU
-		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|x64.Build.0 = Debug|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Checked|x64.Build.0 = Checked|Any CPU
+		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Debug|x64.Build.0 = Debug|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Release|x64.ActiveCfg = Release|Any CPU
 		{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}.Release|x64.Build.0 = Release|Any CPU
-		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Checked|x64.Build.0 = Checked|Any CPU
+		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{612EEF55-B933-4F56-9203-6387DB3755F5}.Debug|x64.Build.0 = Debug|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Release|x64.ActiveCfg = Release|Any CPU
 		{612EEF55-B933-4F56-9203-6387DB3755F5}.Release|x64.Build.0 = Release|Any CPU
-		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|x64.Build.0 = Debug|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Checked|x64.Build.0 = Checked|Any CPU
+		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Debug|x64.Build.0 = Debug|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Release|x64.ActiveCfg = Release|Any CPU
 		{04DCE5F5-545D-4326-AAE7-8B3311248AA3}.Release|x64.Build.0 = Release|Any CPU
-		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|x64.Build.0 = Debug|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Checked|x64.Build.0 = Checked|Any CPU
+		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Debug|x64.Build.0 = Debug|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Release|x64.ActiveCfg = Release|Any CPU
 		{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}.Release|x64.Build.0 = Release|Any CPU
-		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|x64.Build.0 = Debug|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Checked|x64.Build.0 = Checked|Any CPU
+		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Debug|x64.Build.0 = Debug|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Release|x64.ActiveCfg = Release|Any CPU
 		{20860BEB-89DA-4119-B82E-C7DD5994E92F}.Release|x64.Build.0 = Release|Any CPU
-		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|x64.Build.0 = Debug|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Checked|x64.Build.0 = Checked|Any CPU
+		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9050A814-D15D-4F3E-9259-54803F85FE63}.Debug|x64.Build.0 = Debug|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Release|x64.ActiveCfg = Release|Any CPU
 		{9050A814-D15D-4F3E-9259-54803F85FE63}.Release|x64.Build.0 = Release|Any CPU
-		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|x64.Build.0 = Debug|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Checked|x64.Build.0 = Checked|Any CPU
+		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Debug|x64.Build.0 = Debug|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Release|x64.ActiveCfg = Release|Any CPU
 		{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}.Release|x64.Build.0 = Release|Any CPU
-		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Checked|x64.Build.0 = Checked|Any CPU
+		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Release|x64.ActiveCfg = Release|Any CPU
 		{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}.Release|x64.Build.0 = Release|Any CPU
-		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|x64.Build.0 = Debug|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Checked|x64.Build.0 = Checked|Any CPU
+		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Debug|x64.Build.0 = Debug|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Release|x64.ActiveCfg = Release|Any CPU
 		{2896F75C-65F5-489C-99ED-C651B1CF438B}.Release|x64.Build.0 = Release|Any CPU
-		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|x64.Build.0 = Debug|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Checked|x64.Build.0 = Checked|Any CPU
+		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Debug|x64.Build.0 = Debug|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Release|x64.ActiveCfg = Release|Any CPU
 		{2755A058-AF1D-4DDA-85A0-D69E5A96D298}.Release|x64.Build.0 = Release|Any CPU
-		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|x64.Build.0 = Debug|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Checked|x64.Build.0 = Checked|Any CPU
+		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{95B46689-1DF6-4292-93C6-783B238750CD}.Debug|x64.Build.0 = Debug|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Release|x64.ActiveCfg = Release|Any CPU
 		{95B46689-1DF6-4292-93C6-783B238750CD}.Release|x64.Build.0 = Release|Any CPU
-		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Checked|x64.Build.0 = Checked|Any CPU
+		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Release|x64.ActiveCfg = Release|Any CPU
 		{D4376443-7B4E-4592-BA55-2C95E2313BB5}.Release|x64.Build.0 = Release|Any CPU
-		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|x64.Build.0 = Debug|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Checked|x64.Build.0 = Checked|Any CPU
+		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Debug|x64.Build.0 = Debug|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Release|x64.ActiveCfg = Release|Any CPU
 		{3D1C981E-82C6-4479-BA4A-9E498F8968F2}.Release|x64.Build.0 = Release|Any CPU
-		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|x64.Build.0 = Debug|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Checked|x64.Build.0 = Checked|Any CPU
+		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{52239498-7DBD-47B6-8C86-33D3928D305E}.Debug|x64.Build.0 = Debug|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Release|x64.ActiveCfg = Release|Any CPU
 		{52239498-7DBD-47B6-8C86-33D3928D305E}.Release|x64.Build.0 = Release|Any CPU
-		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|x64.Build.0 = Debug|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Checked|x64.Build.0 = Checked|Any CPU
+		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Debug|x64.Build.0 = Debug|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Release|x64.ActiveCfg = Release|Any CPU
 		{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}.Release|x64.Build.0 = Release|Any CPU
-		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|x64.Build.0 = Debug|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Checked|x64.Build.0 = Checked|Any CPU
+		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{281E6D84-DD28-44CF-9007-218767F38CEA}.Debug|x64.Build.0 = Debug|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Release|x64.ActiveCfg = Release|Any CPU
 		{281E6D84-DD28-44CF-9007-218767F38CEA}.Release|x64.Build.0 = Release|Any CPU
-		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Checked|x64.Build.0 = Checked|Any CPU
+		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Release|x64.ActiveCfg = Release|Any CPU
 		{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}.Release|x64.Build.0 = Release|Any CPU
-		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|x64.Build.0 = Debug|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Checked|x64.Build.0 = Checked|Any CPU
+		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Debug|x64.Build.0 = Debug|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Release|x64.ActiveCfg = Release|Any CPU
 		{67E8AF36-6FD6-461E-96BD-A539C62B21CA}.Release|x64.Build.0 = Release|Any CPU
-		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|x64.Build.0 = Debug|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Checked|x64.Build.0 = Checked|Any CPU
+		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Debug|x64.Build.0 = Debug|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Release|x64.ActiveCfg = Release|Any CPU
 		{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}.Release|x64.Build.0 = Release|Any CPU
-		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|x64.Build.0 = Debug|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Checked|x64.Build.0 = Checked|Any CPU
+		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Debug|x64.Build.0 = Debug|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Release|x64.ActiveCfg = Release|Any CPU
 		{CDB2B955-A5B9-4C92-A9CD-66421A10C575}.Release|x64.Build.0 = Release|Any CPU
-		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Checked|x64.Build.0 = Checked|Any CPU
+		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Debug|x64.Build.0 = Debug|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Release|x64.ActiveCfg = Release|Any CPU
 		{D4A7F6E3-10FB-4289-9889-559C58A9CE82}.Release|x64.Build.0 = Release|Any CPU
-		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|x64.Build.0 = Debug|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Checked|x64.Build.0 = Checked|Any CPU
+		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{85F10744-5D68-401F-95B0-11D9434FF153}.Debug|x64.Build.0 = Debug|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Release|Any CPU.Build.0 = Release|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Release|x64.ActiveCfg = Release|Any CPU
 		{85F10744-5D68-401F-95B0-11D9434FF153}.Release|x64.Build.0 = Release|Any CPU
-		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|x64.Build.0 = Debug|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Checked|x64.Build.0 = Checked|Any CPU
+		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Debug|x64.Build.0 = Debug|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Release|x64.ActiveCfg = Release|Any CPU
 		{C34ABC48-FC7E-478E-B148-06E3BF70B638}.Release|x64.Build.0 = Release|Any CPU
-		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|x64.Build.0 = Debug|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Checked|x64.Build.0 = Checked|Any CPU
+		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{65CC7212-A80C-4176-A942-2F9747772F31}.Debug|x64.Build.0 = Debug|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Release|Any CPU.Build.0 = Release|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Release|x64.ActiveCfg = Release|Any CPU
 		{65CC7212-A80C-4176-A942-2F9747772F31}.Release|x64.Build.0 = Release|Any CPU
-		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|x64.Build.0 = Debug|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Checked|x64.Build.0 = Checked|Any CPU
+		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Debug|x64.Build.0 = Debug|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Release|x64.ActiveCfg = Release|Any CPU
 		{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}.Release|x64.Build.0 = Release|Any CPU
-		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|x64.Build.0 = Debug|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Checked|x64.Build.0 = Checked|Any CPU
+		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Debug|x64.Build.0 = Debug|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Release|Any CPU.Build.0 = Release|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Release|x64.ActiveCfg = Release|Any CPU
 		{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}.Release|x64.Build.0 = Release|Any CPU
-		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|x64.Build.0 = Debug|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Checked|x64.Build.0 = Checked|Any CPU
+		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Debug|x64.Build.0 = Debug|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Release|x64.ActiveCfg = Release|Any CPU
 		{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}.Release|x64.Build.0 = Release|Any CPU
-		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Checked|x64.Build.0 = Checked|Any CPU
+		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Debug|x64.Build.0 = Debug|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Release|x64.ActiveCfg = Release|Any CPU
 		{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}.Release|x64.Build.0 = Release|Any CPU
-		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Checked|x64.Build.0 = Checked|Any CPU
+		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Release|x64.ActiveCfg = Release|Any CPU
 		{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}.Release|x64.Build.0 = Release|Any CPU
-		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|x64.Build.0 = Debug|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Checked|x64.Build.0 = Checked|Any CPU
+		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Debug|x64.Build.0 = Debug|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Release|x64.ActiveCfg = Release|Any CPU
 		{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}.Release|x64.Build.0 = Release|Any CPU
-		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|x64.Build.0 = Debug|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Checked|x64.Build.0 = Checked|Any CPU
+		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Debug|x64.Build.0 = Debug|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Release|Any CPU.Build.0 = Release|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Release|x64.ActiveCfg = Release|Any CPU
 		{027E2FF8-91B0-43EE-9FB5-D465143AA146}.Release|x64.Build.0 = Release|Any CPU
-		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Checked|x64.Build.0 = Checked|Any CPU
+		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Debug|x64.Build.0 = Debug|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Release|x64.ActiveCfg = Release|Any CPU
 		{93CE4675-F874-40C2-AFEA-401A247E70BB}.Release|x64.Build.0 = Release|Any CPU
-		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Checked|x64.Build.0 = Checked|Any CPU
+		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Release|x64.ActiveCfg = Release|Any CPU
 		{C846EFEF-EE6C-4946-9DBA-6756578415B4}.Release|x64.Build.0 = Release|Any CPU
-		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|x64.Build.0 = Debug|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Checked|x64.Build.0 = Checked|Any CPU
+		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{75D77419-B86B-47F0-A331-9A760698C35E}.Debug|x64.Build.0 = Debug|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Release|x64.ActiveCfg = Release|Any CPU
 		{75D77419-B86B-47F0-A331-9A760698C35E}.Release|x64.Build.0 = Release|Any CPU
-		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|x64.Build.0 = Debug|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Checked|x64.Build.0 = Checked|Any CPU
+		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Debug|x64.Build.0 = Debug|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Release|x64.ActiveCfg = Release|Any CPU
 		{390610BA-E35C-4473-9D6C-990DDCBDE4F7}.Release|x64.Build.0 = Release|Any CPU
-		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|x64.Build.0 = Debug|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Checked|x64.Build.0 = Checked|Any CPU
+		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Debug|x64.Build.0 = Debug|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Release|x64.ActiveCfg = Release|Any CPU
 		{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}.Release|x64.Build.0 = Release|Any CPU
-		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|x64.Build.0 = Debug|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Checked|x64.Build.0 = Checked|Any CPU
+		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Debug|x64.Build.0 = Debug|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Release|x64.ActiveCfg = Release|Any CPU
 		{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}.Release|x64.Build.0 = Release|Any CPU
-		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|x64.Build.0 = Debug|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Checked|x64.Build.0 = Checked|Any CPU
+		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{581F9C7A-C9E9-479B-A17F-51C578150103}.Debug|x64.Build.0 = Debug|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Release|Any CPU.Build.0 = Release|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Release|x64.ActiveCfg = Release|Any CPU
 		{581F9C7A-C9E9-479B-A17F-51C578150103}.Release|x64.Build.0 = Release|Any CPU
-		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Checked|x64.Build.0 = Checked|Any CPU
+		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Release|x64.ActiveCfg = Release|Any CPU
 		{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}.Release|x64.Build.0 = Release|Any CPU
-		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Checked|x64.Build.0 = Checked|Any CPU
+		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Debug|x64.Build.0 = Debug|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Release|x64.ActiveCfg = Release|Any CPU
 		{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}.Release|x64.Build.0 = Release|Any CPU
-		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|x64.Build.0 = Debug|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Checked|x64.Build.0 = Checked|Any CPU
+		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Debug|x64.Build.0 = Debug|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Release|x64.ActiveCfg = Release|Any CPU
 		{73B862FC-979B-4EEC-A57A-2B04A2B46F01}.Release|x64.Build.0 = Release|Any CPU
-		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|x64.Build.0 = Debug|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Checked|x64.Build.0 = Checked|Any CPU
+		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Debug|x64.Build.0 = Debug|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Release|x64.ActiveCfg = Release|Any CPU
 		{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}.Release|x64.Build.0 = Release|Any CPU
-		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Checked|x64.Build.0 = Checked|Any CPU
+		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Debug|x64.Build.0 = Debug|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Release|x64.ActiveCfg = Release|Any CPU
 		{0B9A50E6-CF08-4A02-9342-67828BDB9F90}.Release|x64.Build.0 = Release|Any CPU
-		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|x64.Build.0 = Debug|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Checked|x64.Build.0 = Checked|Any CPU
+		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Debug|x64.Build.0 = Debug|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Release|x64.ActiveCfg = Release|Any CPU
 		{3BA00219-0647-4CAF-ABA7-54B66438AA1A}.Release|x64.Build.0 = Release|Any CPU
-		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Checked|x64.Build.0 = Checked|Any CPU
+		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Release|x64.ActiveCfg = Release|Any CPU
 		{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}.Release|x64.Build.0 = Release|Any CPU
-		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|x64.Build.0 = Debug|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Checked|x64.Build.0 = Checked|Any CPU
+		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Debug|x64.Build.0 = Debug|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Release|x64.ActiveCfg = Release|Any CPU
 		{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}.Release|x64.Build.0 = Release|Any CPU
-		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Checked|x64.Build.0 = Checked|Any CPU
+		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Debug|x64.Build.0 = Debug|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Release|x64.ActiveCfg = Release|Any CPU
 		{CA7E0C28-6C9E-465E-8D00-649C39A816EE}.Release|x64.Build.0 = Release|Any CPU
-		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Checked|x64.Build.0 = Checked|Any CPU
+		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Release|x64.ActiveCfg = Release|Any CPU
 		{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}.Release|x64.Build.0 = Release|Any CPU
-		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Checked|x64.Build.0 = Checked|Any CPU
+		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Debug|x64.Build.0 = Debug|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Release|x64.ActiveCfg = Release|Any CPU
 		{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}.Release|x64.Build.0 = Release|Any CPU
-		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|x64.Build.0 = Debug|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Checked|x64.Build.0 = Checked|Any CPU
+		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Debug|x64.Build.0 = Debug|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Release|x64.ActiveCfg = Release|Any CPU
 		{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}.Release|x64.Build.0 = Release|Any CPU
-		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|x64.Build.0 = Debug|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Checked|x64.Build.0 = Checked|Any CPU
+		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Debug|x64.Build.0 = Debug|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Release|x64.ActiveCfg = Release|Any CPU
 		{9711B502-A732-43B1-AA5B-CDF7DA92042C}.Release|x64.Build.0 = Release|Any CPU
-		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Checked|x64.Build.0 = Checked|Any CPU
+		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Debug|x64.Build.0 = Debug|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Release|x64.ActiveCfg = Release|Any CPU
 		{6B6C97C1-90DE-4716-BB81-38EA342BE67E}.Release|x64.Build.0 = Release|Any CPU
-		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Checked|x64.Build.0 = Checked|Any CPU
+		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Debug|x64.Build.0 = Debug|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Release|x64.ActiveCfg = Release|Any CPU
 		{AECC90EB-057E-4F71-B856-D761FFB409C7}.Release|x64.Build.0 = Release|Any CPU
-		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|x64.Build.0 = Debug|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Checked|x64.Build.0 = Checked|Any CPU
+		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Debug|x64.Build.0 = Debug|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Release|x64.ActiveCfg = Release|Any CPU
 		{BC3D7C80-7A6E-425F-B161-5E1851092A2E}.Release|x64.Build.0 = Release|Any CPU
-		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|x64.Build.0 = Debug|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Checked|x64.Build.0 = Checked|Any CPU
+		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Debug|x64.Build.0 = Debug|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Release|x64.ActiveCfg = Release|Any CPU
 		{6E345FA6-CA32-47A8-BC90-F759402D1222}.Release|x64.Build.0 = Release|Any CPU
-		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|x64.Build.0 = Debug|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Checked|x64.Build.0 = Checked|Any CPU
+		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Debug|x64.Build.0 = Debug|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Release|x64.ActiveCfg = Release|Any CPU
 		{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}.Release|x64.Build.0 = Release|Any CPU
-		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|x64.Build.0 = Debug|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Checked|x64.Build.0 = Checked|Any CPU
+		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Debug|x64.Build.0 = Debug|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Release|x64.ActiveCfg = Release|Any CPU
 		{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}.Release|x64.Build.0 = Release|Any CPU
-		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Checked|x64.Build.0 = Checked|Any CPU
+		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Release|x64.ActiveCfg = Release|Any CPU
 		{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}.Release|x64.Build.0 = Release|Any CPU
-		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|x64.Build.0 = Debug|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Checked|x64.Build.0 = Checked|Any CPU
+		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Debug|x64.Build.0 = Debug|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Release|x64.ActiveCfg = Release|Any CPU
 		{E72B991C-DC2D-49E4-ADBE-0921F97924A3}.Release|x64.Build.0 = Release|Any CPU
-		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Checked|x64.Build.0 = Checked|Any CPU
+		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Release|x64.ActiveCfg = Release|Any CPU
 		{BB49DE8D-7B90-473C-A40E-419C8264D61C}.Release|x64.Build.0 = Release|Any CPU
-		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|x64.Build.0 = Debug|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Checked|x64.Build.0 = Checked|Any CPU
+		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Debug|x64.Build.0 = Debug|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Release|x64.ActiveCfg = Release|Any CPU
 		{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}.Release|x64.Build.0 = Release|Any CPU
-		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|x64.Build.0 = Debug|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Checked|x64.Build.0 = Checked|Any CPU
+		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Debug|x64.Build.0 = Debug|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Release|Any CPU.Build.0 = Release|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Release|x64.ActiveCfg = Release|Any CPU
 		{307CB204-B03B-41C6-A806-ACD1A0BDDC58}.Release|x64.Build.0 = Release|Any CPU
-		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|x64.Build.0 = Debug|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Checked|x64.Build.0 = Checked|Any CPU
+		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Debug|x64.Build.0 = Debug|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Release|x64.ActiveCfg = Release|Any CPU
 		{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}.Release|x64.Build.0 = Release|Any CPU
-		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|x64.Build.0 = Debug|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Checked|x64.Build.0 = Checked|Any CPU
+		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Debug|x64.Build.0 = Debug|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Release|x64.ActiveCfg = Release|Any CPU
 		{E95CED31-BA82-4462-8A89-51C3C02F8D26}.Release|x64.Build.0 = Release|Any CPU
-		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Checked|x64.Build.0 = Checked|Any CPU
+		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Release|x64.ActiveCfg = Release|Any CPU
 		{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}.Release|x64.Build.0 = Release|Any CPU
-		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|x64.Build.0 = Debug|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Checked|x64.Build.0 = Checked|Any CPU
+		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{762770DA-FA56-4A3A-A630-5270B95311B2}.Debug|x64.Build.0 = Debug|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Release|x64.ActiveCfg = Release|Any CPU
 		{762770DA-FA56-4A3A-A630-5270B95311B2}.Release|x64.Build.0 = Release|Any CPU
-		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|x64.Build.0 = Debug|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Checked|x64.Build.0 = Checked|Any CPU
+		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Debug|x64.Build.0 = Debug|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Release|x64.ActiveCfg = Release|Any CPU
 		{1475D529-78CC-437E-82BC-6C6C10A5936D}.Release|x64.Build.0 = Release|Any CPU
-		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|x64.Build.0 = Debug|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Checked|x64.Build.0 = Checked|Any CPU
+		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Debug|x64.Build.0 = Debug|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Release|x64.ActiveCfg = Release|Any CPU
 		{ECA6C872-18D0-4F24-9429-3E36709DF29F}.Release|x64.Build.0 = Release|Any CPU
-		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Checked|x64.Build.0 = Checked|Any CPU
+		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Debug|x64.Build.0 = Debug|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Release|x64.ActiveCfg = Release|Any CPU
 		{BB8AAFEE-9654-4F6B-A96E-734766D317D2}.Release|x64.Build.0 = Release|Any CPU
-		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|x64.Build.0 = Debug|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Checked|x64.Build.0 = Checked|Any CPU
+		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Debug|x64.Build.0 = Debug|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Release|x64.ActiveCfg = Release|Any CPU
 		{A26D4F08-414D-4444-BD5B-A786D1E1BB65}.Release|x64.Build.0 = Release|Any CPU
-		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|x64.Build.0 = Debug|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Checked|x64.Build.0 = Checked|Any CPU
+		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Debug|x64.Build.0 = Debug|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Release|x64.ActiveCfg = Release|Any CPU
 		{1F9F89B9-793D-45F8-B231-560CE321E8C3}.Release|x64.Build.0 = Release|Any CPU
-		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|x64.Build.0 = Debug|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Checked|x64.Build.0 = Checked|Any CPU
+		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Debug|x64.Build.0 = Debug|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Release|x64.ActiveCfg = Release|Any CPU
 		{54FAA905-87B2-434F-890B-E78091C1DE6C}.Release|x64.Build.0 = Release|Any CPU
-		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|x64.Build.0 = Debug|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Checked|x64.Build.0 = Checked|Any CPU
+		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Debug|x64.Build.0 = Debug|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Release|x64.ActiveCfg = Release|Any CPU
 		{0210D570-2CBA-4A6A-A0BB-60391314F05F}.Release|x64.Build.0 = Release|Any CPU
-		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|x64.Build.0 = Debug|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Checked|x64.Build.0 = Checked|Any CPU
+		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Debug|x64.Build.0 = Debug|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Release|x64.ActiveCfg = Release|Any CPU
 		{FC774CEF-FA61-4FEF-969D-7FB656BAD931}.Release|x64.Build.0 = Release|Any CPU
-		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|x64.Build.0 = Debug|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Checked|x64.Build.0 = Checked|Any CPU
+		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A04473DD-EF02-4686-831E-054DF9F91F86}.Debug|x64.Build.0 = Debug|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Release|x64.ActiveCfg = Release|Any CPU
 		{A04473DD-EF02-4686-831E-054DF9F91F86}.Release|x64.Build.0 = Release|Any CPU
-		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|x64.Build.0 = Debug|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Checked|x64.Build.0 = Checked|Any CPU
+		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Debug|x64.Build.0 = Debug|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Release|x64.ActiveCfg = Release|Any CPU
 		{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}.Release|x64.Build.0 = Release|Any CPU
-		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Checked|x64.Build.0 = Checked|Any CPU
+		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Debug|x64.Build.0 = Debug|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Release|x64.ActiveCfg = Release|Any CPU
 		{A6802642-229E-47CC-B42F-CB135E4A38DF}.Release|x64.Build.0 = Release|Any CPU
-		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|x64.Build.0 = Debug|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Checked|x64.Build.0 = Checked|Any CPU
+		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Debug|x64.Build.0 = Debug|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Release|x64.ActiveCfg = Release|Any CPU
 		{2D5CB3E4-495B-423D-9367-58E2D85CB165}.Release|x64.Build.0 = Release|Any CPU
-		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|x64.Build.0 = Debug|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Checked|x64.Build.0 = Checked|Any CPU
+		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E19A0C27-4003-4051-8641-053AFA2AE532}.Debug|x64.Build.0 = Debug|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Release|x64.ActiveCfg = Release|Any CPU
 		{E19A0C27-4003-4051-8641-053AFA2AE532}.Release|x64.Build.0 = Release|Any CPU
-		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|x64.Build.0 = Debug|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Checked|x64.Build.0 = Checked|Any CPU
+		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Debug|x64.Build.0 = Debug|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Release|x64.ActiveCfg = Release|Any CPU
 		{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}.Release|x64.Build.0 = Release|Any CPU
-		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|x64.Build.0 = Debug|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Checked|x64.Build.0 = Checked|Any CPU
+		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Debug|x64.Build.0 = Debug|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Release|x64.ActiveCfg = Release|Any CPU
 		{F399B587-ED92-4DD3-8588-F5FDD3931FFD}.Release|x64.Build.0 = Release|Any CPU
-		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Checked|x64.Build.0 = Checked|Any CPU
+		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Debug|x64.Build.0 = Debug|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Release|x64.ActiveCfg = Release|Any CPU
 		{2E9D0279-8DA5-4A78-897E-5BF16E421F17}.Release|x64.Build.0 = Release|Any CPU
-		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|x64.Build.0 = Debug|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Checked|x64.Build.0 = Checked|Any CPU
+		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Debug|x64.Build.0 = Debug|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Release|x64.ActiveCfg = Release|Any CPU
 		{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}.Release|x64.Build.0 = Release|Any CPU
-		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|x64.Build.0 = Debug|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Checked|x64.Build.0 = Checked|Any CPU
+		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Debug|x64.Build.0 = Debug|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Release|x64.ActiveCfg = Release|Any CPU
 		{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}.Release|x64.Build.0 = Release|Any CPU
-		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|x64.Build.0 = Debug|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Checked|x64.Build.0 = Checked|Any CPU
+		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Debug|x64.Build.0 = Debug|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Release|x64.ActiveCfg = Release|Any CPU
 		{4818E0D2-FDE7-4760-B73A-D6771454AFFE}.Release|x64.Build.0 = Release|Any CPU
-		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|x64.Build.0 = Debug|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Checked|x64.Build.0 = Checked|Any CPU
+		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Debug|x64.Build.0 = Debug|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Release|x64.ActiveCfg = Release|Any CPU
 		{5AD68D22-B586-4782-8C8D-18733CEBE41F}.Release|x64.Build.0 = Release|Any CPU
-		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|x64.Build.0 = Debug|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Checked|x64.Build.0 = Checked|Any CPU
+		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Debug|x64.Build.0 = Debug|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Release|x64.ActiveCfg = Release|Any CPU
 		{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}.Release|x64.Build.0 = Release|Any CPU
-		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|x64.Build.0 = Debug|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Checked|x64.Build.0 = Checked|Any CPU
+		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Debug|x64.Build.0 = Debug|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Release|x64.ActiveCfg = Release|Any CPU
 		{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}.Release|x64.Build.0 = Release|Any CPU
-		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Checked|x64.Build.0 = Checked|Any CPU
+		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Release|x64.ActiveCfg = Release|Any CPU
 		{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}.Release|x64.Build.0 = Release|Any CPU
-		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Checked|x64.Build.0 = Checked|Any CPU
+		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Debug|x64.Build.0 = Debug|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Release|x64.ActiveCfg = Release|Any CPU
 		{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}.Release|x64.Build.0 = Release|Any CPU
-		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|x64.Build.0 = Debug|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Checked|x64.Build.0 = Checked|Any CPU
+		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Debug|x64.Build.0 = Debug|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Release|x64.ActiveCfg = Release|Any CPU
 		{05A739C9-5067-4BF8-926E-C257FBAA633D}.Release|x64.Build.0 = Release|Any CPU
-		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|x64.Build.0 = Debug|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Checked|x64.Build.0 = Checked|Any CPU
+		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Debug|x64.Build.0 = Debug|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Release|x64.ActiveCfg = Release|Any CPU
 		{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}.Release|x64.Build.0 = Release|Any CPU
-		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|x64.Build.0 = Debug|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Checked|x64.Build.0 = Checked|Any CPU
+		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Debug|x64.Build.0 = Debug|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Release|x64.ActiveCfg = Release|Any CPU
 		{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}.Release|x64.Build.0 = Release|Any CPU
-		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|x64.Build.0 = Debug|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Checked|x64.Build.0 = Checked|Any CPU
+		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Debug|x64.Build.0 = Debug|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Release|x64.ActiveCfg = Release|Any CPU
 		{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}.Release|x64.Build.0 = Release|Any CPU
-		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|x64.Build.0 = Debug|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Checked|x64.Build.0 = Checked|Any CPU
+		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D5A83968-CF00-4ED6-A999-2602996AA234}.Debug|x64.Build.0 = Debug|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Release|x64.ActiveCfg = Release|Any CPU
 		{D5A83968-CF00-4ED6-A999-2602996AA234}.Release|x64.Build.0 = Release|Any CPU
-		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|x64.Build.0 = Debug|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Checked|x64.Build.0 = Checked|Any CPU
+		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Debug|x64.Build.0 = Debug|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Release|x64.ActiveCfg = Release|Any CPU
 		{B77D7828-B6CF-4A16-8551-066928F5E80D}.Release|x64.Build.0 = Release|Any CPU
-		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|x64.Build.0 = Debug|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Checked|x64.Build.0 = Checked|Any CPU
+		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Debug|x64.Build.0 = Debug|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Release|x64.ActiveCfg = Release|Any CPU
 		{8336D84D-D521-4061-A011-0D4D9982CAC4}.Release|x64.Build.0 = Release|Any CPU
-		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|x64.Build.0 = Debug|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Checked|x64.Build.0 = Checked|Any CPU
+		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Debug|x64.Build.0 = Debug|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Release|x64.ActiveCfg = Release|Any CPU
 		{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}.Release|x64.Build.0 = Release|Any CPU
-		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|x64.Build.0 = Debug|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Checked|x64.Build.0 = Checked|Any CPU
+		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Debug|x64.Build.0 = Debug|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Release|x64.ActiveCfg = Release|Any CPU
 		{C458785F-D6EB-4E20-960E-96E0F1495CB2}.Release|x64.Build.0 = Release|Any CPU
-		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|x64.Build.0 = Debug|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Checked|x64.Build.0 = Checked|Any CPU
+		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{13744560-2695-4724-B54C-82FA972B0BC6}.Debug|x64.Build.0 = Debug|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Release|x64.ActiveCfg = Release|Any CPU
 		{13744560-2695-4724-B54C-82FA972B0BC6}.Release|x64.Build.0 = Release|Any CPU
-		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|x64.Build.0 = Debug|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Checked|x64.Build.0 = Checked|Any CPU
+		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Debug|x64.Build.0 = Debug|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Release|x64.ActiveCfg = Release|Any CPU
 		{A93771DA-825C-4897-A8B5-D643BCFACE90}.Release|x64.Build.0 = Release|Any CPU
-		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|x64.Build.0 = Debug|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Checked|x64.Build.0 = Checked|Any CPU
+		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Debug|x64.Build.0 = Debug|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Release|x64.ActiveCfg = Release|Any CPU
 		{D9E1DF21-AD46-4D01-9623-34894A90943F}.Release|x64.Build.0 = Release|Any CPU
-		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|x64.Build.0 = Debug|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Checked|x64.Build.0 = Checked|Any CPU
+		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Debug|x64.Build.0 = Debug|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Release|x64.ActiveCfg = Release|Any CPU
 		{FD02985C-E4C5-430A-8714-E4B1A6EC9789}.Release|x64.Build.0 = Release|Any CPU
-		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|x64.Build.0 = Debug|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Checked|x64.Build.0 = Checked|Any CPU
+		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Debug|x64.Build.0 = Debug|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Release|Any CPU.Build.0 = Release|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Release|x64.ActiveCfg = Release|Any CPU
 		{923A6EA0-9F8F-456A-871A-E46039B1B678}.Release|x64.Build.0 = Release|Any CPU
-		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|x64.Build.0 = Debug|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Checked|x64.Build.0 = Checked|Any CPU
+		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Debug|x64.Build.0 = Debug|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Release|Any CPU.Build.0 = Release|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Release|x64.ActiveCfg = Release|Any CPU
 		{76655B3D-67E1-41D3-A2B0-E03E77D36656}.Release|x64.Build.0 = Release|Any CPU
-		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Checked|x64.Build.0 = Checked|Any CPU
+		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Debug|x64.Build.0 = Debug|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Release|x64.ActiveCfg = Release|Any CPU
 		{CFB1BFEE-DDB0-432F-9023-C887120AEF26}.Release|x64.Build.0 = Release|Any CPU
-		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|x64.Build.0 = Debug|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Checked|x64.Build.0 = Checked|Any CPU
+		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Debug|x64.Build.0 = Debug|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Release|x64.ActiveCfg = Release|Any CPU
 		{CEF603D3-5C1A-47CC-B808-A31C0687209B}.Release|x64.Build.0 = Release|Any CPU
-		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|x64.Build.0 = Debug|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Checked|x64.Build.0 = Checked|Any CPU
+		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{028A8292-C8D2-4B63-8304-A8E36F244279}.Debug|x64.Build.0 = Debug|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Release|Any CPU.Build.0 = Release|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Release|x64.ActiveCfg = Release|Any CPU
 		{028A8292-C8D2-4B63-8304-A8E36F244279}.Release|x64.Build.0 = Release|Any CPU
-		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|x64.Build.0 = Debug|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Checked|x64.Build.0 = Checked|Any CPU
+		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Debug|x64.Build.0 = Debug|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Release|Any CPU.Build.0 = Release|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Release|x64.ActiveCfg = Release|Any CPU
 		{94028362-0517-43DA-B3E8-ED474B0A9A59}.Release|x64.Build.0 = Release|Any CPU
-		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Checked|x64.Build.0 = Checked|Any CPU
+		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Release|x64.ActiveCfg = Release|Any CPU
 		{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}.Release|x64.Build.0 = Release|Any CPU
-		{D362D233-C560-4023-B68A-93162C984D17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D362D233-C560-4023-B68A-93162C984D17}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D362D233-C560-4023-B68A-93162C984D17}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D362D233-C560-4023-B68A-93162C984D17}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D362D233-C560-4023-B68A-93162C984D17}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D362D233-C560-4023-B68A-93162C984D17}.Debug|x64.Build.0 = Debug|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Checked|x64.Build.0 = Checked|Any CPU
+		{D362D233-C560-4023-B68A-93162C984D17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D362D233-C560-4023-B68A-93162C984D17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D362D233-C560-4023-B68A-93162C984D17}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D362D233-C560-4023-B68A-93162C984D17}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D362D233-C560-4023-B68A-93162C984D17}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D362D233-C560-4023-B68A-93162C984D17}.Debug|x64.Build.0 = Debug|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Release|x64.ActiveCfg = Release|Any CPU
 		{D362D233-C560-4023-B68A-93162C984D17}.Release|x64.Build.0 = Release|Any CPU
-		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|x64.Build.0 = Debug|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Checked|x64.Build.0 = Checked|Any CPU
+		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Debug|x64.Build.0 = Debug|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Release|x64.ActiveCfg = Release|Any CPU
 		{FD64267A-0AF0-4A6C-926D-65FAAA94834E}.Release|x64.Build.0 = Release|Any CPU
-		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|x64.Build.0 = Debug|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Checked|x64.Build.0 = Checked|Any CPU
+		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Debug|x64.Build.0 = Debug|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Release|x64.ActiveCfg = Release|Any CPU
 		{C47FB2CB-75F2-492A-A994-72F4AAD2445B}.Release|x64.Build.0 = Release|Any CPU
-		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|x64.Build.0 = Debug|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Checked|x64.Build.0 = Checked|Any CPU
+		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Debug|x64.Build.0 = Debug|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Release|x64.ActiveCfg = Release|Any CPU
 		{84F2A622-1F52-4BE8-9607-C52BF18222E8}.Release|x64.Build.0 = Release|Any CPU
-		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|x64.Build.0 = Debug|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Checked|x64.Build.0 = Checked|Any CPU
+		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Debug|x64.Build.0 = Debug|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Release|Any CPU.Build.0 = Release|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Release|x64.ActiveCfg = Release|Any CPU
 		{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}.Release|x64.Build.0 = Release|Any CPU
-		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Checked|x64.Build.0 = Checked|Any CPU
+		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Release|x64.ActiveCfg = Release|Any CPU
 		{76E37BB2-870B-45D1-81D5-B1248EC522F3}.Release|x64.Build.0 = Release|Any CPU
-		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Checked|x64.Build.0 = Checked|Any CPU
+		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Release|x64.ActiveCfg = Release|Any CPU
 		{C1D19880-4EA9-4D47-ADB2-F3020BB36614}.Release|x64.Build.0 = Release|Any CPU
-		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|x64.Build.0 = Debug|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Checked|x64.Build.0 = Checked|Any CPU
+		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6648448-C527-4F11-8B86-F419064B576F}.Debug|x64.Build.0 = Debug|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Release|x64.ActiveCfg = Release|Any CPU
 		{B6648448-C527-4F11-8B86-F419064B576F}.Release|x64.Build.0 = Release|Any CPU
-		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|x64.Build.0 = Debug|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Checked|x64.Build.0 = Checked|Any CPU
+		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Debug|x64.Build.0 = Debug|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Release|x64.ActiveCfg = Release|Any CPU
 		{DB1F1802-281D-434E-ADF2-F7DA2708BB23}.Release|x64.Build.0 = Release|Any CPU
-		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|x64.Build.0 = Debug|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Checked|x64.Build.0 = Checked|Any CPU
+		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1703781B-A132-48C1-8D83-9418150E5EC3}.Debug|x64.Build.0 = Debug|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Release|x64.ActiveCfg = Release|Any CPU
 		{1703781B-A132-48C1-8D83-9418150E5EC3}.Release|x64.Build.0 = Release|Any CPU
-		{21433341-8435-4758-8874-8B69D3197855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21433341-8435-4758-8874-8B69D3197855}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21433341-8435-4758-8874-8B69D3197855}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{21433341-8435-4758-8874-8B69D3197855}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{21433341-8435-4758-8874-8B69D3197855}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{21433341-8435-4758-8874-8B69D3197855}.Debug|x64.Build.0 = Debug|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Checked|x64.Build.0 = Checked|Any CPU
+		{21433341-8435-4758-8874-8B69D3197855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21433341-8435-4758-8874-8B69D3197855}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21433341-8435-4758-8874-8B69D3197855}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{21433341-8435-4758-8874-8B69D3197855}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{21433341-8435-4758-8874-8B69D3197855}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21433341-8435-4758-8874-8B69D3197855}.Debug|x64.Build.0 = Debug|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Release|Any CPU.Build.0 = Release|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Release|x64.ActiveCfg = Release|Any CPU
 		{21433341-8435-4758-8874-8B69D3197855}.Release|x64.Build.0 = Release|Any CPU
-		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Checked|x64.Build.0 = Checked|Any CPU
+		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Release|x64.ActiveCfg = Release|Any CPU
 		{F1165E77-B017-43EF-BAD6-B694420E2DF9}.Release|x64.Build.0 = Release|Any CPU
-		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|x64.Build.0 = Debug|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Checked|x64.Build.0 = Checked|Any CPU
+		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Debug|x64.Build.0 = Debug|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Release|x64.ActiveCfg = Release|Any CPU
 		{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}.Release|x64.Build.0 = Release|Any CPU
-		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|x64.Build.0 = Debug|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Checked|x64.Build.0 = Checked|Any CPU
+		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Debug|x64.Build.0 = Debug|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Release|x64.ActiveCfg = Release|Any CPU
 		{F956F618-3908-4B72-90A2-E5C95A568BE5}.Release|x64.Build.0 = Release|Any CPU
-		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|x64.Build.0 = Debug|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Checked|x64.Build.0 = Checked|Any CPU
+		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Debug|x64.Build.0 = Debug|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Release|x64.ActiveCfg = Release|Any CPU
 		{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}.Release|x64.Build.0 = Release|Any CPU
-		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|x64.Build.0 = Debug|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Checked|x64.Build.0 = Checked|Any CPU
+		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2804A906-6AE0-475A-BCD0-B4431927593F}.Debug|x64.Build.0 = Debug|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Release|x64.ActiveCfg = Release|Any CPU
 		{2804A906-6AE0-475A-BCD0-B4431927593F}.Release|x64.Build.0 = Release|Any CPU
-		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|x64.Build.0 = Debug|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Checked|x64.Build.0 = Checked|Any CPU
+		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Debug|x64.Build.0 = Debug|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Release|x64.ActiveCfg = Release|Any CPU
 		{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}.Release|x64.Build.0 = Release|Any CPU
-		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|x64.Build.0 = Debug|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Checked|x64.Build.0 = Checked|Any CPU
+		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8B475B38-3649-4F42-851C-0CD105D39443}.Debug|x64.Build.0 = Debug|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Release|x64.ActiveCfg = Release|Any CPU
 		{8B475B38-3649-4F42-851C-0CD105D39443}.Release|x64.Build.0 = Release|Any CPU
-		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|x64.Build.0 = Debug|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Checked|x64.Build.0 = Checked|Any CPU
+		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{271F3C97-79B6-4540-B7A5-206695AF763E}.Debug|x64.Build.0 = Debug|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Release|x64.ActiveCfg = Release|Any CPU
 		{271F3C97-79B6-4540-B7A5-206695AF763E}.Release|x64.Build.0 = Release|Any CPU
-		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|x64.Build.0 = Debug|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Checked|x64.Build.0 = Checked|Any CPU
+		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Debug|x64.Build.0 = Debug|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Release|x64.ActiveCfg = Release|Any CPU
 		{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}.Release|x64.Build.0 = Release|Any CPU
-		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|x64.Build.0 = Debug|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Checked|x64.Build.0 = Checked|Any CPU
+		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Debug|x64.Build.0 = Debug|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Release|x64.ActiveCfg = Release|Any CPU
 		{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}.Release|x64.Build.0 = Release|Any CPU
-		{88478773-3195-4E44-827C-70217D768587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{88478773-3195-4E44-827C-70217D768587}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88478773-3195-4E44-827C-70217D768587}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{88478773-3195-4E44-827C-70217D768587}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{88478773-3195-4E44-827C-70217D768587}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{88478773-3195-4E44-827C-70217D768587}.Debug|x64.Build.0 = Debug|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Checked|x64.Build.0 = Checked|Any CPU
+		{88478773-3195-4E44-827C-70217D768587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88478773-3195-4E44-827C-70217D768587}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88478773-3195-4E44-827C-70217D768587}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{88478773-3195-4E44-827C-70217D768587}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{88478773-3195-4E44-827C-70217D768587}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{88478773-3195-4E44-827C-70217D768587}.Debug|x64.Build.0 = Debug|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Release|Any CPU.Build.0 = Release|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Release|x64.ActiveCfg = Release|Any CPU
 		{88478773-3195-4E44-827C-70217D768587}.Release|x64.Build.0 = Release|Any CPU
-		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|x64.Build.0 = Debug|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Checked|x64.Build.0 = Checked|Any CPU
+		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Debug|x64.Build.0 = Debug|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Release|Any CPU.Build.0 = Release|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Release|x64.ActiveCfg = Release|Any CPU
 		{48C681B9-8B9F-4192-85B7-5D355AB3BA22}.Release|x64.Build.0 = Release|Any CPU
-		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|x64.Build.0 = Debug|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Checked|x64.Build.0 = Checked|Any CPU
+		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Debug|x64.Build.0 = Debug|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Release|x64.ActiveCfg = Release|Any CPU
 		{D6144DFE-A510-468B-AF81-5DFCDB51A82F}.Release|x64.Build.0 = Release|Any CPU
-		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|x64.Build.0 = Debug|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Checked|x64.Build.0 = Checked|Any CPU
+		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A655F286-8C9E-4C53-943C-A1917175368C}.Debug|x64.Build.0 = Debug|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Release|x64.ActiveCfg = Release|Any CPU
 		{A655F286-8C9E-4C53-943C-A1917175368C}.Release|x64.Build.0 = Release|Any CPU
-		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Checked|x64.Build.0 = Checked|Any CPU
+		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Debug|x64.Build.0 = Debug|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Release|x64.ActiveCfg = Release|Any CPU
 		{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}.Release|x64.Build.0 = Release|Any CPU
-		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|x64.Build.0 = Debug|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Checked|x64.Build.0 = Checked|Any CPU
+		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{365C9C3D-367B-4905-82DD-4424A041F001}.Debug|x64.Build.0 = Debug|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Release|Any CPU.Build.0 = Release|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Release|x64.ActiveCfg = Release|Any CPU
 		{365C9C3D-367B-4905-82DD-4424A041F001}.Release|x64.Build.0 = Release|Any CPU
-		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|x64.Build.0 = Debug|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Checked|x64.Build.0 = Checked|Any CPU
+		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{71429F1A-06E7-4830-AD79-B13611080D3F}.Debug|x64.Build.0 = Debug|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Release|x64.ActiveCfg = Release|Any CPU
 		{71429F1A-06E7-4830-AD79-B13611080D3F}.Release|x64.Build.0 = Release|Any CPU
-		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|x64.Build.0 = Debug|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Checked|x64.Build.0 = Checked|Any CPU
+		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Debug|x64.Build.0 = Debug|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Release|x64.ActiveCfg = Release|Any CPU
 		{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}.Release|x64.Build.0 = Release|Any CPU
-		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|x64.Build.0 = Debug|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Checked|x64.Build.0 = Checked|Any CPU
+		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Debug|x64.Build.0 = Debug|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Release|x64.ActiveCfg = Release|Any CPU
 		{7E21C292-9028-4A19-9BC4-31B8BAE3267C}.Release|x64.Build.0 = Release|Any CPU
-		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Checked|x64.Build.0 = Checked|Any CPU
+		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Release|x64.ActiveCfg = Release|Any CPU
 		{F5550373-AC46-4BEA-B446-4C335FF6E5F1}.Release|x64.Build.0 = Release|Any CPU
-		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Checked|x64.Build.0 = Checked|Any CPU
+		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Debug|x64.Build.0 = Debug|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Release|x64.ActiveCfg = Release|Any CPU
 		{CF1D5ED4-2614-4962-8934-2419D50E65A1}.Release|x64.Build.0 = Release|Any CPU
-		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|x64.Build.0 = Debug|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Checked|x64.Build.0 = Checked|Any CPU
+		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Debug|x64.Build.0 = Debug|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Release|x64.ActiveCfg = Release|Any CPU
 		{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}.Release|x64.Build.0 = Release|Any CPU
-		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|x64.Build.0 = Debug|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Checked|x64.Build.0 = Checked|Any CPU
+		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Debug|x64.Build.0 = Debug|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Release|x64.ActiveCfg = Release|Any CPU
 		{1C8140E3-52CD-4983-B625-ADFDD9250249}.Release|x64.Build.0 = Release|Any CPU
-		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Checked|x64.Build.0 = Checked|Any CPU
+		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Debug|x64.Build.0 = Debug|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Release|x64.ActiveCfg = Release|Any CPU
 		{DA709AE7-605E-4697-AF66-B20CBBD007DE}.Release|x64.Build.0 = Release|Any CPU
-		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|x64.Build.0 = Debug|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Checked|x64.Build.0 = Checked|Any CPU
+		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78376B7F-ECE7-43AE-9BEF-081567876638}.Debug|x64.Build.0 = Debug|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Release|Any CPU.Build.0 = Release|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Release|x64.ActiveCfg = Release|Any CPU
 		{78376B7F-ECE7-43AE-9BEF-081567876638}.Release|x64.Build.0 = Release|Any CPU
-		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|x64.Build.0 = Debug|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Checked|x64.Build.0 = Checked|Any CPU
+		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Debug|x64.Build.0 = Debug|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Release|x64.ActiveCfg = Release|Any CPU
 		{847D698E-DCFD-4838-9249-63C2D1E755CF}.Release|x64.Build.0 = Release|Any CPU
-		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Checked|x64.Build.0 = Checked|Any CPU
+		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Release|x64.ActiveCfg = Release|Any CPU
 		{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}.Release|x64.Build.0 = Release|Any CPU
-		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|x64.Build.0 = Debug|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Checked|x64.Build.0 = Checked|Any CPU
+		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C2570136-97AF-487C-98BB-C15060E54B17}.Debug|x64.Build.0 = Debug|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Release|x64.ActiveCfg = Release|Any CPU
 		{C2570136-97AF-487C-98BB-C15060E54B17}.Release|x64.Build.0 = Release|Any CPU
-		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|x64.Build.0 = Debug|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Checked|x64.Build.0 = Checked|Any CPU
+		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Debug|x64.Build.0 = Debug|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Release|x64.ActiveCfg = Release|Any CPU
 		{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}.Release|x64.Build.0 = Release|Any CPU
-		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Checked|x64.Build.0 = Checked|Any CPU
+		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Debug|x64.Build.0 = Debug|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Release|x64.ActiveCfg = Release|Any CPU
 		{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}.Release|x64.Build.0 = Release|Any CPU
-		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|x64.Build.0 = Debug|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Checked|x64.Build.0 = Checked|Any CPU
+		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Debug|x64.Build.0 = Debug|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Release|x64.ActiveCfg = Release|Any CPU
 		{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}.Release|x64.Build.0 = Release|Any CPU
-		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|x64.Build.0 = Debug|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Checked|x64.Build.0 = Checked|Any CPU
+		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Debug|x64.Build.0 = Debug|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Release|x64.ActiveCfg = Release|Any CPU
 		{7BE1774F-860F-4340-B6D5-222EC7BCC804}.Release|x64.Build.0 = Release|Any CPU
-		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|x64.Build.0 = Debug|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Checked|x64.Build.0 = Checked|Any CPU
+		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Debug|x64.Build.0 = Debug|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Release|x64.ActiveCfg = Release|Any CPU
 		{6DD26EFC-D9EF-43B2-BA66-22215741D30E}.Release|x64.Build.0 = Release|Any CPU
-		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|x64.Build.0 = Debug|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Checked|x64.Build.0 = Checked|Any CPU
+		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Debug|x64.Build.0 = Debug|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Release|Any CPU.Build.0 = Release|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Release|x64.ActiveCfg = Release|Any CPU
 		{145DA044-A94A-4360-98F9-9D977F6FEF42}.Release|x64.Build.0 = Release|Any CPU
-		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Checked|x64.Build.0 = Checked|Any CPU
+		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Debug|x64.Build.0 = Debug|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Release|x64.ActiveCfg = Release|Any CPU
 		{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}.Release|x64.Build.0 = Release|Any CPU
-		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|x64.Build.0 = Debug|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Checked|x64.Build.0 = Checked|Any CPU
+		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Debug|x64.Build.0 = Debug|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Release|x64.ActiveCfg = Release|Any CPU
 		{D66FECBC-01AB-4181-9D6A-B72E54E603E1}.Release|x64.Build.0 = Release|Any CPU
-		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|x64.Build.0 = Debug|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Checked|x64.Build.0 = Checked|Any CPU
+		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Debug|x64.Build.0 = Debug|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Release|x64.ActiveCfg = Release|Any CPU
 		{75177B03-2F77-4FEE-AC80-E54CBB0A336E}.Release|x64.Build.0 = Release|Any CPU
-		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|x64.Build.0 = Debug|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Checked|x64.Build.0 = Checked|Any CPU
+		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Debug|x64.Build.0 = Debug|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Release|x64.ActiveCfg = Release|Any CPU
 		{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}.Release|x64.Build.0 = Release|Any CPU
-		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Checked|x64.Build.0 = Checked|Any CPU
+		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Debug|x64.Build.0 = Debug|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Release|x64.ActiveCfg = Release|Any CPU
 		{1B600A8B-5959-4705-B3FC-00101F5EF33A}.Release|x64.Build.0 = Release|Any CPU
-		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Checked|x64.Build.0 = Checked|Any CPU
+		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Release|x64.ActiveCfg = Release|Any CPU
 		{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}.Release|x64.Build.0 = Release|Any CPU
-		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|x64.Build.0 = Debug|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Checked|x64.Build.0 = Checked|Any CPU
+		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Debug|x64.Build.0 = Debug|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Release|x64.ActiveCfg = Release|Any CPU
 		{3BD12975-E574-4960-A91D-D0E9F01A454B}.Release|x64.Build.0 = Release|Any CPU
-		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|x64.Build.0 = Debug|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Checked|x64.Build.0 = Checked|Any CPU
+		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Debug|x64.Build.0 = Debug|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Release|x64.ActiveCfg = Release|Any CPU
 		{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}.Release|x64.Build.0 = Release|Any CPU
-		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|x64.Build.0 = Debug|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Checked|x64.Build.0 = Checked|Any CPU
+		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Debug|x64.Build.0 = Debug|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Release|x64.ActiveCfg = Release|Any CPU
 		{A983D320-C805-4BC7-807F-D260EAE7BD48}.Release|x64.Build.0 = Release|Any CPU
-		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|x64.Build.0 = Debug|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Checked|x64.Build.0 = Checked|Any CPU
+		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Debug|x64.Build.0 = Debug|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Release|x64.ActiveCfg = Release|Any CPU
 		{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}.Release|x64.Build.0 = Release|Any CPU
-		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|x64.Build.0 = Debug|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Checked|x64.Build.0 = Checked|Any CPU
+		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Debug|x64.Build.0 = Debug|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Release|x64.ActiveCfg = Release|Any CPU
 		{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}.Release|x64.Build.0 = Release|Any CPU
-		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|x64.Build.0 = Debug|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Checked|x64.Build.0 = Checked|Any CPU
+		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Debug|x64.Build.0 = Debug|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Release|Any CPU.Build.0 = Release|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Release|x64.ActiveCfg = Release|Any CPU
 		{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}.Release|x64.Build.0 = Release|Any CPU
-		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|x64.Build.0 = Debug|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Checked|x64.Build.0 = Checked|Any CPU
+		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Debug|x64.Build.0 = Debug|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Release|x64.ActiveCfg = Release|Any CPU
 		{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}.Release|x64.Build.0 = Release|Any CPU
-		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|x64.Build.0 = Debug|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Checked|x64.Build.0 = Checked|Any CPU
+		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Debug|x64.Build.0 = Debug|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Release|x64.ActiveCfg = Release|Any CPU
 		{10E70E35-3C01-4B7F-B3B8-02F72403BF88}.Release|x64.Build.0 = Release|Any CPU
-		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Checked|x64.Build.0 = Checked|Any CPU
+		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Debug|x64.Build.0 = Debug|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Release|x64.ActiveCfg = Release|Any CPU
 		{35675403-CEB9-482E-8117-3DE0E5E250B0}.Release|x64.Build.0 = Release|Any CPU
-		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|x64.Build.0 = Debug|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Checked|x64.Build.0 = Checked|Any CPU
+		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Debug|x64.Build.0 = Debug|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Release|x64.ActiveCfg = Release|Any CPU
 		{23E1CE24-CCFB-4163-A861-D48A76295E8F}.Release|x64.Build.0 = Release|Any CPU
-		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|x64.Build.0 = Debug|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Checked|x64.Build.0 = Checked|Any CPU
+		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Debug|x64.Build.0 = Debug|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Release|x64.ActiveCfg = Release|Any CPU
 		{C8DB97C3-1D53-4192-AE65-74A66EFE0841}.Release|x64.Build.0 = Release|Any CPU
-		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|x64.Build.0 = Debug|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Checked|x64.Build.0 = Checked|Any CPU
+		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Debug|x64.Build.0 = Debug|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Release|x64.ActiveCfg = Release|Any CPU
 		{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}.Release|x64.Build.0 = Release|Any CPU
-		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|x64.Build.0 = Debug|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Checked|x64.Build.0 = Checked|Any CPU
+		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Debug|x64.Build.0 = Debug|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Release|Any CPU.Build.0 = Release|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Release|x64.ActiveCfg = Release|Any CPU
 		{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}.Release|x64.Build.0 = Release|Any CPU
-		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|x64.Build.0 = Debug|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Checked|x64.Build.0 = Checked|Any CPU
+		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Debug|x64.Build.0 = Debug|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Release|x64.ActiveCfg = Release|Any CPU
 		{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}.Release|x64.Build.0 = Release|Any CPU
-		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Checked|x64.Build.0 = Checked|Any CPU
+		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Debug|x64.Build.0 = Debug|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Release|x64.ActiveCfg = Release|Any CPU
 		{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}.Release|x64.Build.0 = Release|Any CPU
-		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|x64.Build.0 = Debug|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Checked|x64.Build.0 = Checked|Any CPU
+		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{884433BE-EA75-47B3-828F-B9EA730D5582}.Debug|x64.Build.0 = Debug|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Release|Any CPU.Build.0 = Release|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Release|x64.ActiveCfg = Release|Any CPU
 		{884433BE-EA75-47B3-828F-B9EA730D5582}.Release|x64.Build.0 = Release|Any CPU
-		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Checked|x64.Build.0 = Checked|Any CPU
+		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Debug|x64.Build.0 = Debug|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Release|x64.ActiveCfg = Release|Any CPU
 		{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}.Release|x64.Build.0 = Release|Any CPU
-		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|x64.Build.0 = Debug|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Checked|x64.Build.0 = Checked|Any CPU
+		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Debug|x64.Build.0 = Debug|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Release|x64.ActiveCfg = Release|Any CPU
 		{814622D8-13DE-472B-8AEF-E5E079A3EAAC}.Release|x64.Build.0 = Release|Any CPU
-		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|x64.Build.0 = Debug|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Checked|x64.Build.0 = Checked|Any CPU
+		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Debug|x64.Build.0 = Debug|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Release|x64.ActiveCfg = Release|Any CPU
 		{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}.Release|x64.Build.0 = Release|Any CPU
-		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|x64.Build.0 = Debug|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Checked|x64.Build.0 = Checked|Any CPU
+		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Debug|x64.Build.0 = Debug|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Release|x64.ActiveCfg = Release|Any CPU
 		{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}.Release|x64.Build.0 = Release|Any CPU
-		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Checked|x64.Build.0 = Checked|Any CPU
+		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Debug|x64.Build.0 = Debug|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Release|x64.ActiveCfg = Release|Any CPU
 		{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}.Release|x64.Build.0 = Release|Any CPU
-		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|x64.Build.0 = Debug|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Checked|x64.Build.0 = Checked|Any CPU
+		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Debug|x64.Build.0 = Debug|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Release|x64.ActiveCfg = Release|Any CPU
 		{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}.Release|x64.Build.0 = Release|Any CPU
-		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Checked|x64.Build.0 = Checked|Any CPU
+		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Debug|x64.Build.0 = Debug|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Release|x64.ActiveCfg = Release|Any CPU
 		{5B265761-E669-45A0-ACBC-E201CEEB6FB5}.Release|x64.Build.0 = Release|Any CPU
-		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|x64.Build.0 = Debug|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Checked|x64.Build.0 = Checked|Any CPU
+		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{027838C9-88D1-43A2-AA53-C060E01D6008}.Debug|x64.Build.0 = Debug|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Release|Any CPU.Build.0 = Release|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Release|x64.ActiveCfg = Release|Any CPU
 		{027838C9-88D1-43A2-AA53-C060E01D6008}.Release|x64.Build.0 = Release|Any CPU
-		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|x64.Build.0 = Debug|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Checked|x64.Build.0 = Checked|Any CPU
+		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Debug|x64.Build.0 = Debug|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Release|x64.ActiveCfg = Release|Any CPU
 		{4CC5E4AA-510B-4007-8030-FE75A03D4384}.Release|x64.Build.0 = Release|Any CPU
-		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|x64.Build.0 = Debug|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Checked|x64.Build.0 = Checked|Any CPU
+		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Debug|x64.Build.0 = Debug|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Release|x64.ActiveCfg = Release|Any CPU
 		{2F639404-9C80-4998-ADA0-DC14AA08C345}.Release|x64.Build.0 = Release|Any CPU
-		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|x64.Build.0 = Debug|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Checked|x64.Build.0 = Checked|Any CPU
+		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Debug|x64.Build.0 = Debug|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Release|x64.ActiveCfg = Release|Any CPU
 		{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}.Release|x64.Build.0 = Release|Any CPU
-		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|x64.Build.0 = Debug|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Checked|x64.Build.0 = Checked|Any CPU
+		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Debug|x64.Build.0 = Debug|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Release|x64.ActiveCfg = Release|Any CPU
 		{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}.Release|x64.Build.0 = Release|Any CPU
-		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|x64.Build.0 = Debug|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Checked|x64.Build.0 = Checked|Any CPU
+		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Debug|x64.Build.0 = Debug|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Release|x64.ActiveCfg = Release|Any CPU
 		{C0433D66-2D49-48BF-A0ED-F165724DF311}.Release|x64.Build.0 = Release|Any CPU
-		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|x64.Build.0 = Debug|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Checked|x64.Build.0 = Checked|Any CPU
+		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Debug|x64.Build.0 = Debug|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Release|x64.ActiveCfg = Release|Any CPU
 		{E7191BC4-3001-4CE4-85C3-9A017F0EB574}.Release|x64.Build.0 = Release|Any CPU
-		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Checked|x64.Build.0 = Checked|Any CPU
+		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Debug|x64.Build.0 = Debug|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Release|x64.ActiveCfg = Release|Any CPU
 		{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}.Release|x64.Build.0 = Release|Any CPU
-		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|x64.Build.0 = Debug|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Checked|x64.Build.0 = Checked|Any CPU
+		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Debug|x64.Build.0 = Debug|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Release|Any CPU.Build.0 = Release|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Release|x64.ActiveCfg = Release|Any CPU
 		{41634CFB-AEEF-4F43-8185-8103B11F8F63}.Release|x64.Build.0 = Release|Any CPU
-		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|x64.Build.0 = Debug|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Checked|x64.Build.0 = Checked|Any CPU
+		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{87991D6D-22D3-42C8-9293-E46A70945090}.Debug|x64.Build.0 = Debug|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Release|Any CPU.Build.0 = Release|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Release|x64.ActiveCfg = Release|Any CPU
 		{87991D6D-22D3-42C8-9293-E46A70945090}.Release|x64.Build.0 = Release|Any CPU
-		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|x64.Build.0 = Debug|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Checked|x64.Build.0 = Checked|Any CPU
+		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{75DB9E96-7CC5-437A-87A5-85522502107F}.Debug|x64.Build.0 = Debug|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Release|x64.ActiveCfg = Release|Any CPU
 		{75DB9E96-7CC5-437A-87A5-85522502107F}.Release|x64.Build.0 = Release|Any CPU
-		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|x64.Build.0 = Debug|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Checked|x64.Build.0 = Checked|Any CPU
+		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Debug|x64.Build.0 = Debug|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Release|Any CPU.Build.0 = Release|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Release|x64.ActiveCfg = Release|Any CPU
 		{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}.Release|x64.Build.0 = Release|Any CPU
-		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|x64.Build.0 = Debug|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Checked|x64.Build.0 = Checked|Any CPU
+		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Debug|x64.Build.0 = Debug|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Release|x64.ActiveCfg = Release|Any CPU
 		{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}.Release|x64.Build.0 = Release|Any CPU
-		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|x64.Build.0 = Debug|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Checked|x64.Build.0 = Checked|Any CPU
+		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{439D8731-D45B-448B-8350-166E614A32C9}.Debug|x64.Build.0 = Debug|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Release|x64.ActiveCfg = Release|Any CPU
 		{439D8731-D45B-448B-8350-166E614A32C9}.Release|x64.Build.0 = Release|Any CPU
-		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|x64.Build.0 = Debug|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Checked|x64.Build.0 = Checked|Any CPU
+		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Debug|x64.Build.0 = Debug|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Release|x64.ActiveCfg = Release|Any CPU
 		{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}.Release|x64.Build.0 = Release|Any CPU
-		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|x64.Build.0 = Debug|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Checked|x64.Build.0 = Checked|Any CPU
+		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Debug|x64.Build.0 = Debug|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Release|x64.ActiveCfg = Release|Any CPU
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}.Release|x64.Build.0 = Release|Any CPU
-		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|x64.Build.0 = Debug|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Checked|x64.Build.0 = Checked|Any CPU
+		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Debug|x64.Build.0 = Debug|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Release|x64.ActiveCfg = Release|Any CPU
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29}.Release|x64.Build.0 = Release|Any CPU
-		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Checked|Any CPU.Build.0 = Checked|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Checked|x64.ActiveCfg = Checked|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Checked|x64.Build.0 = Checked|Any CPU
+		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Debug|x64.Build.0 = Debug|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Release|x64.ActiveCfg = Release|Any CPU
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}.Release|x64.Build.0 = Release|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Checked|Any CPU.ActiveCfg = Checked|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Checked|Any CPU.Build.0 = Checked|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Checked|Mixed Platforms.ActiveCfg = Checked|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Checked|Mixed Platforms.Build.0 = Checked|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Checked|x64.ActiveCfg = Checked|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Checked|x64.Build.0 = Checked|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Debug|x64.Build.0 = Debug|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Release|x64.ActiveCfg = Release|Any CPU
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -33404,6 +33470,16 @@ Global
 		{C6DC8E85-DCD2-49A0-977D-CE9795552632} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
 		{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
 		{650B07D3-9BC0-4EF8-8557-44200EC13261} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
+		{38302715-A140-493E-AEF4-3E8F9EE99195} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
+		{6222AF08-F765-44C2-B48C-3C040D62303F} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
+		{5A0F2889-91F1-4670-A4AF-9AF0598E22B7} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
+		{C82D33B6-5779-4E19-8220-1DEA587203B1} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
+		{4240086D-0722-4E93-A6DD-BF779715CE73} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
+		{18F8266B-2F59-4058-8FE6-6B8368CD0D0F} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
+		{E7B36F3A-CD18-4F21-8898-CA43C5FDEA1E} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
+		{1EB5785A-2050-4AD1-820B-F46CCCC3C65A} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
+		{061E4E38-14A9-4305-AD27-5A01A95E9FCE} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
+		{5F015026-51D0-4EF7-B538-24E8864F31D6} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
 		{C5578A39-72FF-4D25-99DA-96A8A99C6740} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
 		{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
 		{A7850EBD-6701-473E-8686-99535F0794A6} = {954F04D0-2FFD-4923-BE9A-2F9F58145708}
@@ -34869,5 +34945,9 @@ Global
 		{DE79BE8C-2F24-4917-BAA0-39AE21C1006F} = {48E19BDB-F7F5-4FEF-ABA9-7FEEAC96D265}
 		{CB644C00-AAB0-4E15-90B4-4E30915CAD29} = {48E19BDB-F7F5-4FEF-ABA9-7FEEAC96D265}
 		{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C} = {48E19BDB-F7F5-4FEF-ABA9-7FEEAC96D265}
+		{F54F4420-F0CB-4BE9-B311-73A8DCBDDD4F} = {8AE4A865-21A5-41B5-96DE-1F92695ADC6C}
+		{C37CECFF-EC02-4B13-A7A5-748C29C4ADB7} = {F54F4420-F0CB-4BE9-B311-73A8DCBDDD4F}
+		{B58B8AED-8591-47E8-A21D-957053454911} = {C37CECFF-EC02-4B13-A7A5-748C29C4ADB7}
+		{95DFC527-4AC1-495E-87D7-E94EE1F7140D} = {B58B8AED-8591-47E8-A21D-957053454911}
 	EndGlobalSection
 EndGlobal
diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets
index c487468149..f015cc710d 100644
--- a/tests/src/CLRTest.Execute.Bash.targets
+++ b/tests/src/CLRTest.Execute.Bash.targets
@@ -27,27 +27,31 @@ WARNING:   When setting properties based on their current state (for example:
       <DisassemblyName>$(MSBuildProjectName).dasm.il</DisassemblyName>
       <TargetAssemblyName>$(MSBuildProjectName).asm.exe</TargetAssemblyName>
 
-      <IlasmRoundTrip Condition="'$(ReferenceLocalMscorlib)'!=''">false</IlasmRoundTrip>
-
       <IlasmRoundTripBashScript Condition="'$(IlasmRoundTrip)'=='true'">
       <![CDATA[
-echo "$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName)
-"$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName)
-_ERRORLEVEL=$?
-if [  $ERRORLEVEL -ne 0 ]
+# Disable Ilasm round-tripping for Linker tests.
+# Todo: Ilasm round-trip on linked binaries.
+      
+if [ -z "$DoLink" ]; 
 then
-  echo EXECUTION OF ILDASM - FAILED $ERRORLEVEL
-  exit 1
-fi
+  echo "$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName)
+  "$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName)
+  ERRORLEVEL=$?
+  if [  $ERRORLEVEL -ne 0 ]
+  then
+    echo EXECUTION OF ILDASM - FAILED $ERRORLEVEL
+    exit 1
+  fi
 
-echo "$CORE_ROOT/ilasm" -output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
-"$CORE_ROOT/ilasm" -output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
-_ERRORLEVEL=$?
-if [ $ERRORLEVEL -ne 0 ]
-then
-  echo EXECUTION OF ILASM - FAILED $ERRORLEVEL
-  exit 1
-fi
+  echo "$CORE_ROOT/ilasm" -output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
+  "$CORE_ROOT/ilasm" -output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
+  ERRORLEVEL=$?
+  if [ $ERRORLEVEL -ne 0 ]
+  then
+    echo EXECUTION OF ILASM - FAILED $ERRORLEVEL
+    exit 1
+  fi
+fi    
       ]]>
       </IlasmRoundTripBashScript>
     </PropertyGroup>
@@ -103,13 +107,17 @@ fi
 
     <Message Text="Project depends on $(_CLRTestToRunFileFullPath)." Condition="'$(_CLRTestNeedsProjectToRun)' == 'True'" />
 
-    <PropertyGroup>        
+    <PropertyGroup>
+      <!-- An exit code of 2 indicates "Skipped" for regular non-windows runs, but "Failed" in Helix -->
+      <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' != 'true'">2</GCBashScriptExitCode>
+      <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' == 'true'">0</GCBashScriptExitCode>
+
       <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(GCStressIncompatible)' == 'true'"><![CDATA[
 $(BashCLRTestEnvironmentCompatibilityCheck)
 if [ ! -z "$COMPlus_GCStress" ]
 then
   echo SKIPPING EXECUTION BECAUSE COMPlus_GCStress IS SET
-  exit 0
+  exit $(GCBashScriptExitCode)
 fi
       ]]></BashCLRTestEnvironmentCompatibilityCheck>
       <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'"><![CDATA[
@@ -117,7 +125,7 @@ $(BashCLRTestEnvironmentCompatibilityCheck)
 if [ \( ! -z "$COMPlus_JitStress" \) -o \( ! -z "$COMPlus_JitStressRegs" \) -o \( ! -z "$COMPlus_JITMinOpts" \) ]
 then
   echo "SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts) IS SET"
-  exit 0
+  exit $(GCBashScriptExitCode)
 fi
       ]]></BashCLRTestEnvironmentCompatibilityCheck>
       <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(HeapVerifyIncompatible)' == 'true'"><![CDATA[
@@ -125,7 +133,7 @@ $(BashCLRTestEnvironmentCompatibilityCheck)
 if [ ! -z "$COMPlus_HeapVerify" ]
 then
   echo SKIPPING EXECUTION BECAUSE COMPlus_HeapVerify IS SET
-  exit 0
+  exit $(GCBashScriptExitCode)
 fi
       ]]></BashCLRTestEnvironmentCompatibilityCheck>
 
@@ -179,25 +187,116 @@ fi
       </BashCLRTestExecutionScriptArgument>
     </ItemGroup>
 
+      <PropertyGroup>
+          <ReflectionRootsXml>$(MSBuildProjectName).reflect.xml</ReflectionRootsXml>
+          <BashLinkerTestLaunchCmds>
+              <![CDATA[
+# Linker commands
+
+LinkBin=__Link
+Assemblies="-a System.Private.CoreLib"
+ReflectionRoots=
+
+shopt -s nullglob
+
+if [ ! -z "$DoLink" ]; 
+then
+  if [ ! -x "$ILLINK" ]; 
+  then
+    echo "Illink executable [$ILLINK] Invalid"
+    exit 1
+  fi
+  
+  # Clean up old Linked binaries, if any
+  rm -rf $LinkBin
     
-    <PropertyGroup>
+  # Remove Native images, since the goal is to run from Linked binaries
+  rm -f *.ni.*
+
+  # Use hints for reflection roots, if provided in $(ReflectionRootsXml)
+  if [ -f $(ReflectionRootsXml) ]; 
+  then
+    ReflectionRoots="-x $(ReflectionRootsXml)"
+  fi
+
+  # Include all .exe files in this directory as entry points (some tests had multiple .exe file modules)
+  for bin in *.exe *.dll; 
+  do 
+    Assemblies="$Assemblies -a ${bin%.*}"
+  done
+
+  # Run dotnet-linker
+  # Run the Linker such that all assemblies except System.Private.Corlib.dll are linked
+  # Debug symbol generation needs some fixes, and is currently omitted.
+  # Once this is fixed, add -b true option.
+  echo "$ILLINK -out $LinkBin -d $CORE_ROOT -c link -l none -t $Assemblies $ReflectionRoots"
+  $ILLINK -out $LinkBin -d $CORE_ROOT -c link -l none -t $Assemblies $ReflectionRoots
+  ERRORLEVEL=$?
+  if [  $ERRORLEVEL -ne 0 ]
+  then
+    echo ILLINK FAILED $ERRORLEVEL
+    if [ -z "$KeepLinkedBinaries" ]; 
+    then
+      rm -rf $LinkBin
+    fi
+    exit 1
+  fi
+  
+  # Copy CORECLR native binaries to $LinkBin, 
+  # so that we can run the test based on that directory
+  cp $CORE_ROOT/*.so $LinkBin/
+  cp $CORE_ROOT/corerun $LinkBin/
+
+  # Copy some files that may be arguments
+  for f in *.txt;
+  do
+    [ -e "$f" ] && cp $f $LinkBin
+  done
+
+  ExePath=$LinkBin/$(InputAssemblyName)
+  export CORE_ROOT=$PWD/$LinkBin
+fi
+]]>
+          </BashLinkerTestLaunchCmds>
+          <BashLinkerTestCleanupCmds>
+              <![CDATA[
+# Clean up the LinkBin directories after test execution.
+# Otherwise, RunTests may run out of disk space.
+
+if [ ! -z "$DoLink" ]; 
+then
+  if [ -z "$KeepLinkedBinaries" ]; 
+  then
+    rm -rf $LinkBin
+  fi
+fi
+]]>
+          </BashLinkerTestCleanupCmds>
+      </PropertyGroup>
+      <PropertyGroup>
       <_CLRTestRunFile Condition="'$(CLRTestIsHosted)'=='true'">"$CORE_ROOT/corerun"</_CLRTestRunFile>
       <BashCLRTestLaunchCmds Condition="'$(IlasmRoundTrip)'=='true'"><![CDATA[
-echo $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments 
-$(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments 
-if [  $? -ne $CLRTestExpectedExitCode ]
-then
-  echo END EXECUTION OF IL{D}ASM BINARY - FAILED $? vs $CLRTestExpectedExitCode
-  echo FAILED
-  exit 1
+if [ -z "$DoLink" ]; then
+  echo $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments 
+  $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments 
+  if [  $? -ne $CLRTestExpectedExitCode ]
+  then
+    echo END EXECUTION OF IL{D}ASM BINARY - FAILED $? vs $CLRTestExpectedExitCode
+    echo FAILED
+    exit 1
+  fi
 fi
       ]]></BashCLRTestLaunchCmds>
 
-      <BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun'"><![CDATA[
+      <BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun'">
+    <![CDATA[
+ExePath=$(InputAssemblyName)
+$(BashLinkerTestLaunchCmds)
 $(BashCLRTestLaunchCmds)
-echo $_DebuggerFullPath $(_CLRTestRunFile) $(InputAssemblyName) $CLRTestExecutionArguments 
-$_DebuggerFullPath $(_CLRTestRunFile) $(InputAssemblyName) $CLRTestExecutionArguments 
+echo $_DebuggerFullPath $(_CLRTestRunFile) $ExePath $CLRTestExecutionArguments 
+$_DebuggerFullPath $(_CLRTestRunFile) $ExePath $CLRTestExecutionArguments 
 CLRTestExitCode=$?
+$(BashLinkerTestCleanupCmds)
       ]]></BashCLRTestLaunchCmds>
       <BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'RunOnly'"><![CDATA[
 $(BashCLRTestLaunchCmds)
diff --git a/tests/src/CLRTest.Execute.Batch.targets b/tests/src/CLRTest.Execute.Batch.targets
index 5de78b42f6..db2a17425d 100644
--- a/tests/src/CLRTest.Execute.Batch.targets
+++ b/tests/src/CLRTest.Execute.Batch.targets
@@ -27,23 +27,24 @@ WARNING:   When setting properties based on their current state (for example:
       <DisassemblyName>$(MSBuildProjectName).dasm.il</DisassemblyName>
       <TargetAssemblyName>$(MSBuildProjectName).asm.exe</TargetAssemblyName>
 
-      <!-- If a test is built against mscorlib instead of dotnet Core, permission attributes can be embedded, which CoreCLR does not support. -->
-      <IlasmRoundTrip Condition="'$(ReferenceLocalMscorlib)'!=''">false</IlasmRoundTrip>
-
        <!-- https://github.com/dotnet/coreclr/issues/2481. Delete /raweh to ildasm once it is resolved.-->
       <IlasmRoundTripBatchScript Condition="'$(IlasmRoundTrip)'=='true'">
       <![CDATA[
-ECHO %CORE_ROOT%\ildasm.exe /raweh /out=$(DisassemblyName) $(InputAssemblyName)
-%CORE_ROOT%\ildasm.exe /raweh /out=$(DisassemblyName) $(InputAssemblyName)
-IF NOT "!ERRORLEVEL!"=="0" (
-  ECHO EXECUTION OF ILDASM - FAILED !ERRORLEVEL!
-  Exit /b 1
-)
-ECHO %CORE_ROOT%\ilasm.exe /output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
-%CORE_ROOT%\ilasm.exe /output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
-IF NOT "!ERRORLEVEL!"=="0" (
-  ECHO EXECUTION OF ILASM - FAILED !ERRORLEVEL!
-  Exit /b 1
+REM Disable Ilasm round-tripping for Linker tests.
+REM Todo: Ilasm round-trip on linked binaries.
+IF NOT DEFINED DoLink ( 
+  ECHO %CORE_ROOT%\ildasm.exe /raweh /out=$(DisassemblyName) $(InputAssemblyName)
+  %CORE_ROOT%\ildasm.exe /raweh /out=$(DisassemblyName) $(InputAssemblyName)
+  IF NOT "!ERRORLEVEL!"=="0" (
+    ECHO EXECUTION OF ILDASM - FAILED !ERRORLEVEL!
+    Exit /b 1
+  )
+  ECHO %CORE_ROOT%\ilasm.exe /output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
+  %CORE_ROOT%\ilasm.exe /output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
+  IF NOT "!ERRORLEVEL!"=="0" (
+    ECHO EXECUTION OF ILASM - FAILED !ERRORLEVEL!
+    Exit /b 1
+  )
 )
       ]]>
       </IlasmRoundTripBatchScript>
@@ -203,7 +204,74 @@ Exit /b 0
       </BatchCLRTestExecutionScriptArgument>
     </ItemGroup>
 
-    <PropertyGroup> 
+      <PropertyGroup>
+          <ReflectionRootsXml>$(MSBuildProjectName).reflect.xml</ReflectionRootsXml>
+          <BatchLinkerTestLaunchCmds><![CDATA[
+REM Linker commands
+
+set LinkBin=__Link
+set Assemblies=-a System.Private.CoreLib
+
+IF defined DoLink ( 
+    IF NOT EXIST !ILLINK! (
+      ECHO ILLink executable [%ILLINK%] Invalid
+      Exit /b 1
+    )
+    
+    REM Clean up old Linked binaries, if any
+    IF EXIST %LinkBin% rmdir /s /q %LinkBin%
+    
+    REM Remove Native images, since the goal is to run from Linked binaries
+    del /q /f *.ni.* 2> nul
+
+    REM Use hints for reflection roots, if provided in $(ReflectionRootsXml)
+    IF EXIST $(ReflectionRootsXml) set ReflectionRoots=-x $(ReflectionRootsXml)
+
+    REM Include all .exe files in this directory as entry points (some tests had multiple .exe file modules)
+    FOR /F "delims=" %%E IN ('dir /b *.exe *.dll') DO SET Assemblies=!Assemblies! -a %%~nE
+
+    REM Run dotnet-linker
+    REM Run the Linker such that all assemblies except System.Private.Corlib.dll are linked
+    REM Debug symbol generation needs some fixes, and is currently omitted.
+    REM Once this is fixed, add -b true option.
+    ECHO %ILLINK% -out %LinkBin% -d %CORE_ROOT% -c link -l none -t !Assemblies! !ReflectionRoots!
+    %ILLINK% -out %LinkBin% -d %CORE_ROOT% -c link -l none -t !Assemblies! !ReflectionRoots!
+    IF NOT "!ERRORLEVEL!"=="0" (
+      ECHO ILLINK FAILED !ERRORLEVEL!
+      IF NOT defined KeepLinkedBinaries (
+          IF EXIST %LinkBin% rmdir /s /q %LinkBin%
+      )
+      Exit /b 1
+    )
+
+    REM Copy CORECLR native binaries to %LinkBin%, so that we can run the test based on that directory
+    copy %CORE_ROOT%\clrjit.dll %LinkBin% > nul 2> nul
+    copy %CORE_ROOT%\coreclr.dll %LinkBin% > nul 2> nul
+    copy %CORE_ROOT%\mscorrc.dll %LinkBin% > nul 2> nul
+    copy %CORE_ROOT%\CoreRun.exe %LinkBin% > nul 2> nul
+
+    REM Copy some files that may be arguments
+    copy *.txt %LinkBin% > nul 2> nul
+
+    set ExePath=%LinkBin%\$(InputAssemblyName)
+    set CORE_ROOT=%~dp0%LinkBin%
+)
+]]>
+          </BatchLinkerTestLaunchCmds>
+          <BatchLinkerTestCleanupCmds>
+              <![CDATA[
+REM Clean up the LinkBin directories after test execution.
+REM Otherwise, RunTests may run out of disk space.
+
+if defined DoLink (
+    if not defined KeepLinkedBinaries (
+        IF EXIST %LinkBin% rmdir /s /q %LinkBin%
+    )
+)              
+]]>
+          </BatchLinkerTestCleanupCmds>
+      </PropertyGroup>      
+      <PropertyGroup>      
       <_CLRTestRunFile Condition="'$(CLRTestIsHosted)'=='true'">"%CORE_ROOT%\corerun.exe"</_CLRTestRunFile>
       <BatchCLRTestLaunchCmds><![CDATA[
 IF NOT "%CLRCustomTestLauncher%"=="" (
@@ -213,21 +281,28 @@ IF NOT "%CLRCustomTestLauncher%"=="" (
 )
       ]]></BatchCLRTestLaunchCmds>
       <BatchCLRTestLaunchCmds Condition=" '$(IlasmRoundTrip)'=='true' "><![CDATA[
-$(BatchCLRTestLaunchCmds)
-ECHO %LAUNCHER% $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args%
-%LAUNCHER% $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args%
-
-IF NOT "!ERRORLEVEL!"=="%CLRTestExpectedExitCode%" (
-  ECHO END EXECUTION OF IL{D}ASM BINARY - FAILED !ERRORLEVEL! vs %CLRTestExpectedExitCode%
-  ECHO FAILED
-  Exit /b 1
+  $(BatchCLRTestLaunchCmds)
+IF NOT DEFINED DoLink ( 
+  ECHO %LAUNCHER% $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args%
+  %LAUNCHER% $(TargetAssemblyName) %CLRTestExecutionArguments% %Host_Args%
+
+  IF NOT "!ERRORLEVEL!"=="%CLRTestExpectedExitCode%" (
+    ECHO END EXECUTION OF IL{D}ASM BINARY - FAILED !ERRORLEVEL! vs %CLRTestExpectedExitCode%
+    ECHO FAILED
+    Exit /b 1
+  )
 )
       ]]></BatchCLRTestLaunchCmds>
-      <BatchCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun'"><![CDATA[
+      <BatchCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun'">
+    <![CDATA[
+set ExePath=$(InputAssemblyName)
+$(BatchLinkerTestLaunchCmds)
 $(BatchCLRTestLaunchCmds)
-ECHO %LAUNCHER% $(InputAssemblyName) %CLRTestExecutionArguments%
-%LAUNCHER% $(InputAssemblyName) %CLRTestExecutionArguments%
+
+ECHO %LAUNCHER% %ExePath% %CLRTestExecutionArguments%
+%LAUNCHER% %ExePath% %CLRTestExecutionArguments%
 set CLRTestExitCode=!ERRORLEVEL!
+$(BatchLinkerTestCleanupCmds)
       ]]></BatchCLRTestLaunchCmds>
 
       <BatchCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'RunOnly'"><![CDATA[
diff --git a/tests/src/CLRTest.GC.targets b/tests/src/CLRTest.GC.targets
index 90b9398a40..f959aaf6e0 100644
--- a/tests/src/CLRTest.GC.targets
+++ b/tests/src/CLRTest.GC.targets
@@ -18,12 +18,16 @@ WARNING:   When setting properties based on their current state (for example:
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
+      <!-- An exit code of 2 indicates "Skipped" for regular non-windows runs, but "Failed" in Helix -->
+        <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' != 'true'">2</GCBashScriptExitCode>
+        <GCBashScriptExitCode Condition="'$(BuildTestsAgainstPackages)' == 'true'">0</GCBashScriptExitCode>
+
         <GCLongGCTestBashScript Condition="'$(IsLongRunningGCTest)' != 'true'"><![CDATA[
 # Long GC script
 if [ ! -z $RunningLongGCTests ]
 then
     echo "Skipping execution because this is not a long-running GC test"
-    exit 0
+    exit $(GCBashScriptExitCode)
 fi
         ]]></GCLongGCTestBashScript>
         <GCLongGCTestBashScript Condition="'$(IsLongRunningGCTest)' == 'true'"><![CDATA[
@@ -31,7 +35,7 @@ fi
 if [ -z $RunningLongGCTests ]
 then
     echo "Skipping execution because long-running GC tests are not enabled"
-    exit 0
+    exit $(GCBashScriptExitCode)
 fi
         ]]></GCLongGCTestBashScript>
 
@@ -41,7 +45,7 @@ fi
 if [ ! -z $RunningGCSimulatorTests ]
 then
     echo "Skipping execution because this is not a GCSimulator test"
-    exit 0
+    exit $(GCBashScriptExitCode)
 fi
         ]]></GCSimulatorTestBashScript>
         <GCSimulatorTestBashScript Condition="'$(IsGCSimulatorTest)' == 'true'"><![CDATA[
@@ -49,7 +53,7 @@ fi
 if [ -z $RunningGCSimulatorTests ]
 then
     echo "Skipping execution because GCSimulator tests are not enabled"
-    exit 0
+    exit $(GCBashScriptExitCode)
 fi
         ]]></GCSimulatorTestBashScript>
 
diff --git a/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
index 1c1ceccb01..e1af9194db 100644
--- a/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
+++ b/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);WINCORESYS;$([System.String]::Copy('$(BuildArch)').ToUpper())</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateRunScript>false</GenerateRunScript>
diff --git a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
index eb9a4142a8..2e7abfe1bc 100644
--- a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
+++ b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
@@ -8,15 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GenerateRunScript>false</GenerateRunScript>
     <CLRTestKind>BuildOnly</CLRTestKind>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
index ddb905087b..e431f3a333 100644
--- a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
+++ b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
@@ -7,12 +7,89 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Win32.SafeHandles;
 
 namespace CoreclrTestLib
 {
+    static class DbgHelp
+    {
+        public enum MiniDumpType : int
+        {
+            MiniDumpNormal                          = 0x00000000,
+            MiniDumpWithDataSegs                    = 0x00000001,
+            MiniDumpWithFullMemory                  = 0x00000002,
+            MiniDumpWithHandleData                  = 0x00000004,
+            MiniDumpFilterMemory                    = 0x00000008,
+            MiniDumpScanMemory                      = 0x00000010,
+            MiniDumpWithUnloadedModules             = 0x00000020,
+            MiniDumpWithIndirectlyReferencedMemory  = 0x00000040,
+            MiniDumpFilterModulePaths               = 0x00000080,
+            MiniDumpWithProcessThreadData           = 0x00000100,
+            MiniDumpWithPrivateReadWriteMemory      = 0x00000200,
+            MiniDumpWithoutOptionalData             = 0x00000400,
+            MiniDumpWithFullMemoryInfo              = 0x00000800,
+            MiniDumpWithThreadInfo                  = 0x00001000,
+            MiniDumpWithCodeSegs                    = 0x00002000,
+            MiniDumpWithoutAuxiliaryState           = 0x00004000,
+            MiniDumpWithFullAuxiliaryState          = 0x00008000,
+            MiniDumpWithPrivateWriteCopyMemory      = 0x00010000,
+            MiniDumpIgnoreInaccessibleMemory        = 0x00020000,
+            MiniDumpWithTokenInformation            = 0x00040000,
+            MiniDumpWithModuleHeaders               = 0x00080000,
+            MiniDumpFilterTriage                    = 0x00100000,
+            MiniDumpValidTypeFlags                  = 0x001fffff
+        }
+
+        [DllImport("DbgHelp.dll", SetLastError = true)]
+        public static extern bool MiniDumpWriteDump(IntPtr handle, int processId, SafeFileHandle file, MiniDumpType dumpType, IntPtr exceptionParam, IntPtr userStreamParam, IntPtr callbackParam);
+    }
+
+    static class Kernel32
+    {
+        public const int MAX_PATH = 260;
+        public const int ERROR_NO_MORE_FILES = 0x12;
+
+        public enum Toolhelp32Flags : uint
+        {
+            TH32CS_INHERIT = 0x80000000,
+            TH32CS_SNAPHEAPLIST = 0x00000001,
+            TH32CS_SNAPMODULE = 0x00000008,
+            TH32CS_SNAPMODULE32 = 0x00000010,
+            TH32CS_SNAPPROCESS = 0x00000002,
+            TH32CS_SNAPTHREAD = 0x00000004
+        };
+
+        public unsafe struct ProcessEntry32
+        {
+            public int Size;
+            public int Usage;
+            public int ProcessID;
+            public IntPtr DefaultHeapID;
+            public int ModuleID;
+            public int Threads;
+            public int ParentProcessID;
+            public int PriClassBase;
+            public int Flags;
+            public fixed char ExeFile[MAX_PATH];
+        }
+
+        [DllImport("kernel32.dll")]
+        public static extern bool CloseHandle(IntPtr handle);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern IntPtr CreateToolhelp32Snapshot(Toolhelp32Flags flags, int processId);
+
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern bool Process32First(IntPtr snapshot, ref ProcessEntry32 entry);
+
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern bool Process32Next(IntPtr snapshot, ref ProcessEntry32 entry);
+    }
+
     public class CoreclrTestWrapperLib
     {
         public const int EXIT_SUCCESS_CODE = 0;
@@ -22,6 +99,63 @@ namespace CoreclrTestLib
         public const int DEFAULT_TIMEOUT = 1000 * 60*10;
         public const string GC_STRESS_LEVEL = "__GCSTRESSLEVEL";
 
+        public const string COLLECT_DUMPS_ENVIRONMENT_VAR = "__CollectDumps";
+        public const string CRASH_DUMP_FOLDER_ENVIRONMENT_VAR = "__CrashDumpFolder";
+
+        static bool CollectCrashDump(Process process, string path)
+        {
+            using (var crashDump = File.OpenWrite(path))
+            {
+                var flags = DbgHelp.MiniDumpType.MiniDumpWithFullMemory | DbgHelp.MiniDumpType.MiniDumpIgnoreInaccessibleMemory;
+                return DbgHelp.MiniDumpWriteDump(process.Handle, process.Id, crashDump.SafeFileHandle, flags, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
+            }
+        }
+
+        static unsafe bool TryFindChildProcessByName(Process process, string childName, out Process child)
+        {
+            IntPtr snapshot = Kernel32.CreateToolhelp32Snapshot(Kernel32.Toolhelp32Flags.TH32CS_SNAPPROCESS, 0);
+            if (snapshot == IntPtr.Zero)
+            {
+                child = null;
+                return false;
+            }
+
+            try
+            {
+                int ppid = process.Id;
+
+                var processEntry = new Kernel32.ProcessEntry32 { Size = sizeof(Kernel32.ProcessEntry32) };
+
+                bool success = Kernel32.Process32First(snapshot, ref processEntry);
+                while (success)
+                {
+                    if (processEntry.ParentProcessID == ppid)
+                    {
+                        try
+                        {
+                            Process c = Process.GetProcessById(processEntry.ProcessID);
+                            if (c.ProcessName.Equals(childName, StringComparison.OrdinalIgnoreCase))
+                            {
+                                child = c;
+                                return true;
+                            }
+                            c.Dispose();
+                        }
+                        catch {}
+                    }
+
+                    success = Kernel32.Process32Next(snapshot, ref processEntry);
+                }
+
+                child = null;
+                return false;
+            }
+            finally
+            {
+                Kernel32.CloseHandle(snapshot);
+            }
+        }
+
         public int RunTest(string executable, string outputFile, string errorFile)
         {
             Debug.Assert(outputFile != errorFile);
@@ -39,6 +173,9 @@ namespace CoreclrTestLib
             string operatingSystem = System.Environment.GetEnvironmentVariable("OS");
             bool runningInWindows = (operatingSystem != null && operatingSystem.StartsWith("Windows"));
 
+            // We can't yet take crash dumps on non-Windows OSs for timed-out tests
+            bool collectCrashDumps = runningInWindows && Environment.GetEnvironmentVariable(COLLECT_DUMPS_ENVIRONMENT_VAR) != null;
+
             var outputStream = new FileStream(outputFile, FileMode.Create);
             var errorStream = new FileStream(errorFile, FileMode.Create);
 
@@ -71,23 +208,44 @@ namespace CoreclrTestLib
 
                 process.Start();
 
-                Task copyOutput = process.StandardOutput.BaseStream.CopyToAsync(outputStream);
-                Task copyError = process.StandardError.BaseStream.CopyToAsync(errorStream);
-
-                bool completed = process.WaitForExit(timeout);
-                copyOutput.Wait(timeout);
-                copyError.Wait(timeout);
+                var cts = new CancellationTokenSource();
+                Task copyOutput = process.StandardOutput.BaseStream.CopyToAsync(outputStream, 4096, cts.Token);
+                Task copyError = process.StandardError.BaseStream.CopyToAsync(errorStream, 4096, cts.Token);
 
-                if (completed)
+                if (process.WaitForExit(timeout))
                 {
                     // Process completed. Check process.ExitCode here.
                     exitCode = process.ExitCode;
+                    Task.WaitAll(copyOutput, copyError);
                 }
                 else
                 {
                     // Timed out.
-                    outputWriter.WriteLine("cmdLine:" + executable + " Timed Out");
-                    errorWriter.WriteLine("cmdLine:" + executable + " Timed Out");
+                    try
+                    {
+                        cts.Cancel();
+                    }
+                    catch {}
+
+                    outputWriter.WriteLine("\ncmdLine:" + executable + " Timed Out");
+                    errorWriter.WriteLine("\ncmdLine:" + executable + " Timed Out");
+
+                    if (collectCrashDumps)
+                    {
+                        string crashDumpFolder = Environment.GetEnvironmentVariable(CRASH_DUMP_FOLDER_ENVIRONMENT_VAR);
+                        if (crashDumpFolder != null)
+                        {
+                            Process childProcess;
+                            if (TryFindChildProcessByName(process, "corerun", out childProcess))
+                            {
+                                string crashDumpPath = Path.Combine(Path.GetFullPath(crashDumpFolder), string.Format("crashdump_{0}.dmp", childProcess.Id));
+                                if (CollectCrashDump(childProcess, crashDumpPath))
+                                {
+                                    Console.WriteLine("Collected crash dump {0}", crashDumpPath);
+                                }
+                            }
+                        }
+                    }
                 }
 
                outputWriter.WriteLine("Test Harness Exitcode is : " + exitCode.ToString());
diff --git a/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj b/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj
index b70f332f0f..b26c89370b 100644
--- a/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj
+++ b/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj
@@ -12,8 +12,8 @@
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <SkipSigning>true</SkipSigning>
-    <FileAlignment>512</FileAlignment>
     <CLRTestKind>BuildOnly</CLRTestKind>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/tests/src/Common/PerfHarness/PerfHarness.cs b/tests/src/Common/PerfHarness/PerfHarness.cs
new file mode 100644
index 0000000000..b3a0ea48c5
--- /dev/null
+++ b/tests/src/Common/PerfHarness/PerfHarness.cs
@@ -0,0 +1,16 @@
+using System.IO;
+using System.Reflection;
+using System.Collections.Generic;
+using Microsoft.Xunit.Performance.Api;
+
+public class PerfHarness
+{
+    public static void Main(string[] args)
+    {
+        string assemblyName = args[0];
+        using (XunitPerformanceHarness harness = new XunitPerformanceHarness(args))
+        {
+            harness.RunBenchmarks(assemblyName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/src/Common/PerfHarness/project.json b/tests/src/Common/PerfHarness/project.json
new file mode 100644
index 0000000000..d920190d11
--- /dev/null
+++ b/tests/src/Common/PerfHarness/project.json
@@ -0,0 +1,19 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "debugType": "portable",
+    "emitEntryPoint": true
+  },
+  "dependencies": {},
+  "frameworks": {
+    "netcoreapp1.1": {
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.1.0"
+        },
+        "xunit.performance.api": "1.0.0-alpha-build0049"
+      }
+    }
+  }
+}
diff --git a/tests/src/Common/build_against_pkg_dependencies/project.json b/tests/src/Common/build_against_pkg_dependencies/project.json
index 719be5949c..501dfec274 100644
--- a/tests/src/Common/build_against_pkg_dependencies/project.json
+++ b/tests/src/Common/build_against_pkg_dependencies/project.json
@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.ILAsm": "2.0.0-beta-25007-01",
-    "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25007-01",
-    "Microsoft.NETCore.Jit": "2.0.0-beta-25007-01",
-    "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25007-01",
-    "Microsoft.NETCore.TestHost": "2.0.0-beta-25007-01"
+    "Microsoft.NETCore.ILAsm": "2.0.0-preview1-25212-04",
+    "Microsoft.NETCore.ILDAsm": "2.0.0-preview1-25212-04",
+    "Microsoft.NETCore.Jit": "2.0.0-preview1-25212-04",
+    "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25212-04",
+    "Microsoft.NETCore.TestHost": "2.0.0-preview1-25212-04"
   },
   "frameworks": {
-    "netcoreapp1.1": {
+    "netcoreapp2.0": {
       "imports": [
         "dnxcore50",
         "portable-net45+win8"
@@ -21,12 +21,12 @@
     "ubuntu.14.04-x64": {},
     "ubuntu.16.04-x64": {},
     "ubuntu.16.10-x64": {},
-    "osx.10.10-x64": {},
+    "osx.10.12-x64": {},
     "centos.7-x64": {},
     "rhel.7-x64": {},
     "debian.8-x64": {},
-    "fedora.23-x64": {},
-    "opensuse.13.2-x64": {},
-    "opensuse.42.1-x64": {}
+    "fedora.24-x64": {},
+    "opensuse.42.1-x64": {},
+    "linux-x64": {}
   }
 }
diff --git a/tests/src/Common/empty/project.json b/tests/src/Common/empty/project.json
index cc74ba8472..e1ec3bfd42 100644
--- a/tests/src/Common/empty/project.json
+++ b/tests/src/Common/empty/project.json
@@ -10,11 +10,10 @@
     "ubuntu.14.04-x64": {},
     "ubuntu.16.04-x64": {},
     "ubuntu.16.10-x64": {},
-    "osx.10.10-x64": {},
+    "osx.10.12-x64": {},
     "centos.7-x64": {},
     "rhel.7-x64": {},
     "debian.8-x64": {},
-    "fedora.23-x64": {},
-    "opensuse.13.2-x64": {}
+    "fedora.24-x64": {}
   }
 }
diff --git a/tests/src/Common/external/external.csproj b/tests/src/Common/external/external.csproj
new file mode 100644
index 0000000000..f7fa75ed32
--- /dev/null
+++ b/tests/src/Common/external/external.csproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <CLRTestKind>BuildOnly</CLRTestKind>
+    <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="Build"
+     DependsOnTargets="ResolveReferences" /> 
+</Project>
\ No newline at end of file
diff --git a/tests/src/Common/external/external.depproj b/tests/src/Common/external/external.depproj
new file mode 100644
index 0000000000..3f7890601d
--- /dev/null
+++ b/tests/src/Common/external/external.depproj
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets
+         This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here
+    -->
+    <ProjectJson>$(MSBuildThisFileDirectory)project.json</ProjectJson>
+    <ProjectLockJson>$(MSBuildThisFileDirectory)project.lock.json</ProjectLockJson>
+    <Language>C#</Language>
+    <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker>
+    <NugetRuntimeIdentifier>win7-x64</NugetRuntimeIdentifier>
+    <OutputPath>$(TargetingPackPath)</OutputPath>
+    <XUnitRunnerPackageId Condition="'$(TargetGroup)' != 'netfx'">xunit.console.netcore</XUnitRunnerPackageId>
+    <XUnitRunnerPackageId Condition="'$(TargetGroup)' == 'netfx'">xunit.runner.console</XUnitRunnerPackageId>
+    <CLRTestKind>SharedLibrary</CLRTestKind>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageToInclude Include="xunit.abstractions"/>
+    <PackageToInclude Include="xunit.assert"/>
+    <PackageToInclude Include="xunit.extensibility.core"/>
+    <PackageToInclude Include="xunit.extensibility.execution"/>
+    <PackageToInclude Include="xunit.runner.utility"/>
+    <PackageToInclude Include="Microsoft.DotNet.xunit.performance"/>
+    <PackageToInclude Include="Microsoft.DotNet.xunit.performance.analysis"/>
+    <PackageToInclude Include="Microsoft.DotNet.xunit.performance.runner.Windows"/>
+    <PackageToInclude Include="xunit.performance.api"/>
+    <PackageToInclude Include="xunit.performance.core"/>
+    <PackageToInclude Include="xunit.performance.execution"/>
+    <PackageToInclude Include="xunit.performance.metrics"/>
+    <PackageToInclude Include="Microsoft.Diagnostics.Tracing.TraceEvent"/>
+    <PackageToInclude Include="Newtonsoft.Json"/>
+    <PackageToInclude Include="Microsoft.CodeAnalysis.Analyzers"/>
+    <PackageToInclude Include="Microsoft.CodeAnalysis.Common"/>
+    <PackageToInclude Include="Microsoft.CodeAnalysis.Compilers"/>
+    <PackageToInclude Include="Microsoft.CodeAnalysis.CSharp"/>
+    <PackageToInclude Include="Microsoft.CodeAnalysis.VisualBasic"/>    
+    <PackageToInclude Include="$(XUnitRunnerPackageId)" />
+  </ItemGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+
+  <Target Name="AddXunitConsoleRunner" BeforeTargets="ResolveReferences" Condition="'$(TargetGroup)' == 'netfx'">
+    <Error Condition="!Exists('$(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion)\tools\xunit.console.exe')"
+            Text="Error: looks the package $(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion) not restored or missing xunit.console.exe."
+    />
+    <ItemGroup>
+      <ReferenceCopyLocalPaths 
+        Include="$(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion)\tools\*.*"
+        Exclude="$(PackagesDir)$(XUnitRunnerPackageId)\$(XUnitPackageVersion)\tools\xunit.console.exe.config"
+      >
+        <Private>false</Private>
+        <NuGetPackageId>$(XUnitRunnerPackageId)</NuGetPackageId>
+        <NuGetPackageVersion>$(XUnitPackageVersion)</NuGetPackageVersion>
+      </ReferenceCopyLocalPaths>
+    </ItemGroup>
+</Target>
+</Project>
\ No newline at end of file
diff --git a/tests/src/Common/external/project.json b/tests/src/Common/external/project.json
new file mode 100644
index 0000000000..63cdc04254
--- /dev/null
+++ b/tests/src/Common/external/project.json
@@ -0,0 +1,26 @@
+{
+  "dependencies": {
+    "Microsoft.CodeAnalysis.Compilers": "1.1.1",
+    "xunit.performance.api": "1.0.0-alpha-build0049",
+    "xunit.performance.core": "1.0.0-alpha-build0049",
+    "xunit.performance.execution": "1.0.0-alpha-build0049",
+    "xunit.performance.metrics": "1.0.0-alpha-build0049",
+    "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
+    "Newtonsoft.Json": "9.0.1",
+    "xunit": "2.2.0-beta2-build3300",
+    "xunit.console.netcore": "1.0.2-prerelease-00177",
+    "xunit.runner.utility": "2.2.0-beta2-build3300"
+  },
+  "frameworks": {
+    "netcoreapp1.1": {
+      "imports": [
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
+  },
+  "runtimes": {
+    "win7-x86": {},
+    "win7-x64": {}
+  }
+}
\ No newline at end of file
diff --git a/tests/src/Common/netcoreapp/project.json b/tests/src/Common/netcoreapp/project.json
index ab1528282e..2fae8dd6c6 100644
--- a/tests/src/Common/netcoreapp/project.json
+++ b/tests/src/Common/netcoreapp/project.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "Microsoft.NETCore.App": "2.0.0-beta-001494-00",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24913-02"
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25210-01"
   },
   "frameworks": {
-    "netcoreapp2.0": { }
+    "netcoreapp2.0": {}
   }
 }
diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json
index 1743f6fc8a..ea49ba346a 100644
--- a/tests/src/Common/targeting_pack_ref/project.json
+++ b/tests/src/Common/targeting_pack_ref/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25007-01"
+    "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-preview1-25212-04"
   },
   "frameworks": {
     "netcoreapp1.1": {
@@ -16,11 +16,10 @@
     "ubuntu.14.04-x64": {},
     "ubuntu.16.04-x64": {},
     "ubuntu.16.10-x64": {},
-    "osx.10.10-x64": {},
+    "osx.10.12-x64": {},
     "centos.7-x64": {},
     "rhel.7-x64": {},
     "debian.8-x64": {},
-    "fedora.23-x64": {},
-    "opensuse.13.2-x64": {}
+    "fedora.24-x64": {}
   }
 }
diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json
index 771391a989..89a5d6b6eb 100644
--- a/tests/src/Common/test_dependencies/project.json
+++ b/tests/src/Common/test_dependencies/project.json
@@ -1,79 +1,15 @@
 {
   "dependencies": {
-    "xunit": "2.2.0-beta2-build3300",
-    "xunit.console.netcore": "1.0.2-prerelease-00177",
-    "xunit.runner.utility": "2.2.0-beta2-build3300",
-    "Microsoft.CodeAnalysis.Compilers": "1.1.1",
-    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
-    "Microsoft.Win32.Primitives": "4.4.0-beta-24913-02",
-    "Newtonsoft.Json": "8.0.3",
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
-    "Microsoft.NETCore.Targets": "1.2.0-beta-24913-02",
-    "System.Collections.Immutable": "1.4.0-beta-24913-02",
-    "System.Threading.Thread": "4.4.0-beta-24913-02",
-    "System.Collections": "4.4.0-beta-24913-02",
-    "System.Xml.XmlSerializer": "4.4.0-beta-24913-02",
-    "System.Collections.Concurrent": "4.4.0-beta-24913-02",
-    "System.ObjectModel": "4.4.0-beta-24913-02",
-    "System.Runtime.Numerics": "4.4.0-beta-24913-02",
-    "System.Collections.NonGeneric": "4.4.0-beta-24913-02",
-    "System.Collections.Specialized": "4.4.0-beta-24913-02",
-    "System.ComponentModel": "4.4.0-beta-24913-02",
-    "System.Reflection.Emit.Lightweight": "4.4.0-beta-24913-02",
-    "System.Reflection.TypeExtensions": "4.4.0-beta-24913-02",
-    "System.Console": "4.4.0-beta-24913-02",
-    "System.Diagnostics.Contracts": "4.4.0-beta-24913-02",
-    "System.Diagnostics.Debug": "4.4.0-beta-24913-02",
-    "System.Diagnostics.Process": "4.4.0-beta-24913-02",
-    "System.Diagnostics.Tools": "4.4.0-beta-24913-02",
-    "System.Diagnostics.Tracing": "4.4.0-beta-24913-02",
-    "System.Dynamic.Runtime": "4.4.0-beta-24913-02",
-    "System.Globalization": "4.4.0-beta-24913-02",
-    "System.Globalization.Calendars": "4.4.0-beta-24913-02",
-    "System.IO": "4.4.0-beta-24913-02",
-    "System.IO.FileSystem": "4.4.0-beta-24913-02",
-    "System.IO.FileSystem.Primitives": "4.4.0-beta-24913-02",
-    "System.Linq": "4.4.0-beta-24913-02",
-    "System.Linq.Queryable": "4.4.0-beta-24913-02",
-    "System.Linq.Expressions": "4.4.0-beta-24913-02",
-    "System.Memory": "4.4.0-beta-24913-02",
-    "System.Reflection": "4.4.0-beta-24913-02",
-    "System.Reflection.Extensions": "4.4.0-beta-24913-02",
-    "System.Resources.ResourceManager": "4.4.0-beta-24913-02",
-    "System.Runtime": "4.4.0-beta-24913-02",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24913-02",
-    "System.Runtime.Extensions": "4.4.0-beta-24913-02",
-    "System.Runtime.Handles": "4.4.0-beta-24913-02",
-    "System.Runtime.InteropServices": "4.4.0-beta-24913-02",
-    "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24913-02",
-    "System.Runtime.Loader": "4.4.0-beta-24913-02",
-    "System.Runtime.Serialization.Json": "4.4.0-beta-24913-02",
-    "System.Runtime.Serialization.Primitives": "4.4.0-beta-24913-02",
-    "System.Runtime.Serialization.Xml": "4.4.0-beta-24913-02",
-    "System.Security.Cryptography.Algorithms": "4.4.0-beta-24913-02",
-    "System.Text.Encoding": "4.4.0-beta-24913-02",
-    "System.Text.Encoding.Extensions": "4.4.0-beta-24913-02",
-    "System.Text.RegularExpressions": "4.4.0-beta-24913-02",
-    "System.Threading": "4.4.0-beta-24913-02",
-    "System.Threading.AccessControl": "4.4.0-beta-24913-02",
-    "System.Threading.Overlapped": "4.4.0-beta-24913-02",
-    "System.Threading.Tasks": "4.4.0-beta-24913-02",
-    "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02",
-    "System.Threading.ThreadPool": "4.4.0-beta-24913-02",
-    "System.Threading.Timer": "4.4.0-beta-24913-02",
-    "System.Xml.ReaderWriter": "4.4.0-beta-24913-02",
-    "System.Xml.XDocument": "4.4.0-beta-24913-02",
-    "System.Xml.XmlDocument": "4.4.0-beta-24913-02",
-    "System.Xml.XPath": "4.4.0-beta-24913-02",
-    "System.Xml.XPath.XmlDocument": "4.4.0-beta-24913-02",
-    "System.Numerics.Vectors": "4.4.0-beta-24913-02"
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25210-01",
+    "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25210-01",
+    "System.Memory": "4.4.0-preview1-25210-01",
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25210-01"
   },
   "frameworks": {
-    "netcoreapp1.1": {
+    "netcoreapp2.0": {
       "imports": [
         "dnxcore50",
+        "netcoreapp1.1",
         "portable-net45+win8"
       ]
     }
@@ -84,11 +20,11 @@
     "ubuntu.14.04-x64": {},
     "ubuntu.16.04-x64": {},
     "ubuntu.16.10-x64": {},
-    "osx.10.10-x64": {},
+    "osx.10.12-x64": {},
     "centos.7-x64": {},
     "rhel.7-x64": {},
     "debian.8-x64": {},
-    "fedora.23-x64": {},
-    "opensuse.13.2-x64": {}
+    "fedora.24-x64": {},
+    "linux-x64": {}
   }
 }
diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj
index 0649d2b1e7..0b0f5b82bf 100644
--- a/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -5,11 +5,8 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker>
+    <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker>
   </PropertyGroup>
-  <ItemGroup>
-    <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" />
-  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <Target Name="Build"
      DependsOnTargets="ResolveReferences" /> 
diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json
index ef47999b2c..0f82a117e8 100644
--- a/tests/src/Common/test_runtime/project.json
+++ b/tests/src/Common/test_runtime/project.json
@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25210-01",
     "Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease",
     "jit-dasm": "0.0.1.4",
     "cijobs": "0.0.1.2",
     "jit-analyze": "0.0.1.1"
   },
   "frameworks": {
-    "netcoreapp1.1": {
+    "netcoreapp2.0": {
       "imports": [
         "dnxcore50",
         "portable-net45+win8"
@@ -20,11 +20,10 @@
     "ubuntu.14.04-x64": {},
     "ubuntu.16.04-x64": {},
     "ubuntu.16.10-x64": {},
-    "osx.10.10-x64": {},
+    "osx.10.12-x64": {},
     "centos.7-x64": {},
     "rhel.7-x64": {},
     "debian.8-x64": {},
-    "fedora.23-x64": {},
-    "opensuse.13.2-x64": {}
+    "fedora.24-x64": {}
   }
 }
diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj
index ad0093adfc..3b55297f3d 100644
--- a/tests/src/Common/test_runtime/test_runtime.csproj
+++ b/tests/src/Common/test_runtime/test_runtime.csproj
@@ -8,12 +8,9 @@
     <!-- Reset the Default project.json-->
     <ProjectJson></ProjectJson>
     <ProjectLockJson></ProjectLockJson>
-    <NugetTargetMoniker>.NETCoreApp,Version=v1.1</NugetTargetMoniker>
+    <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker>
   </PropertyGroup>
   <ItemGroup>
-    <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/tests/src/CoreMangLib/components/fileversioninfo/Assembly1.csproj b/tests/src/CoreMangLib/components/fileversioninfo/Assembly1.csproj
index f81ebf6f66..ec79dc83f6 100644
--- a/tests/src/CoreMangLib/components/fileversioninfo/Assembly1.csproj
+++ b/tests/src/CoreMangLib/components/fileversioninfo/Assembly1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/components/stopwatch/Co9600Ctor.csproj b/tests/src/CoreMangLib/components/stopwatch/Co9600Ctor.csproj
index 94138fcb48..df739d34e1 100644
--- a/tests/src/CoreMangLib/components/stopwatch/Co9600Ctor.csproj
+++ b/tests/src/CoreMangLib/components/stopwatch/Co9600Ctor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/components/stopwatch/Co9604get_IsRunning.csproj b/tests/src/CoreMangLib/components/stopwatch/Co9604get_IsRunning.csproj
index 3e666b807c..62aca07ff2 100644
--- a/tests/src/CoreMangLib/components/stopwatch/Co9604get_IsRunning.csproj
+++ b/tests/src/CoreMangLib/components/stopwatch/Co9604get_IsRunning.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/action/ActionCtor.csproj b/tests/src/CoreMangLib/cti/system/action/ActionCtor.csproj
index 8a2b372df8..2c77dda49a 100644
--- a/tests/src/CoreMangLib/cti/system/action/ActionCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/action/ActionCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/action/ActionInvoke.csproj b/tests/src/CoreMangLib/cti/system/action/ActionInvoke.csproj
index f2b5bf726b..c684b6ec7d 100644
--- a/tests/src/CoreMangLib/cti/system/action/ActionInvoke.csproj
+++ b/tests/src/CoreMangLib/cti/system/action/ActionInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/activator/ActivatorCreateInstance2.csproj b/tests/src/CoreMangLib/cti/system/activator/ActivatorCreateInstance2.csproj
index 2fac0483fb..de4e8775ff 100644
--- a/tests/src/CoreMangLib/cti/system/activator/ActivatorCreateInstance2.csproj
+++ b/tests/src/CoreMangLib/cti/system/activator/ActivatorCreateInstance2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/argumentexception/ArgumentExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/argumentexception/ArgumentExceptionCtor1.csproj
index 6026faa40d..8451f56a0d 100644
--- a/tests/src/CoreMangLib/cti/system/argumentexception/ArgumentExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/argumentexception/ArgumentExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/argumentnullexception/ArgumentNullExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/argumentnullexception/ArgumentNullExceptionCtor1.csproj
index ad3fe2fe72..b88340682b 100644
--- a/tests/src/CoreMangLib/cti/system/argumentnullexception/ArgumentNullExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/argumentnullexception/ArgumentNullExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/argumentoutofrangeexception/ArgumentOutOfRangeExceptionCtor.csproj b/tests/src/CoreMangLib/cti/system/argumentoutofrangeexception/ArgumentOutOfRangeExceptionCtor.csproj
index e75c4eb701..5b99d3d0fe 100644
--- a/tests/src/CoreMangLib/cti/system/argumentoutofrangeexception/ArgumentOutOfRangeExceptionCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/argumentoutofrangeexception/ArgumentOutOfRangeExceptionCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/argumentoutofrangeexception/ArgumentOutOfRangeExceptionMessage.csproj b/tests/src/CoreMangLib/cti/system/argumentoutofrangeexception/ArgumentOutOfRangeExceptionMessage.csproj
index 4611c5e937..7eb69b79a5 100644
--- a/tests/src/CoreMangLib/cti/system/argumentoutofrangeexception/ArgumentOutOfRangeExceptionMessage.csproj
+++ b/tests/src/CoreMangLib/cti/system/argumentoutofrangeexception/ArgumentOutOfRangeExceptionMessage.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/arithmeticexception/ArithmeticExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/arithmeticexception/ArithmeticExceptionCtor1.csproj
index 42778b8130..e954677d81 100644
--- a/tests/src/CoreMangLib/cti/system/arithmeticexception/ArithmeticExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/arithmeticexception/ArithmeticExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch1.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch1.csproj
index b1542e69c8..ee483413ca 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch1.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch1b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch1b.csproj
index 2414ce13a2..cb93d90a7a 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch1b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch1b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch2.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch2.csproj
index b720598ba9..f4befd00a6 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch2.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch2b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch2b.csproj
index d77023b061..209ded4f2b 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch2b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch2b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch3.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch3.csproj
index 41095a04a8..3da540042e 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch3.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch3b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch3b.csproj
index fbc25a4288..27625314b8 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch3b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch3b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch4.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch4.csproj
index dae669bd46..351aaf1212 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch4.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch4b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch4b.csproj
index b4e03cc8ff..ee57d20573 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch4b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch4b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch5.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch5.csproj
index 795f160e5e..9f7d4467db 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch5.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch5b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch5b.csproj
index 7ec6d15aaa..897c6bdea6 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch5b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch5b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch6.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch6.csproj
index c00978c042..3988eaaf76 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch6.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayBinarySearch6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayClear.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayClear.csproj
index e7a549a351..d62181b40d 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayClear.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayClear.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayClone.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayClone.csproj
index b93e526688..4bedc0fa3f 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayClone.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayClone.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayCopy1.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayCopy1.csproj
index 83d142699b..94b8612316 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayCopy1.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayCopy1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayCopy2.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayCopy2.csproj
index 30d0946f7f..676cf62e8d 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayCopy2.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayCopy2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayCopyTo.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayCopyTo.csproj
index d0d1b14dde..1731e4d059 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance1.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance1.csproj
index 90fe984ed8..7e1544c2b5 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance1.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance1b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance1b.csproj
index 8ba4c858c7..ef6ffa5af1 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance1b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance1b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance2.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance2.csproj
index baea5ac0a9..8793bca177 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance2.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance2b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance2b.csproj
index 863926f39b..6383e29fad 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance2b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayCreateInstance2b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayGetEnumerator.csproj
index 45f04eb1d5..35e53248e6 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayGetLength.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayGetLength.csproj
index f064691ecc..f3cd90a601 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayGetLength.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayGetLength.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayGetLowerBound.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayGetLowerBound.csproj
index 2668f6e914..209a4d3f6f 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayGetLowerBound.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayGetLowerBound.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayGetUpperBound.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayGetUpperBound.csproj
index 174ca36389..293ada293c 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayGetUpperBound.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayGetUpperBound.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayGetValue.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayGetValue.csproj
index f9a3b01ef1..248c9ce7d8 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayGetValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayGetValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayGetValue1.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayGetValue1.csproj
index bbfa3e4a04..bc12e6c490 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayGetValue1.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayGetValue1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayGetValue2.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayGetValue2.csproj
index 11f5083a7f..96fb0566a7 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayGetValue2.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayGetValue2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayGetValue2b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayGetValue2b.csproj
index 3fd332fa74..9c46405cb5 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayGetValue2b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayGetValue2b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayICollectionget_Count.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayICollectionget_Count.csproj
index 1dce1edfa4..6597a58335 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayICollectionget_Count.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayICollectionget_Count.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIListAdd.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIListAdd.csproj
index d92019ec2c..df42e36290 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIListAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIListAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIListClear.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIListClear.csproj
index f3d012b9c2..59dbaa0393 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIListClear.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIListClear.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIListContains.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIListContains.csproj
index d0b98cb260..2d20837030 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIListContains.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIListContains.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIListIndexOF.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIListIndexOF.csproj
index 44d552fbb7..d275756fb2 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIListIndexOF.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIListIndexOF.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIListInsert.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIListInsert.csproj
index 6caa13363a..23ae759b63 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIListInsert.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIListInsert.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIListRemove.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIListRemove.csproj
index 007041efac..1ff659cb60 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIListRemove.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIListRemove.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIListRemoveAt.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIListRemoveAt.csproj
index 71fa5d642f..a0d75c109b 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIListRemoveAt.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIListRemoveAt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIListget_item.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIListget_item.csproj
index 3aa23f9e18..78870eebb8 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIListget_item.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIListget_item.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIListset_item.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIListset_item.csproj
index 2727f7a7f7..2ae1511187 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIListset_item.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIListset_item.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf1.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf1.csproj
index 80dc955ef6..1d34cbc11c 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf1.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf1b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf1b.csproj
index aef6731999..aa2f5e4a3e 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf1b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf1b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf2.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf2.csproj
index 6c7df8d601..2ff389c140 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf2.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf2b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf2b.csproj
index 3d3c243b8c..bdcddec88f 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf2b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf2b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf3.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf3.csproj
index d4c5c3d18b..54b7881144 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf3.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf3b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf3b.csproj
index 24cab9fbf3..4b6637bbd8 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf3b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf3b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf4.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf4.csproj
index 7aa0b8eca3..bd7ff719e7 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf4.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf4b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf4b.csproj
index 0fc252348a..f1ebab23b7 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf4b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayIndexOf4b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayInitialize.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayInitialize.csproj
index 30c7f63b00..30face3fb8 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayInitialize.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayInitialize.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf1.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf1.csproj
index be1385af3f..6b2d51ef8b 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf1.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf1b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf1b.csproj
index 52e0ad0c8a..9ed405554d 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf1b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf1b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf2.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf2.csproj
index 4703099349..431151eb01 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf2.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf2b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf2b.csproj
index 1e12acc2fd..955f9d1e17 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf2b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf2b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf3.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf3.csproj
index 68e71436a5..9f40ab06a1 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf3.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf3b.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf3b.csproj
index c84a7545f0..54ba4da538 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf3b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf3b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf4.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf4.csproj
index 439502d2e9..b3f9ec7f96 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf4.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayLastIndexOf4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayLength.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayLength.csproj
index 264a44a9f7..4d4eaac986 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayLength.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayLength.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayRank.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayRank.csproj
index ea9f10632d..dab78d710a 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayRank.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayRank.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayReserse1.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayReserse1.csproj
index 9cd469d3c1..62325ab676 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayReserse1.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayReserse1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayReserse2.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayReserse2.csproj
index dc5ec1840b..fb334afa1c 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayReserse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayReserse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayReverse1.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayReverse1.csproj
index f1676b1d44..fb832c244b 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayReverse1.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayReverse1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArrayReverse2.csproj b/tests/src/CoreMangLib/cti/system/array/ArrayReverse2.csproj
index 87e7b133ad..271b2dd55e 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArrayReverse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArrayReverse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySetValue1.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySetValue1.csproj
index 33a00e8ff5..3970ced91f 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySetValue1.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySetValue1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySetValue1b.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySetValue1b.csproj
index 632171a694..4ac792f146 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySetValue1b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySetValue1b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySetValue2.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySetValue2.csproj
index 13a3f3cfe7..9cedaba07f 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySetValue2.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySetValue2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySetValue2b.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySetValue2b.csproj
index 8ded777226..d19ca259dd 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySetValue2b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySetValue2b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort1.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort1.csproj
index ad0fc7eae1..583e44ca1d 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort1.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort10.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort10.csproj
index e0f37d4084..5b466b7b21 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort10.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort11.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort11.csproj
index 01fdc20559..f75d9c3195 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort11.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort12.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort12.csproj
index c47aef416a..33be8f9d64 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort12.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort12.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort13.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort13.csproj
index f5b70c11b8..ac6ff41c2c 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort13.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort14.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort14.csproj
index acdfca9f24..378dd2e357 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort14.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort1b.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort1b.csproj
index 48812bf2ea..77dac871a2 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort1b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort1b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort2.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort2.csproj
index 67de2efee2..0b31fa4e62 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort2.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort2b.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort2b.csproj
index f6db1c1c0d..2ec8af12bc 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort2b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort2b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort3.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort3.csproj
index 7a36b628e8..136e86679a 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort3.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort3b.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort3b.csproj
index a9f3f50535..a240d5adc0 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort3b.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort3b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort4.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort4.csproj
index 19ea29b19d..d4bf98b280 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort4.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort5.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort5.csproj
index 327e8e7d01..9df3afec1a 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort5.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort6.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort6.csproj
index 71ec6f4028..5a47aa2f71 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort6.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort7.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort7.csproj
index 58094548d2..f60bf988c5 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort7.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort8.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort8.csproj
index b80cb29c0e..1e62d7d3ca 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort8.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/array/ArraySort9.csproj b/tests/src/CoreMangLib/cti/system/array/ArraySort9.csproj
index 4edb5f8550..d6e139909c 100644
--- a/tests/src/CoreMangLib/cti/system/array/ArraySort9.csproj
+++ b/tests/src/CoreMangLib/cti/system/array/ArraySort9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor1.csproj b/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor1.csproj
index a8c8ab8a4f..07a4164b9d 100644
--- a/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor2.csproj b/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor2.csproj
index 1126a47bd6..5f24f446af 100644
--- a/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor3.csproj b/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor3.csproj
index fe0b554b10..3d4843c0cf 100644
--- a/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/arraytypemismatchexception/ArrayTypeMismatchExceptionctor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attribute/DDB125472_GetHashCode.csproj b/tests/src/CoreMangLib/cti/system/attribute/DDB125472_GetHashCode.csproj
index 6e872f9a89..b8dce5aea3 100644
--- a/tests/src/CoreMangLib/cti/system/attribute/DDB125472_GetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/attribute/DDB125472_GetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attribute/GetHashCode.csproj b/tests/src/CoreMangLib/cti/system/attribute/GetHashCode.csproj
index ebe6af1e92..963c7284ae 100644
--- a/tests/src/CoreMangLib/cti/system/attribute/GetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/attribute/GetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsAll.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsAll.csproj
index 2e37bd39da..5fbaa6eac9 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsAll.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsAll.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsAssembly.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsAssembly.csproj
index 3e05460427..3d23904fbf 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsAssembly.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsAssembly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsClass.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsClass.csproj
index ff8197587e..70c7e1524a 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsClass.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsConstructor.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsConstructor.csproj
index fd5d53f77c..1e4af2102e 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsConstructor.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsConstructor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsDelegate.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsDelegate.csproj
index 2007159cb1..028046fa76 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsDelegate.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsDelegate.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsEnum.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsEnum.csproj
index 63ec262ea8..d46afca537 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsEnum.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsEnum.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsEvent.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsEvent.csproj
index f67dc3def9..82fb32dfe8 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsEvent.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsEvent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsField.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsField.csproj
index 19a29439c9..826475b9be 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsField.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsField.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsGenericParameter.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsGenericParameter.csproj
index 2113890daf..bc8b095109 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsGenericParameter.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsGenericParameter.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsInterface.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsInterface.csproj
index 795850e33f..0d386cf416 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsInterface.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsInterface.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsMethod.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsMethod.csproj
index 1a3fc33714..67dbef49b9 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsMethod.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsMethod.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsModule.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsModule.csproj
index 3a32cb64cd..f61d84801b 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsModule.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsModule.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsParameter.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsParameter.csproj
index ddcc38eb1a..fd1fb0bfd0 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsParameter.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsParameter.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsProperty.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsProperty.csproj
index e84822ecef..d7d678564a 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsProperty.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsProperty.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsReturnValue.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsReturnValue.csproj
index a45e3f9f4d..28c53fb311 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsReturnValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsReturnValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsStruct.csproj b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsStruct.csproj
index 6c9c2333bf..2994adfaa7 100644
--- a/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsStruct.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributetargets/AttributeTargetsStruct.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributeusageattribute/AttributeUsageAttributeAllowMultiple.csproj b/tests/src/CoreMangLib/cti/system/attributeusageattribute/AttributeUsageAttributeAllowMultiple.csproj
index e0c70fec02..44681db887 100644
--- a/tests/src/CoreMangLib/cti/system/attributeusageattribute/AttributeUsageAttributeAllowMultiple.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributeusageattribute/AttributeUsageAttributeAllowMultiple.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/attributeusageattribute/AttributeUsageAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/attributeusageattribute/AttributeUsageAttributeCtor.csproj
index 4b070e669a..54db81cf4d 100644
--- a/tests/src/CoreMangLib/cti/system/attributeusageattribute/AttributeUsageAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/attributeusageattribute/AttributeUsageAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor1.csproj
index 03803705a4..f9d25a9514 100644
--- a/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor2.csproj
index 2310402666..8af58ac6a4 100644
--- a/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor3.csproj
index 839418ea50..2bbe4d16ff 100644
--- a/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionMessage.csproj b/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionMessage.csproj
index 1c062018a7..2eaa5a7b78 100644
--- a/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionMessage.csproj
+++ b/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionMessage.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionToString.csproj b/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionToString.csproj
index 21f26bbeb1..725e2f8660 100644
--- a/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/badimageformatexception/BadImageFormatExceptionToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanCompareTo_Boolean.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanCompareTo_Boolean.csproj
index 2343442fd6..4d7e0fbc47 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanCompareTo_Boolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanCompareTo_Boolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanEquals_Boolean.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanEquals_Boolean.csproj
index 024283d580..98d4f3448b 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanEquals_Boolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanEquals_Boolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanEquals_Object.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanEquals_Object.csproj
index fee4e42fe5..2dd81395bc 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanEquals_Object.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanEquals_Object.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanFalseString.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanFalseString.csproj
index 419f79981c..58259f3ea1 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanFalseString.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanFalseString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanGetHashCode.csproj
index de7cae5b1a..90f846aeb2 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToBoolean.csproj
index fb46a2f3bc..b97b0b5a84 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToByte.csproj
index 522bc819c4..80f50ed54d 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToChar.csproj
index 9448f3d738..1014f427e9 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDateTime.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDateTime.csproj
index adcbdd694c..9b58e6845e 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDecimal.csproj
index c850f8f0e5..2622b98004 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDouble.csproj
index 8fb005bdbd..b7f4b7da44 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt16.csproj
index 0d6b763a98..271ede7882 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt32.csproj
index 644c8ab50c..b5701dc5ef 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt64.csproj
index 6ccae6950a..bfb5def745 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToSByte.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToSByte.csproj
index c550c233e2..0b8bb62a14 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToSingle.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToSingle.csproj
index 095f959bd6..58b6894be6 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToType.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToType.csproj
index c0eef53f71..7be9cde438 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToType.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt16.csproj
index 8044d659fc..3024c90192 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt32.csproj
index 257e38faf5..8cb42061ad 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt64.csproj
index 1ee36595f8..9d18c1a2bb 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanIConvertibleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanParse.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanParse.csproj
index 945915348e..d9bde7654d 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanToString.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanToString.csproj
index 4b0a221a6b..88dd1fbf06 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanTrueString.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanTrueString.csproj
index f484a83926..5a1c64f067 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanTrueString.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanTrueString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/boolean/BooleanTryParse.csproj b/tests/src/CoreMangLib/cti/system/boolean/BooleanTryParse.csproj
index ef6f235e5e..df1a740778 100644
--- a/tests/src/CoreMangLib/cti/system/boolean/BooleanTryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/boolean/BooleanTryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteEquals1.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteEquals1.csproj
index 7e9650d061..8f2c966ec3 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteEquals2.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteEquals2.csproj
index 8d0f10ec4c..36e27dcab9 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteGetHashCode.csproj
index 4cc22b3d0d..83ccd08f24 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToBoolean.csproj
index 2e138064a5..e4a1d54ef7 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToByte.csproj
index a189858852..f0d9cacbca 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToChar.csproj
index 2f2680670d..e4b76a413d 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDateTime.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDateTime.csproj
index f2c6b98f58..42162f0650 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDecimal.csproj
index 5c8234ccf6..8928ccb325 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDouble.csproj
index 4d652c7c3f..e7e980a154 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt16.csproj
index 3365efe2cd..3c4ccedb66 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt32.csproj
index 520dba8242..7238688be4 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt64.csproj
index 3852ecf243..309433cd32 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToSByte.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToSByte.csproj
index 9cfa7442c2..c3c55b52bf 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToSingle.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToSingle.csproj
index 6bb05da9ba..9c59744f17 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToType.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToType.csproj
index decaca238d..8bb4eed830 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToType.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt16.csproj
index 9b14c505f0..496a1f228f 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt32.csproj
index 58a2d2882b..1da565f90f 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt64.csproj
index 877f5c3342..c0b24669f0 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteIConvertibleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteMaxValue.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteMaxValue.csproj
index 1e7e62884e..6bcb7c8177 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteMaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteMaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteMinValue.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteMinValue.csproj
index 830833cf3e..cf5ab51cf7 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteMinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteMinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteParse1.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteParse1.csproj
index 0e80c5397f..5b236b9f8c 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteParse1.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteParse1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteParse3.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteParse3.csproj
index d2d84416db..0c75c26d55 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteParse3.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteParse3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteToString2.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteToString2.csproj
index 282fff4814..125743a2a7 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteToString2.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteToString2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteToString3.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteToString3.csproj
index b997ebda4f..2d11db673f 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteToString3.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteToString3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteToString4.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteToString4.csproj
index 9d650cbff9..cfaeaffa40 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteToString4.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteToString4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/byte/ByteTryParse.csproj b/tests/src/CoreMangLib/cti/system/byte/ByteTryParse.csproj
index d997a55c17..252c35cc73 100644
--- a/tests/src/CoreMangLib/cti/system/byte/ByteTryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/byte/ByteTryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharCompateTo1.csproj b/tests/src/CoreMangLib/cti/system/char/CharCompateTo1.csproj
index ba82910f7a..f6afde841c 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharCompateTo1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharCompateTo1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharEquals1.csproj b/tests/src/CoreMangLib/cti/system/char/CharEquals1.csproj
index ac0148924b..ce5e6df400 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharEquals2.csproj b/tests/src/CoreMangLib/cti/system/char/CharEquals2.csproj
index 3710029515..a854c43230 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/char/CharGetHashCode.csproj
index 4520299303..1ff72962cf 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToBoolean.csproj
index 96770dd021..62764f14d6 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToByte.csproj
index 835d8a6aaa..fe9be580f4 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToChar.csproj
index fb2918e3f9..8953138d08 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDateTime.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDateTime.csproj
index eff975feb9..7beb378256 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDecimal.csproj
index 79c9437964..a09d940adc 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDouble.csproj
index c292dd2778..5c9cb74e5a 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt16.csproj
index 16d2fcb545..93eb6c5fdf 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt32.csproj
index d020d4310b..6cf9f2a94e 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt64.csproj
index 522316e775..10d154f8a3 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToSByte.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToSByte.csproj
index f5c8495fdf..41fda7b74c 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToSingle.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToSingle.csproj
index 8cf9f055e1..222c19bd3a 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToType.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToType.csproj
index 75a25d2494..d356470257 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToType.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt16.csproj
index 02790e1bce..41a46874d0 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt32.csproj
index daed9d05c7..0f556c94b3 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt64.csproj
index a2be949938..4cc564cebe 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIConvertibleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsControl1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsControl1.csproj
index ceab689989..ef4334db42 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsControl1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsControl1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsControl2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsControl2.csproj
index dcf3c49af2..9a607f9d2c 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsControl2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsControl2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsDigit1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsDigit1.csproj
index 2e33e76cd6..41cd06217e 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsDigit1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsDigit1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsDigit2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsDigit2.csproj
index bda82cee2d..b02b024b11 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsDigit2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsDigit2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsLetter1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsLetter1.csproj
index cdcffb2736..59410b8777 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsLetter1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsLetter1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsLetter2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsLetter2.csproj
index 3f290f8d6e..43eaa940e1 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsLetter2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsLetter2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsLetterOrDigit1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsLetterOrDigit1.csproj
index d1ab3bed84..bcb2a38d7f 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsLetterOrDigit1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsLetterOrDigit1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsLetterOrDigit2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsLetterOrDigit2.csproj
index 3bd80551be..77ebaa8223 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsLetterOrDigit2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsLetterOrDigit2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsLower1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsLower1.csproj
index 0892633fec..c2493ecfb0 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsLower1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsLower1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsLower2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsLower2.csproj
index a5e677eecc..43a356a7cd 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsLower2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsLower2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsNumber1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsNumber1.csproj
index 2f15458285..a7baf21437 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsNumber1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsNumber1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsNumber2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsNumber2.csproj
index 8fa0e48996..076ee282c8 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsNumber2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsNumber2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsPunctuation2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsPunctuation2.csproj
index 9a0a0a95a5..13418e212b 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsPunctuation2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsPunctuation2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsSeparator1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsSeparator1.csproj
index 2c0d7ab344..cf339b2cf1 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsSeparator1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsSeparator1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsSeparator2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsSeparator2.csproj
index e33187fa94..135eb7c727 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsSeparator2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsSeparator2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsSurrogate1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsSurrogate1.csproj
index 847ae0fd6b..809c6f6b04 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsSurrogate1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsSurrogate1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsSurrogate2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsSurrogate2.csproj
index f7ce4c7dd6..a443e5e4e3 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsSurrogate2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsSurrogate2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsSurrogatePair1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsSurrogatePair1.csproj
index 42c5e170d9..3e7ad0eab1 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsSurrogatePair1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsSurrogatePair1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsSurrogatePair2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsSurrogatePair2.csproj
index c0bb28ddcd..1e14e05ac5 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsSurrogatePair2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsSurrogatePair2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsSymbol1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsSymbol1.csproj
index a74617f44b..c21bb9f555 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsSymbol1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsSymbol1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsUpper1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsUpper1.csproj
index b25d2d6f1c..d1a8d37ace 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsUpper1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsUpper1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsUpper2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsUpper2.csproj
index d33b58b63e..b5fe3b233a 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsUpper2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsUpper2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsWhiteSpace1.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsWhiteSpace1.csproj
index 99881e43b8..1f32103315 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsWhiteSpace1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsWhiteSpace1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharIsWhiteSpace2.csproj b/tests/src/CoreMangLib/cti/system/char/CharIsWhiteSpace2.csproj
index b06308eadb..b76308aeb8 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharIsWhiteSpace2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharIsWhiteSpace2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharMaxValue.csproj b/tests/src/CoreMangLib/cti/system/char/CharMaxValue.csproj
index a61942ebfe..8b2763dfd4 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharMaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharMaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharMinValue.csproj b/tests/src/CoreMangLib/cti/system/char/CharMinValue.csproj
index 8ac01e6857..39703e281b 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharMinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharMinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharToString1.csproj b/tests/src/CoreMangLib/cti/system/char/CharToString1.csproj
index dde02de826..bd37eeb8b9 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharToString1.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharToString1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharToString2.csproj b/tests/src/CoreMangLib/cti/system/char/CharToString2.csproj
index e5b9ec6ffe..44105386e9 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharToString2.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharToString2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/char/CharTryParse.csproj b/tests/src/CoreMangLib/cti/system/char/CharTryParse.csproj
index 764ba04fb8..8a37783127 100644
--- a/tests/src/CoreMangLib/cti/system/char/CharTryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/char/CharTryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorCurrent.csproj
index 5b790de426..375571b2e0 100644
--- a/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorIEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorIEnumeratorCurrent.csproj
index 117b860ba6..7d9f5db7cc 100644
--- a/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorIEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorIEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorIEnumgetCurrent.csproj b/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorIEnumgetCurrent.csproj
index 846b898c2e..74b9589e70 100644
--- a/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorIEnumgetCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorIEnumgetCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorMoveNext.csproj b/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorMoveNext.csproj
index c0c5fde291..247cc40112 100644
--- a/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorMoveNext.csproj
+++ b/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorMoveNext.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorReset.csproj b/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorReset.csproj
index 2717cbce2b..5688d7670b 100644
--- a/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorReset.csproj
+++ b/tests/src/CoreMangLib/cti/system/charenumerator/CharEnumeratorReset.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/clscompliantattribute/CLSCompliantAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/clscompliantattribute/CLSCompliantAttributeCtor.csproj
index 182fe1e302..584c29bc58 100644
--- a/tests/src/CoreMangLib/cti/system/clscompliantattribute/CLSCompliantAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/clscompliantattribute/CLSCompliantAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/clscompliantattribute/CLSCompliantAttributeIsCompliant.csproj b/tests/src/CoreMangLib/cti/system/clscompliantattribute/CLSCompliantAttributeIsCompliant.csproj
index 0becbfd241..6fae83af74 100644
--- a/tests/src/CoreMangLib/cti/system/clscompliantattribute/CLSCompliantAttributeIsCompliant.csproj
+++ b/tests/src/CoreMangLib/cti/system/clscompliantattribute/CLSCompliantAttributeIsCompliant.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryCtor.csproj b/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryCtor.csproj
index 4f4d6a437b..110c449e21 100644
--- a/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryKey.csproj b/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryKey.csproj
index 315f2d562a..70dfb2ffe4 100644
--- a/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryKey.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryKey.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryValue.csproj b/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryValue.csproj
index 3ad87f744e..4c9fad3bdc 100644
--- a/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/dictionaryentry/DictionaryEntryValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCompare1.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCompare1.csproj
index 4ae0bb85b4..de4ab62c0c 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCompare1.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCompare1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCompare2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCompare2.csproj
index 13f945808e..41295a5e3d 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCompare2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCompare2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCtor.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCtor.csproj
index db79218224..7c4cc9a873 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerDefault.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerDefault.csproj
index bfd5838bee..885c03a69e 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerDefault.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/comparer/ComparerDefault.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryAdd.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryAdd.csproj
index 19a2312c1f..d5cfd49d5b 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryClear.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryClear.csproj
index 782ce7224d..2ca4255bc8 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryClear.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryClear.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryComparer.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryComparer.csproj
index 3af86a9609..1e4f39d8de 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryComparer.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryComparer.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryContainsKey.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryContainsKey.csproj
index e99d1c7572..0c7a588739 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryContainsKey.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryContainsKey.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryContainsValue.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryContainsValue.csproj
index f2b960c877..7f270b7da8 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryContainsValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryContainsValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCount.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCount.csproj
index d4cbf0bafd..5307c1ce63 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor1.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor1.csproj
index c0796658e8..567d87ccec 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor2.csproj
index 725e1a3067..5116275601 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor3.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor3.csproj
index 4e81db7fbb..5ebc366bab 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor4.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor4.csproj
index 0e284fddb8..4f9cfcb84e 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor4.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor5.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor5.csproj
index 41640101e2..3c1bc8ebe4 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor5.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor6.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor6.csproj
index a00320a6be..65d4344b85 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor6.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryCtor6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryGetEnumerator.csproj
index 160de22e1a..343b698000 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionAdd.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionAdd.csproj
index 5ba4f9e058..1b152b3b46 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionContains.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionContains.csproj
index 6bb9b31fa6..9dcde2cc96 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionContains.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionContains.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionCopyTo.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionCopyTo.csproj
index 800c9934fc..ecc6e3fee5 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionCopyTo2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionCopyTo2.csproj
index 64a0e486a6..8dd1b9170a 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionCopyTo2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionCopyTo2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsReadOnly.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsReadOnly.csproj
index b8746ccd29..3a962ac214 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsReadOnly.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsReadOnly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsReadOnly2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsReadOnly2.csproj
index 3f1e2b3a52..20967cc453 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsReadOnly2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsReadOnly2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsSynchronized.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsSynchronized.csproj
index 82e218fc6e..23132a9b71 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsSynchronized.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsSynchronized.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsSynchronized2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsSynchronized2.csproj
index d5c7c7f667..0810fe97f2 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsSynchronized2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionIsSynchronized2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionRemove.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionRemove.csproj
index ec1d5b89b8..cbef243fc3 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionRemove.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionRemove.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionSyncRoot.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionSyncRoot.csproj
index 29c4dfada6..c74bedd69f 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionSyncRoot.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionSyncRoot.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionSyncRoot2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionSyncRoot2.csproj
index adc27da1b8..d17eb59f41 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionSyncRoot2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryICollectionSyncRoot2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryAdd.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryAdd.csproj
index 0ef62313aa..817c56d694 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryContains.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryContains.csproj
index 12dd475fad..92dd96b22d 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryContains.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryContains.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryGetEnumerator.csproj
index bc482d378b..c1bff842b4 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsFixedSize.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsFixedSize.csproj
index 3a99776898..b5a9124f33 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsFixedSize.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsFixedSize.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsFixedSize2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsFixedSize2.csproj
index e1b06988a8..ee0cc13368 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsFixedSize2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsFixedSize2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsReadOnly.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsReadOnly.csproj
index b8cbf8f98d..78dac1f870 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsReadOnly.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsReadOnly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsReadOnly2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsReadOnly2.csproj
index 2c5318db02..a43abee1c1 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsReadOnly2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryIsReadOnly2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryItem.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryItem.csproj
index 698089e913..a20e50ed69 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryItem.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryItem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryItem2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryItem2.csproj
index 0ac2b12f81..5b22e29e4e 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryItem2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryItem2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys.csproj
index 6292c9155a..39731a592a 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys2.csproj
index 2daf922c35..9194898854 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys3.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys3.csproj
index b969f65467..4afb919e61 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys3.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys4.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys4.csproj
index 5c002a659f..1f2ceaea6f 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys4.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryKeys4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryRemove.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryRemove.csproj
index f261284443..b7a79ba6e7 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryRemove.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryRemove.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue2.csproj
index b2c1135103..752b3e76e3 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue3.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue3.csproj
index 3c74334baf..f5f2df18f4 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue3.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue4.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue4.csproj
index db8e37d209..c0ed9a3e58 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue4.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValue4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValues.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValues.csproj
index 71b78d84fe..a10ca35dce 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValues.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIDictionaryValues.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIEnumerableGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIEnumerableGetEnumerator.csproj
index 50aa95fd34..5d81ae6deb 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIEnumerableGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIEnumerableGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIEnumerableGetEnumerator2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIEnumerableGetEnumerator2.csproj
index 7a68339439..94beab1cd0 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIEnumerableGetEnumerator2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryIEnumerableGetEnumerator2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryRemove.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryRemove.csproj
index b9bf7857ee..44c3df9292 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryRemove.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryRemove.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryTryGetValue.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryTryGetValue.csproj
index b54a28c6e6..2ba7cdcf27 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryTryGetValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionary/DictionaryTryGetValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Entry.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Entry.csproj
index 0184e85f53..351d8d59f0 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Entry.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Entry.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Key.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Key.csproj
index 0b860f76a0..90805d4d74 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Key.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Key.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Value.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Value.csproj
index 7de979a8e7..d96ec7478c 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Value.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIDictEnumget_Value.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIEnumReset.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIEnumReset.csproj
index deec17f716..e2aed893f3 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIEnumReset.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIEnumReset.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIEnumget_Current.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIEnumget_Current.csproj
index 2b952403f8..2e9415e04d 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIEnumget_Current.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictEnumIEnumget_Current.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorCurrent.csproj
index 7bcd0c075b..0f5e43c30f 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorDispose.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorDispose.csproj
index 0f3e22e2f5..473addc6fc 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorDispose.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorDispose.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorMoveNext.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorMoveNext.csproj
index 6e1626d4fa..a47cf4af57 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorMoveNext.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryenumerator/DictionaryEnumeratorMoveNext.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/GenericICollectionRemove.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/GenericICollectionRemove.csproj
index f992de3e66..dfc16f166f 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/GenericICollectionRemove.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/GenericICollectionRemove.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/ICollectionIsSynchronized.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/ICollectionIsSynchronized.csproj
index 74eb50bf0d..a4313bbaec 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/ICollectionIsSynchronized.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/ICollectionIsSynchronized.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/ICollectionSyncRoot.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/ICollectionSyncRoot.csproj
index 12b77ae097..29348c5a2d 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/ICollectionSyncRoot.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/ICollectionSyncRoot.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/IEnumerableGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/IEnumerableGetEnumerator.csproj
index 43cec70bca..9bae0a4019 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/IEnumerableGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/IEnumerableGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCopyTo.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCopyTo.csproj
index 25e2cf3788..fc33edc9a1 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCount.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCount.csproj
index ff271ee0b4..c1026dceda 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCtor.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCtor.csproj
index 3038b56c5a..06ad79b88c 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionGetEnumerator.csproj
index 3e3537bd27..404997faa7 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/KeyCollectionGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenICollIsReadOnly.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenICollIsReadOnly.csproj
index 7a0536dd6e..b28d42311a 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenICollIsReadOnly.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenICollIsReadOnly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenIEnumGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenIEnumGetEnumerator.csproj
index 6a2ed5c0ed..5297e9cd0c 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenIEnumGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenIEnumGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollClear.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollClear.csproj
index ede45295eb..13a181819c 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollClear.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollClear.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollContains.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollContains.csproj
index 69ecdfbd71..947f497504 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollContains.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollContains.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollectionAdd.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollectionAdd.csproj
index 4fc3d55087..04b82ceb05 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollectionAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollGenericICollectionAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollectionsICollectionCopyTo.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollectionsICollectionCopyTo.csproj
index 72038f9a6f..67e2136501 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollectionsICollectionCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionarykeycollection/SystemCollectionsICollectionCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionCopyTo.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionCopyTo.csproj
index f7e9aee460..aaae694f73 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionCount.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionCount.csproj
index f60269eef9..564ce0b86e 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionctor.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionctor.csproj
index 18b810bc53..e27cb66a13 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionctor.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/DictionaryValueCollectionctor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GenericICollectionIsReadOnly.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GenericICollectionIsReadOnly.csproj
index 91375cb26b..20bba1d8ef 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GenericICollectionIsReadOnly.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GenericICollectionIsReadOnly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GenericICollectionRemove.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GenericICollectionRemove.csproj
index addb9b5780..0edd0a9f20 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GenericICollectionRemove.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GenericICollectionRemove.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GetEnumerator.csproj
index 0b22ba7832..6d13ced7b0 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/GetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ICollectionIsSynchronized.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ICollectionIsSynchronized.csproj
index 74eb50bf0d..a4313bbaec 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ICollectionIsSynchronized.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ICollectionIsSynchronized.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/IEnumerableGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/IEnumerableGetEnumerator.csproj
index 02184f615a..174d857d3f 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/IEnumerableGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/IEnumerableGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/SystemCollICollectionSyncRoot.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/SystemCollICollectionSyncRoot.csproj
index 12b77ae097..29348c5a2d 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/SystemCollICollectionSyncRoot.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/SystemCollICollectionSyncRoot.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/SystemCollectionsICollectionCopyTo.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/SystemCollectionsICollectionCopyTo.csproj
index 72038f9a6f..67e2136501 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/SystemCollectionsICollectionCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/SystemCollectionsICollectionCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollAdd.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollAdd.csproj
index dda53540e5..877409499f 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollClear.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollClear.csproj
index 5fce9a4036..bd0fee04f0 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollClear.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollClear.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollContains.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollContains.csproj
index 2e3a79d993..5cff7e07c3 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollContains.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericICollContains.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericIEnumGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericIEnumGetEnumerator.csproj
index bb9d8ad56d..49c66f7ddf 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericIEnumGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictionaryvaluecollection/ValueCollGenericIEnumGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorCurrent.csproj
index a270561f50..8be33f6aef 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorDispose.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorDispose.csproj
index b18309fc53..8d2c0d09f8 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorDispose.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorDispose.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorMoveNext.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorMoveNext.csproj
index e2b38198d2..6749b2ffa1 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorMoveNext.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryKeyCollectionEnumeratorMoveNext.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorCurrent.csproj
index 984120057d..7a0d58e0b9 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorDispose.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorDispose.csproj
index a00ea05a0c..136574377c 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorDispose.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorDispose.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorMoveNext.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorMoveNext.csproj
index 5e2e88b11f..8f0802f0a0 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorMoveNext.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/DictionaryValueCollectionEnumeratorMoveNext.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/KeyCollectionEnumeratorIEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/KeyCollectionEnumeratorIEnumeratorCurrent.csproj
index 63d9a4b134..4fce296f5b 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/KeyCollectionEnumeratorIEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/KeyCollectionEnumeratorIEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/KeyCollectionEnumeratorIEnumeratorReset.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/KeyCollectionEnumeratorIEnumeratorReset.csproj
index 55cf2498f9..31ab5eec72 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/KeyCollectionEnumeratorIEnumeratorReset.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/KeyCollectionEnumeratorIEnumeratorReset.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/ValueCollectionEnumeratorIEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/ValueCollectionEnumeratorIEnumeratorCurrent.csproj
index 40e5200dd0..9a86d612ca 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/ValueCollectionEnumeratorIEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/ValueCollectionEnumeratorIEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/ValueCollectionEnumeratorIEnumeratorReset.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/ValueCollectionEnumeratorIEnumeratorReset.csproj
index ff1a3e39a8..2ba667a499 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/ValueCollectionEnumeratorIEnumeratorReset.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictkeycollenum/ValueCollectionEnumeratorIEnumeratorReset.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorCurrent.csproj
index 984120057d..7a0d58e0b9 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorDispose.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorDispose.csproj
index a00ea05a0c..136574377c 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorDispose.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorDispose.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorMoveNext.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorMoveNext.csproj
index 5e2e88b11f..8f0802f0a0 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorMoveNext.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/DictionaryValueCollectionEnumeratorMoveNext.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/ValueCollectionEnumeratorIEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/ValueCollectionEnumeratorIEnumeratorCurrent.csproj
index 40e5200dd0..9a86d612ca 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/ValueCollectionEnumeratorIEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/ValueCollectionEnumeratorIEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/ValueCollectionEnumeratorIEnumeratorReset.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/ValueCollectionEnumeratorIEnumeratorReset.csproj
index ff1a3e39a8..2ba667a499 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/ValueCollectionEnumeratorIEnumeratorReset.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/dictvalcollenum/ValueCollectionEnumeratorIEnumeratorReset.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqualityComparerEquals.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqualityComparerEquals.csproj
index 3354790e92..8a6dbe491c 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqualityComparerEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqualityComparerEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqualityComparerGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqualityComparerGetHashCode.csproj
index eb40f68a98..487704e590 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqualityComparerGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqualityComparerGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqulityComparerDefault.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqulityComparerDefault.csproj
index a2e9070de5..7fe3a00581 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqulityComparerDefault.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/equalitycomparer/EqulityComparerDefault.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionAdd.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionAdd.csproj
index 9dbe8f4c48..f271bac023 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionClear.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionClear.csproj
index bf70d0fdc6..2ffe23eb80 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionClear.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionClear.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionContains.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionContains.csproj
index 6edb71211f..c429d345e5 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionContains.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionContains.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionCopyTo.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionCopyTo.csproj
index bf1365484c..df866548db 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionCount.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionCount.csproj
index 0103f9f135..539b069b67 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionIsReadOnly.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionIsReadOnly.csproj
index 45de3a4f3e..8d327dfe98 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionIsReadOnly.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionIsReadOnly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionRemove.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionRemove.csproj
index 13dffce182..cf68f0fac7 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionRemove.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/icollection/ICollectionRemove.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryContainsKey.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryContainsKey.csproj
index cb669dd79c..8701490221 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryContainsKey.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryContainsKey.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryItem.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryItem.csproj
index d10b114dc1..b81010e368 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryItem.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryItem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryKeys.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryKeys.csproj
index d342e32241..942ed177f5 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryKeys.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryKeys.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryTryGetValue.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryTryGetValue.csproj
index a2e1c0a1c8..275a4b4764 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryTryGetValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryTryGetValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryValues.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryValues.csproj
index 82c91c9c6a..35a88beaa4 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryValues.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/idictionary/IDictionaryValues.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/ienumerable/IEnumerableGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/ienumerable/IEnumerableGetEnumerator.csproj
index b818982066..955ca7f78a 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/ienumerable/IEnumerableGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/ienumerable/IEnumerableGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/ienumerator/IEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/ienumerator/IEnumeratorCurrent.csproj
index c18e27a7e5..2c25505bf4 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/ienumerator/IEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/ienumerator/IEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/iequalitycomparer/IEqualityComparerEquals.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/iequalitycomparer/IEqualityComparerEquals.csproj
index f5c09113e0..ac312f4efa 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/iequalitycomparer/IEqualityComparerEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/iequalitycomparer/IEqualityComparerEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/iequalitycomparer/IEqualityComparerGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/iequalitycomparer/IEqualityComparerGetHashCode.csproj
index 11a50af7cb..1eec6ebff2 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/iequalitycomparer/IEqualityComparerGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/iequalitycomparer/IEqualityComparerGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListIndexOf.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListIndexOf.csproj
index b1f99aa3b6..0c715d42ba 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListIndexOf.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListIndexOf.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListInsert.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListInsert.csproj
index 79ac7d7403..1e0773b419 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListInsert.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListInsert.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListItem.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListItem.csproj
index e478c715c1..77dcdd8437 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListItem.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListItem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListRemoveAt.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListRemoveAt.csproj
index c5adbe24df..d3100e3e14 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListRemoveAt.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/ilist/IListRemoveAt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/keynotfoundexception/KeyNotFoundExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/keynotfoundexception/KeyNotFoundExceptionCtor1.csproj
index 0079e6ebdb..dff0b2d226 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/keynotfoundexception/KeyNotFoundExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/keynotfoundexception/KeyNotFoundExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/keynotfoundexception/KeyNotFoundExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/keynotfoundexception/KeyNotFoundExceptionCtor2.csproj
index 3da97953cc..1879a7e9ec 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/keynotfoundexception/KeyNotFoundExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/keynotfoundexception/KeyNotFoundExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairKey.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairKey.csproj
index 7410752239..f7e6efdfa0 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairKey.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairKey.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairToString.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairToString.csproj
index ad97276cf5..683a250cd2 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairValue.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairValue.csproj
index 4f3040d2da..4c4cb87830 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairctor.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairctor.csproj
index 4a1b81fcba..547a46a025 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairctor.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/keyvaluepair/KeyValuePairctor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch1.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch1.csproj
index bacf811bda..9f9b675c36 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch1.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch2.csproj
index 7401c1b207..b0cc39ecfc 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch3.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch3.csproj
index 46607e495e..619e3df8e2 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch3.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/BinarySearch3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo1.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo1.csproj
index 6bb7a3a3da..1b5523d7a2 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo1.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo2.csproj
index abe3776f9c..0b9c0de7e4 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo3.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo3.csproj
index 852ca2812b..3332ca8b36 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo3.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/CopyTo3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListAdd.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListAdd.csproj
index bbc6e0e568..7fd1de1224 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListAddRange.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListAddRange.csproj
index 6ba7aeb470..9d6fb3555e 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListAddRange.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListAddRange.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCapacity.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCapacity.csproj
index 63b3b146d9..7113330055 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCapacity.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCapacity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListClear.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListClear.csproj
index 53acfa4f2f..969161c92f 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListClear.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListClear.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListContains.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListContains.csproj
index 39f89d4350..afca001bea 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListContains.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListContains.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCount.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCount.csproj
index 161d780df5..0ccd490285 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor1.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor1.csproj
index 34fa2a7ab4..d6ea1f9abc 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor2.csproj
index 0427663141..4d5b567316 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor3.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor3.csproj
index f04ac8f826..f4815b2ae9 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListForEach.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListForEach.csproj
index 7b2f84310c..26f50839be 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListForEach.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListForEach.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListGetEnumerator.csproj
index 0bac79a22f..13de02f7c9 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListGetRange.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListGetRange.csproj
index 4dc307e01e..a0b97b5e06 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListGetRange.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListGetRange.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionCopyTo.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionCopyTo.csproj
index 9e0bf2698f..c5967a7a62 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionIsReadOnly.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionIsReadOnly.csproj
index 2de2d81bad..93b57e8951 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionIsReadOnly.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionIsReadOnly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionIsSynchronized.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionIsSynchronized.csproj
index e91910ee72..d551f0d80f 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionIsSynchronized.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionIsSynchronized.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionSyncRoot.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionSyncRoot.csproj
index 5826186dcf..7c39e11015 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionSyncRoot.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListICollectionSyncRoot.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIEnumerableGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIEnumerableGetEnumerator.csproj
index 96955024e0..d229fc80fb 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIEnumerableGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIEnumerableGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIEnumerableGetEnumerator2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIEnumerableGetEnumerator2.csproj
index f79a4f9da2..afa9e30d7b 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIEnumerableGetEnumerator2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIEnumerableGetEnumerator2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListAdd.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListAdd.csproj
index 776c1dfacf..2e3c3c6c65 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListContains.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListContains.csproj
index 04240305b8..617ea16286 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListContains.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListContains.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIndexOf.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIndexOf.csproj
index b9fc79d89d..83b9aaf903 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIndexOf.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIndexOf.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListInsert.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListInsert.csproj
index 442ada9a7c..fac5c49ef2 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListInsert.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListInsert.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIsFixedSize.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIsFixedSize.csproj
index e5957232a7..a11c49bf36 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIsFixedSize.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIsFixedSize.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIsReadOnly.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIsReadOnly.csproj
index beea9cccf4..96f6be26aa 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIsReadOnly.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListIsReadOnly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListItem.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListItem.csproj
index 16fb1d7b49..57d6cbe94d 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListItem.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListItem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListRemove.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListRemove.csproj
index 83c1a7ec50..d741f1af7a 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListRemove.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIListRemove.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf1.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf1.csproj
index 04bc7d5b94..d205f32848 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf1.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf2.csproj
index 799998e1c8..f9ee22eb56 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf3.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf3.csproj
index 323950f28c..cea2db3578 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf3.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListIndexOf3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListInsertRange.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListInsertRange.csproj
index 2c736b5035..d66a3c237b 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListInsertRange.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListInsertRange.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf1.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf1.csproj
index df45362c2d..287ce8d9e0 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf1.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf2.csproj
index 940283954b..edd0043a36 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf3.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf3.csproj
index e4e8c32558..54e53f053a 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf3.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListLastIndexOf3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListRemoveAt.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListRemoveAt.csproj
index 61aa45b0ad..fe657eda63 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListRemoveAt.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListRemoveAt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListRemoveRange.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListRemoveRange.csproj
index 6a19c4971e..25b02e17b6 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListRemoveRange.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListRemoveRange.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListReverse.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListReverse.csproj
index 1540a7a163..0c2a537d82 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListReverse.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListReverse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListReverse2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListReverse2.csproj
index 06e86832b6..caab8039a2 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListReverse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListReverse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListToArray.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListToArray.csproj
index c6795b15d1..04981e2abe 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListToArray.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListToArray.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListTrimExcess.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListTrimExcess.csproj
index 93c57c02fb..2dac894e0a 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/list/ListTrimExcess.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/list/ListTrimExcess.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueClear.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueClear.csproj
index 6c49436887..b69107bb35 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueClear.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueClear.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueContains.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueContains.csproj
index 530d0bc70d..29d17c242c 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueContains.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueContains.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCopyTo.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCopyTo.csproj
index f0f6c495e7..0c402729de 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCount.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCount.csproj
index c1dff6f096..94d09ec371 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor1.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor1.csproj
index 614a862fc0..4760de1906 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor2.csproj
index 448cf0e7b8..867d5718d9 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor3.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor3.csproj
index 96567b12b0..c9dbdb339c 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueDequeue.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueDequeue.csproj
index b26f618a7d..e2111301e2 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueDequeue.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueDequeue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueEnqueue.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueEnqueue.csproj
index 4e5204f355..2536cb738a 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueEnqueue.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueEnqueue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueGetEnumerator.csproj
index 05f0372673..77c097f71b 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueuePeek.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueuePeek.csproj
index 0ea8df89bf..d54e121427 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueuePeek.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueuePeek.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueToArray.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueToArray.csproj
index 08398e89f0..d3f66fb7a8 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueToArray.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queue/QueueToArray.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorCurrent.csproj
index d5731131d3..4b1f862723 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorDispose.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorDispose.csproj
index 3c4af24931..94ec779e5d 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorDispose.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorDispose.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorMoveNext.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorMoveNext.csproj
index 40ef122803..ce6b3ba4c6 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorMoveNext.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/queueenumerator/EnumeratorMoveNext.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackClear.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackClear.csproj
index d386dc6585..49fca1b369 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackClear.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackClear.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackContains.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackContains.csproj
index a78b99a1e0..25bd7af47d 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackContains.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackContains.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCopyTo.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCopyTo.csproj
index 918d0da0c6..b1d3972bde 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCount.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCount.csproj
index a2855ea517..b9cc70222d 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor1.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor1.csproj
index 7362a7410e..b62463ea08 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor2.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor2.csproj
index d6c30d2a21..8224621777 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor3.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor3.csproj
index 7fe8f37aa4..ab7da21135 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackGetEnumerator.csproj
index 0f70239cfb..f580cc1443 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPeek.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPeek.csproj
index 8202ef66e4..edf2fc682b 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPeek.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPeek.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPop.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPop.csproj
index 77950ab10c..e7b18276d2 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPop.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPop.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPush.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPush.csproj
index 230510c283..7e18e95bec 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPush.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackPush.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackToArray.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackToArray.csproj
index 4b7e5a01f1..aab91f5002 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackToArray.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stack/StackToArray.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorCurrent.csproj
index 925a2d8abe..53dc843ea3 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorDispose.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorDispose.csproj
index 0fe8f7324b..fe5cf68a2b 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorDispose.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorDispose.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorMoveNext.csproj b/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorMoveNext.csproj
index 7155849401..96f9b3a029 100644
--- a/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorMoveNext.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/generic/stackenumerator/StackEnumeratorMoveNext.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionCopyTo.csproj b/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionCopyTo.csproj
index 69b320af9a..7928a14ed9 100644
--- a/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionCount.csproj b/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionCount.csproj
index b06045b50b..55fef62678 100644
--- a/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionIsSynchronized.csproj b/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionIsSynchronized.csproj
index 6ae81da9a1..2ae8eeece9 100644
--- a/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionIsSynchronized.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionIsSynchronized.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionSyncRoot.csproj b/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionSyncRoot.csproj
index 2bd3da4969..3c130b9112 100644
--- a/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionSyncRoot.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/icollection/ICollectionSyncRoot.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/icomparer/IComparerCompare.csproj b/tests/src/CoreMangLib/cti/system/collections/icomparer/IComparerCompare.csproj
index 61da2d915d..4a00405cbc 100644
--- a/tests/src/CoreMangLib/cti/system/collections/icomparer/IComparerCompare.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/icomparer/IComparerCompare.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryAdd.csproj b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryAdd.csproj
index a9aa539432..3d23c5e48b 100644
--- a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryClear.csproj b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryClear.csproj
index 460331dfd2..252c867248 100644
--- a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryClear.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryClear.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryContains.csproj b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryContains.csproj
index b36f3854fe..ccb5a38905 100644
--- a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryContains.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryContains.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryGetEnumerator.csproj
index a55a4964cf..169dcfe0d1 100644
--- a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryIsFixedSize.csproj b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryIsFixedSize.csproj
index 1435529934..c4b8197339 100644
--- a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryIsFixedSize.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryIsFixedSize.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryIsReadOnly.csproj b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryIsReadOnly.csproj
index 1c12d2bf48..8596771883 100644
--- a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryIsReadOnly.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryIsReadOnly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryRemove.csproj b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryRemove.csproj
index 93ca10bbc4..3412a13618 100644
--- a/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryRemove.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/idictionary/IDictionaryRemove.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorCurrent.csproj b/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorCurrent.csproj
index 2c8320e0a4..79211d5504 100644
--- a/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorMoveNext.csproj b/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorMoveNext.csproj
index 27d75fd594..ae1234d199 100644
--- a/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorMoveNext.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorMoveNext.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorReset.csproj b/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorReset.csproj
index 91b56d59e8..0944e9a22c 100644
--- a/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorReset.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/ienumerator/IEnumeratorReset.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/ilist/IListIsFixedSize.csproj b/tests/src/CoreMangLib/cti/system/collections/ilist/IListIsFixedSize.csproj
index 80e758a1ef..b38cbf7a95 100644
--- a/tests/src/CoreMangLib/cti/system/collections/ilist/IListIsFixedSize.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/ilist/IListIsFixedSize.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/collections/ilist/IListItem.csproj b/tests/src/CoreMangLib/cti/system/collections/ilist/IListItem.csproj
index 38966d29e4..3c70da76a4 100644
--- a/tests/src/CoreMangLib/cti/system/collections/ilist/IListItem.csproj
+++ b/tests/src/CoreMangLib/cti/system/collections/ilist/IListItem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/comparison/ComparisonBeginInvoke.csproj b/tests/src/CoreMangLib/cti/system/comparison/ComparisonBeginInvoke.csproj
index ea1f5b0f2e..1d3ddcb181 100644
--- a/tests/src/CoreMangLib/cti/system/comparison/ComparisonBeginInvoke.csproj
+++ b/tests/src/CoreMangLib/cti/system/comparison/ComparisonBeginInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/comparison/ComparisonEndInvoke.csproj b/tests/src/CoreMangLib/cti/system/comparison/ComparisonEndInvoke.csproj
index 61432bccd4..f625ae8be7 100644
--- a/tests/src/CoreMangLib/cti/system/comparison/ComparisonEndInvoke.csproj
+++ b/tests/src/CoreMangLib/cti/system/comparison/ComparisonEndInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/comparison/ComparisonInvoke.csproj b/tests/src/CoreMangLib/cti/system/comparison/ComparisonInvoke.csproj
index 8537618ee2..011fc8ef4f 100644
--- a/tests/src/CoreMangLib/cti/system/comparison/ComparisonInvoke.csproj
+++ b/tests/src/CoreMangLib/cti/system/comparison/ComparisonInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/console/ConsoleSetOut_PSC.csproj b/tests/src/CoreMangLib/cti/system/console/ConsoleSetOut_PSC.csproj
index ec387143db..a8e9cce934 100644
--- a/tests/src/CoreMangLib/cti/system/console/ConsoleSetOut_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/console/ConsoleSetOut_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/console/consoleseterror_PSC.csproj b/tests/src/CoreMangLib/cti/system/console/consoleseterror_PSC.csproj
index 4ac1275608..e094f09c85 100644
--- a/tests/src/CoreMangLib/cti/system/console/consoleseterror_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/console/consoleseterror_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertChangeType2.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertChangeType2.csproj
index b1165d4a58..352875fb9f 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertChangeType2.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertChangeType2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertFromBase64CharArray.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertFromBase64CharArray.csproj
index 9d3468bf17..d2b2a0697c 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertFromBase64CharArray.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertFromBase64CharArray.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertFromBase64String.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertFromBase64String.csproj
index 266f8a2de0..1810a1934f 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertFromBase64String.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertFromBase64String.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64CharArray.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64CharArray.csproj
index 4ddcf79cdb..cbdf2db505 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64CharArray.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64CharArray.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64String1.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64String1.csproj
index 31d6264327..edf31f87f8 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64String1.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64String1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64String2.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64String2.csproj
index 70339f48b6..d583e5d53e 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64String2.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToBase64String2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean.csproj
index 20991a9651..2503ec57ba 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean2.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean2.csproj
index 06bdee1bd4..b6f3031c6f 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean2.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean4.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean4.csproj
index 16e31fee69..7128336c36 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean4.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean5.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean5.csproj
index 79118bd26a..86764607cd 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean5.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean6.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean6.csproj
index 1ef974f1e7..b39ecfd310 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean6.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean7.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean7.csproj
index c024a53537..067d458c5f 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean7.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean8.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean8.csproj
index b637a91cd8..d5685a544f 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean8.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToBoolean8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte.csproj
index 414444f237..67614ce95f 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte1.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte1.csproj
index aabaaa79b4..60f8b3f790 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte1.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte2.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte2.csproj
index 2b636f1389..4bb69131e3 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte2.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte3.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte3.csproj
index afcee18894..9af3a9bc81 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte3.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte4.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte4.csproj
index 2941d54b88..a652adde02 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte4.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte6.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte6.csproj
index 45771d9233..52d2e0d929 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte6.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte7.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte7.csproj
index be6a1b4b85..81235704e8 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte7.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte8.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte8.csproj
index 0d3f4e671c..fc77a068dc 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToByte8.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToByte8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar.csproj
index eff7080006..0b8c3a3b40 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar10.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar10.csproj
index 5416e04196..6e1d31add3 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar10.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar11.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar11.csproj
index 38233a725f..e97710677b 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar11.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar12.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar12.csproj
index 4633c90654..661e581f19 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar12.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar12.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar13.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar13.csproj
index 2ae3180f01..4836ed06e4 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar13.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar14.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar14.csproj
index e6eb313cf3..2193ad79bf 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar14.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar15.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar15.csproj
index 584f2d87e5..b495461e3e 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar15.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar15.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar16.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar16.csproj
index 6aa563a637..20a95c6e27 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar16.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar5.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar5.csproj
index a1d4580be0..89682c2646 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar5.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar6.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar6.csproj
index 4dc807d903..b49de07211 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar6.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar7.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar7.csproj
index 846e62a268..9e5340c696 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar7.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar8.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar8.csproj
index 0c879950bb..290062c664 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar8.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar9.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar9.csproj
index 38f04395c7..97acf66576 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToChar9.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToChar9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDateTime.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDateTime.csproj
index e1745202d6..0ad23b5d09 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal.csproj
index e9018d71f1..4cc7f351e3 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal1.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal1.csproj
index dab0cb4a54..e8b7fdb908 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal1.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal10.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal10.csproj
index 4475946855..c88b84a6df 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal10.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal11.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal11.csproj
index 1cb7f40864..34c3125c18 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal11.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal12.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal12.csproj
index 14b642cc71..1d4329dc39 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal12.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal12.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal13.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal13.csproj
index 6500853340..b5cb271da9 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal13.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal14.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal14.csproj
index 57fbe35d82..57b55625bc 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal14.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal15.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal15.csproj
index 4dd42c7c2d..e7ede47e04 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal15.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal15.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal16.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal16.csproj
index 35c1de872c..5973e9c92c 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal16.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal17.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal17.csproj
index 493e1328be..c9c5b7a1dd 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal17.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal18.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal18.csproj
index 6384fb6b5c..e2049617ff 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal18.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal18.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal2.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal2.csproj
index dda9b1bfb7..91101e98ff 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal2.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal5.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal5.csproj
index 70078fd209..c39389f253 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal5.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal6.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal6.csproj
index fff6dbc9ed..adfd3df710 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal6.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal8.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal8.csproj
index b8cf9350c8..614eab9e43 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal8.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal9.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal9.csproj
index d8ef79e380..c68203f817 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal9.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDecimal9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble.csproj
index f381e9d1dc..d0b1a4fcdd 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble10.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble10.csproj
index 556ac117f4..8ac99f0e02 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble10.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble11.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble11.csproj
index b4a8db4608..b5d7a9cfc8 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble11.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble12.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble12.csproj
index 58d6adcbd1..42d570f3af 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble12.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble12.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble13.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble13.csproj
index 8d40685aad..e7f2dec402 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble13.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble14.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble14.csproj
index 28928dd6f5..6de335bcd1 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble14.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble15.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble15.csproj
index 53646f0cfe..8f7d35c8ad 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble15.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble15.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble16.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble16.csproj
index df9e21c035..bc1efd8d26 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble16.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble17.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble17.csproj
index 71d170a0e6..51135da2ea 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble17.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble5.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble5.csproj
index 763d7b5ac8..017012775b 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble5.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble6.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble6.csproj
index 20512dff0b..6c1838ddf0 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble6.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble7.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble7.csproj
index 22a570b2ed..7f2d8e872d 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble7.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble8.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble8.csproj
index 252538643d..9fb9a23c4b 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble8.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble9.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble9.csproj
index 1d2215e774..ca7f7c2b5f 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble9.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToDouble9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16.csproj
index a232e3f326..7bfa8b8059 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_1.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_1.csproj
index 2f59978c30..4b97a72272 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_1.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_10.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_10.csproj
index b188ebe6fb..49d37de13a 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_10.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_11.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_11.csproj
index 2bee678d42..d26b6c9f05 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_11.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_16.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_16.csproj
index c3632380c6..4554680617 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_16.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_17.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_17.csproj
index 5e861334b0..a823762bb8 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_17.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_18.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_18.csproj
index db52e2c587..cd355f835d 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_18.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_18.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_2.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_2.csproj
index 50001eb01a..f3218bb979 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_2.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_3.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_3.csproj
index 34ace3325f..e23430b699 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_3.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_4.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_4.csproj
index 3bfe98012a..79f85c6a46 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_4.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_5.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_5.csproj
index 8c78f29f60..7099e4dcf5 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_5.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_6.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_6.csproj
index f20cf253e0..12195746a2 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_6.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_7.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_7.csproj
index b05546f907..82a21e8b4c 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_7.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_8.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_8.csproj
index bbebc045b7..9968b050b1 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_8.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_9.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_9.csproj
index 499a7b3da8..baa41a4cd9 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_9.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt16_9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32.csproj
index 20fc6c6e79..dab754577b 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_1.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_1.csproj
index 42af6c08bb..69cb682d2a 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_1.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_10.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_10.csproj
index a6272aaa53..bbc63abd15 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_10.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_11.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_11.csproj
index 282220fa2b..e20f44cff7 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_11.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_16.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_16.csproj
index 7d509f278c..2348d4bc86 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_16.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_17.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_17.csproj
index 66ef0534f3..17cdb80431 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_17.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_18.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_18.csproj
index 85bc030df5..30bc5b830d 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_18.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_18.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_2.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_2.csproj
index 5f669a98ac..3eb3609d92 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_2.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_3.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_3.csproj
index 8c844dcdc2..15d18114fd 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_3.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_4.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_4.csproj
index 7e747e2bdf..f5676d53b3 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_4.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_5.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_5.csproj
index 91f6f13f7a..2c4ddc32b9 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_5.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_6.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_6.csproj
index 7d40225b9f..d55d0bd6ec 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_6.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_7.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_7.csproj
index 3ba795096d..2dbd7f9ac5 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_7.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_8.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_8.csproj
index 59d5b4781e..a03f6f2ac5 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_8.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_9.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_9.csproj
index 47010c0853..b6e43e97ea 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_9.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt32_9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64.csproj
index a6d87ef51a..1028e969aa 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_1.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_1.csproj
index b4e1c36214..751bd60416 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_1.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_10.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_10.csproj
index e27072e002..9f7b1d2536 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_10.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_11.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_11.csproj
index 65bf32dfae..452871ced8 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_11.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_16.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_16.csproj
index 3b67d0001d..4800e6659f 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_16.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_17.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_17.csproj
index 7376a039d2..750f4ba343 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_17.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_18.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_18.csproj
index 5bf26c6cab..68898bbabc 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_18.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_18.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_2.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_2.csproj
index 10fe6e30c9..0863e8ee94 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_2.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_3.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_3.csproj
index 4708f36c19..d916d9931b 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_3.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_4.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_4.csproj
index c852b1ff7d..412e445708 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_4.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_5.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_5.csproj
index 41442f6ac1..7da365f6b4 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_5.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_6.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_6.csproj
index b043682eda..bcbc057f58 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_6.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_7.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_7.csproj
index 9b64d58cb4..5a22c0fb62 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_7.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_8.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_8.csproj
index ea3e6e45b0..ead91ded42 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_8.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_9.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_9.csproj
index 7edd303c93..c5590dc823 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_9.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToInt64_9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte.csproj
index 2e6190a557..4d7ec47006 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte1.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte1.csproj
index 9114e86453..dce6af4346 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte1.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte10.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte10.csproj
index c1074c1ba7..2281e0dfda 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte10.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte11.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte11.csproj
index d6e033509e..8db62690ed 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte11.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte16.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte16.csproj
index e208a341db..4af91d1cdc 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte16.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte2.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte2.csproj
index 550437ab73..56fc6a96e2 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte2.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte3.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte3.csproj
index 0e2dcf73ef..9468295212 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte3.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte4.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte4.csproj
index a2aadfb43e..048be10fc4 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte4.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte5.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte5.csproj
index db6810769f..c63ddc6654 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte5.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte6.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte6.csproj
index d93fdab8a1..8a82ca0a3c 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte6.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte7.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte7.csproj
index b876afb018..2f9dd9a95f 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte7.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte8.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte8.csproj
index d2e6010dc2..112c115cd5 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte8.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte9.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte9.csproj
index 19af44613f..7fcd75906e 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte9.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSByte9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle.csproj
index b517c47ee0..aa60399ef5 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle13.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle13.csproj
index c46022278b..8475e44b8a 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle13.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle14.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle14.csproj
index 7aef5196fd..d7e9032c59 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle14.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle15.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle15.csproj
index b77e584a8c..e8c6cc61c7 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle15.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle15.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle16.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle16.csproj
index 21360f011c..c775688ebe 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle16.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle17.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle17.csproj
index aba92daa97..57799d805c 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle17.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToSingle17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString1.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString1.csproj
index 7757676a97..86a3427305 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString1.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString10.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString10.csproj
index 4e89780038..6dbb841a31 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString10.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString11.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString11.csproj
index 79b7e2ef0a..bdaa3336d4 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString11.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString12.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString12.csproj
index e99c33670d..8e3806ce05 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString12.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString12.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString13.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString13.csproj
index b404178b44..e9eed1ba84 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString13.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString14.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString14.csproj
index 7155bf2599..cece9a1f20 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString14.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString15.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString15.csproj
index 5bf898643b..45ae3b2957 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString15.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString15.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString16.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString16.csproj
index 1f63170796..a27a090e3b 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString16.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString17.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString17.csproj
index 2b8bf2bde7..68ad91e896 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString17.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString18.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString18.csproj
index e2d556c1e7..b13190e351 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString18.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString18.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString19.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString19.csproj
index e754a1b7cf..7d6b8c5f20 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString19.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString19.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString2.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString2.csproj
index 48768228ba..0c169f93e6 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString2.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString20.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString20.csproj
index 0e1010fa1d..88fb0a1554 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString20.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString20.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString21.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString21.csproj
index ba66942baa..833bbeefb6 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString21.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString21.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString22.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString22.csproj
index 7d4486ecda..95d52a363d 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString22.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString22.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString23.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString23.csproj
index 06d559f209..ec824c2d1c 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString23.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString23.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString24.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString24.csproj
index c5f45926ca..f02bdd8efc 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString24.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString24.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString25.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString25.csproj
index 70ed585080..8807e7a6f1 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString25.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString25.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString28.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString28.csproj
index b0fbab18ec..eb74b78a35 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString28.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString28.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString29.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString29.csproj
index 72c72cb36d..ae950988ba 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString29.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString29.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString30.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString30.csproj
index bb4f3e7861..7fd00b4224 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString30.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString30.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString31.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString31.csproj
index 1bade83290..4dabfbafcc 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString31.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString31.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString32.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString32.csproj
index 6cf546ede2..0e1e3e3368 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString32.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString33.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString33.csproj
index 52ada24bd3..876b44a808 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString33.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString33.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString4.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString4.csproj
index 164ac5ae59..a5c70a5b62 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString4.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString5.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString5.csproj
index 986dd222d9..63b9d703a7 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString5.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString6.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString6.csproj
index 42f9baa67c..20ee0c53ac 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString6.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString7.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString7.csproj
index d1d53d1749..690cdd1ab0 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString7.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString8.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString8.csproj
index 3e03dc98e7..41bd90bb2a 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString8.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToString9.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToString9.csproj
index dc23314636..70224caa4f 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToString9.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToString9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt16.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt16.csproj
index c8ac29b659..fe8ff77495 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt161.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt161.csproj
index f2bf11b816..ff6a04ef84 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt161.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt161.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1610.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1610.csproj
index 0e3ac497a3..06f3ed4e85 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1610.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1610.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1611.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1611.csproj
index bd17bb5495..459807869c 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1611.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1611.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1612.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1612.csproj
index 89e030f454..cdc3cfc170 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1612.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1612.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1613.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1613.csproj
index 6910e15b0c..9a13434c8e 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1613.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1613.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1614.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1614.csproj
index 4503212cb9..ebfa33d3ec 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1614.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1614.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1615.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1615.csproj
index 10818801f5..05ceda2514 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1615.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1615.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1616.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1616.csproj
index 77a0d2aaeb..58be1af2af 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1616.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1616.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1617.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1617.csproj
index 1c0efa22f9..752ba60e8b 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1617.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1617.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1618.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1618.csproj
index 6ef431c2af..3696da1a0b 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1618.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt1618.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt162.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt162.csproj
index 0e8f278f39..efbe51e129 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt162.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt162.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt163.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt163.csproj
index dd6d6ec25e..f68ac5de86 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt163.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt163.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt164.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt164.csproj
index 85e6a3b6e6..86cbc20add 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt164.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt164.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt165.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt165.csproj
index 80291e8386..2a9aded47c 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt165.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt165.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt166.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt166.csproj
index c8bc382e7b..e512e3c605 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt166.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt166.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt167.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt167.csproj
index eabc4e1929..ba25d4886a 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt167.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt167.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt168.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt168.csproj
index 9658880226..6ef2cb110e 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt168.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt168.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt169.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt169.csproj
index b367fa4ee5..6b0d455af0 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt169.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt169.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt32.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt32.csproj
index f8cbb357a3..e00076c5fa 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt321.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt321.csproj
index 9864fe1e54..172ae40add 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt321.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt321.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3210.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3210.csproj
index 00f85c5101..a66e94ba74 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3210.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3210.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3211.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3211.csproj
index 64637b7bed..04eeb8078b 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3211.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3211.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3212.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3212.csproj
index 99739996ab..86fd4597a4 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3212.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3212.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3213.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3213.csproj
index 465c4b43c1..8e6aec3ebe 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3213.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3213.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3215.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3215.csproj
index 864fb40482..62b7ed4c18 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3215.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3215.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3216.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3216.csproj
index 381885101f..d8b4459dfc 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3216.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3216.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3217.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3217.csproj
index a107a42906..b7f4d1844e 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3217.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3217.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3218.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3218.csproj
index 463b6a7dce..9c50d57812 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3218.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3218.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3219.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3219.csproj
index 95879ed5f2..7659f778cc 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3219.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt3219.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt322.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt322.csproj
index 1a79813174..3828202584 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt322.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt322.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt323.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt323.csproj
index bdef8502b5..60431d0519 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt323.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt323.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt324.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt324.csproj
index 1720a61f4e..691204ce97 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt324.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt324.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt325.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt325.csproj
index d4afe6d155..96307c6744 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt325.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt325.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt326.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt326.csproj
index 82648ac04a..79d2f191de 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt326.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt326.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt327.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt327.csproj
index 443a6ab628..b081000fff 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt327.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt327.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt328.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt328.csproj
index f217236e4d..1e843e541b 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt328.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt328.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt329.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt329.csproj
index bea5f034ad..2b56a421ef 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt329.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt329.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt64.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt64.csproj
index eab1d65dd1..75cfb8825e 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt641.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt641.csproj
index 6b6627344d..4b76784cbc 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt641.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt641.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6410.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6410.csproj
index d2a2025e56..367ee693eb 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6410.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6410.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6411.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6411.csproj
index da16daf7ff..21e35e60ab 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6411.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6411.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6412.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6412.csproj
index 826b178841..6901be97c0 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6412.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6412.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6413.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6413.csproj
index b94253e7e9..de0deddb01 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6413.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6413.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6414.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6414.csproj
index 0067e9b2f9..8da5f816f9 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6414.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6414.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6415.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6415.csproj
index 0e70ae3039..ceef7c42b1 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6415.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6415.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6416.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6416.csproj
index be7b7c120f..bcf681dc64 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6416.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6416.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6417.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6417.csproj
index 6f947ad531..a28d5d93b8 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6417.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6417.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6418.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6418.csproj
index 32c8be804b..c924e1a7b6 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6418.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt6418.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt642.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt642.csproj
index 03bb77d2f1..5c49be6e1b 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt642.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt642.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt643.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt643.csproj
index 6f58f05545..6377174429 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt643.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt643.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt644.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt644.csproj
index 8af74ffe0c..358e34f079 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt644.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt644.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt645.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt645.csproj
index a22fcc1472..540fcab097 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt645.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt645.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt646.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt646.csproj
index e4a858760e..24ac0d2325 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt646.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt646.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt647.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt647.csproj
index 1962400557..4c52756e15 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt647.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt647.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt648.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt648.csproj
index bd99d27585..d60c847477 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt648.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt648.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt649.csproj b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt649.csproj
index 7dc6f687be..95174efe28 100644
--- a/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt649.csproj
+++ b/tests/src/CoreMangLib/cti/system/convert/ConvertToUInt649.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekFriday.csproj b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekFriday.csproj
index 77c7eedd58..0cb74f6579 100644
--- a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekFriday.csproj
+++ b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekFriday.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekMonday.csproj b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekMonday.csproj
index f4e01aebb5..45f2e21bf7 100644
--- a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekMonday.csproj
+++ b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekMonday.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekSaturday.csproj b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekSaturday.csproj
index 481479b09a..2fd13397f3 100644
--- a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekSaturday.csproj
+++ b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekSaturday.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekSunday.csproj b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekSunday.csproj
index 55341d2c69..17ce66a5fa 100644
--- a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekSunday.csproj
+++ b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekSunday.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekThursday.csproj b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekThursday.csproj
index 0c0ec69f16..377c8233c6 100644
--- a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekThursday.csproj
+++ b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekThursday.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekTuesDay.csproj b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekTuesDay.csproj
index 3b5badbbc7..701bbdbb17 100644
--- a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekTuesDay.csproj
+++ b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekTuesDay.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekWednesday.csproj b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekWednesday.csproj
index a496b18f64..df6c81b055 100644
--- a/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekWednesday.csproj
+++ b/tests/src/CoreMangLib/cti/system/dayofweek/DayOfWeekWednesday.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimaFloor.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimaFloor.csproj
index 88fbe2fb3d..8a0d6ca6fd 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimaFloor.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimaFloor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalAdd.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalAdd.csproj
index c5d525c502..795b651f98 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalCompare.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalCompare.csproj
index ad3548edab..171a8b4cf2 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalCompare.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalCompare.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor1.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor1.csproj
index 4b39b45e40..bc53dc1957 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor2.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor2.csproj
index cbf3dacd9f..4ee5391891 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor3.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor3.csproj
index 5cc1e44b25..a0b11969f3 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor4.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor4.csproj
index c505aac19b..cc02250174 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor4.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor5.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor5.csproj
index 2b2bf34546..5f1fb873d3 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor5.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor6.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor6.csproj
index 7b59fde4eb..58dbcb682d 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor6.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor7.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor7.csproj
index ef83f344c7..9238493fda 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor7.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor8.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor8.csproj
index 66cc7abeff..21d88a2884 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor8.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalCtor8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalDivide.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalDivide.csproj
index 9fac1992af..740ec12213 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalDivide.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalDivide.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals1.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals1.csproj
index 269b39607d..aeea6c34f0 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals2.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals2.csproj
index 5747cb5094..7e15966c2a 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals3.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals3.csproj
index 61afb1c85d..b0fa29c370 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals3.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalEquals3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalGetBits.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalGetBits.csproj
index a78ebe1039..a2de25825c 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalGetBits.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalGetBits.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalMaxValue.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalMaxValue.csproj
index 942501a51c..f5dfca059c 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalMaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalMaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalMinValue.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalMinValue.csproj
index c74aa8d803..4f786c1fc5 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalMinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalMinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalMinusOne.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalMinusOne.csproj
index 4d3b221176..c8c3f7cf12 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalMinusOne.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalMinusOne.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalMultiply.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalMultiply.csproj
index f49d44ef60..ed2d153c42 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalMultiply.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalMultiply.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalNegate.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalNegate.csproj
index 5b0e426047..06e1ada2bf 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalNegate.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalNegate.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalOne.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalOne.csproj
index e8f2f1654f..6acf87f756 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalOne.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalOne.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalParse.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalParse.csproj
index 9538353402..5d5cca7524 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalParse2.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalParse2.csproj
index 6994c3c631..8ec0c9c1b9 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalParse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalParse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalParse3.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalParse3.csproj
index 6eea919a02..6f862eda81 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalParse3.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalParse3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalParse4.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalParse4.csproj
index 53bfb3d44f..7a037c4b4a 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalParse4.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalParse4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalRemainder.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalRemainder.csproj
index 1edfad5d9b..2ebb4031f8 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalRemainder.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalRemainder.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalSubtract.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalSubtract.csproj
index eb0f70d5e6..b8214270b6 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalSubtract.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalSubtract.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToBoolean.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToBoolean.csproj
index d1e85286f4..07e38fd552 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToByte.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToByte.csproj
index 101b1fc344..e652be88ee 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToByte1.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToByte1.csproj
index 3a206cf7db..c3a9e9dafb 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToByte1.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToByte1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToChar.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToChar.csproj
index ba30814b35..ed99625520 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToDateTime.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToDateTime.csproj
index 25251942e7..b98602b21c 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToDecimal.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToDecimal.csproj
index 2fdc4b5c6c..6ae233d083 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToDouble.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToDouble.csproj
index dc8641139c..3e201a1b70 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt16.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt16.csproj
index 15e2caef51..5b4e4821fd 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt32.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt32.csproj
index 0b98b202d3..80e6a7610b 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt64.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt64.csproj
index d92655359d..46303ea9d5 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToSByte.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToSByte.csproj
index 5fe8c34077..a884f20da1 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToSingle.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToSingle.csproj
index 3672c7773b..d6a9561db7 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToString1.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToString1.csproj
index fe8b81edb5..008d3f9c23 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToString1.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToString1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToString2.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToString2.csproj
index 46963539f8..83c6ebda5f 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToString2.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToString2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToString3.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToString3.csproj
index f43b292e47..4eb22682bc 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToString3.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToString3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToString4.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToString4.csproj
index 83ae241ba8..f8eaa7da23 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToString4.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToString4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt16.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt16.csproj
index 127bbd132b..628fd674d0 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt32.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt32.csproj
index 486f18e04d..660cc351fd 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt64.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt64.csproj
index 74c9988a13..bfde56503e 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalTruncate.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalTruncate.csproj
index 8ecc82732f..adc607e439 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalTruncate.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalTruncate.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalTryParse.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalTryParse.csproj
index fdf8df16db..60356796b3 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalTryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalTryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/decimal/DecimalZero.csproj b/tests/src/CoreMangLib/cti/system/decimal/DecimalZero.csproj
index 0b8dc586fc..a7c41c8306 100644
--- a/tests/src/CoreMangLib/cti/system/decimal/DecimalZero.csproj
+++ b/tests/src/CoreMangLib/cti/system/decimal/DecimalZero.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/delegate/DelegateABI.csproj b/tests/src/CoreMangLib/cti/system/delegate/DelegateABI.csproj
index cb2a4548a6..8a6e4bf900 100644
--- a/tests/src/CoreMangLib/cti/system/delegate/DelegateABI.csproj
+++ b/tests/src/CoreMangLib/cti/system/delegate/DelegateABI.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/delegate/DelegateCombine1.csproj b/tests/src/CoreMangLib/cti/system/delegate/DelegateCombine1.csproj
index 012b34bbf4..1f9ee25d74 100644
--- a/tests/src/CoreMangLib/cti/system/delegate/DelegateCombine1.csproj
+++ b/tests/src/CoreMangLib/cti/system/delegate/DelegateCombine1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/delegate/DelegateCombineImpl.csproj b/tests/src/CoreMangLib/cti/system/delegate/DelegateCombineImpl.csproj
index 1d7c1e17a0..dcea32a223 100644
--- a/tests/src/CoreMangLib/cti/system/delegate/DelegateCombineImpl.csproj
+++ b/tests/src/CoreMangLib/cti/system/delegate/DelegateCombineImpl.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/delegate/DelegateEquals1.csproj b/tests/src/CoreMangLib/cti/system/delegate/DelegateEquals1.csproj
index 4318a60137..c47e4f232c 100644
--- a/tests/src/CoreMangLib/cti/system/delegate/DelegateEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/delegate/DelegateEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/delegate/DelegateGetHashCode1.csproj b/tests/src/CoreMangLib/cti/system/delegate/DelegateGetHashCode1.csproj
index 3d7a49c77b..d673f91523 100644
--- a/tests/src/CoreMangLib/cti/system/delegate/DelegateGetHashCode1.csproj
+++ b/tests/src/CoreMangLib/cti/system/delegate/DelegateGetHashCode1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/delegate/DelegateGetInvocationList1.csproj b/tests/src/CoreMangLib/cti/system/delegate/DelegateGetInvocationList1.csproj
index 13e1a0f9c9..eb655561e4 100644
--- a/tests/src/CoreMangLib/cti/system/delegate/DelegateGetInvocationList1.csproj
+++ b/tests/src/CoreMangLib/cti/system/delegate/DelegateGetInvocationList1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/delegate/DelegateRemove.csproj b/tests/src/CoreMangLib/cti/system/delegate/DelegateRemove.csproj
index a9b95ee22a..c6bf00967a 100644
--- a/tests/src/CoreMangLib/cti/system/delegate/DelegateRemove.csproj
+++ b/tests/src/CoreMangLib/cti/system/delegate/DelegateRemove.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/delegate/TestForOtherAssembly.csproj b/tests/src/CoreMangLib/cti/system/delegate/TestForOtherAssembly.csproj
index 0497f7d644..1bd583d85d 100644
--- a/tests/src/CoreMangLib/cti/system/delegate/TestForOtherAssembly.csproj
+++ b/tests/src/CoreMangLib/cti/system/delegate/TestForOtherAssembly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/delegate/delegateRemoveImpl.csproj b/tests/src/CoreMangLib/cti/system/delegate/delegateRemoveImpl.csproj
index 32a2dfceb8..7fbdbce265 100644
--- a/tests/src/CoreMangLib/cti/system/delegate/delegateRemoveImpl.csproj
+++ b/tests/src/CoreMangLib/cti/system/delegate/delegateRemoveImpl.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/diagnostics/conditionalattribute/ConditionalAttributeConditionString.csproj b/tests/src/CoreMangLib/cti/system/diagnostics/conditionalattribute/ConditionalAttributeConditionString.csproj
index a933a8a5ba..a0388b1f23 100644
--- a/tests/src/CoreMangLib/cti/system/diagnostics/conditionalattribute/ConditionalAttributeConditionString.csproj
+++ b/tests/src/CoreMangLib/cti/system/diagnostics/conditionalattribute/ConditionalAttributeConditionString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/diagnostics/conditionalattribute/ConditionalAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/diagnostics/conditionalattribute/ConditionalAttributeCtor.csproj
index fb32363a60..f1c8d92376 100644
--- a/tests/src/CoreMangLib/cti/system/diagnostics/conditionalattribute/ConditionalAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/diagnostics/conditionalattribute/ConditionalAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesDefault.csproj b/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesDefault.csproj
index c774856ddd..a6dd48b9dd 100644
--- a/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesDefault.csproj
+++ b/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesDefault.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesDisableOptimizations.csproj b/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesDisableOptimizations.csproj
index 409a9f4961..2de7692013 100644
--- a/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesDisableOptimizations.csproj
+++ b/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesDisableOptimizations.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesEnableEditAndContinue.csproj b/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesEnableEditAndContinue.csproj
index 1337a22909..b3b390c3c6 100644
--- a/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesEnableEditAndContinue.csproj
+++ b/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesEnableEditAndContinue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesIgnoreSymbolStoreSequencePoints.csproj b/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesIgnoreSymbolStoreSequencePoints.csproj
index 35a886e0a7..935de24605 100644
--- a/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesIgnoreSymbolStoreSequencePoints.csproj
+++ b/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesIgnoreSymbolStoreSequencePoints.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesNone.csproj b/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesNone.csproj
index d221a56091..4e4dc35166 100644
--- a/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesNone.csproj
+++ b/tests/src/CoreMangLib/cti/system/diagnostics/debuggingmodes/DebuggingModesNone.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor.csproj b/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor.csproj
index a2bbe56f7a..239d7dcc45 100644
--- a/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor2.csproj
index d216b3b3b2..630bc816c7 100644
--- a/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor3.csproj
index 55b46933d9..28638769c5 100644
--- a/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/dividebyzeroexception/DivideByZeroExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundException1.csproj b/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundException1.csproj
index 3132168481..ec8efd1ba7 100644
--- a/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundException1.csproj
+++ b/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundException1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundExceptionCtor2.csproj
index 72913083a3..9e7fa16f67 100644
--- a/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundExceptionCtor3.csproj
index de34aece1b..c96ae8ec77 100644
--- a/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/dllnotfoundexception/DllNotFoundExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleCompareTo1.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleCompareTo1.csproj
index 6015739d23..b74065b3dd 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleCompareTo1.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleCompareTo1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleEpsilon.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleEpsilon.csproj
index 118fdd485a..6022be8222 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleEpsilon.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleEpsilon.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleEquals1.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleEquals1.csproj
index 22d38ba6fd..61bdbab0e0 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleEquals2.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleEquals2.csproj
index f65b19d926..e494fa2dc6 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleGetHashCode.csproj
index e4b60ff111..fbf6b4dc05 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToBoolean.csproj
index 7257f73042..30b2c25d4b 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToByte.csproj
index bdb53dda03..c69e9c9eae 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDateTime.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDateTime.csproj
index 35b8ded0d2..32ed5207b0 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDecimal.csproj
index 266227b260..c469685b27 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDouble.csproj
index 3e9eee94df..5ce385efb6 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt16.csproj
index 23eecc8f62..be6e5324f7 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt32.csproj
index b4a86a4f15..71534d5a63 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt64.csproj
index 21c04324ac..8893e18ba9 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToSByte.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToSByte.csproj
index 5de336f3b6..5e9982e647 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToSingle.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToSingle.csproj
index 6d42d1bc9a..cd4fe753d1 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIConvertibleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIsInfinity.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIsInfinity.csproj
index 05f8d4172f..0bf4b80a34 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIsInfinity.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIsInfinity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIsNaN.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIsNaN.csproj
index 772727a899..34b2f8d5fc 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIsNaN.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIsNaN.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIsNegativeInfinity.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIsNegativeInfinity.csproj
index b7326f097c..912781f5c4 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIsNegativeInfinity.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIsNegativeInfinity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleIsPositiveInfinity.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleIsPositiveInfinity.csproj
index 7c0cf82bdf..facbfa92e2 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleIsPositiveInfinity.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleIsPositiveInfinity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleMaxValue.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleMaxValue.csproj
index cabc41610b..21d50b33ab 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleMaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleMaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleMinValue.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleMinValue.csproj
index 86dab4f8aa..029a75bb1c 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleMinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleMinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleNaN.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleNaN.csproj
index 9938e31a8f..672470cc7f 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleNaN.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleNaN.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleNegativeInfinity.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleNegativeInfinity.csproj
index f69575cb75..18a15defa1 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleNegativeInfinity.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleNegativeInfinity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleParse3.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleParse3.csproj
index d7de6009d1..bbbdbd1bcb 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleParse3.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleParse3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoublePositiveInfinity.csproj b/tests/src/CoreMangLib/cti/system/double/DoublePositiveInfinity.csproj
index ceb1919398..d40c157375 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoublePositiveInfinity.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoublePositiveInfinity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleToString1.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleToString1.csproj
index cac336e054..68ccb0f59e 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleToString1.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleToString1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleToString2.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleToString2.csproj
index 45274b11b9..3a104ed1df 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleToString2.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleToString2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleToString3.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleToString3.csproj
index 56ce35f388..e248a4801d 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleToString3.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleToString3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleToString4.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleToString4.csproj
index 3ebf1c58c6..25eb995496 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleToString4.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleToString4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/double/DoubleTryParse.csproj b/tests/src/CoreMangLib/cti/system/double/DoubleTryParse.csproj
index f6e54a4513..25fc91d436 100644
--- a/tests/src/CoreMangLib/cti/system/double/DoubleTryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/double/DoubleTryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToInt64.csproj
index 03b5766e81..81afee029d 100644
--- a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToSingle.csproj b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToSingle.csproj
index c706072c6b..efc86f2008 100644
--- a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToType.csproj b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToType.csproj
index c748d8e8c3..abd8f77306 100644
--- a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToType.csproj
+++ b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint16.csproj b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint16.csproj
index 814d39dd69..1990e77cf3 100644
--- a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint16.csproj
+++ b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint32.csproj b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint32.csproj
index 6de8bbe8f6..159bf8cccb 100644
--- a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint32.csproj
+++ b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint64.csproj b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint64.csproj
index 4d1b7448ae..180285e978 100644
--- a/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint64.csproj
+++ b/tests/src/CoreMangLib/cti/system/enum/EnumIConvertibleToUint64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/enum/EnumIsDefined.csproj b/tests/src/CoreMangLib/cti/system/enum/EnumIsDefined.csproj
index 0f0805ee0f..1146479e3f 100644
--- a/tests/src/CoreMangLib/cti/system/enum/EnumIsDefined.csproj
+++ b/tests/src/CoreMangLib/cti/system/enum/EnumIsDefined.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/enum/EnumToObjectb.csproj b/tests/src/CoreMangLib/cti/system/enum/EnumToObjectb.csproj
index 414c1b33cb..2c94029ab7 100644
--- a/tests/src/CoreMangLib/cti/system/enum/EnumToObjectb.csproj
+++ b/tests/src/CoreMangLib/cti/system/enum/EnumToObjectb.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/enum/EnumToString.csproj b/tests/src/CoreMangLib/cti/system/enum/EnumToString.csproj
index 8bd3e0bbab..3c65233ac3 100644
--- a/tests/src/CoreMangLib/cti/system/enum/EnumToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/enum/EnumToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/enum/EnumToString3.csproj b/tests/src/CoreMangLib/cti/system/enum/EnumToString3.csproj
index ce7fd8150c..e61bc936aa 100644
--- a/tests/src/CoreMangLib/cti/system/enum/EnumToString3.csproj
+++ b/tests/src/CoreMangLib/cti/system/enum/EnumToString3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/environment/EnvironmentNewLine.csproj b/tests/src/CoreMangLib/cti/system/environment/EnvironmentNewLine.csproj
index 7eea703dff..2e402d480b 100644
--- a/tests/src/CoreMangLib/cti/system/environment/EnvironmentNewLine.csproj
+++ b/tests/src/CoreMangLib/cti/system/environment/EnvironmentNewLine.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/eventargs/EventArgsctor.csproj b/tests/src/CoreMangLib/cti/system/eventargs/EventArgsctor.csproj
index 75feafd2a3..6c7b4c13e8 100644
--- a/tests/src/CoreMangLib/cti/system/eventargs/EventArgsctor.csproj
+++ b/tests/src/CoreMangLib/cti/system/eventargs/EventArgsctor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/eventhandler/EventHandlerInvoke.csproj b/tests/src/CoreMangLib/cti/system/eventhandler/EventHandlerInvoke.csproj
index b9ae24b422..d2c2e1dd87 100644
--- a/tests/src/CoreMangLib/cti/system/eventhandler/EventHandlerInvoke.csproj
+++ b/tests/src/CoreMangLib/cti/system/eventhandler/EventHandlerInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerBeginInvoke.csproj b/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerBeginInvoke.csproj
index 54c9d83dfb..e1f5a9ddf7 100644
--- a/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerBeginInvoke.csproj
+++ b/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerBeginInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerCtor.csproj b/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerCtor.csproj
index eb1815617b..55f24a1f75 100644
--- a/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerEndInvoke.csproj b/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerEndInvoke.csproj
index 98325a2847..b1360efc46 100644
--- a/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerEndInvoke.csproj
+++ b/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerEndInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerInvoke.csproj b/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerInvoke.csproj
index b9ae24b422..d2c2e1dd87 100644
--- a/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerInvoke.csproj
+++ b/tests/src/CoreMangLib/cti/system/eventhandler_generic/EventHandlerInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor1.csproj
index 897f2554bc..2f6a93b4c0 100644
--- a/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor2.csproj
index c5a34cc2eb..9ed750bebe 100644
--- a/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor3.csproj
index 054677f123..5043ef08bf 100644
--- a/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/exception/ExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/exception/ExceptionGetBaseException.csproj b/tests/src/CoreMangLib/cti/system/exception/ExceptionGetBaseException.csproj
index e206a5727f..3921fe364f 100644
--- a/tests/src/CoreMangLib/cti/system/exception/ExceptionGetBaseException.csproj
+++ b/tests/src/CoreMangLib/cti/system/exception/ExceptionGetBaseException.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/flagsattribute/FlagsAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/flagsattribute/FlagsAttributeCtor.csproj
index 211d8386e5..76040cb773 100644
--- a/tests/src/CoreMangLib/cti/system/flagsattribute/FlagsAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/flagsattribute/FlagsAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor1.csproj
index f03e7b8ba0..9829d6d7e1 100644
--- a/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor2.csproj
index aa3fe0977e..24ec10c71b 100644
--- a/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor3.csproj
index 6cfb013c7c..f5f6d7cca7 100644
--- a/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/formatexception/FormatExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/gc/GCCollect.csproj b/tests/src/CoreMangLib/cti/system/gc/GCCollect.csproj
index 4cbdee06b2..c3c3e545db 100644
--- a/tests/src/CoreMangLib/cti/system/gc/GCCollect.csproj
+++ b/tests/src/CoreMangLib/cti/system/gc/GCCollect.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/gc/GCGetTotalMemory.csproj b/tests/src/CoreMangLib/cti/system/gc/GCGetTotalMemory.csproj
index 0e97ee13e6..3291b549cb 100644
--- a/tests/src/CoreMangLib/cti/system/gc/GCGetTotalMemory.csproj
+++ b/tests/src/CoreMangLib/cti/system/gc/GCGetTotalMemory.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/gc/GCKeepAlive.csproj b/tests/src/CoreMangLib/cti/system/gc/GCKeepAlive.csproj
index 088d78c21d..077e5b657a 100644
--- a/tests/src/CoreMangLib/cti/system/gc/GCKeepAlive.csproj
+++ b/tests/src/CoreMangLib/cti/system/gc/GCKeepAlive.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/gc/GCMaxGeneration.csproj b/tests/src/CoreMangLib/cti/system/gc/GCMaxGeneration.csproj
index 1d9730459b..67a84fd474 100644
--- a/tests/src/CoreMangLib/cti/system/gc/GCMaxGeneration.csproj
+++ b/tests/src/CoreMangLib/cti/system/gc/GCMaxGeneration.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/gc/GCReRegisterForFinalize.csproj b/tests/src/CoreMangLib/cti/system/gc/GCReRegisterForFinalize.csproj
index d39f562027..69fefab0ee 100644
--- a/tests/src/CoreMangLib/cti/system/gc/GCReRegisterForFinalize.csproj
+++ b/tests/src/CoreMangLib/cti/system/gc/GCReRegisterForFinalize.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/gc/GCSuppressFinalize.csproj b/tests/src/CoreMangLib/cti/system/gc/GCSuppressFinalize.csproj
index fb56117dcc..14867a49ac 100644
--- a/tests/src/CoreMangLib/cti/system/gc/GCSuppressFinalize.csproj
+++ b/tests/src/CoreMangLib/cti/system/gc/GCSuppressFinalize.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/gc/GCWaitForPendingFinalizers.csproj b/tests/src/CoreMangLib/cti/system/gc/GCWaitForPendingFinalizers.csproj
index 282fad69d6..e89dce50e6 100644
--- a/tests/src/CoreMangLib/cti/system/gc/GCWaitForPendingFinalizers.csproj
+++ b/tests/src/CoreMangLib/cti/system/gc/GCWaitForPendingFinalizers.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidCompareTo1_cti.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidCompareTo1_cti.csproj
index f9464ce72e..77ab0e9d26 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidCompareTo1_cti.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidCompareTo1_cti.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidCompareTo2.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidCompareTo2.csproj
index 61376f210a..0a3914077d 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidCompareTo2.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidCompareTo2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidCtor1.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidCtor1.csproj
index 7db856720d..8aa0986684 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidCtor1_cti.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidCtor1_cti.csproj
index 0b210436cd..b035505157 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidCtor1_cti.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidCtor1_cti.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidCtor2_cti.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidCtor2_cti.csproj
index 11010ededd..d44caa882e 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidCtor2_cti.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidCtor2_cti.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidCtor3.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidCtor3.csproj
index cb0d31fd81..b113a62f8d 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidCtor3_cti.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidCtor3_cti.csproj
index ee59380c04..dc719eda37 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidCtor3_cti.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidCtor3_cti.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidEmpty.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidEmpty.csproj
index 8809cf3d7a..5242708fd3 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidEmpty.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidEmpty.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidEquals1.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidEquals1.csproj
index c9a376ccf3..979ed663de 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidEquals1_cti.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidEquals1_cti.csproj
index 3924d495a1..f7537f4e38 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidEquals1_cti.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidEquals1_cti.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidEquals2.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidEquals2.csproj
index f06eb96b4b..a26ae9844d 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidEquals2_cti.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidEquals2_cti.csproj
index 4e916b53b6..6dbf6633a5 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidEquals2_cti.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidEquals2_cti.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidEquals3.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidEquals3.csproj
index c5e603d517..3389abc98c 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidEquals3.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidEquals3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidGetHashCode.csproj
index 0f59d61c87..4f78304b4d 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidNewGuid.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidNewGuid.csproj
index 19b9bf414e..ea3d55f802 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidNewGuid.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidNewGuid.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidToByteArray.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidToByteArray.csproj
index e9edf29036..c591e0fc1c 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidToByteArray.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidToByteArray.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/guid/GuidToString1.csproj b/tests/src/CoreMangLib/cti/system/guid/GuidToString1.csproj
index d534ed6641..de6f44cae6 100644
--- a/tests/src/CoreMangLib/cti/system/guid/GuidToString1.csproj
+++ b/tests/src/CoreMangLib/cti/system/guid/GuidToString1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/icomparable/IComparableCompareTo.csproj b/tests/src/CoreMangLib/cti/system/icomparable/IComparableCompareTo.csproj
index 66d540f300..1996206ee8 100644
--- a/tests/src/CoreMangLib/cti/system/icomparable/IComparableCompareTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/icomparable/IComparableCompareTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/icomparable_generic/IComparable_GenericCompareTo.csproj b/tests/src/CoreMangLib/cti/system/icomparable_generic/IComparable_GenericCompareTo.csproj
index e20e85b932..f0c21d266e 100644
--- a/tests/src/CoreMangLib/cti/system/icomparable_generic/IComparable_GenericCompareTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/icomparable_generic/IComparable_GenericCompareTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToBoolean.csproj
index 482b70923d..a42cbda709 100644
--- a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToByte.csproj
index c8344e7f41..ff38e01ac2 100644
--- a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToChar.csproj
index abc4ca6686..b69b371bd1 100644
--- a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDateTime.csproj b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDateTime.csproj
index 5c07493163..a38f5faa22 100644
--- a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDecimal.csproj
index 917c4a0bce..aa939160d7 100644
--- a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDouble.csproj
index 03d6051b74..133ffa1ab3 100644
--- a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt16.csproj
index 2db69b35fd..ea2d23ce72 100644
--- a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt32.csproj
index f65d9a32f8..2a86f56c06 100644
--- a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt64.csproj
index 109f869e4c..d7910bc2f3 100644
--- a/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/iconvertible/IConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/idisposable/IDisposableDispose.csproj b/tests/src/CoreMangLib/cti/system/idisposable/IDisposableDispose.csproj
index 2085aac549..5d2f41848e 100644
--- a/tests/src/CoreMangLib/cti/system/idisposable/IDisposableDispose.csproj
+++ b/tests/src/CoreMangLib/cti/system/idisposable/IDisposableDispose.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/iformatable/IFormatableToString.csproj b/tests/src/CoreMangLib/cti/system/iformatable/IFormatableToString.csproj
index 939f1ae964..da68adcd59 100644
--- a/tests/src/CoreMangLib/cti/system/iformatable/IFormatableToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/iformatable/IFormatableToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor1.csproj b/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor1.csproj
index ec926ab8c0..7143af85b5 100644
--- a/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor2.csproj b/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor2.csproj
index 1a11fd18b8..9ba3f5e183 100644
--- a/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor3.csproj b/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor3.csproj
index bae6af7969..ecc1a4e8a0 100644
--- a/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/indexoutofrangeexception/IndexOutOfRangeExceptionctor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32CompareTo1.csproj b/tests/src/CoreMangLib/cti/system/int/Int32CompareTo1.csproj
index ce5264dc7a..54d1d89688 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32CompareTo1.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32CompareTo1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32Equals1.csproj b/tests/src/CoreMangLib/cti/system/int/Int32Equals1.csproj
index 322ea9d2c6..9e0b65d0db 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32Equals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32Equals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32Equals2.csproj b/tests/src/CoreMangLib/cti/system/int/Int32Equals2.csproj
index eac9434701..21d617c51e 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32Equals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32Equals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32GetHashCode.csproj b/tests/src/CoreMangLib/cti/system/int/Int32GetHashCode.csproj
index ec3de7cd93..f61210db25 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32GetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32GetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToBoolean.csproj
index e13276b367..30ead42508 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToByte.csproj
index 3d4553f71d..d56db3f09a 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToChar.csproj
index 1a3caf4751..4a852cb22c 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDateTime.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDateTime.csproj
index 750210cc30..3fa5a0a04c 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDecimal.csproj
index e65dc118cf..a1de3d8bc8 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDouble.csproj
index 97ff5d3445..b344ba6d79 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt16.csproj
index 1c1f39b5cd..c3352ea2aa 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt32.csproj
index 796da93f25..13c222392f 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt64.csproj
index b40330bec4..1c944e1368 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToSByte.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToSByte.csproj
index 3183e03bcb..ce0ab50126 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToSingle.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToSingle.csproj
index 6099a92178..321e38bc8e 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToType.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToType.csproj
index 30798c7ac6..b6499677c4 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToType.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt16.csproj
index 57dc4eddcf..b243609cea 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt32.csproj
index cd7ef56963..58b9c79024 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt64.csproj
index c738b66676..a21dea76c7 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32IConvertibleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32MaxValue.csproj b/tests/src/CoreMangLib/cti/system/int/Int32MaxValue.csproj
index c7dd4e1d67..789583b635 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32MaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32MaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32MinValue.csproj b/tests/src/CoreMangLib/cti/system/int/Int32MinValue.csproj
index 275022f7d2..c30c13d530 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32MinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32MinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32Parse1.csproj b/tests/src/CoreMangLib/cti/system/int/Int32Parse1.csproj
index 39d734a9c5..1310df47af 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32Parse1.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32Parse1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32Parse2.csproj b/tests/src/CoreMangLib/cti/system/int/Int32Parse2.csproj
index 5324f84d4a..02ce3e68cd 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32Parse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32Parse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32Parse3.csproj b/tests/src/CoreMangLib/cti/system/int/Int32Parse3.csproj
index e6d8537449..6634e074e0 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32Parse3.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32Parse3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32Parse4.csproj b/tests/src/CoreMangLib/cti/system/int/Int32Parse4.csproj
index 84086c58f5..5cb1113721 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32Parse4.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32Parse4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32ToString3.csproj b/tests/src/CoreMangLib/cti/system/int/Int32ToString3.csproj
index f3eac04f68..1d846ea557 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32ToString3.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32ToString3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int/Int32TryParse.csproj b/tests/src/CoreMangLib/cti/system/int/Int32TryParse.csproj
index ae40884fa2..273223cadf 100644
--- a/tests/src/CoreMangLib/cti/system/int/Int32TryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/int/Int32TryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16Equals1.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16Equals1.csproj
index 04a44e1f4b..3537f75437 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16Equals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16Equals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16Equals2.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16Equals2.csproj
index 82461a2aa1..65ae0dc4dc 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16Equals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16Equals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16GetHashCode.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16GetHashCode.csproj
index 79e713a66f..00d7a19d5e 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16GetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16GetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToBoolean.csproj
index 2b04967520..ddf84b7cc7 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToByte.csproj
index c2daa34dab..6c280743af 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToChar.csproj
index 1910c353ae..b76d40e12c 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDateTime.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDateTime.csproj
index 02ce251856..3320f6dff5 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDecimal.csproj
index c70132d86a..e355ba4a32 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDouble.csproj
index 4f572017b0..4d3d44783b 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt16.csproj
index 6db031dd01..5d42e6eef9 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt32.csproj
index 6250da6f61..ca216068b1 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt64.csproj
index 1b1890a57d..4c26f01ee5 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToSByte.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToSByte.csproj
index 1a259a6091..124bfb52e5 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToSingle.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToSingle.csproj
index 285f1dc626..6905c8fa61 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToType.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToType.csproj
index 2f1275877b..eaa48703ac 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToType.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt16.csproj
index 097a14c501..584d43a97a 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt32.csproj
index c885fe6973..f1eb931f2f 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt64.csproj
index 356f611a12..6fb0c5caad 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16IConvertibleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16MaxValue.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16MaxValue.csproj
index e6f0585f39..5a7e11c22b 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16MaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16MaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16MinValue.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16MinValue.csproj
index 57a66d8b17..283834bf61 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16MinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16MinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16Parse1.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16Parse1.csproj
index d72a9901cf..5eae3b1111 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16Parse1.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16Parse1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16Parse2.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16Parse2.csproj
index eeb0610ed4..b238db373e 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16Parse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16Parse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16Parse3.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16Parse3.csproj
index d73aee0719..bc7ce2713a 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16Parse3.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16Parse3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int16/Int16TryParse.csproj b/tests/src/CoreMangLib/cti/system/int16/Int16TryParse.csproj
index 133b9c3717..4b4af63357 100644
--- a/tests/src/CoreMangLib/cti/system/int16/Int16TryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/int16/Int16TryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64CompareTo1.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64CompareTo1.csproj
index e04d554fda..65f776efaf 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64CompareTo1.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64CompareTo1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64Equals1.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64Equals1.csproj
index 8ff30e1fe5..cf19e98792 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64Equals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64Equals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64Equals2.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64Equals2.csproj
index e1fd605000..4bfa0eb9a9 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64Equals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64Equals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64GetHashCode.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64GetHashCode.csproj
index 24ce1f2644..5484397ef5 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64GetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64GetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToBoolean.csproj
index f2453d901d..5fafbe6ef8 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToByte.csproj
index 1a25af457f..e965e76676 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToChar.csproj
index 5fb7ba1c45..2454f61154 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDateTime.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDateTime.csproj
index 538f05f701..1abad20619 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDecimal.csproj
index 0fafb606c0..deb4fe2300 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDouble.csproj
index 1c3f7e454c..1fddeb7766 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt16.csproj
index 2d0ae36988..e3365547a9 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt32.csproj
index 7f0e8619b8..dd6ff221c4 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt64.csproj
index 3a27671f22..c3f34f6697 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToSByte.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToSByte.csproj
index 9ce48b389f..aa124de7ad 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToSingle.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToSingle.csproj
index b541729436..7a2b9b08f4 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToType.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToType.csproj
index 7a8ad0f206..d0d3151cf5 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToType.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt16.csproj
index 99e79bbdb2..7a23b2f8ae 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt32.csproj
index 179acb8d96..8df39d4561 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt64.csproj
index ecb5286a53..eba2e4640b 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64IConvertibleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64MaxValue.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64MaxValue.csproj
index d02dbb72d1..b4aa8ec4b7 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64MaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64MaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64MinValue.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64MinValue.csproj
index fa0e24b908..c4448ea053 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64MinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64MinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64Parse1.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64Parse1.csproj
index cce9d0651f..9cba741ee4 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64Parse1.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64Parse1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64Parse2.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64Parse2.csproj
index 16bcd77491..acb66f3de4 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64Parse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64Parse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64Parse3.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64Parse3.csproj
index e0aec68729..4d84683dce 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64Parse3.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64Parse3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64ToString3.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64ToString3.csproj
index 12f6e32670..4ba8224beb 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64ToString3.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64ToString3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/int64/Int64TryParse.csproj b/tests/src/CoreMangLib/cti/system/int64/Int64TryParse.csproj
index 8356072b6f..2c3fe7fa6e 100644
--- a/tests/src/CoreMangLib/cti/system/int64/Int64TryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/int64/Int64TryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Int32.csproj b/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Int32.csproj
index 38aee082eb..e1a9dd34b9 100644
--- a/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Int32.csproj
+++ b/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Int32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Int64.csproj b/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Int64.csproj
index d732404b1c..67b795b434 100644
--- a/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Int64.csproj
+++ b/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Int64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Void.csproj b/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Void.csproj
index 72dee39a59..c3d6948912 100644
--- a/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Void.csproj
+++ b/tests/src/CoreMangLib/cti/system/intptr/IntPtrCtor_Void.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/intptr/IntPtrEquals.csproj b/tests/src/CoreMangLib/cti/system/intptr/IntPtrEquals.csproj
index 5b40945386..39c8902c82 100644
--- a/tests/src/CoreMangLib/cti/system/intptr/IntPtrEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/intptr/IntPtrEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/intptr/IntPtrGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/intptr/IntPtrGetHashCode.csproj
index 734b84f666..5937b4a46d 100644
--- a/tests/src/CoreMangLib/cti/system/intptr/IntPtrGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/intptr/IntPtrGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/intptr/IntPtrToInt32.csproj b/tests/src/CoreMangLib/cti/system/intptr/IntPtrToInt32.csproj
index 3f4b9bbaaa..c6742f556a 100644
--- a/tests/src/CoreMangLib/cti/system/intptr/IntPtrToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/intptr/IntPtrToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/intptr/IntPtrToInt64.csproj b/tests/src/CoreMangLib/cti/system/intptr/IntPtrToInt64.csproj
index 85fe0996cf..befd0a7530 100644
--- a/tests/src/CoreMangLib/cti/system/intptr/IntPtrToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/intptr/IntPtrToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/intptr/IntPtrToPointer.csproj b/tests/src/CoreMangLib/cti/system/intptr/IntPtrToPointer.csproj
index aa4c2eb5ac..b0c03a7276 100644
--- a/tests/src/CoreMangLib/cti/system/intptr/IntPtrToPointer.csproj
+++ b/tests/src/CoreMangLib/cti/system/intptr/IntPtrToPointer.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/intptr/IntPtrToString.csproj b/tests/src/CoreMangLib/cti/system/intptr/IntPtrToString.csproj
index df4030d6ff..f1ef9089ca 100644
--- a/tests/src/CoreMangLib/cti/system/intptr/IntPtrToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/intptr/IntPtrToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/intptr/IntPtrZero.csproj b/tests/src/CoreMangLib/cti/system/intptr/IntPtrZero.csproj
index 5a8a7cac13..0e2d60d85c 100644
--- a/tests/src/CoreMangLib/cti/system/intptr/IntPtrZero.csproj
+++ b/tests/src/CoreMangLib/cti/system/intptr/IntPtrZero.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor1.csproj b/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor1.csproj
index ebc10103c6..c970f3c186 100644
--- a/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor2.csproj b/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor2.csproj
index f0f006a34e..72905d8980 100644
--- a/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor3.csproj b/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor3.csproj
index 882d567602..2bc152af3d 100644
--- a/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/invalidcastexception/InvalidCastExceptionctor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor1.csproj b/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor1.csproj
index a4d4789ab3..fc8014becf 100644
--- a/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor2.csproj b/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor2.csproj
index f1d889deb5..ee98d6839e 100644
--- a/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor3.csproj b/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor3.csproj
index a54db9d67e..8a239e8543 100644
--- a/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/invalidoperationexception/InvalidOperationExceptionctor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor1.csproj b/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor1.csproj
index ac93cb9c35..34ff8c5e38 100644
--- a/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor2.csproj b/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor2.csproj
index 3575b285b1..fb62b0699d 100644
--- a/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor3.csproj b/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor3.csproj
index da6b87d733..3ad0ed78bc 100644
--- a/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/invalidprogramexception/InvalidProgramExceptionctor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/binarywriter/BinaryWriterOutStream_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/binarywriter/BinaryWriterOutStream_PSC.csproj
index 7d53d43895..e1472e55c1 100644
--- a/tests/src/CoreMangLib/cti/system/io/binarywriter/BinaryWriterOutStream_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/binarywriter/BinaryWriterOutStream_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/directorynotfoundexception/DirectoryNotFoundExceptionctor1.csproj b/tests/src/CoreMangLib/cti/system/io/directorynotfoundexception/DirectoryNotFoundExceptionctor1.csproj
index bc4acbb5eb..5534d385e7 100644
--- a/tests/src/CoreMangLib/cti/system/io/directorynotfoundexception/DirectoryNotFoundExceptionctor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/directorynotfoundexception/DirectoryNotFoundExceptionctor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/directorynotfoundexception/DirectoryNotFoundExceptionctor2.csproj b/tests/src/CoreMangLib/cti/system/io/directorynotfoundexception/DirectoryNotFoundExceptionctor2.csproj
index 1f3a4c0b25..120a66b849 100644
--- a/tests/src/CoreMangLib/cti/system/io/directorynotfoundexception/DirectoryNotFoundExceptionctor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/directorynotfoundexception/DirectoryNotFoundExceptionctor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/endofstreamexception/endofstreamexceptionctor1_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/endofstreamexception/endofstreamexceptionctor1_PSC.csproj
index 22876c4a35..53034285db 100644
--- a/tests/src/CoreMangLib/cti/system/io/endofstreamexception/endofstreamexceptionctor1_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/endofstreamexception/endofstreamexceptionctor1_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/endofstreamexception/endofstreamexceptionctor2_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/endofstreamexception/endofstreamexceptionctor2_PSC.csproj
index 90bd0a1dc6..9c46051505 100644
--- a/tests/src/CoreMangLib/cti/system/io/endofstreamexception/endofstreamexceptionctor2_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/endofstreamexception/endofstreamexceptionctor2_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessEnum.csproj b/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessEnum.csproj
index 6482386565..04897b93b2 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessEnum.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessEnum.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessRead.csproj b/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessRead.csproj
index cf95f4415d..db0a490ca8 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessRead.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessRead.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessReadWrite.csproj b/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessReadWrite.csproj
index 342a6e429e..5a4c587100 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessReadWrite.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessReadWrite.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessWrite.csproj b/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessWrite.csproj
index cae58e4ab2..c0255acd13 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessWrite.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileaccess/FileAccessWrite.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesArchive.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesArchive.csproj
index 0a43864c6d..89e2e079cf 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesArchive.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesArchive.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesCompressed.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesCompressed.csproj
index 05654dc037..977c97bdf9 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesCompressed.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesCompressed.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesDeivce.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesDeivce.csproj
index d393db84d1..e367f73b0d 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesDeivce.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesDeivce.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesDirectory.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesDirectory.csproj
index 088733412e..7b2f661126 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesDirectory.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesDirectory.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesEncrypted.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesEncrypted.csproj
index 7aba6ace0a..4388cc0d68 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesEncrypted.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesEncrypted.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesEnum.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesEnum.csproj
index 4771e8d41e..a2d48ff610 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesEnum.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesEnum.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesHidden.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesHidden.csproj
index 5c3265c5ca..69593794d9 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesHidden.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesHidden.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesNormal.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesNormal.csproj
index f40da41d49..4993baf348 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesNormal.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesNormal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesNotContentIndexed.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesNotContentIndexed.csproj
index ac4048b395..01e588cb2c 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesNotContentIndexed.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesNotContentIndexed.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesOffline.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesOffline.csproj
index f165f8cacf..fafd377ec1 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesOffline.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesOffline.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesReadOnly.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesReadOnly.csproj
index 58ba24f050..6e5ffc678c 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesReadOnly.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesReadOnly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesReparsePoint.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesReparsePoint.csproj
index 25d8b2e095..8d90d5ce7d 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesReparsePoint.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesReparsePoint.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesSystem.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesSystem.csproj
index bcaa378381..6a2c3af5ff 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesSystem.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesSystem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesTemporary.csproj b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesTemporary.csproj
index 33a973693d..423c3849f7 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesTemporary.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileattributes/FileAttributesTemporary.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeAppend.csproj b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeAppend.csproj
index bf89abb4d1..2f3b3b3cea 100644
--- a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeAppend.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeAppend.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeCreate.csproj b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeCreate.csproj
index 90ab544519..f431097b32 100644
--- a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeCreate.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeCreate.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeCreateNew.csproj b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeCreateNew.csproj
index 29c779d600..f1d679aebd 100644
--- a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeCreateNew.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeCreateNew.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeEnum.csproj b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeEnum.csproj
index 103669fb4a..03411e6c49 100644
--- a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeEnum.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeEnum.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeOpen.csproj b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeOpen.csproj
index ab54c1a470..dacce25d53 100644
--- a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeOpen.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeOpen.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeOpenOrCreate.csproj b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeOpenOrCreate.csproj
index bece32bc60..4578a84a2b 100644
--- a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeOpenOrCreate.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeOpenOrCreate.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeTruncate.csproj b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeTruncate.csproj
index 174898c2cd..0f66381b56 100644
--- a/tests/src/CoreMangLib/cti/system/io/filemode/FileModeTruncate.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filemode/FileModeTruncate.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionCtor.csproj b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionCtor.csproj
index 626a72fdb9..811f725354 100644
--- a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionCtor2.csproj
index e017d67d42..396d3178e0 100644
--- a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionGetMessage.csproj b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionGetMessage.csproj
index bcedc9d1e9..7d18f1f1c5 100644
--- a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionGetMessage.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionGetMessage.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionMessage.csproj b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionMessage.csproj
index afb4c84b3e..fedc1979d7 100644
--- a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionMessage.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionMessage.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionToString.csproj b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionToString.csproj
index 608928a6e8..26a5d9dcc8 100644
--- a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionctor1.csproj b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionctor1.csproj
index adb235b820..4a4050300e 100644
--- a/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionctor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filenotfoundexception/FileNotFoundExceptionctor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareEnum.csproj b/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareEnum.csproj
index f2ccd6927b..6d5f094e7a 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareEnum.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareEnum.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareNone.csproj b/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareNone.csproj
index abd8ffb5ec..496bed511c 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareNone.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareNone.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareRead.csproj b/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareRead.csproj
index 4ea388b2a6..550dc83691 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareRead.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareRead.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareReadWrite.csproj b/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareReadWrite.csproj
index dc9c988feb..a8883a1f2a 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareReadWrite.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareReadWrite.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareWrite.csproj b/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareWrite.csproj
index 2554ef5b27..ad3cc652fd 100644
--- a/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareWrite.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/fileshare/FileShareWrite.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/filestream/FileStreamDispose_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/filestream/FileStreamDispose_PSC.csproj
index 21cd9655ce..ea183ec338 100644
--- a/tests/src/CoreMangLib/cti/system/io/filestream/FileStreamDispose_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/filestream/FileStreamDispose_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/ioexception/IOExceptionctor1.csproj b/tests/src/CoreMangLib/cti/system/io/ioexception/IOExceptionctor1.csproj
index b0e15e8a38..4e7301485b 100644
--- a/tests/src/CoreMangLib/cti/system/io/ioexception/IOExceptionctor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/ioexception/IOExceptionctor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/ioexception/IOExceptionctor2.csproj b/tests/src/CoreMangLib/cti/system/io/ioexception/IOExceptionctor2.csproj
index e426122b93..2e1fce9943 100644
--- a/tests/src/CoreMangLib/cti/system/io/ioexception/IOExceptionctor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/ioexception/IOExceptionctor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor.csproj b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor.csproj
index 8738f18269..e404365263 100644
--- a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor2.csproj b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor2.csproj
index 0234777c25..96b5428400 100644
--- a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor3.csproj b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor3.csproj
index 8396f2e1d4..b3e801ddc6 100644
--- a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor4.csproj b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor4.csproj
index 5f42fd3868..fc5bdd872b 100644
--- a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor4.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor5.csproj b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor5.csproj
index ec6daa58a8..5c04cd1106 100644
--- a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor5.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor6.csproj b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor6.csproj
index bd6096da84..1cd8db0380 100644
--- a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor6.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor7.csproj b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor7.csproj
index eea79ddbb8..6103b0e424 100644
--- a/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor7.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/memorystream/MemoryStreamCtor7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/pathtoolongexception/PathTooLongExceptionctor1.csproj b/tests/src/CoreMangLib/cti/system/io/pathtoolongexception/PathTooLongExceptionctor1.csproj
index 7b79fea0f7..91592f0cf4 100644
--- a/tests/src/CoreMangLib/cti/system/io/pathtoolongexception/PathTooLongExceptionctor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/pathtoolongexception/PathTooLongExceptionctor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/pathtoolongexception/PathTooLongExceptionctor2.csproj b/tests/src/CoreMangLib/cti/system/io/pathtoolongexception/PathTooLongExceptionctor2.csproj
index 158916841d..b701e43743 100644
--- a/tests/src/CoreMangLib/cti/system/io/pathtoolongexception/PathTooLongExceptionctor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/pathtoolongexception/PathTooLongExceptionctor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginBegin.csproj b/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginBegin.csproj
index 23781eb6ec..233c5187d3 100644
--- a/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginBegin.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginBegin.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginCurrent.csproj b/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginCurrent.csproj
index fe78321b8a..83fbe75407 100644
--- a/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginCurrent.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginCurrent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginEnd.csproj b/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginEnd.csproj
index 4971aae814..2801706e69 100644
--- a/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginEnd.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginEnd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginEnum.csproj b/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginEnum.csproj
index a219e51c9b..a6c36efef2 100644
--- a/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginEnum.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/seekorigin/SeekOriginEnum.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/stream/StreamDispose1_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/stream/StreamDispose1_PSC.csproj
index fbfc92c491..1cc0da54a4 100644
--- a/tests/src/CoreMangLib/cti/system/io/stream/StreamDispose1_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/stream/StreamDispose1_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/stream/StreamDispose2_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/stream/StreamDispose2_PSC.csproj
index 0abd37abc3..32849a760d 100644
--- a/tests/src/CoreMangLib/cti/system/io/stream/StreamDispose2_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/stream/StreamDispose2_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/stream/StreamNull_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/stream/StreamNull_PSC.csproj
index a265fdf3d3..8785fce1a7 100644
--- a/tests/src/CoreMangLib/cti/system/io/stream/StreamNull_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/stream/StreamNull_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/stream/StreamReadTimeOut_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/stream/StreamReadTimeOut_PSC.csproj
index 77972734cb..f6507a002c 100644
--- a/tests/src/CoreMangLib/cti/system/io/stream/StreamReadTimeOut_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/stream/StreamReadTimeOut_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/stream/StreamWriteTimeOut_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/stream/StreamWriteTimeOut_PSC.csproj
index 1514904fc5..212a7d7891 100644
--- a/tests/src/CoreMangLib/cti/system/io/stream/StreamWriteTimeOut_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/stream/StreamWriteTimeOut_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/streamreader/StreamReaderNull_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/streamreader/StreamReaderNull_PSC.csproj
index 1e24e41b9a..3cbf0b1e8a 100644
--- a/tests/src/CoreMangLib/cti/system/io/streamreader/StreamReaderNull_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/streamreader/StreamReaderNull_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/stringwriter/StringWriterEncoding_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/stringwriter/StringWriterEncoding_PSC.csproj
index e32fa18046..0ad50d3c75 100644
--- a/tests/src/CoreMangLib/cti/system/io/stringwriter/StringWriterEncoding_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/stringwriter/StringWriterEncoding_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/textreader/TextReaderNull_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/textreader/TextReaderNull_PSC.csproj
index 18c69d9a31..6c3ae4c77b 100644
--- a/tests/src/CoreMangLib/cti/system/io/textreader/TextReaderNull_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/textreader/TextReaderNull_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/io/textwriter/TextWriterNull_PSC.csproj b/tests/src/CoreMangLib/cti/system/io/textwriter/TextWriterNull_PSC.csproj
index 7214cb76eb..108fa431f8 100644
--- a/tests/src/CoreMangLib/cti/system/io/textwriter/TextWriterNull_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/io/textwriter/TextWriterNull_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathAbs1.csproj b/tests/src/CoreMangLib/cti/system/math/MathAbs1.csproj
index 01e2fc15e8..8e12ede552 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathAbs1.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathAbs1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathAbs2.csproj b/tests/src/CoreMangLib/cti/system/math/MathAbs2.csproj
index f644cecbb6..f421355156 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathAbs2.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathAbs2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathAbs3.csproj b/tests/src/CoreMangLib/cti/system/math/MathAbs3.csproj
index 71b28c7ccc..cd8fa7c867 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathAbs3.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathAbs3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathAbs4.csproj b/tests/src/CoreMangLib/cti/system/math/MathAbs4.csproj
index 0d602ceaf2..bce118e878 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathAbs4.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathAbs4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathAbs5.csproj b/tests/src/CoreMangLib/cti/system/math/MathAbs5.csproj
index 599ee56758..8f1af1bc03 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathAbs5.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathAbs5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathAbs6.csproj b/tests/src/CoreMangLib/cti/system/math/MathAbs6.csproj
index c0e8b060db..af17be4641 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathAbs6.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathAbs6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathAbs7.csproj b/tests/src/CoreMangLib/cti/system/math/MathAbs7.csproj
index cfee604fdf..32ed439807 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathAbs7.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathAbs7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathAcos.csproj b/tests/src/CoreMangLib/cti/system/math/MathAcos.csproj
index 58a5df1c83..db4399848d 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathAcos.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathAcos.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathAtan.csproj b/tests/src/CoreMangLib/cti/system/math/MathAtan.csproj
index 35ed661869..97c60ab9b2 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathAtan.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathAtan.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathAtan2.csproj b/tests/src/CoreMangLib/cti/system/math/MathAtan2.csproj
index 1f95698a14..66541e915a 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathAtan2.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathAtan2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathCeiling.csproj b/tests/src/CoreMangLib/cti/system/math/MathCeiling.csproj
index 3f161d2921..9d5ba1219a 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathCeiling.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathCeiling.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathCos.csproj b/tests/src/CoreMangLib/cti/system/math/MathCos.csproj
index d148975025..b89723c161 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathCos.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathCos.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathCosh.csproj b/tests/src/CoreMangLib/cti/system/math/MathCosh.csproj
index 73afb0ce96..3b35276a92 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathCosh.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathCosh.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathE.csproj b/tests/src/CoreMangLib/cti/system/math/MathE.csproj
index d9437729dd..fb03b3fe37 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathE.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathE.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathExp.csproj b/tests/src/CoreMangLib/cti/system/math/MathExp.csproj
index 46a3593a3e..50d1bcd1a3 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathExp.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathExp.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathFloor.csproj b/tests/src/CoreMangLib/cti/system/math/MathFloor.csproj
index 5b61a708c2..dd97d6491b 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathFloor.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathFloor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathIEEERemainder.csproj b/tests/src/CoreMangLib/cti/system/math/MathIEEERemainder.csproj
index 904d5b7e5d..010624e1c3 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathIEEERemainder.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathIEEERemainder.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathLog.csproj b/tests/src/CoreMangLib/cti/system/math/MathLog.csproj
index 3d28bfba51..673f45d20d 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathLog.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathLog.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathLog10.csproj b/tests/src/CoreMangLib/cti/system/math/MathLog10.csproj
index ba0dbb7fb5..488e18de2c 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathLog10.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathLog10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMax1.csproj b/tests/src/CoreMangLib/cti/system/math/MathMax1.csproj
index 52dd951681..77e7d8fce8 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMax1.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMax1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMax10.csproj b/tests/src/CoreMangLib/cti/system/math/MathMax10.csproj
index e5ff91ed67..a24b29ff69 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMax10.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMax10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMax11.csproj b/tests/src/CoreMangLib/cti/system/math/MathMax11.csproj
index 5729dc0e18..b86b14876f 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMax11.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMax11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMax2.csproj b/tests/src/CoreMangLib/cti/system/math/MathMax2.csproj
index db47f6cd49..feb0532023 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMax2.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMax2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMax3.csproj b/tests/src/CoreMangLib/cti/system/math/MathMax3.csproj
index 051910e041..85a77a7e0e 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMax3.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMax3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMax4.csproj b/tests/src/CoreMangLib/cti/system/math/MathMax4.csproj
index ce013144b8..611821088c 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMax4.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMax4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMax5.csproj b/tests/src/CoreMangLib/cti/system/math/MathMax5.csproj
index c83a029e2a..7c475e7e4b 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMax5.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMax5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMax6.csproj b/tests/src/CoreMangLib/cti/system/math/MathMax6.csproj
index 5e09ae1463..b7bea963d0 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMax6.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMax6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMax7.csproj b/tests/src/CoreMangLib/cti/system/math/MathMax7.csproj
index c06f11631e..a39ef8a2d5 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMax7.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMax7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMax8.csproj b/tests/src/CoreMangLib/cti/system/math/MathMax8.csproj
index d9c7015553..b39cec43d2 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMax8.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMax8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMax9.csproj b/tests/src/CoreMangLib/cti/system/math/MathMax9.csproj
index bd1329ad15..053f42017b 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMax9.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMax9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMin1.csproj b/tests/src/CoreMangLib/cti/system/math/MathMin1.csproj
index 52c4d5ca07..c7d45682f2 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMin1.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMin1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMin10.csproj b/tests/src/CoreMangLib/cti/system/math/MathMin10.csproj
index 6411bee3ec..f8a5f069a5 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMin10.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMin10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMin11.csproj b/tests/src/CoreMangLib/cti/system/math/MathMin11.csproj
index c2beb42c7f..c6bf020e59 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMin11.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMin11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMin2.csproj b/tests/src/CoreMangLib/cti/system/math/MathMin2.csproj
index 513a58d5c4..a01f6aab2c 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMin2.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMin2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMin3.csproj b/tests/src/CoreMangLib/cti/system/math/MathMin3.csproj
index 08c7919443..66c42d9468 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMin3.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMin3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMin4.csproj b/tests/src/CoreMangLib/cti/system/math/MathMin4.csproj
index 8c3072407f..6a8740a035 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMin4.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMin4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMin5.csproj b/tests/src/CoreMangLib/cti/system/math/MathMin5.csproj
index e224b0b67c..35aa604e45 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMin5.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMin5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMin6.csproj b/tests/src/CoreMangLib/cti/system/math/MathMin6.csproj
index a0d0043fb7..c194e369a7 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMin6.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMin6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMin7.csproj b/tests/src/CoreMangLib/cti/system/math/MathMin7.csproj
index 8a189f261e..2c18e23ca7 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMin7.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMin7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMin8.csproj b/tests/src/CoreMangLib/cti/system/math/MathMin8.csproj
index f17f657c53..aa5a213cd3 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMin8.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMin8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathMin9.csproj b/tests/src/CoreMangLib/cti/system/math/MathMin9.csproj
index 819ea9f750..6640ae7702 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathMin9.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathMin9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathPI.csproj b/tests/src/CoreMangLib/cti/system/math/MathPI.csproj
index e5dc61ba4c..b84aa6efd8 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathPI.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathPI.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathPow.csproj b/tests/src/CoreMangLib/cti/system/math/MathPow.csproj
index 3c70e7a02c..de1a2d5ddc 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathPow.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathPow.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathRound2.csproj b/tests/src/CoreMangLib/cti/system/math/MathRound2.csproj
index 3056ccdcfc..c18b3c8650 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathRound2.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathRound2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathRound3.csproj b/tests/src/CoreMangLib/cti/system/math/MathRound3.csproj
index fed781d31f..7e0e77632b 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathRound3.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathRound3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathRound4.csproj b/tests/src/CoreMangLib/cti/system/math/MathRound4.csproj
index 440958e2db..df8712ef57 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathRound4.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathRound4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathSign1.csproj b/tests/src/CoreMangLib/cti/system/math/MathSign1.csproj
index 47305371a7..aa2676b104 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathSign1.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathSign1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathSign2.csproj b/tests/src/CoreMangLib/cti/system/math/MathSign2.csproj
index d94bf86ba3..fed1e4dd39 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathSign2.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathSign2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathSign3.csproj b/tests/src/CoreMangLib/cti/system/math/MathSign3.csproj
index 2a038b2666..6b3f35b8c7 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathSign3.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathSign3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathSign4.csproj b/tests/src/CoreMangLib/cti/system/math/MathSign4.csproj
index d46241e76f..c31b8cb4b9 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathSign4.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathSign4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathSign5.csproj b/tests/src/CoreMangLib/cti/system/math/MathSign5.csproj
index fe1cd8c44a..6229711795 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathSign5.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathSign5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathSign6.csproj b/tests/src/CoreMangLib/cti/system/math/MathSign6.csproj
index a8fcffff35..26e6ea93e9 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathSign6.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathSign6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathSign7.csproj b/tests/src/CoreMangLib/cti/system/math/MathSign7.csproj
index e7663af9b2..a1c16d5c65 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathSign7.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathSign7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathSin.csproj b/tests/src/CoreMangLib/cti/system/math/MathSin.csproj
index f133a98a3c..89554e3678 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathSin.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathSin.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathSinh.csproj b/tests/src/CoreMangLib/cti/system/math/MathSinh.csproj
index b8934fe6b7..7203fdf238 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathSinh.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathSinh.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathSqrt.csproj b/tests/src/CoreMangLib/cti/system/math/MathSqrt.csproj
index 6b4225aecf..e0bc8b4251 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathSqrt.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathSqrt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathTan.csproj b/tests/src/CoreMangLib/cti/system/math/MathTan.csproj
index c575203e1d..fb3aaee245 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathTan.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathTan.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/MathTanh.csproj b/tests/src/CoreMangLib/cti/system/math/MathTanh.csproj
index fbe2853fea..6c4bb2f821 100644
--- a/tests/src/CoreMangLib/cti/system/math/MathTanh.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/MathTanh.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/mathRound1.csproj b/tests/src/CoreMangLib/cti/system/math/mathRound1.csproj
index ebbf272e62..7b67225905 100644
--- a/tests/src/CoreMangLib/cti/system/math/mathRound1.csproj
+++ b/tests/src/CoreMangLib/cti/system/math/mathRound1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/math/mathpow.cs b/tests/src/CoreMangLib/cti/system/math/mathpow.cs
index c9b02c3e9d..10986a8991 100644
--- a/tests/src/CoreMangLib/cti/system/math/mathpow.cs
+++ b/tests/src/CoreMangLib/cti/system/math/mathpow.cs
@@ -217,7 +217,7 @@ public class MathPow
         {
             double d = Math.Pow(- 1, double.NegativeInfinity);
 
-            if (!double.IsNaN(d))
+            if (d != 1)
             {
                 TestLibrary.TestFramework.LogError("007.1", "Return value is wrong!");
                 retVal = false;
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFAbs.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFAbs.csproj
new file mode 100644
index 0000000000..c4c0cd949c
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFAbs.csproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{753E20EC-61C7-4BF3-92EE-4519A55FA4B5}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfabs.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFAcos.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFAcos.csproj
new file mode 100644
index 0000000000..ae9f7ebb20
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFAcos.csproj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{68E081B5-2C96-4105-B01B-34C7C746FDC8}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfacos.cs" />
+    <Compile Include="mathftestlib.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFAtan.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFAtan.csproj
new file mode 100644
index 0000000000..c1266af226
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFAtan.csproj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A1A8A825-38A2-4B8C-BD81-12494482AE26}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfatan.cs" />
+    <Compile Include="mathftestlib.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFAtan2.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFAtan2.csproj
new file mode 100644
index 0000000000..f5be31fb4d
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFAtan2.csproj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{89EDC6AB-FDB9-4A19-A4E8-0DA10B59AE5E}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfatan2.cs" />
+    <Compile Include="mathftestlib.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFCeiling.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFCeiling.csproj
new file mode 100644
index 0000000000..166f1ee830
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFCeiling.csproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{003D9B58-D8CA-4D5C-A3BB-2C36B166F3F2}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfceiling.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFCos.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFCos.csproj
new file mode 100644
index 0000000000..a2df131c0b
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFCos.csproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D5D37943-62D6-4579-8AD9-6EC793534C31}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfcos.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFCosh.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFCosh.csproj
new file mode 100644
index 0000000000..2fe6d56a72
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFCosh.csproj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{381997D1-75E4-46D4-8663-EE60183BAD60}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfcosh.cs" />
+    <Compile Include="mathftestlib.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFE.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFE.csproj
new file mode 100644
index 0000000000..fd68e159e5
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFE.csproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F5F42C53-AC5D-4140-82C7-A441C50726C8}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfe.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFExp.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFExp.csproj
new file mode 100644
index 0000000000..f801d9fbf9
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFExp.csproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3332C473-8FCF-4BC8-8A4A-EEA791A77C0D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfexp.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFFloor.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFFloor.csproj
new file mode 100644
index 0000000000..f1c6c15d18
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFFloor.csproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E7916B4D-47B3-4F8D-B5C9-437318A10C69}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathffloor.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFIEEERemainder.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFIEEERemainder.csproj
new file mode 100644
index 0000000000..96bb00e4a0
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFIEEERemainder.csproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C288A75E-FCA5-41F4-80A2-3546920487F7}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfieeeremainder.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFLog.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFLog.csproj
new file mode 100644
index 0000000000..fe65e272c0
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFLog.csproj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{25B363C9-3059-4071-8B63-8AD56BEFB169}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathflog.cs" />
+    <Compile Include="mathftestlib.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFLog10.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFLog10.csproj
new file mode 100644
index 0000000000..0aeb7b03e4
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFLog10.csproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BB3AD81D-7036-49BC-A0C3-318FC89F00FD}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathflog10.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+      <Project>{C8C0DC74-FAC4-45B1-81FE-70C4808366E0}</Project>
+      <Name>CoreCLRTestLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFMax.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFMax.csproj
new file mode 100644
index 0000000000..a9647700d9
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFMax.csproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{8CFA48E4-0F16-4B70-841A-A276E55B2536}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfmax.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFMin.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFMin.csproj
new file mode 100644
index 0000000000..51c0ac8da6
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFMin.csproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{78BFB69A-326B-4BCE-9913-E5CBA473FC94}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfmin.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFPI.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFPI.csproj
new file mode 100644
index 0000000000..3cd78b5b59
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFPI.csproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6FD7CFCB-9BE3-46D9-9AA1-F15574084F22}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfpi.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFPow.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFPow.csproj
new file mode 100644
index 0000000000..3ac9594b44
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFPow.csproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{AF3C5F7A-51BC-4B3B-A12A-068765B390D6}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfpow.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFRound1.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFRound1.csproj
new file mode 100644
index 0000000000..df404a9e53
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFRound1.csproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DE4C7ADC-AC3D-4555-9E3B-F9C3C5542A1E}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfround1.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFRound2.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFRound2.csproj
new file mode 100644
index 0000000000..13fa160d07
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFRound2.csproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{ABFDE127-D0A5-4202-8320-E1B0B52B218D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfround2.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFSign.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFSign.csproj
new file mode 100644
index 0000000000..1ac06eb063
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFSign.csproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D030C47B-3942-4B1F-800D-28863DDB6F0D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfsign.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFSin.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFSin.csproj
new file mode 100644
index 0000000000..8430dfcdf3
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFSin.csproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{8B5F12CB-20BC-472D-BE8F-EC289FD8D85B}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfsin.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFSinh.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFSinh.csproj
new file mode 100644
index 0000000000..88723286d7
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFSinh.csproj
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9340A0ED-9EA3-4B36-8C15-43FBB22C640E}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfsinh.cs" />
+    <Compile Include="mathftestlib.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFSqrt.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFSqrt.csproj
new file mode 100644
index 0000000000..e07cb2ea0a
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFSqrt.csproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5F8BCFB3-581B-455C-AA69-F1434DB4948A}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathfsqrt.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFTan.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFTan.csproj
new file mode 100644
index 0000000000..86c2700cb0
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFTan.csproj
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{12FAA70F-51FD-49C3-A3BE-48254AEB9354}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathftan.cs" />
+    <Compile Include="mathftestlib.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/MathFTanh.csproj b/tests/src/CoreMangLib/cti/system/mathf/MathFTanh.csproj
new file mode 100644
index 0000000000..051107de6f
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/MathFTanh.csproj
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EFC1E11C-BA0F-44A5-AC95-7572BE852F37}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>1</CLRTestPriority>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add Compile Object Here -->
+    <Compile Include="mathftanh.cs" />
+    <Compile Include="mathftestlib.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfabs.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfabs.cs
new file mode 100644
index 0000000000..7e0184d437
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfabs.cs
@@ -0,0 +1,183 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Abs(System.Single)
+/// </summary>
+public class MathFAbs
+{
+    public static int Main(string[] args)
+    {
+        MathFAbs abs = new MathFAbs();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Abs(System.Single)...");
+
+        if (abs.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the max value of float should be equal to its Abs value");
+
+        try
+        {
+            float max = float.MaxValue;
+            if (MathF.Abs(max) != max)
+            {
+                TestLibrary.TestFramework.LogError("001", "The Abs of max value should be equal to itself!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the min value of float should be equal to its Abs value");
+
+        try
+        {
+            float min = float.MinValue;
+            if (MathF.Abs(min) != -min)
+            {
+                TestLibrary.TestFramework.LogError("003", "The Abs of max value should be equal to it's contrary!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify the NegativeInfinity of float should be equal to its contrary...");
+
+        try
+        {
+            float negInfinit = float.NegativeInfinity;
+            if (MathF.Abs(negInfinit) != -negInfinit)
+            {
+                TestLibrary.TestFramework.LogError("005", "The Abs of max value should be equal to it's contrary!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the PositiveInfinity of float should be equal to its Abs value");
+
+        try
+        {
+            float posInfinit = float.PositiveInfinity;
+            if (MathF.Abs(posInfinit) != posInfinit)
+            {
+                TestLibrary.TestFramework.LogError("007", "The Abs of max value should be equal to itself!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify Abs value of zero should be equal to both itself and its contrary value...");
+
+        try
+        {
+            float zero = 0;
+            if (MathF.Abs(zero) != zero || MathF.Abs(zero) != -zero)
+            {
+                TestLibrary.TestFramework.LogError("009", "Abs value of zero should be equal to both itself and its contrary value!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify Abs value of Epsilon ");
+
+        try
+        {
+            float epsilon = float.Epsilon;
+            if (MathF.Abs(epsilon) != epsilon)
+            {
+                TestLibrary.TestFramework.LogError("011", "Abs value of epsilon should be equal to itself...");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfacos.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfacos.cs
new file mode 100644
index 0000000000..a3ea64e23c
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfacos.cs
@@ -0,0 +1,210 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Acos(System.Single)
+/// </summary>
+public class MathFAcos
+{
+    public static int Main(string[] args)
+    {
+        MathFAcos Acos = new MathFAcos();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Acos(System.Single)...");
+
+        if (Acos.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+        retVal = PosTest7() && retVal;
+
+        //TestLibrary.TestFramework.LogInformation("[Negtive]");
+        //retVal = NegTest1() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the value of Arccos(-1) is MathF.PI...");
+
+        try
+        {
+            float angle = MathF.Acos(-1);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, MathF.PI))
+            {
+                TestLibrary.TestFramework.LogError("001", "Expected MathF.Acos(-1) = " + MathF.PI.ToString() + ", received " +
+            angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the value of Arccos(0) is MathF.PI/2...");
+
+        try
+        {
+            float angle = MathF.Acos(0);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, MathF.PI / 2))
+            {
+                TestLibrary.TestFramework.LogError("003", "Expected pi/2, got " + angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify the value of Arccos(1) is 0...");
+
+        try
+        {
+            float angle = MathF.Acos(1);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, 0))
+            {
+                TestLibrary.TestFramework.LogError("005", "Expected 1, got " + angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the value of Arccos(0.5) is MathF.PI/3...");
+
+        try
+        {
+            float angle = MathF.Acos(0.5f);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, 1.04719755f))
+            {
+                TestLibrary.TestFramework.LogError("007", "Expected 1.04719755, got " + angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify the value of Arccos(-0.5) is 2*MathF.PI/3...");
+
+        try
+        {
+            float angle = MathF.Acos(-0.5f);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, 2.09439510f))
+            {
+                TestLibrary.TestFramework.LogError("009", "Expected: 2.09439510, actual: " + angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify the value of Arccos(MathF.Sqrt(3)/2) is MathF.PI/6...");
+
+        try
+        {
+            float angle = MathF.Acos(MathF.Sqrt(3) / 2);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, 0.523598776f))
+            {
+                TestLibrary.TestFramework.LogError("011", "Expected: 0.523598776, actual: " + angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest7()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest7: Verify the value of Arccos(-MathF.Sqrt(3)/2) is 5*MathF.PI/6...");
+
+        try
+        {
+            float angle = MathF.Acos(-MathF.Sqrt(3) / 2);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, 2.61799388f))
+            {
+                TestLibrary.TestFramework.LogError("013", "Expected: 2.61799388, actual: " + angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("014", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfatan.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfatan.cs
new file mode 100644
index 0000000000..e2b3c75b7a
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfatan.cs
@@ -0,0 +1,164 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Atan(System.Single)
+/// </summary>
+public class MathFAtan
+{
+    public static int Main(string[] args)
+    {
+        MathFAtan arctan = new MathFAtan();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Atan(System.Single)...");
+
+        if (arctan.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the value of arctan(NegativeInfinity) is -MathF.PI/2...");
+
+        try
+        {
+            float angle = MathF.Atan(float.NegativeInfinity);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, -MathF.PI / 2))
+            {
+                TestLibrary.TestFramework.LogError("001", "Expected: -pi/2, actual: " +
+                    angle.ToString() + " diff>epsilon= " + MathFTestLib.Epsilon.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the value of arctan(PositiveInfinity) is MathF.PI/2...");
+
+        try
+        {
+            float angle = MathF.Atan(float.PositiveInfinity);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, MathF.PI / 2))
+            {
+                TestLibrary.TestFramework.LogError("003", "Expected: pi/2, actual: " +
+                    angle.ToString() + " diff>epsilon= " + MathFTestLib.Epsilon.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify the value of arctan(0) is zero...");
+
+        try
+        {
+            float angle = MathF.Atan(0);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, 0))
+            {
+                TestLibrary.TestFramework.LogError("005", "Expected: 0, actual: " +
+                    angle.ToString() + " diff>epsilon= " + MathFTestLib.Epsilon.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the value of atn(inf+1)=atn(inf)");
+
+        try
+        {
+            float angle = MathF.Atan(float.PositiveInfinity + 1);
+            float baseline = MathF.Atan(float.PositiveInfinity);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, baseline))
+            {
+                TestLibrary.TestFramework.LogError("007", "Expected: " + baseline.ToString() + ", actual: " +
+                    angle.ToString() + " diff>epsilon= " + MathFTestLib.Epsilon.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify atn(-inf -1)=atn(-inf)");
+
+        try
+        {
+            float angle = MathF.Atan(float.NegativeInfinity - 1);
+            float baseline = MathF.Atan(float.NegativeInfinity);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, baseline))
+            {
+                TestLibrary.TestFramework.LogError("009", "Expected " + baseline.ToString() + ", actual: " + angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfatan2.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfatan2.cs
new file mode 100644
index 0000000000..264c6240fc
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfatan2.cs
@@ -0,0 +1,272 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Atan2(System.Single, System.Single)
+/// </summary>
+public class MathFAtan2
+{
+    public static int Main(string[] args)
+    {
+        MathFAtan2 arctan2 = new MathFAtan2();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Atan2(System.Single,System.Single)...");
+
+        if (arctan2.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+        retVal = PosTest7() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the angle of arctan(x,y) when the point in quadrant one...");
+
+        try
+        {
+            float x = TestLibrary.Generator.GetSingle(-55);
+            while (x <= 0)
+            {
+                x = TestLibrary.Generator.GetSingle(-55);
+            }
+            float y = TestLibrary.Generator.GetSingle(-55);
+            while (y <= 0)
+            {
+                y = TestLibrary.Generator.GetSingle(-55);
+            }
+
+            float angle = MathF.Atan2(y, x);
+            if (angle > MathF.PI / 2 || angle < 0)
+            {
+                TestLibrary.TestFramework.LogError("001", "The angle should be between 0 and MathF.PI/2, actual: " +
+                    angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the angle of arctan(x,y) when the point in quadrant four...");
+
+        try
+        {
+            float x = TestLibrary.Generator.GetSingle(-55);
+            while (x <= 0)
+            {
+                x = TestLibrary.Generator.GetSingle(-55);
+            }
+            float y = TestLibrary.Generator.GetSingle(-55);
+            while (y >= 0)
+            {
+                y = -TestLibrary.Generator.GetSingle(-55);
+            }
+
+            float angle = MathF.Atan2(y, x);
+            if (angle > 0 || angle < -MathF.PI / 2)
+            {
+                TestLibrary.TestFramework.LogError("003", "The angle should be between 0 and -MathF.PI/2, actual: " +
+                    angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify the angle of arctan(x,y) when the point in forward direction of X axis...");
+
+        try
+        {
+            float x = TestLibrary.Generator.GetSingle(-55);
+            while (x <= 0)
+            {
+                x = TestLibrary.Generator.GetSingle(-55);
+            }
+
+            float y = 0;
+            float angle = MathF.Atan2(y, x);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, 0.0f))
+            {
+                TestLibrary.TestFramework.LogError("005", "The angle should be zero,actual: " + angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the angle of arctan(x,y) when the point in forward direction of Y axis...");
+
+        try
+        {
+            float x = 0;
+            float y = TestLibrary.Generator.GetSingle(-55);
+            while (y <= 0)
+            {
+                y = TestLibrary.Generator.GetSingle(-55);
+            }
+            float angle = MathF.Atan2(y, x);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, MathF.PI / 2))
+            {
+                TestLibrary.TestFramework.LogError("007", "The angle should be pi/2, actual:" + angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify the angle of arctan(x,y) when the point in negative direction of Y axis...");
+
+        try
+        {
+            float x = 0;
+            float y = TestLibrary.Generator.GetSingle(-55);
+            while (y >= 0)
+            {
+                y = -TestLibrary.Generator.GetSingle(-55);
+            }
+            float angle = MathF.Atan2(y, x);
+            if (!MathFTestLib.SingleIsWithinEpsilon(angle, -MathF.PI / 2))
+            {
+                TestLibrary.TestFramework.LogError("009", "The angle should be -pi/2, actual: " + angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify the angle of arctan(x,y) when the point in quadrant two...");
+
+        try
+        {
+            float x = TestLibrary.Generator.GetSingle(-55);
+            while (x >= 0)
+            {
+                x = -TestLibrary.Generator.GetSingle(-55);
+            }
+            float y = TestLibrary.Generator.GetSingle(-55);
+            while (y <= 0)
+            {
+                y = TestLibrary.Generator.GetSingle(-55);
+            }
+
+            float angle = MathF.Atan2(y, x);
+            if (angle < MathF.PI / 2 || angle > MathF.PI)
+            {
+                TestLibrary.TestFramework.LogError("011", "The angle should be between 0 and MathF.PI/2, actual: " + angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest7()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest7: Verify the angle of arctan(x,y) when the point in quadrant three...");
+
+        try
+        {
+            float x = TestLibrary.Generator.GetSingle(-55);
+            while (x >= 0)
+            {
+                x = -TestLibrary.Generator.GetSingle(-55);
+            }
+            float y = TestLibrary.Generator.GetSingle(-55);
+            while (y >= 0)
+            {
+                y = -TestLibrary.Generator.GetSingle(-55);
+            }
+
+            float angle = MathF.Atan2(y, x);
+            if (angle > -MathF.PI / 2 || angle < -MathF.PI)
+            {
+                TestLibrary.TestFramework.LogError("013", "The angle should be between 0 and MathF.PI/2, actual: " +
+                    angle.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("014", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfceiling.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfceiling.cs
new file mode 100644
index 0000000000..7398697037
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfceiling.cs
@@ -0,0 +1,206 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Ceiling(System.Single)
+/// </summary>
+public class MathFCeiling
+{
+    public static int Main(string[] args)
+    {
+        MathFCeiling ceiling = new MathFCeiling();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Ceiling(System.Single)...");
+
+        if (ceiling.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify Ceiling number should be equal to the integer part of negative number...");
+
+        try
+        {
+            float number = TestLibrary.Generator.GetSingle(-55);
+            while (number >= 0)
+            {
+                number = (-TestLibrary.Generator.GetSingle(-55)) * 100;
+            }
+
+            float ceilingNumber = MathF.Ceiling(number);
+            if (ceilingNumber < number || ceilingNumber > number + 1)
+            {
+                TestLibrary.TestFramework.LogError("001", "The Ceiling number should be equal to the integer part of negative number!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify Ceiling number should be equal to itself when number is negative integer");
+
+        try
+        {
+            float number = TestLibrary.Generator.GetSingle(-55);
+            while (number >= 0)
+            {
+                number = (-TestLibrary.Generator.GetSingle(-55)) * 100;
+            }
+
+            float ceilingNumber = MathF.Ceiling(number);
+            if (ceilingNumber != MathF.Ceiling(ceilingNumber))
+            {
+                TestLibrary.TestFramework.LogError("003", "The Ceiling number should be equal to itself when number is negative integer...");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify Ceiling number should be equal to the integer part plus one of positive number...");
+
+        try
+        {
+            float number = TestLibrary.Generator.GetSingle(-55);
+            while (number <= 0)
+            {
+                number = (TestLibrary.Generator.GetSingle(-55)) * 100;
+            }
+
+            float ceilingNumber = MathF.Ceiling(number);
+            if (ceilingNumber < number || ceilingNumber > number + 1)
+            {
+                TestLibrary.TestFramework.LogError("005", "The Ceiling number should be equal to the integer part plus one of positive number!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify Ceiling number should be equal to itself when number is positive integer");
+
+        try
+        {
+            float number = TestLibrary.Generator.GetSingle(-55);
+            while (number <= 0)
+            {
+                number = (TestLibrary.Generator.GetSingle(-55)) * 100;
+            }
+
+            float ceilingNumber = MathF.Ceiling(number);
+            if (ceilingNumber != MathF.Ceiling(ceilingNumber))
+            {
+                TestLibrary.TestFramework.LogError("007", "The Ceiling number should be equal to itself when number is positive integer...");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify Ceiling number should be equal to itself when number is maxvalue...");
+
+        try
+        {
+            float ceilingMax = MathF.Ceiling(float.MaxValue);
+            if (ceilingMax != float.MaxValue)
+            {
+                TestLibrary.TestFramework.LogError("009", "The Ceiling number should be equal to itself when number is maxvalue!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify Ceiling number should be equal to itself when number is minvalue...");
+
+        try
+        {
+            float ceilingMax = MathF.Ceiling(float.MinValue);
+            if (ceilingMax != float.MinValue)
+            {
+                TestLibrary.TestFramework.LogError("011", "The Ceiling number should be equal to itself when number is minvalue!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfcos.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfcos.cs
new file mode 100644
index 0000000000..30f41cbd98
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfcos.cs
@@ -0,0 +1,184 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Cos(System.Single)
+/// </summary>
+public class MathFCos
+{
+    public static int Main(string[] args)
+    {
+        MathFCos cos = new MathFCos();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Cos(System.Single)...");
+
+        if (cos.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the value of cosine(0)...");
+
+        try
+        {
+            float value = MathF.Cos(0);
+            if (value != 1)
+            {
+                TestLibrary.TestFramework.LogError("001", "cosine(0) should be 1!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the value of cosine(MathF.PI/2)...");
+
+        try
+        {
+            float value = MathF.Cos(MathF.PI / 2);
+            if (MathF.Abs(1000000 * value) >= 0.1)
+            {
+                TestLibrary.TestFramework.LogError("003", "cosine(MathF.PI/2) should be 0!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify the value of cosine(MathF.PI)...");
+
+        try
+        {
+            float value = MathF.Cos(MathF.PI);
+            if (value != -1)
+            {
+                TestLibrary.TestFramework.LogError("005", "cosine(MathF.PI) should be -1!");
+                retVal = false;
+            }
+
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the value of cosine(3*MathF.PI/2)...");
+
+        try
+        {
+            float value = MathF.Cos(3 * MathF.PI / 2);
+            if (MathF.Abs(1000000 * value) >= 0.1)
+            {
+                TestLibrary.TestFramework.LogError("007", "cosine(3*MathF.PI/2) should be 0!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify the value of cosine(2*MathF.PI) is equal to cosine(0)...");
+
+        try
+        {
+            float value1 = MathF.Cos(0);
+            float value2 = MathF.Cos(2 * MathF.PI);
+            if (value1 != value2)
+            {
+                TestLibrary.TestFramework.LogError("009", "cosine(3*MathF.PI/2) should be 0!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify the value of cosine(number) is between -1 and 1...");
+
+        try
+        {
+            float coefficient = TestLibrary.Generator.GetSingle(-55);
+            if (MathF.Cos(2 * coefficient * MathF.PI) > 1 || MathF.Cos(2 * coefficient * MathF.PI) < -1)
+            {
+                TestLibrary.TestFramework.LogError("011", "The scale of cosine is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfcosh.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfcosh.cs
new file mode 100644
index 0000000000..a67ad0104d
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfcosh.cs
@@ -0,0 +1,169 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Cosh(System.Single)
+/// </summary>
+public class MathFCosh
+{
+    public static int Main(string[] args)
+    {
+        MathFCosh cosh = new MathFCosh();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Cosh(System.Single)...");
+
+        if (cosh.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the monotonicity of cosh function...");
+
+        try
+        {
+            float variable = TestLibrary.Generator.GetSingle(-55);
+            float value1 = MathF.Cosh(variable);
+            float positiveoffset = MathF.Exp(-15);
+            float value2 = MathF.Cosh(variable + positiveoffset);
+
+            if (value2 <= value1)
+            {
+                TestLibrary.TestFramework.LogError("001", "the monotonicity of cosh function [x>=y -> cosh(x)>=cosh(y)]");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the evenness of cosh function [cosh(x)=cosh(-x)]");
+
+        try
+        {
+            float variable = TestLibrary.Generator.GetSingle(-55);
+            float value1 = MathF.Cosh(variable);
+            float value2 = MathF.Cosh(-variable);
+
+            if (!MathFTestLib.SingleIsWithinEpsilon(value1, value2))
+            {
+                TestLibrary.TestFramework.LogError("003", "The parity of cosh should be even function!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify the value of cosh(0) = 1...");
+
+        try
+        {
+            float zero = 0;
+            float value = MathF.Cosh(zero);
+            if (!MathFTestLib.SingleIsWithinEpsilon(value, 1))
+            {
+                TestLibrary.TestFramework.LogError("005", "The value of cosh(0) should be 1, actual: " + value.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the cosh(+inf)=+inf...");
+
+        try
+        {
+            float variable = float.MaxValue;
+            float value = MathF.Cosh(variable);
+            if (value != float.PositiveInfinity)
+            {
+                TestLibrary.TestFramework.LogError("007", "The value should be float.PositiveInfinity, actual: " + value.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify the value of cosh(float.MinValue)=+inf");
+
+        try
+        {
+            float variable = float.MinValue;
+            float value = MathF.Cosh(variable);
+            if (value != float.PositiveInfinity)
+            {
+                TestLibrary.TestFramework.LogError("009", "The value should be float.PositiveInfinity, actual: " +
+                    value.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfe.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfe.cs
new file mode 100644
index 0000000000..91acdd5ca3
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfe.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.E
+/// </summary>
+public class MathFE
+{
+    public static int Main(string[] args)
+    {
+        MathFE mathE = new MathFE();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.E...");
+
+        if (mathE.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the value of MathF.E...");
+
+        try
+        {
+            float constantE = MathF.E;
+            if (constantE != 2.71828183f)
+            {
+                TestLibrary.TestFramework.LogError("001", "The value of E is not correct!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfexp.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfexp.cs
new file mode 100644
index 0000000000..a1c9abd557
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfexp.cs
@@ -0,0 +1,171 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Exp(System.Single)
+/// </summary>
+public class MathFExp
+{
+    public static int Main(string[] args)
+    {
+        MathFExp exp = new MathFExp();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Exp(System.Single)...");
+
+        if (exp.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify monotonicity of Exp function");
+
+        try
+        {
+            float variable = TestLibrary.Generator.GetSingle(-55);
+            float value1 = MathF.Exp(variable);
+            float positiveoffset = MathF.Exp(-15);
+            float value2 = MathF.Exp(variable + positiveoffset);
+
+            if (value2 <= value1)
+            {
+                TestLibrary.TestFramework.LogError("001", "The monotonicity of chx function should be increase by degree!");
+                retVal = false;
+            }
+
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify Exp is neither odd function nor even function...");
+
+        try
+        {
+            float variable = TestLibrary.Generator.GetSingle(-55);
+            float value1 = MathF.Exp(variable);
+            float value2 = MathF.Exp(-variable);
+
+            if (value1 == value2 || value1 == -value2)
+            {
+                TestLibrary.TestFramework.LogError("003", "The exp function should not be symmetry!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify the value of Exp(0) is 1...");
+
+        try
+        {
+            float value = MathF.Exp(0);
+
+            if (value != 1)
+            {
+                TestLibrary.TestFramework.LogError("005", "The value of Exp(0) is 1!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the value of Exp(float.MaxValue)...");
+
+        try
+        {
+            float variable = float.MaxValue;
+            float value = MathF.Exp(variable);
+
+            if (value != float.PositiveInfinity)
+            {
+                TestLibrary.TestFramework.LogError("007", "The value of Exp(float.MaxValue) should be PositiveInfinity!");
+                retVal = true;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify the value of Exp(float.MaxValue)");
+
+        try
+        {
+            float variable = float.MinValue;
+            float value = MathF.Exp(variable);
+
+            if (value != 0)
+            {
+                TestLibrary.TestFramework.LogError("009", "The value of Exp(float.MaxValue) should be PositiveInfinity!");
+                retVal = true;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathffloor.cs b/tests/src/CoreMangLib/cti/system/mathf/mathffloor.cs
new file mode 100644
index 0000000000..88e2a941d6
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathffloor.cs
@@ -0,0 +1,206 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Floor(System.Single)
+/// </summary>
+public class MathFFloor
+{
+    public static int Main(string[] args)
+    {
+        MathFFloor floor = new MathFFloor();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Floor(System.Single)...");
+
+        if (floor.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify floor number should be equal to intefer part subtract one of negative number...");
+
+        try
+        {
+            float number = TestLibrary.Generator.GetSingle(-55);
+            while (number >= 0)
+            {
+                number = (-TestLibrary.Generator.GetSingle(-55)) * 100;
+            }
+
+            float floorNumber = MathF.Floor(number);
+            if (floorNumber < number - 1 || floorNumber > number)
+            {
+                TestLibrary.TestFramework.LogError("001", "The Ceiling number should be equal to the integer part of negative number!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify floor number should be equal to itself when number is negative integer...");
+
+        try
+        {
+            float number = TestLibrary.Generator.GetSingle(-55);
+            while (number >= 0)
+            {
+                number = (-TestLibrary.Generator.GetSingle(-55)) * 100;
+            }
+
+            float floorNumber = MathF.Floor(number);
+            if (floorNumber != MathF.Floor(floorNumber))
+            {
+                TestLibrary.TestFramework.LogError("003", "The floor number should be equal to itself when number is negative integer...");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify floor number should be equal to the integer part of positive number...");
+
+        try
+        {
+            float number = TestLibrary.Generator.GetSingle(-55);
+            while (number <= 0)
+            {
+                number = (TestLibrary.Generator.GetSingle(-55)) * 100;
+            }
+
+            float floorNumber = MathF.Floor(number);
+            if (floorNumber < number - 1 || floorNumber > number)
+            {
+                TestLibrary.TestFramework.LogError("005", "The floor number should be equal to the integer part plus one of positive number!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify floor number should be equal to itself when number is positive integer...");
+
+        try
+        {
+            float number = TestLibrary.Generator.GetSingle(-55);
+            while (number <= 0)
+            {
+                number = (TestLibrary.Generator.GetSingle(-55)) * 100;
+            }
+
+            float floorNumber = MathF.Floor(number);
+            if (floorNumber != MathF.Floor(floorNumber))
+            {
+                TestLibrary.TestFramework.LogError("007", "The floor number should be equal to itself when number is positive integer...");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify floor number should be equal to itself when number is maxvalue...");
+
+        try
+        {
+            float floorMax = MathF.Floor(float.MaxValue);
+            if (floorMax != float.MaxValue)
+            {
+                TestLibrary.TestFramework.LogError("009", "The floor number should be equal to itself when number is maxvalue!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify floor number should be equal to itself when number is minvalue...");
+
+        try
+        {
+            float floorMin = MathF.Floor(float.MinValue);
+            if (floorMin != float.MinValue)
+            {
+                TestLibrary.TestFramework.LogError("011", "The floor number should be equal to itself when number is minvalue!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfieeeremainder.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfieeeremainder.cs
new file mode 100644
index 0000000000..a4cdde39fe
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfieeeremainder.cs
@@ -0,0 +1,148 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.IEEERemainder(System.Single, System.Single)
+/// </summary>
+public class MathFIEEERemainder
+{
+    public static int Main(string[] args)
+    {
+        MathFIEEERemainder ieeeRemainder = new MathFIEEERemainder();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.IEEERemainder(System.Single,System.Single)...");
+
+        if (ieeeRemainder.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify  x / y fails halfway between two integer,the even integer is less than odd integer...");
+
+        try
+        {
+            float x = 5;
+            float y = 2;
+            float remainder = MathF.IEEERemainder(x, y);
+
+            // When x=5,y=2,the quotient should be equal to the even nember 2, therefore the IEEERemainder is positive
+            if (remainder != x - MathF.Floor(x / y) * y)
+            {
+                TestLibrary.TestFramework.LogError("001", "The remainder should be x - (y*quotient)!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify x/y fails halfway between two integer,the add integer is less than even integer...");
+
+        try
+        {
+            float x = 7;
+            float y = 2;
+            float remainder = MathF.IEEERemainder(x, y);
+
+            //When x=7,y=2,the quotient should be equal to the even number 4,therefore the IEEERemainder is negative
+            if (remainder != x - MathF.Ceiling(x / y) * y)
+            {
+                TestLibrary.TestFramework.LogError("003", "The remainder should be x - (y*quotient)!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify divisor is zero...");
+
+        try
+        {
+            float x = TestLibrary.Generator.GetSingle(-55);
+            float y = 0;
+            float remainder = MathF.IEEERemainder(x, y);
+
+            if (!float.IsNaN(remainder))
+            {
+                TestLibrary.TestFramework.LogError("005", "The value should be float.NaN!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the value 0 is returned when x - (y*quotient) is zero...");
+
+        try
+        {
+            float x = 6;
+            float y = 2;
+            float remainder = MathF.IEEERemainder(x, y);
+
+            if (remainder != 0)
+            {
+                TestLibrary.TestFramework.LogError("007", "The value should be zero!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathflog.cs b/tests/src/CoreMangLib/cti/system/mathf/mathflog.cs
new file mode 100644
index 0000000000..7e460c4f26
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathflog.cs
@@ -0,0 +1,246 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Log(System.Single)
+/// </summary>
+public class MathFLog
+{
+    public static int Main(string[] args)
+    {
+        MathFLog log = new MathFLog();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Log(System.Single)...");
+
+        if (log.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+        retVal = PosTest7() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the monotonicity of ln(f)...");
+
+        try
+        {
+            float var1 = 100.1f * TestLibrary.Generator.GetSingle(-55);
+            float var2 = 100.1f * TestLibrary.Generator.GetSingle(-55);
+
+            if (var1 < var2)
+            {
+                if (MathF.Log(var1) >= MathF.Log(var2))
+                {
+                    TestLibrary.TestFramework.LogError("001", "The value of ln(var1)=" + MathF.Log(var1).ToString() +
+                        " should be less than ln(var2)=" + MathF.Log(var2).ToString());
+                    retVal = false;
+                }
+            }
+            else if (var1 > var2)
+            {
+                if (MathF.Log(var1) <= MathF.Log(var2))
+                {
+                    TestLibrary.TestFramework.LogError("002", "The value of ln(var1)=" + MathF.Log(var1).ToString() +
+                        " should be larger than ln(var2)=" + MathF.Log(var2).ToString());
+                    retVal = false;
+                }
+            }
+            else
+            {
+                if (!MathFTestLib.SingleIsWithinEpsilon(MathF.Log(var1), MathF.Log(var2)))
+                {
+                    TestLibrary.TestFramework.LogError("003", "The value of ln(var1)=" + MathF.Log(var1).ToString() +
+                        " should be equal to ln(var2)=" + MathF.Log(var2).ToString());
+                    retVal = false;
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the value is negative when var is between o and 1...");
+
+        try
+        {
+            float var = 0;
+            while (var <= 0 && var >= 1)
+            {
+                var = TestLibrary.Generator.GetSingle(-55);
+            }
+
+            if (MathF.Log(var) >= 0)
+            {
+                TestLibrary.TestFramework.LogError("005", "The value should be negative, is " + MathF.Log(var).ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify the value of ln(1) is 0...");
+
+        try
+        {
+            float var = 1;
+            if (!MathFTestLib.SingleIsWithinEpsilon(MathF.Log(var), 0))
+            {
+                TestLibrary.TestFramework.LogError("007", "The value of ln(1) should be zero, is " + MathF.Log(var).ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the value of ln(var) is larger than zero...");
+
+        try
+        {
+            float var = TestLibrary.Generator.GetSingle(-55);
+            while (var <= 1)
+            {
+                var *= 10;
+            }
+
+            if (MathF.Log(var) < 0)
+            {
+                TestLibrary.TestFramework.LogError("009", "The value should be larger than zero, is " + MathF.Log(var).ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify the value of ln(0)...");
+
+        try
+        {
+            float var = 0;
+            if (!float.IsNegativeInfinity(MathF.Log(var)))
+            {
+                TestLibrary.TestFramework.LogError("011", "the value of ln(0) should be negativeInfinity, is " +
+                    MathF.Log(var).ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify the value of ln(var) when var is negative...");
+
+        try
+        {
+            float var = -TestLibrary.Generator.GetSingle(-55);
+            while (var >= 0)
+            {
+                var = TestLibrary.Generator.GetSingle(-55);
+            }
+
+            if (!float.IsNaN(MathF.Log(var)))
+            {
+                TestLibrary.TestFramework.LogError("013", "The value should be NaN, is " + MathF.Log(var).ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("014", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest7()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest7: Verify the value of ln(e)...");
+
+        try
+        {
+            float var = MathF.E;
+            if (!MathFTestLib.SingleIsWithinEpsilon(MathF.Log(var), 1))
+            {
+                TestLibrary.TestFramework.LogError("015", "The value should be equal to 1, is " + MathF.Log(var).ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("016", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathflog10.cs b/tests/src/CoreMangLib/cti/system/mathf/mathflog10.cs
new file mode 100644
index 0000000000..753bbf43a0
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathflog10.cs
@@ -0,0 +1,242 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Log10(System.Single)
+/// </summary>
+public class MathFLog10
+{
+    public static int Main(string[] args)
+    {
+        MathFLog10 log10 = new MathFLog10();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Log10(System.Single)...");
+
+        if (log10.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+        retVal = PosTest7() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the monotonicity of Log10(var)...");
+
+        try
+        {
+            float var1 = 100.1f * TestLibrary.Generator.GetSingle(-55);
+            float var2 = 100.1f * TestLibrary.Generator.GetSingle(-55);
+
+            if (var1 < var2)
+            {
+                if (MathF.Log10(var1) >= MathF.Log10(var2))
+                {
+                    TestLibrary.TestFramework.LogError("001", "The value of Log10(var1) should be less than In(var2)...");
+                    retVal = false;
+                }
+            }
+            else if (var1 > var2)
+            {
+                if (MathF.Log10(var1) <= MathF.Log10(var2))
+                {
+                    TestLibrary.TestFramework.LogError("002", "The value of Log10(var1) should be larger than In(var2)...");
+                    retVal = false;
+                }
+            }
+            else
+            {
+                if (MathF.Log10(var1) != MathF.Log10(var2))
+                {
+                    TestLibrary.TestFramework.LogError("003", "The value of Log10(var1) should be equal to In(var2)...");
+                    retVal = false;
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the value is negative when var is between o and 1...");
+
+        try
+        {
+            float var = 0;
+            while (var <= 0 && var >= 1)
+            {
+                var = TestLibrary.Generator.GetSingle(-55);
+            }
+
+            if (MathF.Log10(var) >= 0)
+            {
+                TestLibrary.TestFramework.LogError("005", "The value should be negative!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify the value of Log10(1) is 0...");
+
+        try
+        {
+            float var = 1;
+            if (MathF.Log10(var) != 0)
+            {
+                TestLibrary.TestFramework.LogError("007", "The value of Log10(1) should be zero!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the value of Log10(var) is larger than zero...");
+
+        try
+        {
+            float var = TestLibrary.Generator.GetSingle(-55);
+            while (var <= 1)
+            {
+                var *= 10;
+            }
+
+            if (MathF.Log10(var) < 0)
+            {
+                TestLibrary.TestFramework.LogError("009", "The value should be larger than zero!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify the value of Log10(0)...");
+
+        try
+        {
+            float var = 0;
+            if (!float.IsNegativeInfinity(MathF.Log10(var)))
+            {
+                TestLibrary.TestFramework.LogError("011", "the value of Log10(0) should be negativeInfinity!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify the value of Log10(var) when var is negative...");
+
+        try
+        {
+            float var = -TestLibrary.Generator.GetSingle(-55);
+            while (var >= 0)
+            {
+                var = TestLibrary.Generator.GetSingle(-55);
+            }
+
+            if (!float.IsNaN(MathF.Log10(var)))
+            {
+                TestLibrary.TestFramework.LogError("013", "The value should be NaN!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("014", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest7()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest7: Verify the value of Log10(10)...");
+
+        try
+        {
+            float var = 10;
+            if (MathF.Log10(var) != 1)
+            {
+                TestLibrary.TestFramework.LogError("015", "the value should be equal to 1!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("016", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfmax.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfmax.cs
new file mode 100644
index 0000000000..421a1817c4
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfmax.cs
@@ -0,0 +1,102 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Max(System.Single, System.Single)
+/// </summary>
+public class MathFMax8
+{
+    public static int Main(string[] args)
+    {
+        MathFMax8 max8 = new MathFMax8();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Max(System.Single,System.Single)...");
+
+        if (max8.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the return value of max function...");
+
+        try
+        {
+            float var1 = TestLibrary.Generator.GetSingle(-55);
+            float var2 = TestLibrary.Generator.GetSingle(-55);
+
+            if (var1 > var2 && !float.IsNaN(var1) && !float.IsNaN(var2))
+            {
+                if (MathF.Max(var1, var2) != var1)
+                {
+                    TestLibrary.TestFramework.LogError("001", "The return value should be var1!");
+                    retVal = false;
+                }
+            }
+            else if (!float.IsNaN(var1) && !float.IsNaN(var2))
+            {
+                if (MathF.Max(var1, var2) != var2)
+                {
+                    TestLibrary.TestFramework.LogError("002", "The return value should be var2!");
+                    retVal = false;
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("003", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the max value of float.NaN and float.PositiveInfinity...");
+
+        try
+        {
+            float var1 = float.NaN;
+            float var2 = float.PositiveInfinity;
+
+            if (!float.IsNaN(MathF.Max(var1, var2)))
+            {
+                TestLibrary.TestFramework.LogError("004", "The return value should be single.NaN!");
+                retVal = false;
+            }
+
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("005", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfmin.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfmin.cs
new file mode 100644
index 0000000000..4920faeb1b
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfmin.cs
@@ -0,0 +1,101 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Min(System.Single, System.Single)
+/// </summary>
+public class MathFMin8
+{
+    public static int Main(string[] args)
+    {
+        MathFMin8 min8 = new MathFMin8();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Min(System.Single,System.Single)...");
+
+        if (min8.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the return value of min function...");
+
+        try
+        {
+            float var1 = TestLibrary.Generator.GetSingle(-55);
+            float var2 = TestLibrary.Generator.GetSingle(-55);
+
+            if (var1 < var2 && !float.IsNaN(var1) && !float.IsNaN(var2))
+            {
+                if (MathF.Min(var1, var2) != var1)
+                {
+                    TestLibrary.TestFramework.LogError("001", "The return value should be var1!");
+                    retVal = false;
+                }
+            }
+            else if (!float.IsNaN(var1) && !float.IsNaN(var2))
+            {
+                if (MathF.Min(var1, var2) != var2)
+                {
+                    TestLibrary.TestFramework.LogError("002", "The return value should be var2!");
+                    retVal = false;
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("003", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the min value of float.NaN and float.NegativeInfinity...");
+
+        try
+        {
+            float var1 = float.NaN;
+            float var2 = float.NegativeInfinity;
+
+            if (!float.IsNaN(MathF.Min(var1, var2)))
+            {
+                TestLibrary.TestFramework.LogError("004", "The return value should be float.NaN!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("005", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfpi.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfpi.cs
new file mode 100644
index 0000000000..d793a11c42
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfpi.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.PI
+/// </summary>
+public class MathFPI
+{
+    public static int Main(string[] args)
+    {
+        MathFPI mathPI = new MathFPI();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.PI...");
+
+        if (mathPI.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the value of MathF.PI...");
+
+        try
+        {
+            float mathPI = MathF.PI;
+            if (mathPI != 3.14159265f)
+            {
+                TestLibrary.TestFramework.LogError("001", "The value of MathF.PI is not correct!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfpow.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfpow.cs
new file mode 100644
index 0000000000..deac1d8978
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfpow.cs
@@ -0,0 +1,523 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Pow(System.Single, System.Single)
+/// </summary>
+public class MathFPow
+{
+    #region Public Methods
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+        retVal = PosTest7() && retVal;
+        retVal = PosTest8() && retVal;
+        retVal = PosTest9() && retVal;
+        retVal = PosTest10() && retVal;
+        retVal = PosTest11() && retVal;
+        retVal = PosTest12() && retVal;
+        retVal = PosTest13() && retVal;
+        retVal = PosTest14() && retVal;
+        retVal = PosTest15() && retVal;
+        retVal = PosTest16() && retVal;
+
+
+        //
+        // TODO: Add your negative test cases here
+        //
+        // TestLibrary.TestFramework.LogInformation("[Negative]");
+        // retVal = NegTest1() && retVal;
+
+        return retVal;
+    }
+
+    #region Positive Test Cases
+    public bool PosTest1()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify Pow when one of args is NaN .");
+
+        try
+        {
+            float f = MathF.Pow(float.NaN, TestLibrary.Generator.GetByte(-55));
+
+            if (!float.IsNaN(f))
+            {
+                TestLibrary.TestFramework.LogError("001.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("001.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify Pow when second arg is zero .");
+
+        try
+        {
+            float f = MathF.Pow(TestLibrary.Generator.GetByte(-55), 0);
+
+            if (f != 1)
+            {
+                TestLibrary.TestFramework.LogError("002.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify Pow(NegativeInfinity, < 0) .");
+
+        try
+        {
+            float f = MathF.Pow(float.NegativeInfinity, -TestLibrary.Generator.GetSingle(-55));
+
+            if (f != 0)
+            {
+                TestLibrary.TestFramework.LogError("003.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("003.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify Pow(NegativeInfinity, positive odd int) .");
+
+        try
+        {
+            float f = MathF.Pow(float.NegativeInfinity, TestLibrary.Generator.GetByte(-55) * 2 + 1);
+
+            if (f != float.NegativeInfinity)
+            {
+                TestLibrary.TestFramework.LogError("004.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify Pow(NegativeInfinity, positive non-odd int) .");
+
+        try
+        {
+            int e = (TestLibrary.Generator.GetByte(-55) + 1) * 2;
+            float f = MathF.Pow(float.NegativeInfinity, e);
+
+            if (f != float.PositiveInfinity)
+            {
+                TestLibrary.TestFramework.LogError("005.1", "Return value is wrong: expected float.PositiveInfinity, actual: " +
+                    f.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("005.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify Pow(< 0, non-int) .");
+
+        try
+        {
+            float f = MathF.Pow(-TestLibrary.Generator.GetByte(-55) - 1, TestLibrary.Generator.GetSingle() + 0.1f);
+
+            if (!float.IsNaN(f))
+            {
+                TestLibrary.TestFramework.LogError("006.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest7()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest7: Verify Pow(-1, NegativeInfinity) .");
+
+        try
+        {
+            float f = MathF.Pow(-1, float.NegativeInfinity);
+
+            if (f != 1)
+            {
+                TestLibrary.TestFramework.LogError("007.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("007.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest8()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest8: Verify Pow(-1<x<1, NegativeInfinity) .");
+
+        try
+        {
+            float f = MathF.Pow(TestLibrary.Generator.GetSingle(-55), float.NegativeInfinity);
+
+            if (!float.IsPositiveInfinity(f))
+            {
+                TestLibrary.TestFramework.LogError("008.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest9()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest9: Verify Pow(-1<x<1, PositiveInfinity) .");
+
+        try
+        {
+            float f = MathF.Pow(TestLibrary.Generator.GetSingle(-55), float.PositiveInfinity);
+
+            if (f != 0)
+            {
+                TestLibrary.TestFramework.LogError("009.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("009.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest10()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest10: Verify Pow(>1, NegativeInfinity) .");
+
+        try
+        {
+            float f = MathF.Pow(TestLibrary.Generator.GetSingle(-55) + 1, float.NegativeInfinity);
+
+            if (f != 0)
+            {
+                TestLibrary.TestFramework.LogError("010.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest11()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest11: Verify Pow(>1, PositiveInfinity) .");
+
+        try
+        {
+            float f = MathF.Pow(TestLibrary.Generator.GetSingle(-55) + 1, float.PositiveInfinity);
+
+            if (!float.IsPositiveInfinity(f))
+            {
+                TestLibrary.TestFramework.LogError("011.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("011.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest12()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest12: Verify Pow( 0, < 0) .");
+
+        try
+        {
+            float f = MathF.Pow(0, -TestLibrary.Generator.GetSingle(-55) - 0.1f);
+
+            if (!float.IsPositiveInfinity(f))
+            {
+                TestLibrary.TestFramework.LogError("012.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest13()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest13: Verify Pow( 0, > 0) .");
+
+        try
+        {
+            float f = MathF.Pow(0, TestLibrary.Generator.GetSingle(-55) + 0.1f);
+
+            if (f != 0)
+            {
+                TestLibrary.TestFramework.LogError("013.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("013.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest14()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest14: Verify Pow( 1, any value) .");
+
+        try
+        {
+            float f = MathF.Pow(1, TestLibrary.Generator.GetSingle(-55));
+
+            if (f != 1)
+            {
+                TestLibrary.TestFramework.LogError("014.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("014.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest15()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest15: Verify Pow( PositiveInfinity, < 0) .");
+
+        try
+        {
+            float f = MathF.Pow(float.PositiveInfinity, -TestLibrary.Generator.GetSingle(-55) - 0.1f);
+
+            if (f != 0)
+            {
+                TestLibrary.TestFramework.LogError("015.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("015.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest16()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest16: Verify Pow( PositiveInfinity, > 0) .");
+
+        try
+        {
+            float f = MathF.Pow(float.PositiveInfinity, TestLibrary.Generator.GetSingle(-55) + 0.1f);
+
+            if (!float.IsPositiveInfinity(f))
+            {
+                TestLibrary.TestFramework.LogError("015.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("015.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+    #endregion
+
+    #region Nagetive Test Cases
+    //public bool NegTest1()
+    //{
+    //    bool retVal = true;
+
+    //    TestLibrary.TestFramework.BeginScenario("NegTest1: ");
+
+    //    try
+    //    {
+    //          //
+    //          // Add your test logic here
+    //          //
+    //    }
+    //    catch (Exception e)
+    //    {
+    //        TestLibrary.TestFramework.LogError("101", "Unexpected exception: " + e);
+    //        TestLibrary.TestFramework.LogInformation(e.StackTrace);
+    //        retVal = false;
+    //    }
+
+    //    return retVal;
+    //}
+    #endregion
+    #endregion
+
+    public static int Main()
+    {
+        MathFPow test = new MathFPow();
+
+        TestLibrary.TestFramework.BeginTestCase("MathFPow");
+
+        if (test.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfround1.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfround1.cs
new file mode 100644
index 0000000000..7ee824e0f3
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfround1.cs
@@ -0,0 +1,145 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Round(System.Single)
+/// </summary>
+public class MathFRound1
+{
+    #region Public Methods
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+
+        retVal = NegTest1() && retVal;
+
+        return retVal;
+    }
+
+    #region Positive Test Cases
+    public bool PosTest1()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify Round(System.Single) when decimal part of arg f <= 0.5 .");
+
+        try
+        {
+            int tempIntVar = TestLibrary.Generator.GetInt32(-55);
+
+            float tempSingleVar;
+            do
+                tempSingleVar = TestLibrary.Generator.GetSingle(-55);
+            while (tempSingleVar > 0.5);
+
+            float f = tempIntVar + tempSingleVar;
+
+            if (MathF.Round(f) != tempIntVar)
+            {
+                Console.WriteLine("actual value = " + tempIntVar);
+                Console.WriteLine("expected value = " + MathF.Round(f));
+                TestLibrary.TestFramework.LogError("001.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("001.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify Round(System.Single) when decimal part of arg f > 0.5 .");
+
+        try
+        {
+            int tempIntVar = TestLibrary.Generator.GetInt32(-55);
+
+            float tempSingleVar;
+            do
+                tempSingleVar = TestLibrary.Generator.GetSingle(-55);
+            while (tempSingleVar <= 0.5);
+
+            float f = tempIntVar + tempSingleVar;
+
+            if (MathF.Round(f) != tempIntVar + 1)
+            {
+                Console.WriteLine("actual value = " + (tempIntVar + 1));
+                Console.WriteLine("expected value = " + MathF.Round(f));
+                TestLibrary.TestFramework.LogError("001.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("001.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+    #endregion
+
+    #region Nagetive Test Cases
+    public bool NegTest1()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.BeginScenario("NegTest1: OverflowException is not thrown.");
+
+        try
+        {
+            float result = MathF.Round(float.Parse(float.MaxValue.ToString() + "1"));
+            TestLibrary.TestFramework.LogError("101.1", " OverflowException is not thrown.");
+            retVal = false;
+        }
+        catch (OverflowException)
+        { }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("101.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+    #endregion
+    #endregion
+
+    public static int Main()
+    {
+        MathFRound1 test = new MathFRound1();
+
+        TestLibrary.TestFramework.BeginTestCase("MathFRound1");
+
+        if (test.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfround2.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfround2.cs
new file mode 100644
index 0000000000..8ad7a3e485
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfround2.cs
@@ -0,0 +1,188 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Pow(System.Single, System.Int32)
+/// </summary>
+public class MathFRound2
+{
+    #region Public Methods
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+
+        retVal = NegTest1() && retVal;
+        retVal = NegTest2() && retVal;
+
+        return retVal;
+    }
+
+    #region Positive Test Cases
+    public bool PosTest1()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify Round(f, 0)");
+
+        try
+        {
+            int i = 0;
+            if (MathF.Round(3.4f, i) != 3 || MathF.Round(3.5f, i) != 4 || MathF.Round(3.6f, i) != 4)
+            {
+                TestLibrary.TestFramework.LogError("001.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("001.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify Round(f, 1)");
+
+        try
+        {
+            if (MathF.Round(3.44f, 1) != 3.4f || MathF.Round(3.45f, 1) != 3.4f || MathF.Round(3.46f, 1) != 3.5f)
+            {
+                TestLibrary.TestFramework.LogError("002.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+
+        // Add your scenario description here
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify Round(f, 6)");
+
+        try
+        {
+            float f1 = 1234.56784f;
+            float expectedResult1 = 1234.5678f;
+
+            float f2 = 1234.56785f;
+            float expectedResult2 = 1234.5679f;
+
+            float f3 = 1234.56786f;
+            float expectedResult3 = 1234.5679f;
+
+            int i = 6;
+
+            if (MathF.Round(f1, i).ToString() != expectedResult1.ToString()
+             || MathF.Round(f2, i).ToString() != expectedResult2.ToString()
+             || MathF.Round(f3, i).ToString() != expectedResult3.ToString())
+            {
+                TestLibrary.TestFramework.LogError("003.1", "Return value is wrong!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("003.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+    #endregion
+
+    #region Nagetive Test Cases
+    public bool NegTest1()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.BeginScenario("NegTest1: ArgumentOutOfRangeException is not thrown.");
+
+        try
+        {
+            float f = MathF.Round(3.45f, -1);
+            TestLibrary.TestFramework.LogError("101.1", " OverflowException is not thrown.");
+            retVal = false;
+        }
+        catch (ArgumentOutOfRangeException)
+        { }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("101.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool NegTest2()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.BeginScenario("NegTest2: ArgumentOutOfRangeException is not thrown.");
+
+        try
+        {
+            float f = MathF.Round(12345.6789f, 8);
+            TestLibrary.TestFramework.LogError("102.1", " OverflowException is not thrown.");
+            retVal = false;
+        }
+        catch (ArgumentOutOfRangeException)
+        { }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("102.2", "Unexpected exception: " + e);
+            TestLibrary.TestFramework.LogInformation(e.StackTrace);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+    #endregion
+    #endregion
+
+    public static int Main()
+    {
+        MathFRound2 test = new MathFRound2();
+
+        TestLibrary.TestFramework.BeginTestCase("MathFRound4");
+
+        if (test.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfsign.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfsign.cs
new file mode 100644
index 0000000000..de9a5b432a
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfsign.cs
@@ -0,0 +1,270 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Sign(System.Single)
+/// </summary>
+public class MathFSign
+{
+    public static int Main(string[] args)
+    {
+        MathFSign test = new MathFSign();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Sign(System.Single).");
+
+        if (test.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+        retVal = PosTest7() && retVal;
+        retVal = PosTest8() && retVal;
+
+        TestLibrary.TestFramework.LogInformation("[Negtive]");
+        retVal = NegTest1() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify float.MaxValue is a positive number.");
+
+        try
+        {
+            float s = float.MaxValue;
+            if (MathF.Sign(s) != 1)
+            {
+                TestLibrary.TestFramework.LogError("P01.1", "float.MaxValue is not a positive number!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P01.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify float.MinValue is a negative number.");
+
+        try
+        {
+            float s = float.MinValue;
+            if (MathF.Sign(s) != -1)
+            {
+                TestLibrary.TestFramework.LogError("P02.1", "float.MinValue is not a negative number!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P02.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify float.PositiveInfinity is a positive number.");
+
+        try
+        {
+            float s = float.PositiveInfinity;
+            if (MathF.Sign(s) != 1)
+            {
+                TestLibrary.TestFramework.LogError("P03.1", "float.PositiveInfinity is not a positive number!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P03.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify float.NegativeInfinity is a negative number.");
+
+        try
+        {
+            float s = float.NegativeInfinity;
+            if (MathF.Sign(s) != -1)
+            {
+                TestLibrary.TestFramework.LogError("P04.1", "float.NegativeInfinity is not a negative number!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P04.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify float.Epsilon is a positive number.");
+
+        try
+        {
+            float s = float.Epsilon;
+            if (MathF.Sign(s) != 1)
+            {
+                TestLibrary.TestFramework.LogError("P05.1", "float.Epsilon is not a positive number!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P05.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify the return value should be 1 when the float is positive.");
+
+        try
+        {
+            float s = TestLibrary.Generator.GetSingle(-55);
+            while (s <= 0)
+            {
+                s = TestLibrary.Generator.GetSingle(-55);
+            }
+
+            if (MathF.Sign(s) != 1)
+            {
+                TestLibrary.TestFramework.LogError("P06.1", "The return value is not 1 when the float is positive!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P06.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest7()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest7: Verify the return value should be -1 when the float is negative.");
+
+        try
+        {
+            float s = TestLibrary.Generator.GetSingle(-55);
+            while (s <= 0)
+            {
+                s = TestLibrary.Generator.GetSingle(-55);
+            }
+
+            if (MathF.Sign(-s) != -1)
+            {
+                TestLibrary.TestFramework.LogError("P07.1", "The return value is not -1 when the float is negative!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P07.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest8()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest8: Verify the return value should be 0 when the float is zero.");
+
+        try
+        {
+            float s = 0.0f;
+
+            if (MathF.Sign(s) != 0)
+            {
+                TestLibrary.TestFramework.LogError("P08.1", "The return value is not -1 when the float is negative!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P08.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool NegTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("NegTest1: ArithmeticException should be thrown when value is equal to NaN.");
+
+        try
+        {
+            float s = float.NaN;
+            MathF.Sign(s);
+
+            TestLibrary.TestFramework.LogError("N01.1", "ArithmeticException is not thrown when value is equal to NaN!");
+            retVal = false;
+
+        }
+        catch (ArithmeticException)
+        {
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("N01.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfsin.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfsin.cs
new file mode 100644
index 0000000000..bd212777b4
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfsin.cs
@@ -0,0 +1,230 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Sin(System.Single)
+/// </summary>
+public class MathFSin
+{
+    public static int Main(string[] args)
+    {
+        MathFSin test = new MathFSin();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Sin(System.Single).");
+
+        if (test.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+        retVal = PosTest7() && retVal;
+        retVal = PosTest8() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the result when radian is 0.");
+
+        try
+        {
+            float f = MathF.Sin(0);
+            if (f != 0)
+            {
+                TestLibrary.TestFramework.LogError("P01.1", "The result is error when radian is 0!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P01.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the result is 1 when radian is MathF.PI/2.");
+
+        try
+        {
+            float f = MathF.Sin(MathF.PI / 2);
+            if (f != 1)
+            {
+                TestLibrary.TestFramework.LogError("P02.1", "The result is error when radian is MathF.PI/2!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P02.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify the result is -1 when radian is -MathF.PI/2.");
+
+        try
+        {
+            float f = MathF.Sin(-MathF.PI / 2);
+            if (f != -1)
+            {
+                TestLibrary.TestFramework.LogError("P03.1", "The result is error when radian is -MathF.PI/2!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P03.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the result is 1/2 when radian is MathF.PI/6.");
+
+        try
+        {
+            float f = MathF.Round(MathF.Sin(MathF.PI / 6), 2);
+            if (f != 0.5d)
+            {
+                TestLibrary.TestFramework.LogError("P04.1", "The result is error when radian is MathF.PI/6!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P04.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify the result is -1/2 when radian is -MathF.PI/6.");
+
+        try
+        {
+            float f = MathF.Round(MathF.Sin(-MathF.PI / 6), 2);
+            if (f != -0.5d)
+            {
+                TestLibrary.TestFramework.LogError("P05.1", "The result is error when radian is -MathF.PI/6!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P05.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify the result is NaN when radian is PositiveInfinity.");
+
+        try
+        {
+            float f = MathF.Sin(float.PositiveInfinity);
+            if (f.CompareTo(float.NaN) != 0)
+            {
+                TestLibrary.TestFramework.LogError("P06.1", "The result is error when radian is PositiveInfinity!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P06.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest7()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest7: Verify the result is NaN when radian is NegativeInfinity.");
+
+        try
+        {
+            float f = MathF.Sin(float.NegativeInfinity);
+            if (f.CompareTo(float.NaN) != 0)
+            {
+                TestLibrary.TestFramework.LogError("P07.1", "The result is error when radian is NegativeInfinity!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P07.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest8()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest8: Verify the result is NaN when radian is NaN.");
+
+        try
+        {
+            float f = MathF.Sin(float.NaN);
+            if (f.CompareTo(float.NaN) != 0)
+            {
+                TestLibrary.TestFramework.LogError("P08.1", "The result is error when radian is NaN!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P08.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfsinh.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfsinh.cs
new file mode 100644
index 0000000000..427c8723b0
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfsinh.cs
@@ -0,0 +1,230 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Sinh(System.Single)
+/// </summary>
+public class MathFSinh
+{
+    public static int Main(string[] args)
+    {
+        MathFSinh test = new MathFSinh();
+        TestLibrary.TestFramework.BeginTestCase("Testing System.MathF.Sinh(System.Single).");
+
+        if (test.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+        retVal = PosTest7() && retVal;
+        retVal = PosTest8() && retVal;
+
+        return retVal;
+    }
+
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Verify the result when radian is 0.");
+
+        try
+        {
+            float f = MathF.Sinh(0);
+            if (!MathFTestLib.SingleIsWithinEpsilon(f, 0))
+            {
+                TestLibrary.TestFramework.LogError("P01.1", "The result is error when radian is 0!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P01.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Verify the result when radian is MathF.PI/2.");
+
+        try
+        {
+            float f = MathF.Sinh(MathF.PI / 2);
+            if (!MathFTestLib.SingleIsWithinEpsilon(f, 2.30129890f))
+            {
+                TestLibrary.TestFramework.LogError("P02.1", "The result is error when radian is MathF.PI/2!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P02.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Verify the result when radian is -MathF.PI/2.");
+
+        try
+        {
+            float f = MathF.Sinh(-MathF.PI / 2);
+            if (!MathFTestLib.SingleIsWithinEpsilon(f, -2.30129890f))
+            {
+                TestLibrary.TestFramework.LogError("P03.1", "The result is error when radian is -MathF.PI/2!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P03.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Verify the result when radian is MathF.PI/6.");
+
+        try
+        {
+            float f = MathF.Sinh(MathF.PI / 6);
+            if (!MathFTestLib.SingleIsWithinEpsilon(f, 0.547853474f))
+            {
+                TestLibrary.TestFramework.LogError("P04.1", "The result is error when radian is MathF.PI/6!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P04.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: Verify the result when radian is -MathF.PI/6.");
+
+        try
+        {
+            float f = MathF.Sinh(-MathF.PI / 6);
+            if (!MathFTestLib.SingleIsWithinEpsilon(f, -0.547853474f))
+            {
+                TestLibrary.TestFramework.LogError("P05.1", "The result is error when radian is -MathF.PI/6!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P05.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: Verify the result is PositiveInfinity when radian is PositiveInfinity.");
+
+        try
+        {
+            float f = MathF.Sinh(float.PositiveInfinity);
+            if (f.CompareTo(float.PositiveInfinity) != 0)
+            {
+                TestLibrary.TestFramework.LogError("P06.1", "The result is error when radian is PositiveInfinity!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P06.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest7()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest7: Verify the result is NegativeInfinity when radian is NegativeInfinity.");
+
+        try
+        {
+            float f = MathF.Sinh(float.NegativeInfinity);
+            if (f.CompareTo(float.NegativeInfinity) != 0)
+            {
+                TestLibrary.TestFramework.LogError("P07.1", "The result is error when radian is NegativeInfinity!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P07.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+
+    public bool PosTest8()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest8: Verify the result is NaN when radian is NaN.");
+
+        try
+        {
+            float f = MathF.Sinh(float.NaN);
+            if (f.CompareTo(float.NaN) != 0)
+            {
+                TestLibrary.TestFramework.LogError("P08.1", "The result is error when radian is NaN!");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("P08.2", "Unexpected exception occurs: " + e);
+            retVal = false;
+        }
+
+        return retVal;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathfsqrt.cs b/tests/src/CoreMangLib/cti/system/mathf/mathfsqrt.cs
new file mode 100644
index 0000000000..8771f84333
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathfsqrt.cs
@@ -0,0 +1,175 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Sqrt(float)
+/// </summary>
+public class MathFSqrt
+{
+    public static int Main()
+    {
+        MathFSqrt mathSqrt = new MathFSqrt();
+        TestLibrary.TestFramework.BeginTestCase("MathFSqrt");
+        if (mathSqrt.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+        return retVal;
+    }
+
+    #region PositiveTest
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1:Calculate the zero sqrt");
+        try
+        {
+            float source = 0;
+            float des = MathF.Sqrt(source);
+            if (des != 0)
+            {
+                TestLibrary.TestFramework.LogError("001", "the ExpectResult is not the ActualResult");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpect exception:" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2:Calculate the positive number sqrt");
+        try
+        {
+            float source = 100;
+            float des = MathF.Sqrt(source);
+            if (des != 10)
+            {
+                TestLibrary.TestFramework.LogError("003", "the ExpectResult is not the ActualResult");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpect exception:" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3:Calculate the negative number sqrt");
+        try
+        {
+            float source = -1;
+            float des = MathF.Sqrt(source);
+            if (!float.IsNaN(des))
+            {
+                TestLibrary.TestFramework.LogError("005", "the ExpectResult is not the ActualResult");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpect exception:" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4:Calculate the float NaN sqrt");
+        try
+        {
+            float source = float.NaN;
+            float des = MathF.Sqrt(source);
+            if (!float.IsNaN(des))
+            {
+                TestLibrary.TestFramework.LogError("007", "the ExpectResult is not the ActualResult");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpect exception:" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5:Calculate the float PositiveInfinity sqrt");
+        try
+        {
+            float source = float.PositiveInfinity;
+            float des = MathF.Sqrt(source);
+            if (!float.IsPositiveInfinity(des))
+            {
+                TestLibrary.TestFramework.LogError("009", "the ExpectResult is not the ActualResult");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpect exception:" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6:Calculate the float NegativeInfinity sqrt");
+        try
+        {
+            float source = float.NegativeInfinity;
+            float des = MathF.Sqrt(source);
+            if (!float.IsNaN(des))
+            {
+                TestLibrary.TestFramework.LogError("011", "the ExpectResult is not the ActualResult");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012", "Unexpect exception:" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+    #endregion
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathftan.cs b/tests/src/CoreMangLib/cti/system/mathf/mathftan.cs
new file mode 100644
index 0000000000..08391150f4
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathftan.cs
@@ -0,0 +1,200 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Tan(float)
+/// </summary>
+public class MathFTan
+{
+    private const float c_DELTA = 0.000005f;
+
+    public static int Main()
+    {
+        MathFTan mathTan = new MathFTan();
+        TestLibrary.TestFramework.BeginTestCase("MathFTan");
+        if (mathTan.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+        retVal = PosTest7() && retVal;
+        return retVal;
+    }
+
+    #region PositiveTest
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Caculate the tangent of 0 degrees");
+        try
+        {
+            float sourceA = (float)0;
+            float desA = MathF.Tan(sourceA);
+            if (!MathFTestLib.SingleIsWithinEpsilon(desA, (float)0))
+            {
+                TestLibrary.TestFramework.LogError("001", "Expected: 0, actual: " + desA.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Calculate the tangent of 90 degrees");
+        try
+        {
+            float sourceA = 90;
+            float desA = MathF.Tan(sourceA * (MathF.PI / 180));
+            if ((desA - 16331778728383844.0) > c_DELTA)
+            {
+                TestLibrary.TestFramework.LogError("003", "the ExpectResult is not the ActualResult: Expected(" + 16331778728383844.0 + ") Actual(" + desA + ")");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Calculate the tangent of 180 degrees");
+        try
+        {
+            float sourceA = 180;
+            float desA = MathF.Tan(sourceA * (MathF.PI / 180));
+            if ((desA + 0.00000000000000012246063538223773) > c_DELTA)
+            {
+                TestLibrary.TestFramework.LogError("005", "Expected: 0.00000000000000012246063538223773, actual: " + desA.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Calculate the tangent of 45 degrees");
+        try
+        {
+            float sourceA = 45.0f;
+            float desA = MathF.Tan(sourceA * (MathF.PI / 180));
+            if (!MathFTestLib.SingleIsWithinEpsilon(desA, 1.0f))
+            {
+                TestLibrary.TestFramework.LogError("007", "Expected: 1.0, actual: " + desA.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: The float is float NaN");
+        try
+        {
+            float sourceA = float.NaN;
+            float desA = MathF.Tan(sourceA);
+            if (!float.IsNaN(desA))
+            {
+                TestLibrary.TestFramework.LogError("009", "the ExpectResult is not the ActualResult: Expected(NaN) Actual(" + desA + ")");
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: The float is float NegativeInfinity");
+        try
+        {
+            float sourceA = float.NegativeInfinity;
+            float desA = MathF.Tan(sourceA);
+            if (!float.IsNaN(desA))
+            {
+                TestLibrary.TestFramework.LogError("011", "Expected: NaN, actual: " + desA.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest7()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest7: The float is float PositiveInfinity");
+        try
+        {
+            float sourceA = float.PositiveInfinity;
+            float desA = MathF.Tan(sourceA);
+            if (!float.IsNaN(desA))
+            {
+                TestLibrary.TestFramework.LogError("013", "Expected: NaN, actual: " + desA.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("014", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+    #endregion
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathftanh.cs b/tests/src/CoreMangLib/cti/system/mathf/mathftanh.cs
new file mode 100644
index 0000000000..311be44a2b
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathftanh.cs
@@ -0,0 +1,202 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// System.MathF.Tanh(bouble)
+/// </summary>
+public class MathFTanh
+{
+    public static int Main()
+    {
+        MathFTanh mathTanh = new MathFTanh();
+        TestLibrary.TestFramework.BeginTestCase("MathFTanh");
+        if (mathTanh.RunTests())
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("PASS");
+            return 100;
+        }
+        else
+        {
+            TestLibrary.TestFramework.EndTestCase();
+            TestLibrary.TestFramework.LogInformation("FAIL");
+            return 0;
+        }
+    }
+
+    public bool RunTests()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.LogInformation("[Positive]");
+        retVal = PosTest1() && retVal;
+        retVal = PosTest2() && retVal;
+        retVal = PosTest3() && retVal;
+        retVal = PosTest4() && retVal;
+        retVal = PosTest5() && retVal;
+        retVal = PosTest6() && retVal;
+        retVal = PosTest7() && retVal;
+        return retVal;
+    }
+
+    #region PositiveTest
+    public bool PosTest1()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest1: Caculate the tanh of 0 degrees");
+        try
+        {
+            float sourceA = 0;
+            float desA = MathF.Tanh(sourceA);
+            if (!MathFTestLib.SingleIsWithinEpsilon(desA, sourceA))
+            {
+                TestLibrary.TestFramework.LogError("001", "Expected: 0, actual: " + desA.ToString() + "; diff > epsilon = " +
+                    MathFTestLib.Epsilon.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("002", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest2()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest2: Calculate the tanh of 90 degrees");
+        try
+        {
+            float sourceA = 90;
+            float desA = MathF.Tanh(sourceA * (MathF.PI / 180));
+            if (!MathFTestLib.SingleIsWithinEpsilon(desA, 0.917152336f))
+            {
+                TestLibrary.TestFramework.LogError("003", "Expected: 0.917152336, actual: " + desA.ToString() + "; diff > epsilon = " +
+                    MathFTestLib.Epsilon.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("004", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest3()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest3: Calculate the tanh of 180 degrees");
+        try
+        {
+            float sourceA = 180;
+            float desA = MathF.Tan(sourceA * (MathF.PI / 180));
+            if (!MathFTestLib.SingleIsWithinEpsilon(desA, -0.0f))
+            {
+                TestLibrary.TestFramework.LogError("005", "Expected: -0.0, actual: " + desA.ToString() + "; diff > epsilon = " +
+                    MathFTestLib.Epsilon.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("006", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest4()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest4: Calculate the tanh of 45 degrees");
+        try
+        {
+            float sourceA = 45.0f;
+            float desA = MathF.Tanh(sourceA * (MathF.PI / 180));
+            if (!MathFTestLib.SingleIsWithinEpsilon(desA, 0.655794203f))
+            {
+                TestLibrary.TestFramework.LogError("007", "Expected: 0.655794203, actual: " + desA.ToString() + "; diff > epsilon = " +
+                    MathFTestLib.Epsilon.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("008", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest5()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest5: tanh(NaN)=NaN");
+        try
+        {
+            float sourceA = float.NaN;
+            float desA = MathF.Tanh(sourceA);
+            if (!float.IsNaN(desA))
+            {
+                TestLibrary.TestFramework.LogError("009", "Expected: NaN, actual: " + desA.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("010", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest6()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest6: tanh(-inf)=-1");
+        try
+        {
+            float sourceA = float.NegativeInfinity;
+            float desA = MathF.Tanh(sourceA);
+            if (!MathFTestLib.SingleIsWithinEpsilon(desA, -1))
+            {
+                TestLibrary.TestFramework.LogError("011", "Expected: -1, actual: " + desA.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("012", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+
+    public bool PosTest7()
+    {
+        bool retVal = true;
+        TestLibrary.TestFramework.BeginScenario("PosTest7: tanh(+inf) = 1");
+        try
+        {
+            float sourceA = float.PositiveInfinity;
+            float desA = MathF.Tanh(sourceA);
+            if (!MathFTestLib.SingleIsWithinEpsilon(desA, 1))
+            {
+                TestLibrary.TestFramework.LogError("013", "Expected 1, actual: " + desA.ToString());
+                retVal = false;
+            }
+        }
+        catch (Exception e)
+        {
+            TestLibrary.TestFramework.LogError("014", "Unexpected exception" + e);
+            retVal = false;
+        }
+        return retVal;
+    }
+    #endregion
+}
diff --git a/tests/src/CoreMangLib/cti/system/mathf/mathftestlib.cs b/tests/src/CoreMangLib/cti/system/mathf/mathftestlib.cs
new file mode 100644
index 0000000000..d9aadcb946
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/mathf/mathftestlib.cs
@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// Summary description for Class1
+/// </summary>
+public class MathFTestLib
+{
+    private static decimal epsilon = new decimal(0.000001D);
+
+    public static decimal Epsilon
+    {
+        get
+        {
+            return epsilon;
+        }
+
+        set
+        {
+            epsilon = Convert.ToDecimal(value);
+        }
+    }
+
+    public static bool SingleIsWithinEpsilon(float x, float y)
+    {
+        decimal dx = new decimal(x);
+        decimal dy = new decimal(y);
+
+        decimal diff = Math.Abs(decimal.Subtract(dx, dy));
+        return diff.CompareTo(Epsilon) <= 0;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor1.csproj
index 6955bdd95a..b38a1f2e0c 100644
--- a/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor2.csproj
index 3136b98148..e7036b03ac 100644
--- a/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor3.csproj
index f890ef66df..6f41dd766b 100644
--- a/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/memberaccessexception/MemberAccessExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor1.csproj
index 3f790ba65c..afb4ac6bc6 100644
--- a/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor2.csproj
index 9d272b0424..4931eecf8e 100644
--- a/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor3.csproj
index ae89ec47da..2fe3aa3df7 100644
--- a/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/methodaccessexception/MethodAccessExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor1.csproj
index 4696cc7fc9..4f40b875cb 100644
--- a/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor2.csproj
index 6249203236..bf3d241196 100644
--- a/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor3.csproj
index 888feef0f4..d693b75326 100644
--- a/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionMessage.csproj b/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionMessage.csproj
index 426e2d835e..52906d273c 100644
--- a/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionMessage.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingfieldexception/MissingFieldExceptionMessage.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor1.csproj
index 231d41ba48..b26e0db1b6 100644
--- a/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor2.csproj
index f6bc2c0f3c..70d029801f 100644
--- a/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor3.csproj
index d9404a1b43..012dc5d45d 100644
--- a/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionMessage.csproj b/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionMessage.csproj
index f5dce2ec2e..ea151db066 100644
--- a/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionMessage.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingmemberexception/MissingMemberExceptionMessage.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor1.csproj
index 4390e50edb..2845820b3d 100644
--- a/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor2.csproj
index 9f3fb5a708..c68eee21bf 100644
--- a/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor3.csproj
index 3641bec93e..1c04d87126 100644
--- a/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionMessage.csproj b/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionMessage.csproj
index 2555272357..7d764dd539 100644
--- a/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionMessage.csproj
+++ b/tests/src/CoreMangLib/cti/system/missingmethodexception/MissingMethodExceptionMessage.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateCombineImpl.csproj b/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateCombineImpl.csproj
index 2a8f4eebc4..f6aa183053 100644
--- a/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateCombineImpl.csproj
+++ b/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateCombineImpl.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateEquals.csproj b/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateEquals.csproj
index eaecb9282b..84096a13e6 100644
--- a/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateGetHashCode.csproj
index dcd26022f7..ea3ba03369 100644
--- a/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateGetInvocationList.csproj b/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateGetInvocationList.csproj
index 5d44c4fdc2..aa68282208 100644
--- a/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateGetInvocationList.csproj
+++ b/tests/src/CoreMangLib/cti/system/multicastdelegate/MulticastDelegateGetInvocationList.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor1.csproj
index 6fa4d7c809..b999364dae 100644
--- a/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor2.csproj
index f37043bb51..45936337e3 100644
--- a/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor3.csproj
index 4d1817ff7c..4ecb8d19fd 100644
--- a/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/notimplementedexception/NotImplementedExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor1.csproj
index 9cd219d25b..386de24ceb 100644
--- a/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor2.csproj
index 734789f003..8216c75a27 100644
--- a/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor3.csproj
index 348a97befc..0f18689c1a 100644
--- a/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/notsupportedexception/NotSupportedExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullable/NullableCompare.csproj b/tests/src/CoreMangLib/cti/system/nullable/NullableCompare.csproj
index 097aae54a0..378746f8c8 100644
--- a/tests/src/CoreMangLib/cti/system/nullable/NullableCompare.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullable/NullableCompare.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullable/NullableCtor.csproj b/tests/src/CoreMangLib/cti/system/nullable/NullableCtor.csproj
index 269e2d7b93..ea5eca4185 100644
--- a/tests/src/CoreMangLib/cti/system/nullable/NullableCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullable/NullableCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullable/NullableEquals.csproj b/tests/src/CoreMangLib/cti/system/nullable/NullableEquals.csproj
index 2d21c29de5..0cc9f45381 100644
--- a/tests/src/CoreMangLib/cti/system/nullable/NullableEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullable/NullableEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullable/NullableEquals2.csproj b/tests/src/CoreMangLib/cti/system/nullable/NullableEquals2.csproj
index 21c78f7694..17014b4a46 100644
--- a/tests/src/CoreMangLib/cti/system/nullable/NullableEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullable/NullableEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullable/NullableGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/nullable/NullableGetHashCode.csproj
index 04aad7f5f6..702fe391c5 100644
--- a/tests/src/CoreMangLib/cti/system/nullable/NullableGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullable/NullableGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullable/NullableGetUnderlyingType.csproj b/tests/src/CoreMangLib/cti/system/nullable/NullableGetUnderlyingType.csproj
index 9a84a6c13c..053e6d8205 100644
--- a/tests/src/CoreMangLib/cti/system/nullable/NullableGetUnderlyingType.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullable/NullableGetUnderlyingType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullable/NullableGetValueOrDefault1.csproj b/tests/src/CoreMangLib/cti/system/nullable/NullableGetValueOrDefault1.csproj
index c4fe1a21d6..088e21a173 100644
--- a/tests/src/CoreMangLib/cti/system/nullable/NullableGetValueOrDefault1.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullable/NullableGetValueOrDefault1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullable/NullableGetValueOrDefault2.csproj b/tests/src/CoreMangLib/cti/system/nullable/NullableGetValueOrDefault2.csproj
index 4e87130eb0..0970cb4c1c 100644
--- a/tests/src/CoreMangLib/cti/system/nullable/NullableGetValueOrDefault2.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullable/NullableGetValueOrDefault2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullable/NullableHasValue.csproj b/tests/src/CoreMangLib/cti/system/nullable/NullableHasValue.csproj
index fc4f887379..aea3dfb557 100644
--- a/tests/src/CoreMangLib/cti/system/nullable/NullableHasValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullable/NullableHasValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullable/NullableToString.csproj b/tests/src/CoreMangLib/cti/system/nullable/NullableToString.csproj
index d85d2eb6c3..86472ae6f5 100644
--- a/tests/src/CoreMangLib/cti/system/nullable/NullableToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullable/NullableToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullable/NullableValue.csproj b/tests/src/CoreMangLib/cti/system/nullable/NullableValue.csproj
index 81698862b6..8f8ed6dace 100644
--- a/tests/src/CoreMangLib/cti/system/nullable/NullableValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullable/NullableValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/nullreferenceexception/NullReferenceExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/nullreferenceexception/NullReferenceExceptionCtor1.csproj
index 5a0f4da28d..94f2f119ab 100644
--- a/tests/src/CoreMangLib/cti/system/nullreferenceexception/NullReferenceExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/nullreferenceexception/NullReferenceExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/object/ObjectCtor.csproj b/tests/src/CoreMangLib/cti/system/object/ObjectCtor.csproj
index 39b1ab0230..c674af133b 100644
--- a/tests/src/CoreMangLib/cti/system/object/ObjectCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/object/ObjectCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/object/ObjectEquals1.csproj b/tests/src/CoreMangLib/cti/system/object/ObjectEquals1.csproj
index 6ab0c74a45..f1dd0f7f8c 100644
--- a/tests/src/CoreMangLib/cti/system/object/ObjectEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/object/ObjectEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/object/ObjectEquals2.csproj b/tests/src/CoreMangLib/cti/system/object/ObjectEquals2.csproj
index 8feb4d225c..16b5be7933 100644
--- a/tests/src/CoreMangLib/cti/system/object/ObjectEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/object/ObjectEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/object/ObjectFinalize.csproj b/tests/src/CoreMangLib/cti/system/object/ObjectFinalize.csproj
index b5e6e5bbc0..f9a6fac6fe 100644
--- a/tests/src/CoreMangLib/cti/system/object/ObjectFinalize.csproj
+++ b/tests/src/CoreMangLib/cti/system/object/ObjectFinalize.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/object/ObjectGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/object/ObjectGetHashCode.csproj
index c9dc6a6eb5..5185bd95fc 100644
--- a/tests/src/CoreMangLib/cti/system/object/ObjectGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/object/ObjectGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/object/ObjectMemberwiseClone.csproj b/tests/src/CoreMangLib/cti/system/object/ObjectMemberwiseClone.csproj
index 0720d4bf3d..ddcfbfbd85 100644
--- a/tests/src/CoreMangLib/cti/system/object/ObjectMemberwiseClone.csproj
+++ b/tests/src/CoreMangLib/cti/system/object/ObjectMemberwiseClone.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/object/ObjectReferenceEquals.csproj b/tests/src/CoreMangLib/cti/system/object/ObjectReferenceEquals.csproj
index 31b5e02b19..d94e3753ab 100644
--- a/tests/src/CoreMangLib/cti/system/object/ObjectReferenceEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/object/ObjectReferenceEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/object/ObjectToString.csproj b/tests/src/CoreMangLib/cti/system/object/ObjectToString.csproj
index ae45c27574..b3297b8651 100644
--- a/tests/src/CoreMangLib/cti/system/object/ObjectToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/object/ObjectToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/objectdisposedexception/ObjectDisposedExceptionMessage.csproj b/tests/src/CoreMangLib/cti/system/objectdisposedexception/ObjectDisposedExceptionMessage.csproj
index 0955bfa452..2d47ad348a 100644
--- a/tests/src/CoreMangLib/cti/system/objectdisposedexception/ObjectDisposedExceptionMessage.csproj
+++ b/tests/src/CoreMangLib/cti/system/objectdisposedexception/ObjectDisposedExceptionMessage.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/objectdisposedexception/ObjectDisposedExceptionObjectName.csproj b/tests/src/CoreMangLib/cti/system/objectdisposedexception/ObjectDisposedExceptionObjectName.csproj
index 5e90e24d2a..fe1b4d3db8 100644
--- a/tests/src/CoreMangLib/cti/system/objectdisposedexception/ObjectDisposedExceptionObjectName.csproj
+++ b/tests/src/CoreMangLib/cti/system/objectdisposedexception/ObjectDisposedExceptionObjectName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor1.csproj b/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor1.csproj
index 87e824532d..d6335fa6d1 100644
--- a/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor2.csproj b/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor2.csproj
index 564ef034eb..9026322804 100644
--- a/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor3.csproj b/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor3.csproj
index a709dfd978..8b69cbdc57 100644
--- a/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeIsError.csproj b/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeIsError.csproj
index 57779274ac..8e3921cdfa 100644
--- a/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeIsError.csproj
+++ b/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeIsError.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeMessage.csproj b/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeMessage.csproj
index 46d79eaa26..67077782b1 100644
--- a/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeMessage.csproj
+++ b/tests/src/CoreMangLib/cti/system/obsoleteattribute/ObsoleteAttributeMessage.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor1.csproj
index 025e5fbf71..ab77740765 100644
--- a/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor2.csproj
index 86624eef2a..8d58c2c925 100644
--- a/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor3.csproj
index 22e4ef01b4..df006a7d93 100644
--- a/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/outofmemoryexception/OutOfMemoryExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor1.csproj
index 3ef2f95659..1598e2bfa1 100644
--- a/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor2.csproj
index 8c68382fd6..1fe17d3ac8 100644
--- a/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor3.csproj
index 14c8ddff71..c7134272f3 100644
--- a/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/overflowexception/OverflowExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/paramarrayattribute/ParamArrayAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/paramarrayattribute/ParamArrayAttributeCtor.csproj
index 497c5cb0e7..dcbdb80cb3 100644
--- a/tests/src/CoreMangLib/cti/system/paramarrayattribute/ParamArrayAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/paramarrayattribute/ParamArrayAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor1.csproj
index f89225ade0..ea7f4859c8 100644
--- a/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor2.csproj
index 0aa3276995..87001da628 100644
--- a/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor3.csproj
index a8e71e4a3d..ae556dd363 100644
--- a/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/platformnotsupportedexception/PlatformNotSupportedExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/predicate/PredicateBeginInvoke.csproj b/tests/src/CoreMangLib/cti/system/predicate/PredicateBeginInvoke.csproj
index 04c0db26db..5b19afc06c 100644
--- a/tests/src/CoreMangLib/cti/system/predicate/PredicateBeginInvoke.csproj
+++ b/tests/src/CoreMangLib/cti/system/predicate/PredicateBeginInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/predicate/PredicateEndInvoke.csproj b/tests/src/CoreMangLib/cti/system/predicate/PredicateEndInvoke.csproj
index fb5d5a5ca4..db7ea4c03e 100644
--- a/tests/src/CoreMangLib/cti/system/predicate/PredicateEndInvoke.csproj
+++ b/tests/src/CoreMangLib/cti/system/predicate/PredicateEndInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/predicate/PredicateInvoke.csproj b/tests/src/CoreMangLib/cti/system/predicate/PredicateInvoke.csproj
index 234e0bd1db..d71f555122 100644
--- a/tests/src/CoreMangLib/cti/system/predicate/PredicateInvoke.csproj
+++ b/tests/src/CoreMangLib/cti/system/predicate/PredicateInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/random/RandomCtor1.csproj b/tests/src/CoreMangLib/cti/system/random/RandomCtor1.csproj
index 8a8b28cb4c..8b7473eec3 100644
--- a/tests/src/CoreMangLib/cti/system/random/RandomCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/random/RandomCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/random/RandomCtor2.csproj b/tests/src/CoreMangLib/cti/system/random/RandomCtor2.csproj
index 90fd4a2f46..d39ca4ef5a 100644
--- a/tests/src/CoreMangLib/cti/system/random/RandomCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/random/RandomCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/random/RandomNext1.csproj b/tests/src/CoreMangLib/cti/system/random/RandomNext1.csproj
index 9164596f62..dc42c8b19c 100644
--- a/tests/src/CoreMangLib/cti/system/random/RandomNext1.csproj
+++ b/tests/src/CoreMangLib/cti/system/random/RandomNext1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/random/RandomNext2.csproj b/tests/src/CoreMangLib/cti/system/random/RandomNext2.csproj
index a197369f68..89e810e0e0 100644
--- a/tests/src/CoreMangLib/cti/system/random/RandomNext2.csproj
+++ b/tests/src/CoreMangLib/cti/system/random/RandomNext2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/random/RandomNext3.csproj b/tests/src/CoreMangLib/cti/system/random/RandomNext3.csproj
index 88842a22f0..d471395363 100644
--- a/tests/src/CoreMangLib/cti/system/random/RandomNext3.csproj
+++ b/tests/src/CoreMangLib/cti/system/random/RandomNext3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/random/RandomNextBytes.csproj b/tests/src/CoreMangLib/cti/system/random/RandomNextBytes.csproj
index 17d9ceff0b..17203b4ad1 100644
--- a/tests/src/CoreMangLib/cti/system/random/RandomNextBytes.csproj
+++ b/tests/src/CoreMangLib/cti/system/random/RandomNextBytes.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/random/RandomNextDouble.csproj b/tests/src/CoreMangLib/cti/system/random/RandomNextDouble.csproj
index ac23c02aa0..91ee971c9b 100644
--- a/tests/src/CoreMangLib/cti/system/random/RandomNextDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/random/RandomNextDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/random/RandomSample.csproj b/tests/src/CoreMangLib/cti/system/random/RandomSample.csproj
index 9a81345d67..34c3f2b913 100644
--- a/tests/src/CoreMangLib/cti/system/random/RandomSample.csproj
+++ b/tests/src/CoreMangLib/cti/system/random/RandomSample.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor1.csproj
index 45e105a218..1254b39ebc 100644
--- a/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor2.csproj
index 0d3a80f2b7..6d7860a4ed 100644
--- a/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor3.csproj
index e0fa5b9ca4..70c88720c6 100644
--- a/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/rankexception/RankExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor1.csproj
index 4e591bb168..4bfa9874f7 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor2.csproj
index 5fcf822620..90b1ae6722 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor3.csproj
index e09bfc3ba8..293487a5c8 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/ambiguousmatchexception/AmbiguousMatchExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assembly/TestAssembly1.csproj b/tests/src/CoreMangLib/cti/system/reflection/assembly/TestAssembly1.csproj
index 25435dd684..b848ebc3da 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assembly/TestAssembly1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assembly/TestAssembly1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assembly/TestTarget2.csproj b/tests/src/CoreMangLib/cti/system/reflection/assembly/TestTarget2.csproj
index 3982d0ffc8..3994e02b11 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assembly/TestTarget2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assembly/TestTarget2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblyconfigurationattribute/AssemblyConfigurationAttribute.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblyconfigurationattribute/AssemblyConfigurationAttribute.csproj
index 8f7945ba11..e4c1cd54bc 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblyconfigurationattribute/AssemblyConfigurationAttribute.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblyconfigurationattribute/AssemblyConfigurationAttribute.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblyconfigurationattribute/AssemblyConfigurationAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblyconfigurationattribute/AssemblyConfigurationAttributeCtor.csproj
index 5662bbd6f5..fd1de6b96c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblyconfigurationattribute/AssemblyConfigurationAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblyconfigurationattribute/AssemblyConfigurationAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblydefaultaliasattribute/AssemblyDefaultAliasAttribute.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblydefaultaliasattribute/AssemblyDefaultAliasAttribute.csproj
index 74110b4577..915ffca58c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblydefaultaliasattribute/AssemblyDefaultAliasAttribute.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblydefaultaliasattribute/AssemblyDefaultAliasAttribute.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblydefaultaliasattribute/AssemblyDefaultAliasAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblydefaultaliasattribute/AssemblyDefaultAliasAttributeCtor.csproj
index 5ff1fef95c..c65aeb5af6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblydefaultaliasattribute/AssemblyDefaultAliasAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblydefaultaliasattribute/AssemblyDefaultAliasAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblydelaysignattribute/AssemblyDelaySignAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblydelaysignattribute/AssemblyDelaySignAttributeCtor.csproj
index 1766719e75..a4f1f382fe 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblydelaysignattribute/AssemblyDelaySignAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblydelaysignattribute/AssemblyDelaySignAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblydelaysignattribute/AssemblyDelaySignAttributeDelaySign.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblydelaysignattribute/AssemblyDelaySignAttributeDelaySign.csproj
index c30b8e5b03..dbb5ee0fd0 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblydelaysignattribute/AssemblyDelaySignAttributeDelaySign.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblydelaysignattribute/AssemblyDelaySignAttributeDelaySign.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblydescriptionattribute/AssemblyDescriptionAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblydescriptionattribute/AssemblyDescriptionAttributeCtor.csproj
index 2c5217e40a..020c7af437 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblydescriptionattribute/AssemblyDescriptionAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblydescriptionattribute/AssemblyDescriptionAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblydescriptionattribute/AssemblyDescriptionAttributeDescription.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblydescriptionattribute/AssemblyDescriptionAttributeDescription.csproj
index 409c8c4298..617ce27861 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblydescriptionattribute/AssemblyDescriptionAttributeDescription.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblydescriptionattribute/AssemblyDescriptionAttributeDescription.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblykeyfileattribute/AssemblyKeyFileAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblykeyfileattribute/AssemblyKeyFileAttributeCtor.csproj
index d2afba8d40..91383d07a5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblykeyfileattribute/AssemblyKeyFileAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblykeyfileattribute/AssemblyKeyFileAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblykeyfileattribute/AssemblyKeyFileAttributeKeyFile.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblykeyfileattribute/AssemblyKeyFileAttributeKeyFile.csproj
index 5acfa56029..b22d1b61ef 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblykeyfileattribute/AssemblyKeyFileAttributeKeyFile.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblykeyfileattribute/AssemblyKeyFileAttributeKeyFile.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblykeynameattribute/AssemblyKeyNameAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblykeynameattribute/AssemblyKeyNameAttributeCtor.csproj
index 0028ebc63e..f795d484c2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblykeynameattribute/AssemblyKeyNameAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblykeynameattribute/AssemblyKeyNameAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblykeynameattribute/AssemblyKeyNameAttributeKeyName.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblykeynameattribute/AssemblyKeyNameAttributeKeyName.csproj
index 0e1c19c596..9491032a58 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblykeynameattribute/AssemblyKeyNameAttributeKeyName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblykeynameattribute/AssemblyKeyNameAttributeKeyName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameGetPublicKey.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameGetPublicKey.csproj
index 3d57f609d2..a5b04fe7fe 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameGetPublicKey.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameGetPublicKey.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameGetPublicKeyToken.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameGetPublicKeyToken.csproj
index b88e717afb..057fcc6c8f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameGetPublicKeyToken.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameGetPublicKeyToken.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameSetPublicKey.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameSetPublicKey.csproj
index f45d1f7e8f..cb1363b4ad 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameSetPublicKey.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameSetPublicKey.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameSetPublicKeyToken.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameSetPublicKeyToken.csproj
index 2d332162e8..351fb5cf05 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameSetPublicKeyToken.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameSetPublicKeyToken.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameVersion.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameVersion.csproj
index 0a4909b6d9..083dab4b29 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameVersion.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblyname/AssemblyNameVersion.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsNone.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsNone.csproj
index a7177b1a5c..524ce59233 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsNone.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsNone.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsPublicKey.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsPublicKey.csproj
index 41f85ebead..91b1e28ef3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsPublicKey.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsPublicKey.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsRetargetable.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsRetargetable.csproj
index bedd209f21..7bec5b22aa 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsRetargetable.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblynameflags/AssemblyNameFlagsRetargetable.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblytitleattribute/AssemblyTitleAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblytitleattribute/AssemblyTitleAttributeCtor.csproj
index 738e0e115d..7bae657044 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblytitleattribute/AssemblyTitleAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblytitleattribute/AssemblyTitleAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/assemblytitleattribute/AssemblyTitleAttributeTitle.csproj b/tests/src/CoreMangLib/cti/system/reflection/assemblytitleattribute/AssemblyTitleAttributeTitle.csproj
index 7b7e78d746..cc71c96fd6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/assemblytitleattribute/AssemblyTitleAttributeTitle.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/assemblytitleattribute/AssemblyTitleAttributeTitle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsAny.csproj b/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsAny.csproj
index 7a2bee6878..52159a3868 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsAny.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsAny.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsExplicitThis.csproj b/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsExplicitThis.csproj
index 301b8bbb3c..8fd9609513 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsExplicitThis.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsExplicitThis.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsHasThis.csproj b/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsHasThis.csproj
index 96c9501b9d..2a92724a3a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsHasThis.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsHasThis.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsStandard.csproj b/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsStandard.csproj
index 14e3694410..615847b53b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsStandard.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsStandard.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsVarArgs.csproj b/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsVarArgs.csproj
index 7240c0b39a..f8b94162fe 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsVarArgs.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/callingconventions/CallingConventionsVarArgs.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/constructorinfo/ConstructorInfoConstructorName.csproj b/tests/src/CoreMangLib/cti/system/reflection/constructorinfo/ConstructorInfoConstructorName.csproj
index 582389845a..f69c0456b3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/constructorinfo/ConstructorInfoConstructorName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/constructorinfo/ConstructorInfoConstructorName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/constructorinfo/ConstructorInfoTypeConstructorName.csproj b/tests/src/CoreMangLib/cti/system/reflection/constructorinfo/ConstructorInfoTypeConstructorName.csproj
index 504f6f7c97..c84584cbd4 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/constructorinfo/ConstructorInfoTypeConstructorName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/constructorinfo/ConstructorInfoTypeConstructorName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/defaultmemberattribute/DefaultMemberAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/reflection/defaultmemberattribute/DefaultMemberAttributeCtor.csproj
index ab6ca414c8..b6ff0f1417 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/defaultmemberattribute/DefaultMemberAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/defaultmemberattribute/DefaultMemberAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/defaultmemberattribute/DefaultMemberAttributeMemberName.csproj b/tests/src/CoreMangLib/cti/system/reflection/defaultmemberattribute/DefaultMemberAttributeMemberName.csproj
index c982ed5e81..bd0f6acc1c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/defaultmemberattribute/DefaultMemberAttributeMemberName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/defaultmemberattribute/DefaultMemberAttributeMemberName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests.cs b/tests/src/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests.cs
new file mode 100644
index 0000000000..1dc717d884
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests.cs
@@ -0,0 +1,136 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+public static class DynamicMethodJumpStubTests
+{
+    private static int Main()
+    {
+        DynamicMethodJumpStubTest();
+        return 100;
+    }
+
+    public static void DynamicMethodJumpStubTest()
+    {
+        if (!Environment.Is64BitProcess)
+        {
+            return;
+        }
+
+        // Reserve memory around framework libraries. This is just a best attempt, it typically doesn't help since the
+        // precode allocator may have already committed pages it can allocate from, or it may commit reserved pages close to
+        // framework libraries.
+        ReserveMemoryAround(new Action(ExecutionContext.RestoreFlow).Method.MethodHandle);
+
+        for (int i = 0; i < 64; ++i)
+        {
+            DynamicMethod dynamicMethod = CreateDynamicMethod("DynMethod" + i);
+            Action dynamicMethodDelegate = (Action)dynamicMethod.CreateDelegate(typeof(Action));
+
+            // Before compiling the dynamic method, reserve memory around its current entry point, which should be its
+            // precode. Then, when compiling the method, there would be a good chance that the code will be located far from
+            // the precode, forcing the use of a jump stub.
+            ReserveMemoryAround(
+                (RuntimeMethodHandle)
+                typeof(DynamicMethod).InvokeMember(
+                    "GetMethodDescriptor",
+                    BindingFlags.Instance | BindingFlags.InvokeMethod | BindingFlags.NonPublic,
+                    null,
+                    dynamicMethod,
+                    null));
+
+            dynamicMethodDelegate();
+        }
+
+        // This test does not release reserved pages because they may have been committed by other components on the system
+    }
+
+    private static DynamicMethod CreateDynamicMethod(string name)
+    {
+        var dynamicMethod = new DynamicMethod(name, null, null);
+        ILGenerator ilGenerator = dynamicMethod.GetILGenerator();
+        ilGenerator.Emit(OpCodes.Ret);
+        return dynamicMethod;
+    }
+
+    private const uint AllocationGranularity = (uint)64 << 10;
+    private const ulong ReserveRangeRadius = (ulong)4 << 30; // reserve 4 GB before and after the base address
+
+    private static void ReserveMemoryAround(RuntimeMethodHandle methodHandle)
+    {
+        ulong baseAddress = (ulong)methodHandle.Value.ToInt64();
+
+        ulong low = baseAddress - ReserveRangeRadius;
+        if (low > baseAddress)
+        {
+            low = ulong.MinValue;
+        }
+        else
+        {
+            low &= ~((ulong)AllocationGranularity - 1);
+        }
+
+        ulong high = baseAddress + ReserveRangeRadius;
+        if (high < baseAddress)
+        {
+            high = ulong.MaxValue;
+        }
+
+        ulong address = low;
+        while (address <= high)
+        {
+            VirtualAlloc(
+                new UIntPtr(address),
+                new UIntPtr(AllocationGranularity),
+                AllocationType.RESERVE,
+                MemoryProtection.NOACCESS);
+
+            if (address + AllocationGranularity < address)
+            {
+                break;
+            }
+            address += AllocationGranularity;
+        }
+    }
+
+    [Flags]
+    private enum AllocationType : uint
+    {
+        COMMIT = 0x1000,
+        RESERVE = 0x2000,
+        RESET = 0x80000,
+        LARGE_PAGES = 0x20000000,
+        PHYSICAL = 0x400000,
+        TOP_DOWN = 0x100000,
+        WRITE_WATCH = 0x200000
+    }
+
+    [Flags]
+    private enum MemoryProtection : uint
+    {
+        EXECUTE = 0x10,
+        EXECUTE_READ = 0x20,
+        EXECUTE_READWRITE = 0x40,
+        EXECUTE_WRITECOPY = 0x80,
+        NOACCESS = 0x01,
+        READONLY = 0x02,
+        READWRITE = 0x04,
+        WRITECOPY = 0x08,
+        GUARD_Modifierflag = 0x100,
+        NOCACHE_Modifierflag = 0x200,
+        WRITECOMBINE_Modifierflag = 0x400
+    }
+
+    [DllImport("kernel32.dll", SetLastError = true)]
+    private static extern UIntPtr VirtualAlloc(
+        UIntPtr lpAddress,
+        UIntPtr dwSize,
+        AllocationType flAllocationType,
+        MemoryProtection flProtect);
+}
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests.csproj
new file mode 100644
index 0000000000..8e917f2821
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests.csproj
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <AssemblyName>DynMethodJumpStubTests</AssemblyName>
+    <ProjectGuid>{742D9E05-668D-4B90-97F9-717A7572FE6C}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="DynMethodJumpStubTests.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+</Project>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlBranch.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlBranch.csproj
index a32078f8f0..727a5d8d77 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlBranch.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlBranch.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlCall.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlCall.csproj
index 1de002acbe..28c8f1546b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlCall.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlCall.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlCond_Branch.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlCond_Branch.csproj
index 64ffc94cff..8f2fd404fb 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlCond_Branch.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlCond_Branch.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlMeta.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlMeta.csproj
index 503257fd4c..0fb97fe8ba 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlMeta.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlMeta.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlNext.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlNext.csproj
index 8fd6bdb5f2..f5413ad8fd 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlNext.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlNext.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlReturn.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlReturn.csproj
index 7fbadb67cd..c8c65dd772 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlReturn.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlReturn.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlThrow.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlThrow.csproj
index 32f5706e04..d2cd5ac73e 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlThrow.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/flowcontrol/FlowControlThrow.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeEquals1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeEquals1.csproj
index 7015bbcf82..9568d4d726 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeEquals2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeEquals2.csproj
index efac612ca3..e2571612eb 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeFlowControl.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeFlowControl.csproj
index 73cfd056bb..ae6b47e67e 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeFlowControl.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeFlowControl.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeGetHashCode.csproj
index 1f4cd5148f..7d8d1d23de 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeName.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeName.csproj
index fb595542d6..513bb373be 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeOpCodeType.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeOpCodeType.csproj
index 734b96b92a..a9e4cff1d1 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeOpCodeType.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeOpCodeType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeOperandType.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeOperandType.csproj
index f53d7a2e04..21f305a652 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeOperandType.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeOperandType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeSize.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeSize.csproj
index 9d53d50df8..35f5ecac1e 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeSize.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeSize.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeStackBehaviourPop.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeStackBehaviourPop.csproj
index 3216fc25e0..14f430e562 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeStackBehaviourPop.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeStackBehaviourPop.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeStackBehaviourPush.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeStackBehaviourPush.csproj
index 75b916a37a..30d0a7d2f5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeStackBehaviourPush.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeStackBehaviourPush.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeToString.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeToString.csproj
index ef5db01e76..4f73b7c365 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeValue.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeValue.csproj
index e883f168ed..9c052df7be 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodeValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAdd_Ovf.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAdd_Ovf.csproj
index 55c1af1cf0..8eefb77689 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAdd_Ovf.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAdd_Ovf.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAdd_Ovf_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAdd_Ovf_Un.csproj
index cf0dd17997..b1e5263098 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAdd_Ovf_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAdd_Ovf_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAnd.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAnd.csproj
index 208578fd74..a5653356c9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAnd.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesAnd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesArglist.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesArglist.csproj
index 690bb42dde..726cf12b15 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesArglist.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesArglist.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBeq.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBeq.csproj
index 3d57b0c25c..c393e7e542 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBeq.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBeq.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBeq_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBeq_S.csproj
index 6a3d64a27b..d39e900721 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBeq_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBeq_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge.csproj
index 5e0b877622..b5b7e2518e 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_S.csproj
index 3391adb73e..c2f2f813d5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_Un.csproj
index 639ad11a5d..06463b8cc7 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_Un_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_Un_S.csproj
index a462f27818..0c5c313e9a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_Un_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBge_Un_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt.csproj
index 515a115e38..ef3bb71d88 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_S.csproj
index 2fec1e5d9f..4366f340de 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_Un.csproj
index dfec19da92..535faba911 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_Un_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_Un_S.csproj
index cb673dc88a..7aa16370ca 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_Un_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBgt_Un_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle.csproj
index 240ce5efad..6f84c4dca6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_S.csproj
index 81cc2a5b59..8d6c4dadf9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_Un.csproj
index b668e9ccd2..91f65d0105 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_Un_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_Un_S.csproj
index b78ef4f2f6..2b01538f38 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_Un_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBle_Un_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt.csproj
index c87ad162d4..524ece4895 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_S.csproj
index efa8405b24..c6a1ad9429 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_Un.csproj
index 8e782d1677..a45e980741 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_Un_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_Un_S.csproj
index 7e505399a5..29ada82b4c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_Un_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBlt_Un_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBne_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBne_Un.csproj
index 0bee82de84..10531cfc09 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBne_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBne_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBne_Un_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBne_Un_S.csproj
index d84e6b5101..211ac58ef8 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBne_Un_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBne_Un_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBox.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBox.csproj
index 7c17f3952e..227b4d8215 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBox.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBox.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBr.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBr.csproj
index ca68026746..d4b81c4067 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBr.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBr.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBr_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBr_S.csproj
index 6b316251fc..95d665d42d 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBr_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBr_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBreak.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBreak.csproj
index 448aec43a7..bdf0546d50 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBreak.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBreak.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrfalse.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrfalse.csproj
index 6f26167c14..f7a5f2df0f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrfalse.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrfalse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrfalse_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrfalse_S.csproj
index 528b96e0ae..16d5dcb3a7 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrfalse_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrfalse_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrtrue.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrtrue.csproj
index f0e7ff0eda..870cdbfe1b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrtrue.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrtrue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrtrue_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrtrue_S.csproj
index 37d32511a8..cd6f307f83 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrtrue_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesBrtrue_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCall.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCall.csproj
index ead7451528..75c20d2135 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCall.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCall.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCalli.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCalli.csproj
index b209da4a04..03129cce91 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCalli.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCalli.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCallvirt.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCallvirt.csproj
index 78e9175eff..777f9f598c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCallvirt.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCallvirt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCastclass.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCastclass.csproj
index 2b296e8c64..8b0aeb74f8 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCastclass.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCastclass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCeq.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCeq.csproj
index 1f8db339df..950f98c630 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCeq.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCeq.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCgt.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCgt.csproj
index 216e11196f..5057f53aad 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCgt.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCgt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCgt_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCgt_Un.csproj
index 22ff4f9b8d..2986434cfb 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCgt_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCgt_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCkfinite.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCkfinite.csproj
index 6e511ddf94..edec2072a2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCkfinite.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCkfinite.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesClt.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesClt.csproj
index e9cbe66dd9..007cffc43e 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesClt.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesClt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesClt_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesClt_Un.csproj
index 07a4b008eb..c1247a2dec 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesClt_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesClt_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConstrained.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConstrained.csproj
index 37c82dae58..a7f708cb78 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConstrained.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConstrained.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I.csproj
index d4feda1441..cd188bc862 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I1.csproj
index badcf3bb12..4895f71cd2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I2.csproj
index ec59e238bc..31dd8566fd 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I4.csproj
index d643ea331b..2060979ad4 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I8.csproj
index 194111d99e..070f615b94 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_I8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I.csproj
index a76a54b453..f1a847537b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I1.csproj
index 2fee57fbea..8635490048 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I1_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I1_Un.csproj
index 1e4b152f16..9b07405bce 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I1_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I1_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I2.csproj
index f8b987f739..b662509ed2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I2_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I2_Un.csproj
index de2b128549..00a5a248da 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I2_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I2_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I4.csproj
index db23375f0e..ac4e91e696 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I4_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I4_Un.csproj
index 77c0ca50fa..740cada4ce 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I4_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I4_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I8.csproj
index ef6dd01f2d..41bfc893e6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I8_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I8_Un.csproj
index 9a20100a86..b65b168a89 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I8_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I8_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I_Un.csproj
index b82faf29c8..9a6434b5a9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_I_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U.csproj
index b1a5ffef7f..c6cb9f8da6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U1.csproj
index 49d93cfe9d..1da200dde2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U1_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U1_Un.csproj
index d75f2c4c2e..15104bdfc2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U1_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U1_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U2.csproj
index d1c9c1feb8..eeacdc71b5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U2_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U2_Un.csproj
index 44ad85c7f8..48a08d4485 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U2_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U2_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U4.csproj
index 00f9ada47d..254a640a71 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U4_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U4_Un.csproj
index 952a1e619f..5e0294ac3e 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U4_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U4_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U8.csproj
index b936cd7490..dc76e4eb4b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U8_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U8_Un.csproj
index eed2081bf9..dacfb57642 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U8_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U8_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U_Un.csproj
index 8be80addde..9c2c147832 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_Ovf_U_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R4.csproj
index df84165fb3..4636d11c59 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R8.csproj
index 362d7d1087..b6010b3cc3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R_Un.csproj
index b36efa17e3..0ef6a2d987 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_R_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U.csproj
index b9848d1c91..a47a5df99c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U1.csproj
index 4eb8ef63cb..31b6cea934 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U2.csproj
index 2eb2089d8a..172fe55c17 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U4.csproj
index 52742d1958..8c4967b67f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U8.csproj
index c05c604d06..5952068196 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesConv_U8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCpblk.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCpblk.csproj
index 2b9d534255..1ab4552b90 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCpblk.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCpblk.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCpobj.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCpobj.csproj
index f3bdb90f94..2ecd52335e 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCpobj.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesCpobj.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDiv.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDiv.csproj
index dd8af4940e..763f77863a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDiv.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDiv.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDiv_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDiv_Un.csproj
index 6b3c3dec43..63dfce6db7 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDiv_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDiv_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDup.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDup.csproj
index b623638df8..dab78c5541 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDup.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesDup.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesEndfilter.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesEndfilter.csproj
index 2634b24815..4685ca66de 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesEndfilter.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesEndfilter.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesEndfinally.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesEndfinally.csproj
index a8d2f3ab44..80696dc085 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesEndfinally.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesEndfinally.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesInitblk.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesInitblk.csproj
index 5154c74670..ad35c994f7 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesInitblk.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesInitblk.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesInitobj.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesInitobj.csproj
index 8f5d9d3b40..46f7a27763 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesInitobj.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesInitobj.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesIsinst.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesIsinst.csproj
index 6674be129d..c9386e2233 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesIsinst.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesIsinst.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesJmp.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesJmp.csproj
index 3e51fbffc3..d869e8eb3a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesJmp.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesJmp.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg.csproj
index aa8b46e444..43c192c3c9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_0.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_0.csproj
index 186d45ec29..b33e9ef924 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_0.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_0.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_1.csproj
index 3a98e2934b..3f83ca7f31 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_2.csproj
index 8c10400daf..36c54c3f66 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_3.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_3.csproj
index 3b7a145f19..77b368b8bb 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_3.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_S.csproj
index f97a2060e2..be2212d5e4 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarg_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarga.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarga.csproj
index bff752e27e..4fcd99b113 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarga.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarga.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarga_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarga_S.csproj
index 9a1555d409..ab6e7743a7 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarga_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdarga_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4.csproj
index 7dca2feab7..3619cc2067 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_0.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_0.csproj
index 34b95e63c6..c26ec0b018 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_0.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_0.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_1.csproj
index 7c99c79e4d..a62f417f76 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_2.csproj
index 63523a97be..82fdcb1803 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_3.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_3.csproj
index 62c23cc330..af37eaa765 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_3.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_4.csproj
index dcff653a02..5acc5be0da 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_5.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_5.csproj
index f8a0767b4c..bea0418f60 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_5.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_6.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_6.csproj
index 19585f268c..a699a9ff67 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_6.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_7.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_7.csproj
index 015872ec41..53ae71277b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_7.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_8.csproj
index 3e57778007..3885aca6a8 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_M1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_M1.csproj
index 4c881bb75c..b6e391b227 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_M1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_M1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_S.csproj
index a59116720c..bb8905fdb6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I4_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I8.csproj
index f5664e99f2..1f901e97d3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_I8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_R4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_R4.csproj
index 63e860e670..41e7a67db3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_R4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_R4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_R8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_R8.csproj
index 6ac882ebfc..3d14749030 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_R8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdc_R8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem.csproj
index b8b5170422..c26d7acb3b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I.csproj
index 4817e76bcd..26562150fd 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I1.csproj
index 81792bfb22..b45c9fe3bb 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I2.csproj
index 3b462a99ff..f551e8cefd 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I4.csproj
index f06991851d..3c8315d51f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I8.csproj
index 034683da24..fff29009b1 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_I8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_R4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_R4.csproj
index 51d5f80ac4..c4330f9888 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_R4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_R4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_R8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_R8.csproj
index 5b133cae69..3ae90219de 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_R8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_R8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_Ref.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_Ref.csproj
index 56981b512f..6d2506f731 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_Ref.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_Ref.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U1.csproj
index 6d386c7928..49741d20bc 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U2.csproj
index ab1fab34e6..4e7583849c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U4.csproj
index 902c8e6b6e..26d2f87260 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelem_U4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelema.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelema.csproj
index 841f661e30..663f303b48 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelema.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdelema.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdfld.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdfld.csproj
index 6cff1ebbf7..1e823b4fad 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdfld.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdfld.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdflda.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdflda.csproj
index 26144710d6..205c44f39c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdflda.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdflda.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdftn.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdftn.csproj
index 894c4943ba..4e998beb22 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdftn.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdftn.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I.csproj
index a99cdab455..74f1d639dd 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I1.csproj
index 242c115052..2c8c4d8168 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I2.csproj
index 47f3a90255..172905c398 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I4.csproj
index 93b9a633e6..6a327bb862 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I8.csproj
index 4b1ea64c0f..5db6d73959 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_I8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_R4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_R4.csproj
index 40eb761925..5d3c792642 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_R4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_R4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_R8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_R8.csproj
index fd64e1cb68..fca061b22d 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_R8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_R8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_Ref.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_Ref.csproj
index 216f9302ef..141ab80d93 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_Ref.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_Ref.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U1.csproj
index 3b116d08e2..b56bb4cbc6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U2.csproj
index 3d71e60721..cdc96d2b61 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U4.csproj
index 14ceae793d..b82549d608 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdind_U4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdlen.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdlen.csproj
index 4506ae7b74..d1a933b6c1 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdlen.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdlen.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc.csproj
index f60351c0c6..f86b76629b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_0.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_0.csproj
index fef531977b..17b422628c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_0.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_0.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_1.csproj
index 4e6e7e5ccb..e94ab57e7d 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_2.csproj
index 9adaa3d375..ba77fce0cc 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_3.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_3.csproj
index a68de7460a..83d95139db 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_3.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_S.csproj
index c7216157ec..e3d1d0dfdc 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloc_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloca.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloca.csproj
index 931535c73e..e289c8e05f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloca.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloca.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloca_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloca_S.csproj
index 5d0a634edf..092b22d10a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloca_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdloca_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdnull.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdnull.csproj
index cf415df2bd..e9f86b9e46 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdnull.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdnull.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdobj.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdobj.csproj
index 29da95ca31..a1529794e5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdobj.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdobj.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdsfld.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdsfld.csproj
index 7a124bc138..d2a9e6572b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdsfld.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdsfld.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdsflda.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdsflda.csproj
index 074d983537..ada95b23b2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdsflda.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdsflda.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdstr.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdstr.csproj
index bae0a4bba4..9bbef597d9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdstr.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdstr.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdtoken.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdtoken.csproj
index 97808aea4c..2bb6efceb1 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdtoken.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdtoken.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdvirtftn.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdvirtftn.csproj
index b9e89a6e25..54ee11408f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdvirtftn.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLdvirtftn.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLeave.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLeave.csproj
index efe1542cf1..3e06096c83 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLeave.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLeave.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLeave_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLeave_S.csproj
index 15cf986044..1b2de030f2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLeave_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLeave_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLocalloc.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLocalloc.csproj
index 0afa156ce1..0404da4d93 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLocalloc.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesLocalloc.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMkrefany.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMkrefany.csproj
index 68fe7619f2..3c4193e3b5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMkrefany.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMkrefany.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul.csproj
index a74dda328d..9528a1467b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul_Ovf.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul_Ovf.csproj
index 41c05bf2c7..369ef5283b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul_Ovf.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul_Ovf.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul_Ovf_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul_Ovf_Un.csproj
index 7e26af5b98..818249cb20 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul_Ovf_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesMul_Ovf_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNeg.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNeg.csproj
index 8417f918ed..26d8401fd9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNeg.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNeg.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNewarr.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNewarr.csproj
index 81c1be5665..809cf04e4c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNewarr.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNewarr.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNewobj.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNewobj.csproj
index 759cb06b27..a8ec0ef2a5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNewobj.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNewobj.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNop.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNop.csproj
index ebe9290b4f..d10ff7b6ca 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNop.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNop.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNot.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNot.csproj
index b1f80a0da1..ee90b31b42 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNot.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesNot.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesOr.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesOr.csproj
index bf9652b16a..cfc9b9c996 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesOr.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesOr.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPop.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPop.csproj
index 93791e74fb..4db23cc128 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPop.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPop.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix1.csproj
index c011c51d90..d446aca25c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix2.csproj
index ac3946a340..3e04f8453a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix3.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix3.csproj
index e6d8cb71d6..902eab330b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix3.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix4.csproj
index e048599d86..640f9b5eff 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix5.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix5.csproj
index ee09110a8b..c0d58759e8 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix5.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix6.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix6.csproj
index 3b1e81d22c..8805f222b1 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix6.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix7.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix7.csproj
index 440dd00a88..3591bf9697 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix7.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefix7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefixref.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefixref.csproj
index 80ae24c2f8..791fa79cc5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefixref.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesPrefixref.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesReadonly.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesReadonly.csproj
index bf0c407999..07ffeedb21 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesReadonly.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesReadonly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRefanytype.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRefanytype.csproj
index 74d3cc4395..db6641b8bc 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRefanytype.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRefanytype.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRefanyval.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRefanyval.csproj
index 4fff3f194f..fd1ea65612 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRefanyval.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRefanyval.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRem.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRem.csproj
index b3e7f37259..cd077ac30b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRem.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRem_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRem_Un.csproj
index 9335f22223..9f45dfdc50 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRem_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRem_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRet.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRet.csproj
index 074bfdc974..812ac7c110 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRet.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRet.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRethrow.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRethrow.csproj
index 9840b3a5ea..4da8b2d810 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRethrow.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesRethrow.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShl.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShl.csproj
index 8c67c500eb..14b5b13a95 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShl.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShl.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShr.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShr.csproj
index 9032f28cfc..9f4924550b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShr.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShr.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShr_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShr_Un.csproj
index 32bf6afa80..f0e7c630c9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShr_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesShr_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSizeof.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSizeof.csproj
index 2741e6ab9c..bc5fddbbbb 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSizeof.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSizeof.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStarg.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStarg.csproj
index ccf43b6204..ba8b35b5ba 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStarg.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStarg.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStarg_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStarg_S.csproj
index 6013ae0202..ab62f14ebc 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStarg_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStarg_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem.csproj
index 5b85b69c3c..1752e86c0f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I.csproj
index 2441b10871..6b5543233a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I1.csproj
index 2c147c15cb..e80c199e32 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I2.csproj
index d48a916e08..fc7e06dcb9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I4.csproj
index 517c1f5753..5dbacb6ce4 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I8.csproj
index 5020ce0199..7cbdfd6414 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_I8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_R4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_R4.csproj
index ba8dfc8a7a..a15c853f07 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_R4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_R4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_R8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_R8.csproj
index 8136c69be0..897cfd99fa 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_R8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_R8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_Ref.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_Ref.csproj
index 08b02e6ea9..4a933bd54b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_Ref.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStelem_Ref.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStfld.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStfld.csproj
index 2e3876fff4..7b271ccf70 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStfld.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStfld.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I.csproj
index 5821f96d93..30443d7f4f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I1.csproj
index 6c126657b4..1880b518f4 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I2.csproj
index d3e99b025e..c45fba68d8 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I4.csproj
index a834163f35..6f6ec289a5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I8.csproj
index a5f453911a..8ad2481a75 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_I8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_R4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_R4.csproj
index b7c5b8d14c..2980f856bc 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_R4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_R4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_R8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_R8.csproj
index 2e6749e6ab..868b3d0943 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_R8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_R8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_Ref.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_Ref.csproj
index 9fe5acef60..1fdd956e9f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_Ref.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStind_Ref.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc.csproj
index a26f798cda..f9dca4010b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_0.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_0.csproj
index db42358e92..0d8ac2471b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_0.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_0.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_1.csproj
index 0c57376c55..d8b6ae7961 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_2.csproj
index 51da591224..d9d9954598 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_3.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_3.csproj
index e368805cae..e3e58cd093 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_3.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_S.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_S.csproj
index 9dd5c8581b..5a7969994a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_S.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStloc_S.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStobj.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStobj.csproj
index 09e9ba0495..0136609981 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStobj.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStobj.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStsfld.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStsfld.csproj
index 762f3fb2da..c068ab7fb3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStsfld.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesStsfld.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub.csproj
index 44c12049b4..7fe460c526 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub_Ovf.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub_Ovf.csproj
index f3a37509ff..398fa52925 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub_Ovf.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub_Ovf.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub_Ovf_Un.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub_Ovf_Un.csproj
index 24fc59052a..998e201462 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub_Ovf_Un.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSub_Ovf_Un.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSwitch.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSwitch.csproj
index c0f658bccb..fbfe0878a3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSwitch.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesSwitch.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesTailcall.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesTailcall.csproj
index 032a221284..991362f2ee 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesTailcall.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesTailcall.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesTakesSingleByteArgument.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesTakesSingleByteArgument.csproj
index 044fdc8c06..2bb20bbb37 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesTakesSingleByteArgument.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesTakesSingleByteArgument.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesThrow.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesThrow.csproj
index bf4c38fb47..4a7c317993 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesThrow.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesThrow.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnaligned.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnaligned.csproj
index 5a12326b7d..53fd09665e 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnaligned.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnaligned.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnbox.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnbox.csproj
index 810854616f..db00777e79 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnbox.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnbox.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnbox_Any.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnbox_Any.csproj
index 01220d8408..1c2a02b577 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnbox_Any.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesUnbox_Any.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesVolatile.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesVolatile.csproj
index 9e3c66e802..240099a4b3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesVolatile.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesVolatile.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesXor.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesXor.csproj
index 8625c48fac..b136b087a7 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesXor.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodes/OpCodesXor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeMacro.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeMacro.csproj
index 7652e9271a..e25d0219b1 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeMacro.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeMacro.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeNternal.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeNternal.csproj
index 4a44695ab5..5f02e4d1aa 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeNternal.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeNternal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeObjmodel.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeObjmodel.csproj
index 82877b17a8..f21a4288a9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeObjmodel.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypeObjmodel.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypePrefix.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypePrefix.csproj
index 98c46573b5..6b0c7e56ad 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypePrefix.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypePrefix.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypePrimitive.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypePrimitive.csproj
index 8a4bb1c1c2..23480805b7 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypePrimitive.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/opcodetype/OpCodeTypePrimitive.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineBrTarget.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineBrTarget.csproj
index 0281394d41..39d18a59ad 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineBrTarget.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineBrTarget.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineField.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineField.csproj
index 21858c5541..e44b1e1337 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineField.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineField.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineI.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineI.csproj
index 03d2230d95..4dff4efd86 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineI.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineI.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineI8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineI8.csproj
index 6b8d768bd1..fbd878e469 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineI8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineI8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineMethod.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineMethod.csproj
index 8811ba75b1..ab905c6a40 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineMethod.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineMethod.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineNone.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineNone.csproj
index 2329ac015f..08826504fd 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineNone.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineNone.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineR.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineR.csproj
index adf75ec3c7..80f07c7cf1 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineR.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineR.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineSig.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineSig.csproj
index 4b76a90c91..f704375c27 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineSig.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineSig.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineString.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineString.csproj
index f8b3e643a3..2593f5e977 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineString.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineSwitch.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineSwitch.csproj
index 9c17804d65..e65795e8a2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineSwitch.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineSwitch.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineTok.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineTok.csproj
index 6de5db8364..17e964c81d 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineTok.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineTok.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineType.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineType.csproj
index cb4d85cc45..5b34c6005e 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineType.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineVar.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineVar.csproj
index 39bce2a647..8ce693c1f3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineVar.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeInlineVar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineBrTarget.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineBrTarget.csproj
index 08a9cc9a97..cfc6a47408 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineBrTarget.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineBrTarget.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineI.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineI.csproj
index 53750671a3..6dd56b1e11 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineI.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineI.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineR.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineR.csproj
index c7bd0f2d75..c0a3dc6d01 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineR.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineR.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineVar.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineVar.csproj
index 0e09c8da3a..07771c0219 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineVar.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/operandtype/OperandTypeShortInlineVar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize16.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize16.csproj
index aa20fcf22a..e1a6fede7c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize16.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize2.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize2.csproj
index 77489a160e..712bc4dea0 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize4.csproj
index 5d3d7a2ccb..31992744ba 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSize4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize1.csproj
index 4b75abe7ec..babb4276c1 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize128.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize128.csproj
index 88ade54dbc..d7951f9b3f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize128.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize128.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize32.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize32.csproj
index faaeaf9e33..a4fe7a9b07 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize32.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize64.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize64.csproj
index 6933d8803b..21873f298f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize64.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize8.csproj
index c942fc1f10..8eb74b5b5f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeSize8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeUnspecified.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeUnspecified.csproj
index 7684cc642a..0783cfc4eb 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeUnspecified.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/packingsize/PackingSizeUnspecified.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop0.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop0.csproj
index 7e0fbaaf55..3925e4bda5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop0.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop0.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop1.csproj
index 4d466b47db..79d03f2fcc 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop1_pop1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop1_pop1.csproj
index 1943ca15e4..8b98e2c4cf 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop1_pop1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPop1_pop1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi.csproj
index 331e7e7b90..63478314b5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_pop1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_pop1.csproj
index b58b98ebbc..b07076ee2e 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_pop1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_pop1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi.csproj
index 2f3a5486a1..c1cee38662 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi8.csproj
index 33eb87024e..19114c7f6c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi_popi.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi_popi.csproj
index f5e710b943..cbd4442cd0 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi_popi.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popi_popi.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popr4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popr4.csproj
index 30de505350..b7eaf09fdb 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popr4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popr4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popr8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popr8.csproj
index 0fc0385b79..31889876b2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popr8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopi_popr8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref.csproj
index a7c2e38f2b..82c30094de 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_pop1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_pop1.csproj
index f86621dcd5..fc09e0a3c9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_pop1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_pop1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi.csproj
index b2f2e55c11..5b5bea2338 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_pop1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_pop1.csproj
index 4063593b9c..4b92f5a6d2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_pop1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_pop1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popi.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popi.csproj
index 6eb3a9724e..f253422dae 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popi.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popi.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popi8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popi8.csproj
index 0150612bfe..8338e01ba5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popi8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popi8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popr4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popr4.csproj
index 73a8d7825d..f57f518914 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popr4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popr4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popr8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popr8.csproj
index 0ce078c775..99d0ed0378 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popr8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popr8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popref.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popref.csproj
index 63051a7d46..3a47f31383 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popref.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPopref_popi_popref.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush0.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush0.csproj
index e12faf94c5..0c77d1d5c6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush0.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush0.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush1.csproj
index c51a8d3a3e..a45c90519a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush1_push1.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush1_push1.csproj
index 3494a989da..a9f543e4af 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush1_push1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPush1_push1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushi.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushi.csproj
index fa4b99bb1e..14b63a4ac3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushi.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushi.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushi8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushi8.csproj
index 3b6eab8580..f47b2b532a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushi8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushi8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushr4.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushr4.csproj
index ddc6beb962..2c014f928e 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushr4.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushr4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushr8.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushr8.csproj
index 8da46c08ff..df1ab197b8 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushr8.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushr8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushref.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushref.csproj
index d9fa80712a..e1812a9c4b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushref.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourPushref.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourVarpop.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourVarpop.csproj
index 2d1907e531..db339f59f3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourVarpop.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourVarpop.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourVarpush.csproj b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourVarpush.csproj
index efda8c2f9a..cdba1c0384 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourVarpush.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/emit/stackbehaviour/StackBehaviourVarpush.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesNone.csproj b/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesNone.csproj
index 3425ba83b8..4ae3ae1d0d 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesNone.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesNone.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesRTSpecialName.csproj b/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesRTSpecialName.csproj
index 92ed90c7f8..bbe5f96745 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesRTSpecialName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesRTSpecialName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesSpecialName.csproj b/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesSpecialName.csproj
index 585831a025..4741d53dae 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesSpecialName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/eventattributes/EventAttributesSpecialName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesAssembly.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesAssembly.csproj
index bfa6e97353..9ce06fd29f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesAssembly.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesAssembly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamANDAssem.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamANDAssem.csproj
index dba3692358..7395ec65b9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamANDAssem.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamANDAssem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamORAssem.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamORAssem.csproj
index 70ad6550d7..6298e9e1e6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamORAssem.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamORAssem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamily.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamily.csproj
index 9bea9323d9..127462a5f9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamily.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFamily.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFieldAccessMask.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFieldAccessMask.csproj
index 41f0ed0a43..8f933ac96d 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFieldAccessMask.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesFieldAccessMask.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesHasDefault.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesHasDefault.csproj
index 9b350094c5..2d784be2b9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesHasDefault.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesHasDefault.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesHasFieldRVA.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesHasFieldRVA.csproj
index 44bb48f404..b31ec8925c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesHasFieldRVA.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesHasFieldRVA.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesInitOnly.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesInitOnly.csproj
index f85018c349..797e621cac 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesInitOnly.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesInitOnly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesLiteral.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesLiteral.csproj
index cf3f40ef11..180ab1f1e7 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesLiteral.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesLiteral.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesNotSerialized.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesNotSerialized.csproj
index 75fd8444c7..82f0b7b53f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesNotSerialized.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesNotSerialized.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPinvokeImpl.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPinvokeImpl.csproj
index 30f8ca441e..4027819120 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPinvokeImpl.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPinvokeImpl.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPrivate.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPrivate.csproj
index 633aca53c4..fa8ed3ee31 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPrivate.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPrivate.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPrivateScope.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPrivateScope.csproj
index 8ece59d7ac..03353560cb 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPrivateScope.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPrivateScope.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPublic.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPublic.csproj
index c7004acafc..e0bfef7ec6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPublic.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesPublic.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesRTSpecialName.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesRTSpecialName.csproj
index 7c01bdb3f4..7308228dd1 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesRTSpecialName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesRTSpecialName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesSpecialName.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesSpecialName.csproj
index a35dacbe19..acfb43f544 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesSpecialName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesSpecialName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesStatic.csproj b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesStatic.csproj
index 745cdd1ae5..e891f916cd 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesStatic.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/fieldattributes/FieldAttributesStatic.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesAbstract.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesAbstract.csproj
index ba1bdcef63..8dacb7f451 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesAbstract.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesAbstract.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamANDAssem.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamANDAssem.csproj
index 42047b8080..742693b1a6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamANDAssem.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamANDAssem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamORAssem.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamORAssem.csproj
index e41b9bd840..2c4a6c4b87 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamORAssem.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamORAssem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamily.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamily.csproj
index 00d8268252..7360442208 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamily.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFamily.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFinal.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFinal.csproj
index 0a314da0a2..330da22c50 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFinal.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesFinal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesHasSecurity.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesHasSecurity.csproj
index 39b64ef058..9bbf467344 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesHasSecurity.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesHasSecurity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesHideBySig.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesHideBySig.csproj
index cfad3b8448..894cf0bdfe 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesHideBySig.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesHideBySig.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesMemberAccessMask.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesMemberAccessMask.csproj
index 81f3913e4c..380aebb390 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesMemberAccessMask.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesMemberAccessMask.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesNewSlot.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesNewSlot.csproj
index ce63e59376..dd29432508 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesNewSlot.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesNewSlot.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPinvokeImpl.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPinvokeImpl.csproj
index 802eea05d9..8c78f1e838 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPinvokeImpl.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPinvokeImpl.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPrivate.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPrivate.csproj
index 0cdfc06bb5..a4f8e0360f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPrivate.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPrivate.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPrivateScope.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPrivateScope.csproj
index bde7c28c67..8993b2036d 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPrivateScope.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPrivateScope.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPublic.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPublic.csproj
index 4b2ddca105..5643ca436f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPublic.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesPublic.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesRTSpecialName.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesRTSpecialName.csproj
index 5c28448daf..eb9e94ecd9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesRTSpecialName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesRTSpecialName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesRequireSecObject.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesRequireSecObject.csproj
index 52172a19d1..8c93f715e4 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesRequireSecObject.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesRequireSecObject.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesReuseSlot.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesReuseSlot.csproj
index 2ccec4d694..34da180d29 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesReuseSlot.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesReuseSlot.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesSpecialName.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesSpecialName.csproj
index 6b8eb78052..dfdc07a08a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesSpecialName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesSpecialName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesStatic.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesStatic.csproj
index 6d08ad1635..85a2fa62e9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesStatic.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesStatic.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesUnmanagedExport.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesUnmanagedExport.csproj
index 681e31ae8f..26fad19430 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesUnmanagedExport.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesUnmanagedExport.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesVirtual.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesVirtual.csproj
index c31b170953..c870116b49 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesVirtual.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesVirtual.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesVtableLayoutMask.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesVtableLayoutMask.csproj
index 535449a2f7..bda26956f8 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesVtableLayoutMask.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodattributes/MethodAttributesVtableLayoutMask.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesCodeTypeMask.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesCodeTypeMask.csproj
index dc7c27e034..d268357aec 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesCodeTypeMask.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesCodeTypeMask.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesForwardRef.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesForwardRef.csproj
index 259b118457..08b446414b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesForwardRef.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesForwardRef.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesIL.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesIL.csproj
index 75ede5922c..b24d73a774 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesIL.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesIL.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesInternalCall.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesInternalCall.csproj
index ac1612753e..a018564da3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesInternalCall.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesInternalCall.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesManaged.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesManaged.csproj
index aef7acc59e..0d81549b67 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesManaged.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesManaged.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesManagedMask.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesManagedMask.csproj
index e4b7890a63..feafcdec95 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesManagedMask.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesManagedMask.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesNative.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesNative.csproj
index 8de861184c..1954dae7c5 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesNative.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesNative.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesNoInlining.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesNoInlining.csproj
index 7e976ef504..953c872830 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesNoInlining.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesNoInlining.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesOPTIL.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesOPTIL.csproj
index d6030aaa16..dd7fc9c54f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesOPTIL.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesOPTIL.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesPreserveSig.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesPreserveSig.csproj
index a0140645ff..f731b5c018 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesPreserveSig.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesPreserveSig.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesRuntime.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesRuntime.csproj
index 9dcc114a43..e0af1307be 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesRuntime.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesRuntime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesSynchronized.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesSynchronized.csproj
index 6ab5d937f3..ab727f8349 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesSynchronized.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesSynchronized.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesUnmanaged.csproj b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesUnmanaged.csproj
index 7101d6cf12..59e388c6ba 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesUnmanaged.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/methodimplattributes/MethodImplAttributesUnmanaged.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesHasDefault.csproj b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesHasDefault.csproj
index d39d7f212c..1138062ea9 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesHasDefault.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesHasDefault.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesIn.csproj b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesIn.csproj
index 1fedcd14d8..e2a7c7670d 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesIn.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesIn.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesNone.csproj b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesNone.csproj
index 9d14c39ed7..d3bf00c0ca 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesNone.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesNone.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesOptional.csproj b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesOptional.csproj
index a64b47c940..860ad49107 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesOptional.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesOptional.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesOut.csproj b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesOut.csproj
index 31fc2ec7a1..ed798c0d9f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesOut.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesOut.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesRetval.csproj b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesRetval.csproj
index 2606c8ee7d..8d38794f57 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesRetval.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/parameterattributes/ParameterAttributesRetval.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesHasDefault.csproj b/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesHasDefault.csproj
index 9ff49f54ff..d0d3ee7e4a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesHasDefault.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesHasDefault.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesNone.csproj b/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesNone.csproj
index 9fb7362296..55b02495c0 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesNone.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesNone.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesRTSpecialName.csproj b/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesRTSpecialName.csproj
index 3370b5d0c7..8929a36668 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesRTSpecialName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesRTSpecialName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesSpecialName.csproj b/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesSpecialName.csproj
index 1f1c209b82..7eb4bb331f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesSpecialName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/propertyattributes/PropertyAttributesSpecialName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/targetinvocationexception/TargetInvocationExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/reflection/targetinvocationexception/TargetInvocationExceptionCtor1.csproj
index 96e6ff16b8..7baa547aca 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/targetinvocationexception/TargetInvocationExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/targetinvocationexception/TargetInvocationExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/targetinvocationexception/TargetInvocationExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/reflection/targetinvocationexception/TargetInvocationExceptionCtor2.csproj
index 9418174c75..963697d3a4 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/targetinvocationexception/TargetInvocationExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/targetinvocationexception/TargetInvocationExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor1.csproj
index 7847c10fd8..d674f5fb5f 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor2.csproj
index 33d2557988..aa841d6a34 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor3.csproj
index 47427771c3..fe85c20614 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/targetparametercountexception/TargetParameterCountExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAbstract.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAbstract.csproj
index ccc03b25b9..f24d414253 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAbstract.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAbstract.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAnsiClass.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAnsiClass.csproj
index 70eb395f13..f02eba8d91 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAnsiClass.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAnsiClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAutoClass.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAutoClass.csproj
index e2f6158378..b1ebbe8848 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAutoClass.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAutoClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAutoLayout.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAutoLayout.csproj
index ae86d11912..610a0b64fd 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAutoLayout.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesAutoLayout.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesBeforeFieldInit.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesBeforeFieldInit.csproj
index 85cf6813d0..e678506e78 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesBeforeFieldInit.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesBeforeFieldInit.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesClass.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesClass.csproj
index d445fb7b8f..8db82b506c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesClass.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesClassSemanticsMask.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesClassSemanticsMask.csproj
index 203c01ccc6..acfdb5fc39 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesClassSemanticsMask.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesClassSemanticsMask.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesExplicitLayout.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesExplicitLayout.csproj
index 6081d0bd4e..0d55655f60 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesExplicitLayout.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesExplicitLayout.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesHasSecurity.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesHasSecurity.csproj
index 9b8cf95f55..95695fb4e6 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesHasSecurity.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesHasSecurity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesImport.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesImport.csproj
index 8296af0dc5..01e8d2593a 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesImport.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesImport.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesInterface.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesInterface.csproj
index 4ea5cc3e5a..01c7c4bd83 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesInterface.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesInterface.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesLayoutMask.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesLayoutMask.csproj
index 197379d543..c80115e854 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesLayoutMask.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesLayoutMask.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedAssembly.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedAssembly.csproj
index afe43c361a..3aa41d5814 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedAssembly.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedAssembly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamANDAssem.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamANDAssem.csproj
index 3703998c92..39c7d813f3 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamANDAssem.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamANDAssem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamORAssem.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamORAssem.csproj
index 8b393cd122..14791d1a29 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamORAssem.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamORAssem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamily.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamily.csproj
index 7fb43f743a..020faa819b 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamily.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedFamily.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedPrivate.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedPrivate.csproj
index ba780e831d..01ad122abe 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedPrivate.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedPrivate.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedPublic.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedPublic.csproj
index 2d68b50300..e603f4e97c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedPublic.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesNestedPublic.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesPublic.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesPublic.csproj
index ee64dbd71c..31f26e2f1c 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesPublic.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesPublic.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesRTSpecialName.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesRTSpecialName.csproj
index 376f66351b..161cea64bd 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesRTSpecialName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesRTSpecialName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSealed.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSealed.csproj
index 0e622ee3b2..420ceb72e0 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSealed.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSealed.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSequentialLayout.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSequentialLayout.csproj
index 153f0399bb..7bd33dfc15 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSequentialLayout.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSequentialLayout.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSerializable.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSerializable.csproj
index 3aeb6f32b0..b146d6c925 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSerializable.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSerializable.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSpecialName.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSpecialName.csproj
index 89715d4d97..0819f46235 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSpecialName.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesSpecialName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesStringFormatMask.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesStringFormatMask.csproj
index db03452539..40be56a512 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesStringFormatMask.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesStringFormatMask.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesUnicodeClass.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesUnicodeClass.csproj
index 6c171b1370..594dc9b970 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesUnicodeClass.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesUnicodeClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesVisibilityMask.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesVisibilityMask.csproj
index 5f1fe5dc8c..e4975141a2 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesVisibilityMask.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttributesVisibilityMask.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttribytesNotPublic.csproj b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttribytesNotPublic.csproj
index 289c36d965..b6c90668d0 100644
--- a/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttribytesNotPublic.csproj
+++ b/tests/src/CoreMangLib/cti/system/reflection/typeattributes/TypeAttribytesNotPublic.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor1.csproj
index 39816d2e76..ae9e50f691 100644
--- a/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor2.csproj
index 2d21682a31..304071027d 100644
--- a/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor3.csproj
index 14e0326b8c..50a81d3f26 100644
--- a/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/resources/missingmanifestresourceexception/MissingManifestResourceExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/resources/neutralresourceslanguageattribute/CultureName.csproj b/tests/src/CoreMangLib/cti/system/resources/neutralresourceslanguageattribute/CultureName.csproj
index 2e3aa123b2..afc132694b 100644
--- a/tests/src/CoreMangLib/cti/system/resources/neutralresourceslanguageattribute/CultureName.csproj
+++ b/tests/src/CoreMangLib/cti/system/resources/neutralresourceslanguageattribute/CultureName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/resources/neutralresourceslanguageattribute/NeutralResourcesLanguageAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/resources/neutralresourceslanguageattribute/NeutralResourcesLanguageAttributeCtor.csproj
index 86b76f1569..48bb19d084 100644
--- a/tests/src/CoreMangLib/cti/system/resources/neutralresourceslanguageattribute/NeutralResourcesLanguageAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/resources/neutralresourceslanguageattribute/NeutralResourcesLanguageAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/resources/resourcemanager/CustomCulture.csproj b/tests/src/CoreMangLib/cti/system/resources/resourcemanager/CustomCulture.csproj
index 224af9eab4..0e99494c3b 100644
--- a/tests/src/CoreMangLib/cti/system/resources/resourcemanager/CustomCulture.csproj
+++ b/tests/src/CoreMangLib/cti/system/resources/resourcemanager/CustomCulture.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/resources/satellitecontractversionattribute/AttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/resources/satellitecontractversionattribute/AttributeCtor.csproj
index 0ed15af221..d15dfebb89 100644
--- a/tests/src/CoreMangLib/cti/system/resources/satellitecontractversionattribute/AttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/resources/satellitecontractversionattribute/AttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/resources/satellitecontractversionattribute/AttributeVersion.csproj b/tests/src/CoreMangLib/cti/system/resources/satellitecontractversionattribute/AttributeVersion.csproj
index 58a4eccfc4..fd9848d435 100644
--- a/tests/src/CoreMangLib/cti/system/resources/satellitecontractversionattribute/AttributeVersion.csproj
+++ b/tests/src/CoreMangLib/cti/system/resources/satellitecontractversionattribute/AttributeVersion.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/accessedthroughpropertyattribute/ATPACtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/accessedthroughpropertyattribute/ATPACtor.csproj
index f0eb2609ca..63d7dfe7d4 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/accessedthroughpropertyattribute/ATPACtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/accessedthroughpropertyattribute/ATPACtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/accessedthroughpropertyattribute/ATPAPropertyName.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/accessedthroughpropertyattribute/ATPAPropertyName.csproj
index caa03677f3..b5cf81b8ab 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/accessedthroughpropertyattribute/ATPAPropertyName.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/accessedthroughpropertyattribute/ATPAPropertyName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/compilationrelaxations/AttributeCtor1.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/compilationrelaxations/AttributeCtor1.csproj
index fcb0c02992..305678e9ec 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/compilationrelaxations/AttributeCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/compilationrelaxations/AttributeCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/compilergeneratedattribute/CompilerGeneratedAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/compilergeneratedattribute/CompilerGeneratedAttributeCtor.csproj
index 2cc71056ec..e66ecbbf81 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/compilergeneratedattribute/CompilerGeneratedAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/compilergeneratedattribute/CompilerGeneratedAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/customconstantattribute/CustomConstantAttributector.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/customconstantattribute/CustomConstantAttributector.csproj
index 71c907ed4e..8b2ef08dbd 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/customconstantattribute/CustomConstantAttributector.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/customconstantattribute/CustomConstantAttributector.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/indexernameattribute/IndexerNameAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/indexernameattribute/IndexerNameAttributeCtor.csproj
index 63d8fc56ce..e70b4ef553 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/indexernameattribute/IndexerNameAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/indexernameattribute/IndexerNameAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/internalsvisibletoattribute/IVTAAssemblyName.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/internalsvisibletoattribute/IVTAAssemblyName.csproj
index 79bd5c6a0a..e5926a26ca 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/internalsvisibletoattribute/IVTAAssemblyName.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/internalsvisibletoattribute/IVTAAssemblyName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/internalsvisibletoattribute/IVTACtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/internalsvisibletoattribute/IVTACtor.csproj
index c83f1d2154..75b0465d09 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/internalsvisibletoattribute/IVTACtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/internalsvisibletoattribute/IVTACtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/methodimploptions/MethodImplOptionsNoInlining.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/methodimploptions/MethodImplOptionsNoInlining.csproj
index fb6bd2d4fa..1a051ba4f8 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/methodimploptions/MethodImplOptionsNoInlining.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/methodimploptions/MethodImplOptionsNoInlining.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/methodimploptions/MethodImplOptionsPreserveSig.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/methodimploptions/MethodImplOptionsPreserveSig.csproj
index fe882bcb7b..d6a9dbe21b 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/methodimploptions/MethodImplOptionsPreserveSig.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/methodimploptions/MethodImplOptionsPreserveSig.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimecompatibilityattribute/RCAttrWrapNEThrows.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimecompatibilityattribute/RCAttrWrapNEThrows.csproj
index 456fdca54e..864932d272 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimecompatibilityattribute/RCAttrWrapNEThrows.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimecompatibilityattribute/RCAttrWrapNEThrows.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimecompatibilityattribute/RuntimeCompatAttrCtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimecompatibilityattribute/RuntimeCompatAttrCtor.csproj
index 448409135c..352ed4d683 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimecompatibilityattribute/RuntimeCompatAttrCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimecompatibilityattribute/RuntimeCompatAttrCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/GetHashCode.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/GetHashCode.csproj
index 1297feab3f..4be9cf8226 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/GetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/GetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/PlatformAssembly.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/PlatformAssembly.csproj
index d6e6f2efad..c0b5b0e75f 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/PlatformAssembly.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/PlatformAssembly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/UserAssembly.csproj b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/UserAssembly.csproj
index 9bdd6bc740..1228e63ce1 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/UserAssembly.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/compilerservices/runtimehelpers/UserAssembly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/decimalconstantattribute/DecimalConstantAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/decimalconstantattribute/DecimalConstantAttributeCtor.csproj
index 708b7dd808..e1d65a828d 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/decimalconstantattribute/DecimalConstantAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/decimalconstantattribute/DecimalConstantAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/decimalconstantattribute/DecimalConstantAttributeValue.csproj b/tests/src/CoreMangLib/cti/system/runtime/decimalconstantattribute/DecimalConstantAttributeValue.csproj
index c786eee7c2..8ab29f4e6b 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/decimalconstantattribute/DecimalConstantAttributeValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/decimalconstantattribute/DecimalConstantAttributeValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeCtor.csproj
index 248ed5ea87..3261a5bdc8 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeElementType.csproj b/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeElementType.csproj
index 04e6bc5e72..007e32328e 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeElementType.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeElementType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeLength.csproj b/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeLength.csproj
index 6a79b7267d..a67bfb0cbf 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeLength.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/fixedbufferattribute/FixedBufferAttributeLength.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/callingconvention/CallingConventionWinapi.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/callingconvention/CallingConventionWinapi.csproj
index 8c11186c8a..f5ec51a36f 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/callingconvention/CallingConventionWinapi.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/callingconvention/CallingConventionWinapi.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/charset/CharSetUnicode.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/charset/CharSetUnicode.csproj
index d9e1fc059e..dc56583f32 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/charset/CharSetUnicode.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/charset/CharSetUnicode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/dllimportattribute/DllImportTest.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/dllimportattribute/DllImportTest.csproj
index 8170b45cce..3c8f4df8a1 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/dllimportattribute/DllImportTest.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/dllimportattribute/DllImportTest.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/fieldoffsetattribute/FieldOffsetAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/fieldoffsetattribute/FieldOffsetAttributeCtor.csproj
index 07e4214721..a7ff694a6c 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/fieldoffsetattribute/FieldOffsetAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/fieldoffsetattribute/FieldOffsetAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/fieldoffsetattribute/FieldOffsetAttributeValue.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/fieldoffsetattribute/FieldOffsetAttributeValue.csproj
index 74a0e2aa06..b3b515200c 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/fieldoffsetattribute/FieldOffsetAttributeValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/fieldoffsetattribute/FieldOffsetAttributeValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleAddrOfPinnedObject_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleAddrOfPinnedObject_PSC.csproj
index f14599ca5a..42c9cba834 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleAddrOfPinnedObject_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleAddrOfPinnedObject_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleAlloc1_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleAlloc1_PSC.csproj
index 49b7fe20ca..f8bf8a2a1e 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleAlloc1_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleAlloc1_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleFree_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleFree_PSC.csproj
index 6ffd270414..9d13c31b56 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleFree_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleFree_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleTarget_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleTarget_PSC.csproj
index 12aa8d378b..ad1437a48c 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleTarget_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandle/GCHandleTarget_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeNormal.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeNormal.csproj
index 8044a900fa..c51583bf7b 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeNormal.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeNormal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypePinned.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypePinned.csproj
index 6628922b45..286865fd74 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypePinned.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypePinned.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeWeak.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeWeak.csproj
index fcb69d5594..9245a33367 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeWeak.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeWeak.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeWeakTrackResurrection.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeWeakTrackResurrection.csproj
index fbba32ff72..b4bf08374b 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeWeakTrackResurrection.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/gchandletype/GCHandleTypeWeakTrackResurrection.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/inattribute/InAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/inattribute/InAttributeCtor.csproj
index 251be617a1..d3afe1db0b 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/inattribute/InAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/inattribute/InAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/layoutkind/LayoutKindAuto.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/layoutkind/LayoutKindAuto.csproj
index 521c92e0dd..4ed1820d6c 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/layoutkind/LayoutKindAuto.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/layoutkind/LayoutKindAuto.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/layoutkind/LayoutKindSequential.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/layoutkind/LayoutKindSequential.csproj
index 012a81c14b..f71b305850 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/layoutkind/LayoutKindSequential.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/layoutkind/LayoutKindSequential.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/MarshalSizeOf1_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/MarshalSizeOf1_PSC.csproj
index b3e5063c82..a3b235f21a 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/MarshalSizeOf1_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/MarshalSizeOf1_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/MarshalSizeOf2_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/MarshalSizeOf2_PSC.csproj
index a127ac484c..8ea6d90ed0 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/MarshalSizeOf2_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/MarshalSizeOf2_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/OleAut32.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/OleAut32.csproj
index b1221d3cde..f265d7f0ec 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/OleAut32.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshal/OleAut32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeArraySubType.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeArraySubType.csproj
index d2bcef048f..a98ad7715a 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeArraySubType.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeArraySubType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeCtor1.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeCtor1.csproj
index e8fce67c3b..921cfa554c 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeCtor2.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeCtor2.csproj
index 3f526f4da7..658508b45b 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalCookie.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalCookie.csproj
index 82f260cfe1..d8eb829b26 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalCookie.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalCookie.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalType.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalType.csproj
index 3d76da15a6..41d1ed10b7 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalType.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalTypeRef.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalTypeRef.csproj
index 2ca16d24b1..5c02a032bc 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalTypeRef.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeMarshalTypeRef.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeSizeConst.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeSizeConst.csproj
index eef4687815..222a4ae3d6 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeSizeConst.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeSizeConst.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeSizeParamIndex.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeSizeParamIndex.csproj
index 82a7b9e88a..800e6f8a29 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeSizeParamIndex.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeSizeParamIndex.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeValue.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeValue.csproj
index 6da49ace85..991825d8ba 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/marshalasattribute/MarshalAsAttributeValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/outattribute/OutAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/outattribute/OutAttributeCtor.csproj
index c89544690c..0f3629b0ce 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/outattribute/OutAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/outattribute/OutAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/preservesigattribute/PreserveSigAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/preservesigattribute/PreserveSigAttributeCtor.csproj
index e05b67a3f3..1868f06438 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/preservesigattribute/PreserveSigAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/preservesigattribute/PreserveSigAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleCtor_cti_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleCtor_cti_PSC.csproj
index 35230c5d95..12b33fdbba 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleCtor_cti_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleCtor_cti_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousAddRef_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousAddRef_PSC.csproj
index 156b16be64..aaa2b06e78 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousAddRef_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousAddRef_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousGetHandle_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousGetHandle_PSC.csproj
index 4852153d36..0a467e6ee3 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousGetHandle_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousGetHandle_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousRelease_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousRelease_PSC.csproj
index 9fc0565b1d..39439f9386 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousRelease_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDangerousRelease_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDispose1_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDispose1_PSC.csproj
index 36c271d5a7..846df01e41 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDispose1_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDispose1_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDispose2_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDispose2_PSC.csproj
index d1e50f17e5..5902ff5274 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDispose2_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleDispose2_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleHandle_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleHandle_PSC.csproj
index e2a020ae5f..355e570dfd 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleHandle_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleHandle_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleIsClosed_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleIsClosed_PSC.csproj
index 0b3a7f9be3..401ddca3be 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleIsClosed_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleIsClosed_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleIsInvalid_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleIsInvalid_PSC.csproj
index 8c4dca60ec..1ab0c20a23 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleIsInvalid_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleIsInvalid_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleSetHandleAsInvalid_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleSetHandleAsInvalid_PSC.csproj
index 943958f4e8..5f0560a708 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleSetHandleAsInvalid_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleSetHandleAsInvalid_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleSetHandle_PSC.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleSetHandle_PSC.csproj
index 010b4a6a8b..e636dd1ecf 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleSetHandle_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/safehandle/SafeHandleSetHandle_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeCharSet.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeCharSet.csproj
index 6c9b22c22b..4589e67683 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeCharSet.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeCharSet.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeCtor.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeCtor.csproj
index c15b438c5e..a8ee97a176 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributePack.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributePack.csproj
index 55b0d8caa1..902509f987 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributePack.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributePack.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeSize.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeSize.csproj
index ae7b963081..ae18af358d 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeSize.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeSize.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeValue.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeValue.csproj
index f08db5b3c2..8c5c75b710 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/structlayoutattribute/StructLayoutAttributeValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtime/interopservices/unmanagedtype/UnmanagedType.csproj b/tests/src/CoreMangLib/cti/system/runtime/interopservices/unmanagedtype/UnmanagedType.csproj
index 7cde284b0c..a496316a80 100644
--- a/tests/src/CoreMangLib/cti/system/runtime/interopservices/unmanagedtype/UnmanagedType.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtime/interopservices/unmanagedtype/UnmanagedType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtimefieldhandle/RuntimeFieldHandleEquals.csproj b/tests/src/CoreMangLib/cti/system/runtimefieldhandle/RuntimeFieldHandleEquals.csproj
index d854a94841..9ba78c3258 100644
--- a/tests/src/CoreMangLib/cti/system/runtimefieldhandle/RuntimeFieldHandleEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtimefieldhandle/RuntimeFieldHandleEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtimefieldhandle/RuntimeFieldHandleGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/runtimefieldhandle/RuntimeFieldHandleGetHashCode.csproj
index 88e7b1533d..1d83e6fbbc 100644
--- a/tests/src/CoreMangLib/cti/system/runtimefieldhandle/RuntimeFieldHandleGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtimefieldhandle/RuntimeFieldHandleGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtimemethodhandle/RuntimeMethodHandleEquals.csproj b/tests/src/CoreMangLib/cti/system/runtimemethodhandle/RuntimeMethodHandleEquals.csproj
index cedbb6c763..f55060f383 100644
--- a/tests/src/CoreMangLib/cti/system/runtimemethodhandle/RuntimeMethodHandleEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtimemethodhandle/RuntimeMethodHandleEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtimemethodhandle/RuntimeMethodHanldeGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/runtimemethodhandle/RuntimeMethodHanldeGetHashCode.csproj
index b95bb5f540..9315b951ee 100644
--- a/tests/src/CoreMangLib/cti/system/runtimemethodhandle/RuntimeMethodHanldeGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtimemethodhandle/RuntimeMethodHanldeGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtimetypehandle/RuntimeTypeHandleEquals.csproj b/tests/src/CoreMangLib/cti/system/runtimetypehandle/RuntimeTypeHandleEquals.csproj
index c507498b9e..2baf35b7aa 100644
--- a/tests/src/CoreMangLib/cti/system/runtimetypehandle/RuntimeTypeHandleEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtimetypehandle/RuntimeTypeHandleEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/runtimetypehandle/RuntimeTypeHandleGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/runtimetypehandle/RuntimeTypeHandleGetHashCode.csproj
index e091a34c6f..8132008a13 100644
--- a/tests/src/CoreMangLib/cti/system/runtimetypehandle/RuntimeTypeHandleGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/runtimetypehandle/RuntimeTypeHandleGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteCompareTo2.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteCompareTo2.csproj
index bbc9aa3ba1..ad61d31671 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteCompareTo2.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteCompareTo2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteEquals1.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteEquals1.csproj
index beeac21da3..1bf3a1dd6a 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteEquals2.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteEquals2.csproj
index bdfc1aaf59..03ef19bab7 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteGetHashCode.csproj
index 913bc5091c..81761761e0 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToBoolean.csproj
index 63b8f08714..1528c99917 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToByte.csproj
index 29848ba3c0..ca9d25cb53 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToChar.csproj
index 7b0e794eb8..e5394acdc7 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToDecimal.csproj
index 4913347c2e..f0cf3ed3dc 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToDouble.csproj
index 73978da739..fd8922a6ad 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt16.csproj
index bf631aa465..78f64eb706 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt32.csproj
index 37a2fe0d75..195256bba8 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt64.csproj
index 31716d0125..d719a2fbff 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt16.csproj
index 6138df9012..6085af089d 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt32.csproj
index 654f53f592..23ac9c2cb6 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt64.csproj
index 210bfa2d87..aa18a66fbf 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteIConvertibleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteMaxValue.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteMaxValue.csproj
index 1343ce4f72..bc6a06a028 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteMaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteMaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteMinValue.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteMinValue.csproj
index b7f7f0ebe3..58707302fb 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteMinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteMinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteParse1.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteParse1.csproj
index 7853b5d000..bbfa9b66cd 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteParse1.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteParse1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteParse2.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteParse2.csproj
index 1f9c63b6d0..f2a4de111e 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteParse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteParse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteParse3.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteParse3.csproj
index f6f1801aa5..61908510b4 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteParse3.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteParse3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/sbyte/SByteTryParse.csproj b/tests/src/CoreMangLib/cti/system/sbyte/SByteTryParse.csproj
index 6b86872fdd..d428a3c246 100644
--- a/tests/src/CoreMangLib/cti/system/sbyte/SByteTryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/sbyte/SByteTryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor1.csproj
index ddd7cf72c7..14863303d4 100644
--- a/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor2.csproj
index 04cf0e9a53..05c4ad4abc 100644
--- a/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor3.csproj
index e7afd4cf1d..7c68e8234c 100644
--- a/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionToString.csproj b/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionToString.csproj
index aa275717e9..29311c9c60 100644
--- a/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/security/securityexception/SecurityExceptionToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleEpsilon.csproj b/tests/src/CoreMangLib/cti/system/single/SingleEpsilon.csproj
index 87a8bbdcad..7f7d596e11 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleEpsilon.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleEpsilon.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/single/SingleGetHashCode.csproj
index 1644ecea96..3c2e1ca578 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleIsInfinity.csproj b/tests/src/CoreMangLib/cti/system/single/SingleIsInfinity.csproj
index 9a823e87c2..66eef889ca 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleIsInfinity.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleIsInfinity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleIsNaN.csproj b/tests/src/CoreMangLib/cti/system/single/SingleIsNaN.csproj
index cef10c92c1..65da583c0d 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleIsNaN.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleIsNaN.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleIsNegativeInfinity.csproj b/tests/src/CoreMangLib/cti/system/single/SingleIsNegativeInfinity.csproj
index 3ff6a9b1a6..6042dd00bc 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleIsNegativeInfinity.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleIsNegativeInfinity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleIsPositiveInfinity.csproj b/tests/src/CoreMangLib/cti/system/single/SingleIsPositiveInfinity.csproj
index 5536aa18cb..98870d4060 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleIsPositiveInfinity.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleIsPositiveInfinity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleMaxValue.csproj b/tests/src/CoreMangLib/cti/system/single/SingleMaxValue.csproj
index 7b5a7dce41..f2707215c6 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleMaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleMaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleMinValue.csproj b/tests/src/CoreMangLib/cti/system/single/SingleMinValue.csproj
index 2a2bcf2866..21099d036a 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleMinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleMinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleNaN.csproj b/tests/src/CoreMangLib/cti/system/single/SingleNaN.csproj
index eccaf66f38..b8174f6ee2 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleNaN.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleNaN.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleParse1.csproj b/tests/src/CoreMangLib/cti/system/single/SingleParse1.csproj
index bc69c568d7..77cdfff06e 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleParse1.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleParse1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleParse2.csproj b/tests/src/CoreMangLib/cti/system/single/SingleParse2.csproj
index d97cc8ccc3..34932f0b32 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleParse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleParse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToBoolean.csproj
index 9a7b2907bb..b58ab30b64 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToByte.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToByte.csproj
index 5e1ac2268a..53d551c337 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToChar.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToChar.csproj
index 45ce5a58ed..c62d9f0abc 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToDateTime.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToDateTime.csproj
index f7515be996..d8fdfc38f0 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToDecimal.csproj
index 91813c4d9e..c95bb7badf 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToDouble.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToDouble.csproj
index d2d40a50de..a252a1a3ba 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToInt16.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToInt16.csproj
index 1183806cf3..82efa2e348 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToInt32.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToInt32.csproj
index 50a5514ffa..61673a93f1 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToInt64.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToInt64.csproj
index 6ee398033b..951bbbfb5d 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToSByte.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToSByte.csproj
index 7f234e62bb..fc121bf3d7 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToSingle.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToSingle.csproj
index f75287f4ad..b684b673a0 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToUInt16.csproj
index ef46e66036..98bd9040ac 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToUInt32.csproj
index 20cedf2410..4119af2a86 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/single/SingleToUInt64.csproj
index 11b1bb4bb7..acea2b9cc2 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/single/SingleTryParse.csproj b/tests/src/CoreMangLib/cti/system/single/SingleTryParse.csproj
index 71b6926d88..ccec436685 100644
--- a/tests/src/CoreMangLib/cti/system/single/SingleTryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/single/SingleTryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringChars.csproj b/tests/src/CoreMangLib/cti/system/string/StringChars.csproj
index b55c608ba5..f88354aeb5 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringChars.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringChars.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringCompare1.csproj b/tests/src/CoreMangLib/cti/system/string/StringCompare1.csproj
index 91161458ef..6a4c58a5dd 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringCompare1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringCompare1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringCompare15.csproj b/tests/src/CoreMangLib/cti/system/string/StringCompare15.csproj
index 70cfc36271..78bacd89dd 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringCompare15.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringCompare15.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringCompare2.csproj b/tests/src/CoreMangLib/cti/system/string/StringCompare2.csproj
index 31252d7405..0f00954ada 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringCompare2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringCompare2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringCompare9.csproj b/tests/src/CoreMangLib/cti/system/string/StringCompare9.csproj
index 1c37e359de..186f72397f 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringCompare9.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringCompare9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringCompareOrdinal1.csproj b/tests/src/CoreMangLib/cti/system/string/StringCompareOrdinal1.csproj
index c0f4d7baf6..a73d9a1e7a 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringCompareOrdinal1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringCompareOrdinal1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringCompareOrdinal2.csproj b/tests/src/CoreMangLib/cti/system/string/StringCompareOrdinal2.csproj
index df6cd4e6be..fbae476401 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringCompareOrdinal2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringCompareOrdinal2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringConcat1.csproj b/tests/src/CoreMangLib/cti/system/string/StringConcat1.csproj
index a1be2be7ec..03348cd78f 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringConcat1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringConcat1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringConcat2.csproj b/tests/src/CoreMangLib/cti/system/string/StringConcat2.csproj
index 56aa09714a..863386db4c 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringConcat2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringConcat2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringConcat3.csproj b/tests/src/CoreMangLib/cti/system/string/StringConcat3.csproj
index 8ef833f3ee..946a5cf590 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringConcat3.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringConcat3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringConcat4.csproj b/tests/src/CoreMangLib/cti/system/string/StringConcat4.csproj
index 25a76ffded..4adf3bbecf 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringConcat4.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringConcat4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringConcat5.csproj b/tests/src/CoreMangLib/cti/system/string/StringConcat5.csproj
index 8310db0aff..36f0782313 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringConcat5.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringConcat5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringConcat6.csproj b/tests/src/CoreMangLib/cti/system/string/StringConcat6.csproj
index ed9553a807..85d9bb38a6 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringConcat6.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringConcat6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringConcat7.csproj b/tests/src/CoreMangLib/cti/system/string/StringConcat7.csproj
index 7256a63ba9..b3b01a5501 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringConcat7.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringConcat7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringConcat8.csproj b/tests/src/CoreMangLib/cti/system/string/StringConcat8.csproj
index 8640858946..3aafdb46cd 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringConcat8.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringConcat8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringCopyTo.csproj b/tests/src/CoreMangLib/cti/system/string/StringCopyTo.csproj
index 8831cd5e4c..8e6ce6f526 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringCopyTo.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringCopyTo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringCtor5.csproj b/tests/src/CoreMangLib/cti/system/string/StringCtor5.csproj
index 49743902e5..e5f2caf75c 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringCtor5.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringCtor5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringCtorChar.csproj b/tests/src/CoreMangLib/cti/system/string/StringCtorChar.csproj
index ed19b7b97e..4d0c3dadc5 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringCtorChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringCtorChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringEmpty.csproj b/tests/src/CoreMangLib/cti/system/string/StringEmpty.csproj
index 99b3d23829..8a03e06aac 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringEmpty.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringEmpty.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringEquals1.csproj b/tests/src/CoreMangLib/cti/system/string/StringEquals1.csproj
index e31952b16c..ee7b104d33 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringEquals2.csproj b/tests/src/CoreMangLib/cti/system/string/StringEquals2.csproj
index 578bdb24b5..cd8d093357 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringEquals3.csproj b/tests/src/CoreMangLib/cti/system/string/StringEquals3.csproj
index 039f310c15..3b999e88cd 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringEquals3.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringEquals3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringEquals6.csproj b/tests/src/CoreMangLib/cti/system/string/StringEquals6.csproj
index 66ba50e5f9..b52eb211b3 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringEquals6.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringEquals6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringFormat1.csproj b/tests/src/CoreMangLib/cti/system/string/StringFormat1.csproj
index d997c62fc7..a87b0df57c 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringFormat1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringFormat1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringFormat2.csproj b/tests/src/CoreMangLib/cti/system/string/StringFormat2.csproj
index e30bdf53ae..f0f7a68876 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringFormat2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringFormat2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/string/StringGetEnumerator.csproj
index f37ef9bbd7..a4fdcbe37f 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/string/StringGetHashCode.csproj
index 8bb3b5d528..7aa74f4635 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToBoolean.csproj
index 4f95af5131..f450152f77 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToByte.csproj
index 9f5b478327..20533ad5f8 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToChar.csproj
index e019648eac..79de90038d 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt16.csproj
index af66f13dc7..9ab93033be 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt32.csproj
index 80efdcacfa..10186fee7f 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt64.csproj
index 1a362deefb..8a78ec9c78 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToSByte.csproj b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToSByte.csproj
index 657333403a..4395ac4f45 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt16.csproj
index c9a5910463..90db46f041 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt32.csproj
index 73e76bda7b..b13a1ec5fa 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt64.csproj
index e5d82b702c..5ded94a1b2 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIConvertibleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIEnumerableGetEnumerator.csproj b/tests/src/CoreMangLib/cti/system/string/StringIEnumerableGetEnumerator.csproj
index 52d723852d..7ff71621d8 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIEnumerableGetEnumerator.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIEnumerableGetEnumerator.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIndexOf10.csproj b/tests/src/CoreMangLib/cti/system/string/StringIndexOf10.csproj
index ad9de87321..04f081780b 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIndexOf10.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIndexOf10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringInsert.csproj b/tests/src/CoreMangLib/cti/system/string/StringInsert.csproj
index de6565c4f1..0d8c220022 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringInsert.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringInsert.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringIsNullOrEmpty.csproj b/tests/src/CoreMangLib/cti/system/string/StringIsNullOrEmpty.csproj
index 40ffa0974e..6a06a11be8 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringIsNullOrEmpty.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringIsNullOrEmpty.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringJoin.csproj b/tests/src/CoreMangLib/cti/system/string/StringJoin.csproj
index 273e01874e..e28c12c692 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringJoin.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringJoin.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringJoin1.csproj b/tests/src/CoreMangLib/cti/system/string/StringJoin1.csproj
index cd3cae2517..033cecb12c 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringJoin1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringJoin1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringJoin2.csproj b/tests/src/CoreMangLib/cti/system/string/StringJoin2.csproj
index 13c85e8178..9bcc584f0d 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringJoin2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringJoin2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringLength.csproj b/tests/src/CoreMangLib/cti/system/string/StringLength.csproj
index 9756239244..4d51f19de3 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringLength.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringLength.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringPadLeft.csproj b/tests/src/CoreMangLib/cti/system/string/StringPadLeft.csproj
index 204b1a9724..18fed4dace 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringPadLeft.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringPadLeft.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringPadLeft1.csproj b/tests/src/CoreMangLib/cti/system/string/StringPadLeft1.csproj
index c133fbfbc9..1cf9e6bf9f 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringPadLeft1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringPadLeft1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringPadLeft2.csproj b/tests/src/CoreMangLib/cti/system/string/StringPadLeft2.csproj
index d82452ab0a..bf5c845288 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringPadLeft2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringPadLeft2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringPadRight.csproj b/tests/src/CoreMangLib/cti/system/string/StringPadRight.csproj
index 1f117d6029..abc4dbb642 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringPadRight.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringPadRight.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringPadRight1.csproj b/tests/src/CoreMangLib/cti/system/string/StringPadRight1.csproj
index 82d09a08bb..f75793bbaf 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringPadRight1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringPadRight1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringPadRight2.csproj b/tests/src/CoreMangLib/cti/system/string/StringPadRight2.csproj
index 25894ecf41..86adbb06c0 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringPadRight2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringPadRight2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringRemove1.csproj b/tests/src/CoreMangLib/cti/system/string/StringRemove1.csproj
index c8bbad417d..107e520548 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringRemove1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringRemove1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringRemove2.csproj b/tests/src/CoreMangLib/cti/system/string/StringRemove2.csproj
index 8250efcbb9..4e7f9c9cdd 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringRemove2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringRemove2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringReplace1.csproj b/tests/src/CoreMangLib/cti/system/string/StringReplace1.csproj
index 50b5928513..0c11f9b1bd 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringReplace1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringReplace1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringReplace2.csproj b/tests/src/CoreMangLib/cti/system/string/StringReplace2.csproj
index 7824a2a6f7..093a5c11d5 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringReplace2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringReplace2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringReplace3.csproj b/tests/src/CoreMangLib/cti/system/string/StringReplace3.csproj
new file mode 100644
index 0000000000..3e59c1d8f0
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/string/StringReplace3.csproj
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4AC1-495E-87D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>0</CLRTestPriority>
+    <ReferenceSystemPrivateCoreLib>true</ReferenceSystemPrivateCoreLib>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="stringreplace3.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/CoreMangLib/cti/system/string/StringSplit1.csproj b/tests/src/CoreMangLib/cti/system/string/StringSplit1.csproj
index f0a6d5a21e..85478fd471 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringSplit1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringSplit1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringSubString1.csproj b/tests/src/CoreMangLib/cti/system/string/StringSubString1.csproj
index ac680c1c3a..162db2330e 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringSubString1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringSubString1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringSubString2.csproj b/tests/src/CoreMangLib/cti/system/string/StringSubString2.csproj
index fe17002a35..31ad428e13 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringSubString2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringSubString2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringToCharArray.csproj b/tests/src/CoreMangLib/cti/system/string/StringToCharArray.csproj
index 7de01660b2..c5896f8821 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringToCharArray.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringToCharArray.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringToString1.csproj b/tests/src/CoreMangLib/cti/system/string/StringToString1.csproj
index 91f2699654..d1a039d7bd 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringToString1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringToString1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringTrim1.csproj b/tests/src/CoreMangLib/cti/system/string/StringTrim1.csproj
index caba21005a..d3590029fb 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringTrim1.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringTrim1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringTrim1b.csproj b/tests/src/CoreMangLib/cti/system/string/StringTrim1b.csproj
index fbf6dbbc8c..e3fc8d004a 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringTrim1b.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringTrim1b.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringTrim2.csproj b/tests/src/CoreMangLib/cti/system/string/StringTrim2.csproj
index d536208682..c36b8637c1 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringTrim2.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringTrim2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringTrim3.csproj b/tests/src/CoreMangLib/cti/system/string/StringTrim3.csproj
index 9a64cfd333..af2c1c3735 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringTrim3.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringTrim3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/StringTrim4.csproj b/tests/src/CoreMangLib/cti/system/string/StringTrim4.csproj
index 4271a2c36b..ae18b4580d 100644
--- a/tests/src/CoreMangLib/cti/system/string/StringTrim4.csproj
+++ b/tests/src/CoreMangLib/cti/system/string/StringTrim4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/string/stringreplace3.cs b/tests/src/CoreMangLib/cti/system/string/stringreplace3.cs
new file mode 100644
index 0000000000..88c20af10b
--- /dev/null
+++ b/tests/src/CoreMangLib/cti/system/string/stringreplace3.cs
@@ -0,0 +1,75 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System;
+
+/// <summary>
+/// String.Replace(String, String)
+/// Replaces all occurrences of a specified Unicode character in this instance 
+/// with another specified Unicode character. 
+/// </summary>
+public class StringReplace3
+{
+    public static int Main()
+    {
+        int result =  Test1() && Test2() && Test3() && Test4() && Test5() && Test6() && Test7() ? 100 : -1;
+
+        return result; 
+    }
+
+    private static bool Test1()
+    {
+        string strExpected = "Test HEY with HEYAND HEY";
+        string strActual = "Test %token% with %TOKEN%AND %tokeN%".Replace("%token%", "HEY", StringComparison.InvariantCultureIgnoreCase);
+
+        return strExpected == strActual;
+    }
+
+    private static bool Test2()
+    {
+        string strExpected = "Test HEY with HEYAND Test!";
+        string strActual = "Test %token% with %TOKEN%AND Test!".Replace("%token%", "HEY", StringComparison.InvariantCultureIgnoreCase);
+
+        return strExpected == strActual;
+    }
+
+    private static bool Test3()
+    {
+        string strExpected = "HEYTest HEY with HEYAND Test!";
+        string strActual = "%TOKEN%Test %token% with %TOKEN%AND Test!".Replace("%token%", "HEY", StringComparison.InvariantCultureIgnoreCase);
+
+        return strExpected == strActual;
+    }
+
+    private static bool Test4()
+    {
+        string strExpected = "HEYHEYTest HEY with HEYAND Test!";
+        string strActual = "%TOKEN%%token%Test %token% with %TOKEN%AND Test!".Replace("%token%", "HEY", StringComparison.InvariantCultureIgnoreCase);
+
+        return strExpected == strActual;
+    }
+
+    private static bool Test5()
+    {
+        string strExpected = "dof";
+        string strActual = "d\u00e9f".Replace("e\u0301", "o", StringComparison.InvariantCultureIgnoreCase);
+
+        return strExpected == strActual;
+    }
+
+    private static bool Test6()
+    {
+        string strExpected = "dof";
+        string strActual = "de\u0301f".Replace("\u00e9", "o", StringComparison.InvariantCultureIgnoreCase);
+
+        return strExpected == strActual;
+    }
+
+    private static bool Test7()
+    {
+        string strExpected = "dfo";
+        string strActual = "de\u0301fo".Replace("\u00e9", "", StringComparison.InvariantCultureIgnoreCase);
+
+        return strExpected == strActual;
+    }
+}
diff --git a/tests/src/CoreMangLib/cti/system/stringcompare/StringComparerCtor.csproj b/tests/src/CoreMangLib/cti/system/stringcompare/StringComparerCtor.csproj
index 3c160f0aff..5f1b68e61d 100644
--- a/tests/src/CoreMangLib/cti/system/stringcompare/StringComparerCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/stringcompare/StringComparerCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerCompare2.csproj b/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerCompare2.csproj
index 773384c155..468d5bce27 100644
--- a/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerCompare2.csproj
+++ b/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerCompare2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerEquals1.csproj b/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerEquals1.csproj
index 4d847b42fe..dd2f37a8a1 100644
--- a/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerEquals3.csproj b/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerEquals3.csproj
index d217bd44f8..918b049abe 100644
--- a/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerEquals3.csproj
+++ b/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerEquals3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerGetType.csproj b/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerGetType.csproj
index d0e0732ef9..d48ee48987 100644
--- a/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerGetType.csproj
+++ b/tests/src/CoreMangLib/cti/system/stringcomparer/StringComparerGetType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonCurrentCulture.csproj b/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonCurrentCulture.csproj
index f1afe69027..0c5250fdbb 100644
--- a/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonCurrentCulture.csproj
+++ b/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonCurrentCulture.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonCurrentCultureIgnoreCase.csproj b/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonCurrentCultureIgnoreCase.csproj
index 92c9505181..9cca71a901 100644
--- a/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonCurrentCultureIgnoreCase.csproj
+++ b/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonCurrentCultureIgnoreCase.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonOrdinal.csproj b/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonOrdinal.csproj
index 9bc0f5c7b8..e30400df31 100644
--- a/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonOrdinal.csproj
+++ b/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonOrdinal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonOrdinalIgnoreCase.csproj b/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonOrdinalIgnoreCase.csproj
index f33ce7b31c..52daf8208a 100644
--- a/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonOrdinalIgnoreCase.csproj
+++ b/tests/src/CoreMangLib/cti/system/stringcomparison/StringComparisonOrdinalIgnoreCase.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/szarrayhelper/SZArrayHelperSetItem.csproj b/tests/src/CoreMangLib/cti/system/szarrayhelper/SZArrayHelperSetItem.csproj
index a2f87c2942..9578389d90 100644
--- a/tests/src/CoreMangLib/cti/system/szarrayhelper/SZArrayHelperSetItem.csproj
+++ b/tests/src/CoreMangLib/cti/system/szarrayhelper/SZArrayHelperSetItem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/decoder/DecoderCtor.csproj b/tests/src/CoreMangLib/cti/system/text/decoder/DecoderCtor.csproj
index 38029f39f3..76c022f4be 100644
--- a/tests/src/CoreMangLib/cti/system/text/decoder/DecoderCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/decoder/DecoderCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/decoder/DecoderReset.csproj b/tests/src/CoreMangLib/cti/system/text/decoder/DecoderReset.csproj
index fc24095c73..c92cb45b43 100644
--- a/tests/src/CoreMangLib/cti/system/text/decoder/DecoderReset.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/decoder/DecoderReset.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoder/EncoderCtor.csproj b/tests/src/CoreMangLib/cti/system/text/encoder/EncoderCtor.csproj
index 36214aa5f6..80084a679a 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoder/EncoderCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoder/EncoderCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingBigEndianUnicode.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingBigEndianUnicode.csproj
index de38a17102..cc1b28ec9b 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingBigEndianUnicode.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingBigEndianUnicode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingClone.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingClone.csproj
index b2c795d550..49f52f458c 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingClone.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingClone.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingConvert1.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingConvert1.csproj
index c527e0cbb4..7d04c14069 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingConvert1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingConvert1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingConvert2.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingConvert2.csproj
index decdb22854..1952401589 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingConvert2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingConvert2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingCtor1.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingCtor1.csproj
index d233d9ea41..a243e3aaad 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingEquals.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingEquals.csproj
index 16b79f0878..7e141920a4 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount.csproj
index fa49aec76f..c5370dce63 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount1.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount1.csproj
index 80b2290182..839070a622 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount2.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount2.csproj
index 1664c5e3b0..94f4e2d2e4 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount3.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount3.csproj
index eabec11dbd..b67ce92708 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount3.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetByteCount3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes1.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes1.csproj
index 3aa91edb1c..9feae4e52c 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes2.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes2.csproj
index 2b5b3d6918..dcbaa40258 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes3.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes3.csproj
index 45758399e4..fe26cdf767 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes3.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes4.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes4.csproj
index ebb479a55f..88624e9bc1 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes4.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes5.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes5.csproj
index 3ec9b3be7d..4053672c9e 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes5.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetBytes5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount.csproj
index 88fcc5409d..a75e93f0df 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount1.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount1.csproj
index ac44837b2a..ff091f390d 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount2.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount2.csproj
index 2cb3dbca3f..e097cfdbeb 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetCharCount2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars1.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars1.csproj
index d2695906f2..3351eacf14 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars2.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars2.csproj
index 1e6d122229..1eab7d0edb 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars3.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars3.csproj
index 26d88930b4..8f69ae30f4 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars3.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetChars3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetDecoder.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetDecoder.csproj
index 93cbdf5ae1..8f48e18412 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetDecoder.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetDecoder.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetEncoder.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetEncoder.csproj
index 3448a0c999..34664a6990 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetEncoder.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetEncoder.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetEncoding2.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetEncoding2.csproj
index 544694ab67..8f8eaa17da 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetEncoding2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetEncoding2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetMaxByteCount.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetMaxByteCount.csproj
index 17ea376210..6dac4b927a 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetMaxByteCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetMaxByteCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetMaxCharCount.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetMaxCharCount.csproj
index 473731f35c..f9a28627a1 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetMaxCharCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetMaxCharCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetPreamble.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetPreamble.csproj
index 77644c9545..3cbb02033c 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetPreamble.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetPreamble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetString.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetString.csproj
index 17b19b836d..af09637817 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetString.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingGetString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingUTF8.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingUTF8.csproj
index 5b07323710..9b96d6253f 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingUTF8.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingUTF8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingUnicode.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingUnicode.csproj
index a2fd3a06fe..7c76d43ba7 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingUnicode.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingUnicode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingWebName.csproj b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingWebName.csproj
index 00a1f70e35..dfbee86cdb 100644
--- a/tests/src/CoreMangLib/cti/system/text/encoding/EncodingWebName.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/encoding/EncodingWebName.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend.csproj
index bdfb1a8d9b..77d3e382dc 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend1.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend1.csproj
index 91457986bb..4bf3e056cd 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend10.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend10.csproj
index 5e6b55cdea..a10b908d0e 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend10.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend11.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend11.csproj
index c7c43637e8..04b1bc36d7 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend11.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend12.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend12.csproj
index 7453acda9d..45532c85bc 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend12.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend12.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend13.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend13.csproj
index 8758d6ea08..7eb547dda4 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend13.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend14.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend14.csproj
index 5628211ab9..9dd452e5b7 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend14.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend15.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend15.csproj
index e444003508..0a045532e3 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend15.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend15.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend16.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend16.csproj
index 19a87a0117..ac3e37d460 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend16.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend17.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend17.csproj
index 2ed589eb22..a9ac03eafb 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend17.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend18.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend18.csproj
index 7547a64504..91c91d9e92 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend18.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend18.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend19.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend19.csproj
index ad96b18e1f..b1f7ceecd6 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend19.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend19.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend2.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend2.csproj
index d780323ca5..8ce65eaf9c 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend3.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend3.csproj
index d5e6f40278..c3760532a7 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend3.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend4.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend4.csproj
index b20656e660..147d155ea4 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend4.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend5.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend5.csproj
index b4f8d1170e..6d2a776f01 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend5.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend6.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend6.csproj
index c9dcb6d658..f84544f11f 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend6.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend7.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend7.csproj
index a083eb398f..347852661a 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend7.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend8.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend8.csproj
index dc0aa3f26b..b0a760ef0a 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend8.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend8.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend9.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend9.csproj
index 4fe4d7a09d..113a68099b 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend9.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderAppend9.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderCapacity.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderCapacity.csproj
index c85de5bc82..2fc468eae5 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderCapacity.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderCapacity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderCapacity_cti.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderCapacity_cti.csproj
index e448ea2b2e..f02da0aa26 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderCapacity_cti.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderCapacity_cti.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderChars.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderChars.csproj
index 949ce37a8c..76cb6fa110 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderChars.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderChars.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert.csproj
index efc2275202..af83b4f4b2 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert3.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert3.csproj
index 217151cd45..a35e2b4f4f 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert3.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert4.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert4.csproj
index 59d56962de..12f678df93 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert4.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderInsert4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderLength.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderLength.csproj
index 63b8bd744a..9e361b5c22 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderLength.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderLength.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderLength_cti.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderLength_cti.csproj
index 64dc05c881..5cd824a0e6 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderLength_cti.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderLength_cti.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderRemove.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderRemove.csproj
index 3d39d76bdf..8483d9e949 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderRemove.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderRemove.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace1.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace1.csproj
index d0263b9e52..58a3814f39 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace2.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace2.csproj
index 10dcca41f9..8b8d639575 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace3.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace3.csproj
index 629c8c8b66..db39147576 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace3.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace4.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace4.csproj
index d79d3edb35..017624012f 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace4.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderReplace4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderToString1.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderToString1.csproj
index 5d67a4a350..8c3508dabc 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderToString1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderToString1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderToString2.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderToString2.csproj
index a993b1eed0..1f6daa3f66 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderToString2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderToString2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor1.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor1.csproj
index 5789a87498..c36bec65a2 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor2.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor2.csproj
index 740395e243..92fda707ae 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor3.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor3.csproj
index f204e3e876..9cb20e387f 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor4.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor4.csproj
index c95a927390..2c04b1aa1a 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor4.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor5.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor5.csproj
index 9219b1cd54..fa2e35e38f 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor5.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor6.csproj b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor6.csproj
index 97eccf6261..1ad4637d82 100644
--- a/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor6.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/stringbuilder/StringBuilderctor6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingCtor1.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingCtor1.csproj
index 592beb8c48..730a60bffa 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingEquals.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingEquals.csproj
index 9ff5750b8c..bb7ddbc865 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetByteCount1.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetByteCount1.csproj
index b12b1cb169..84b9dd83aa 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetByteCount1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetByteCount1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetByteCount2.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetByteCount2.csproj
index 227918a940..050800616b 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetByteCount2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetByteCount2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetBytes2.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetBytes2.csproj
index d83d15f21f..2949355e26 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetBytes2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetBytes2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetCharCount.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetCharCount.csproj
index ea8813b3c5..b075874c5f 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetCharCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetCharCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetChars.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetChars.csproj
index 97f99916a4..e0ed8f1478 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetChars.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetChars.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetDecoder.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetDecoder.csproj
index 451089d7cf..7539c3bd26 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetDecoder.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetDecoder.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetEncoder.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetEncoder.csproj
index b54e6c476d..b03451e15b 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetEncoder.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetEncoder.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetHashCode.csproj
index 0074c8788f..a233e4aa32 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetMaxByteCount.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetMaxByteCount.csproj
index 33bbc9bd69..6b240ac5a9 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetMaxByteCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetMaxByteCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetMaxCharCount.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetMaxCharCount.csproj
index 6798d02af4..96e57e3c4a 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetMaxCharCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetMaxCharCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetPreamble.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetPreamble.csproj
index 471c5a05ab..770c382b74 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetPreamble.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetPreamble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetString.csproj b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetString.csproj
index 911d008623..8aeaf4225a 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetString.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/UnicodeEncodingGetString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/unicodeencodinggetbytecount1.cs b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/unicodeencodinggetbytecount1.cs
index 4bc7f40c0e..a753b13604 100644
--- a/tests/src/CoreMangLib/cti/system/text/unicodeencoding/unicodeencodinggetbytecount1.cs
+++ b/tests/src/CoreMangLib/cti/system/text/unicodeencoding/unicodeencodinggetbytecount1.cs
@@ -189,7 +189,7 @@ public class UnicodeEncodingGetByteCount
         TestLibrary.TestFramework.BeginScenario("NegTest1:Invoke the method with null");
         try
         {
-            actualValue = uEncoding.GetByteCount(null,0,0);
+            actualValue = uEncoding.GetByteCount((char[])null, 0, 0);
 
             TestLibrary.TestFramework.LogError("007", "No ArgumentNullException throw out expected.");
             retVal = false;
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor.csproj
index d88ce25d01..d836c0e6a6 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor2.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor2.csproj
index 51a7d9d159..34cfa185a9 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor3.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor3.csproj
index fb5df3e5c3..0869eebeee 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingEquals.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingEquals.csproj
index d3c76a96d6..cda2355a37 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetByteCount1.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetByteCount1.csproj
index 733fc932d0..0a688eb6a7 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetByteCount1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetByteCount1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetByteCount2.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetByteCount2.csproj
index d8b844be48..e5b629e839 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetByteCount2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetByteCount2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetBytes1.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetBytes1.csproj
index a456012521..742f38eab8 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetBytes1.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetBytes1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetBytes2.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetBytes2.csproj
index c1d8362fbf..ebe0e5c38a 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetBytes2.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetBytes2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetCharCount.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetCharCount.csproj
index ba21cfa089..2116e93866 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetCharCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetCharCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetChars.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetChars.csproj
index fbe3d316cc..de065f01f0 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetChars.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetChars.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetDecoder.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetDecoder.csproj
index f0f5b34429..51a89e8f11 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetDecoder.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetDecoder.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetEncoder.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetEncoder.csproj
index c31630576e..d1411b36f5 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetEncoder.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetEncoder.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetHashCode.csproj
index 2d4ae1480f..ff667f392d 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetMaxByteCount.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetMaxByteCount.csproj
index d1fcaa9867..e5299b0a1b 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetMaxByteCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetMaxByteCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetMaxCharCount.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetMaxCharCount.csproj
index d5ef5ec907..c02fb0acae 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetMaxCharCount.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetMaxCharCount.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetPreamble.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetPreamble.csproj
index da3751d0fe..7b5df688df 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetPreamble.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetPreamble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetString.csproj b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetString.csproj
index 3e77979811..073b5bfc77 100644
--- a/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetString.csproj
+++ b/tests/src/CoreMangLib/cti/system/text/utf8encoding/UTF8EncodingGetString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventCtor.csproj b/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventCtor.csproj
index aef0a8da87..5b1c4223dc 100644
--- a/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventReSet.csproj b/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventReSet.csproj
index 6805b93469..e9be8c529b 100644
--- a/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventReSet.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventReSet.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventSet.csproj b/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventSet.csproj
index 36408d4465..b49a81ea06 100644
--- a/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventSet.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/autoresetevent/AutoResetEventSet.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/autoresetevent/autoreseteventctor.cs b/tests/src/CoreMangLib/cti/system/threading/autoresetevent/autoreseteventctor.cs
index 284889d8f2..ad001402d6 100644
--- a/tests/src/CoreMangLib/cti/system/threading/autoresetevent/autoreseteventctor.cs
+++ b/tests/src/CoreMangLib/cti/system/threading/autoresetevent/autoreseteventctor.cs
@@ -1,7 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
+
 using System;
+using System.Diagnostics;
 using System.Threading;
 
 public class AutoResetEventCtor
@@ -70,8 +72,8 @@ public class AutoResetEventCtor
     {
         bool           retVal = true;
         AutoResetEvent are;
-	long           ticksBefore;
-	long           ticksAfter;
+        Stopwatch      sw;
+        long           elapsedTicks;
 
         TestLibrary.TestFramework.BeginScenario("PosTest1: AutoResetEvent.Ctor(false)");
 
@@ -80,19 +82,20 @@ public class AutoResetEventCtor
             // true means that the initial state should be signaled
             are = new AutoResetEvent(false);
 
-            ticksBefore = DateTime.Now.Ticks;
+            sw = Stopwatch.StartNew();
 
             // verify that the autoreset event is signaled
             // if it is not signaled the following call will block for ever
             TestLibrary.TestFramework.LogInformation("Calling AutoResetEvent.WaitOne()... if the event is signaled it will not wait long enough");
             are.WaitOne(c_MILLISECONDS_TOWAIT);
 
-            ticksAfter = DateTime.Now.Ticks;
+            sw.Stop();
+            elapsedTicks = sw.Elapsed.Ticks;
 
-            if (c_DELTA < Math.Abs((ticksAfter - ticksBefore) - (c_MILLISECONDS_TOWAIT*10000)))
+            if (c_DELTA < Math.Abs(elapsedTicks - (c_MILLISECONDS_TOWAIT*10000)))
             {
                 TestLibrary.TestFramework.LogError("002", "AutoResetEvent did not wait long enough... this implies that the parameter was not respected.");
-                TestLibrary.TestFramework.LogError("002", " WaitTime=" + (ticksAfter-ticksBefore) + " (ticks)");
+                TestLibrary.TestFramework.LogError("002", " WaitTime=" + elapsedTicks + " (ticks)");
                 TestLibrary.TestFramework.LogError("002", " Execpted=" + (c_MILLISECONDS_TOWAIT*10000) + " (ticks)");
                 TestLibrary.TestFramework.LogError("002", " Acceptable Delta=" + c_DELTA + " (ticks)");
                 retVal = false;
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedAdd1.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedAdd1.csproj
index 962f1efd73..2e8b0040bc 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedAdd1.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedAdd1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedAdd2.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedAdd2.csproj
index 4ee8578d96..6b92529f78 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedAdd2.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedAdd2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange1.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange1.csproj
index e08bcbe212..fef60386d5 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange1.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange5.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange5.csproj
index 40dbaa7b09..5aa52f254f 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange5.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange6.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange6.csproj
index a7fe800683..2981c242f1 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange6.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange7.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange7.csproj
index 550baf90cc..c6c7ec3ed8 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange7.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedCompareExchange7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedDecrement1.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedDecrement1.csproj
index bf24dd73c8..c24eed3570 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedDecrement1.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedDecrement1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedDecrement2.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedDecrement2.csproj
index 4eb114b05a..10c2fffdc6 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedDecrement2.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedDecrement2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange1.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange1.csproj
index cf5566fa10..ffff96fdb6 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange1.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange5.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange5.csproj
index 83ce4f513c..18f4f00d19 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange5.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange5.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange6.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange6.csproj
index b5451b29e7..e334ce6cc9 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange6.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange6.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange7.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange7.csproj
index 48545fd140..efc3b0bca2 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange7.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedExchange7.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedIncrement1.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedIncrement1.csproj
index 860a761832..7c0a33c523 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedIncrement1.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedIncrement1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedIncrement2.csproj b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedIncrement2.csproj
index 54662d69af..e7513df6d0 100644
--- a/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedIncrement2.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/interlocked/InterlockedIncrement2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/manualresetevent/ManualResetEventCtor.csproj b/tests/src/CoreMangLib/cti/system/threading/manualresetevent/ManualResetEventCtor.csproj
index b85bc60bde..b5f2bf0cd1 100644
--- a/tests/src/CoreMangLib/cti/system/threading/manualresetevent/ManualResetEventCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/manualresetevent/ManualResetEventCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/timeout/TimeOutInfinite.csproj b/tests/src/CoreMangLib/cti/system/threading/timeout/TimeOutInfinite.csproj
index 35721b8369..effe100066 100644
--- a/tests/src/CoreMangLib/cti/system/threading/timeout/TimeOutInfinite.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/timeout/TimeOutInfinite.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleCtor.csproj b/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleCtor.csproj
index ddecd770ae..56094c3f6b 100644
--- a/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleCtor.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleCtor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleDispose1.csproj b/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleDispose1.csproj
index 7908613884..f23a5a4173 100644
--- a/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleDispose1.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleDispose1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleDispose3.csproj b/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleDispose3.csproj
index 3351c7271f..56e9ccc6ca 100644
--- a/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleDispose3.csproj
+++ b/tests/src/CoreMangLib/cti/system/threading/waithandle/WaitHandleDispose3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor1.csproj
index 4d9cc043fa..9df39d5e7c 100644
--- a/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor2.csproj
index a654fdd577..0fda8923d2 100644
--- a/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor3.csproj
index 9017b7219f..071d62e08a 100644
--- a/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/timeoutexception/TimeoutExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanAdd.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanAdd.csproj
index 9b7052e7d5..de8ab529b6 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanAdd.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanAdd.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCompare1.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCompare1.csproj
index 13a4fac2b7..986ae19def 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCompare1.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCompare1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCompareTo2.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCompareTo2.csproj
index 48bcbc9bf6..1db260e769 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCompareTo2.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCompareTo2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor1.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor1.csproj
index 5789dae7fb..7491f060e1 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor2.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor2.csproj
index e2fbca0e31..e2c862448f 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor3.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor3.csproj
index e4710a3726..98c29eaad0 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor4.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor4.csproj
index c5e2d6d2d7..f0174abd92 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor4.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanCtor4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanDuration.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanDuration.csproj
index 1a8754a40f..3f8d61a81c 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanDuration.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanDuration.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals1.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals1.csproj
index 7d2d6e47c7..99c62dc1af 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals2.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals2.csproj
index d1f58a8763..589c64b2f3 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals3.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals3.csproj
index b65670948c..592b5c8ff9 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals3.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanEquals3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanFromTicks.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanFromTicks.csproj
index f1284b78ee..cffc0e9665 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanFromTicks.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanFromTicks.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanGetHashCode.csproj
index e49509129a..4f167127a8 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanMaxValue.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanMaxValue.csproj
index d28c5d01f6..364806cc0c 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanMaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanMaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanMinValue.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanMinValue.csproj
index 58d1ed3fd2..bd44479663 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanMinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanMinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanNegate.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanNegate.csproj
index f5dd6cf080..ca4e8742b0 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanNegate.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanNegate.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicks.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicks.csproj
index 2bbcbb7824..691a7f19ee 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicks.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicks.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerDay.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerDay.csproj
index ce8a17e662..5c66d31403 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerDay.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerDay.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerHour.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerHour.csproj
index 13c5bfdff5..7aa7e2d994 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerHour.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerHour.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerMinute.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerMinute.csproj
index e4f69cb73d..3d7963c609 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerMinute.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerMinute.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerSecond.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerSecond.csproj
index d91d2fb208..cc5f618916 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerSecond.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTicksPerSecond.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanToString_str.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanToString_str.csproj
index 8fb88df746..058c80ec40 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanToString_str.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanToString_str.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalDays.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalDays.csproj
index 558e1c8a34..2827113049 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalDays.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalDays.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalHours.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalHours.csproj
index 4b34529de4..9945530024 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalHours.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalHours.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalMilliseconds.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalMilliseconds.csproj
index ce7f75d751..7312aac959 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalMilliseconds.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalMilliseconds.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalMinutes.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalMinutes.csproj
index 149f4786d3..f8e6704ab5 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalMinutes.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalMinutes.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalSeconds.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalSeconds.csproj
index 1b1f657724..ac0248c043 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalSeconds.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanTotalSeconds.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanZero.csproj b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanZero.csproj
index 5a6c8ce183..3a1a965d76 100644
--- a/tests/src/CoreMangLib/cti/system/timespan/TimeSpanZero.csproj
+++ b/tests/src/CoreMangLib/cti/system/timespan/TimeSpanZero.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeEquals1.csproj b/tests/src/CoreMangLib/cti/system/type/TypeEquals1.csproj
index e0fb1d55da..a7f8c6ea3a 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeEquals2.csproj b/tests/src/CoreMangLib/cti/system/type/TypeEquals2.csproj
index 11c949ea21..a19d626179 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeGetArrayRank.csproj b/tests/src/CoreMangLib/cti/system/type/TypeGetArrayRank.csproj
index 85a404e9ff..b52781b436 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeGetArrayRank.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeGetArrayRank.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeGetElementType.csproj b/tests/src/CoreMangLib/cti/system/type/TypeGetElementType.csproj
index 45d2d55b22..f09aed5340 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeGetElementType.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeGetElementType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeGetGenericTypeDefinition.csproj b/tests/src/CoreMangLib/cti/system/type/TypeGetGenericTypeDefinition.csproj
index 558042ed6d..fa069421ff 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeGetGenericTypeDefinition.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeGetGenericTypeDefinition.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/type/TypeGetHashCode.csproj
index 2e6214263a..1103f53c4f 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeGetType1.csproj b/tests/src/CoreMangLib/cti/system/type/TypeGetType1.csproj
index 928823a622..43cf5d0805 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeGetType1.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeGetType1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeGetType2.csproj b/tests/src/CoreMangLib/cti/system/type/TypeGetType2.csproj
index 1d35b2a312..c8a8c20296 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeGetType2.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeGetType2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeGetTypeFromHandle.csproj b/tests/src/CoreMangLib/cti/system/type/TypeGetTypeFromHandle.csproj
index b083ec8505..9ac01f31ad 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeGetTypeFromHandle.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeGetTypeFromHandle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeHasElementTypeImpl.csproj b/tests/src/CoreMangLib/cti/system/type/TypeHasElementTypeImpl.csproj
index e9962d2fab..4c31ba5ec8 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeHasElementTypeImpl.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeHasElementTypeImpl.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeIsByRefImpl.csproj b/tests/src/CoreMangLib/cti/system/type/TypeIsByRefImpl.csproj
index 9c4f870820..6370b287dc 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeIsByRefImpl.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeIsByRefImpl.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeIsPointerImpl.csproj b/tests/src/CoreMangLib/cti/system/type/TypeIsPointerImpl.csproj
index e39cab361f..8c19ad458d 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeIsPointerImpl.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeIsPointerImpl.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeMakeArrayType1.csproj b/tests/src/CoreMangLib/cti/system/type/TypeMakeArrayType1.csproj
index d5911207bc..22ec6c924c 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeMakeArrayType1.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeMakeArrayType1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeMakeArrayType2.csproj b/tests/src/CoreMangLib/cti/system/type/TypeMakeArrayType2.csproj
index a9b5e21cc1..fba1b4b1bd 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeMakeArrayType2.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeMakeArrayType2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeMakeByRefType.csproj b/tests/src/CoreMangLib/cti/system/type/TypeMakeByRefType.csproj
index 666ab8e4f0..1c963882d3 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeMakeByRefType.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeMakeByRefType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeMakePointerType.csproj b/tests/src/CoreMangLib/cti/system/type/TypeMakePointerType.csproj
index 83375b4b68..8c6f6c94a6 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeMakePointerType.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeMakePointerType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/type/TypeToString.csproj b/tests/src/CoreMangLib/cti/system/type/TypeToString.csproj
index 4341bb3629..0a9849370d 100644
--- a/tests/src/CoreMangLib/cti/system/type/TypeToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/type/TypeToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeBoolean.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeBoolean.csproj
index 0ce68ffaff..a38c151ca5 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeByte.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeByte.csproj
index e70641af62..7ef5452791 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeChar.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeChar.csproj
index 3dc04530c4..30f7ca1d42 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDateTime.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDateTime.csproj
index 1029198bbe..3172c03805 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDecimal.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDecimal.csproj
index 6930d85861..7f7c71eb79 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDouble.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDouble.csproj
index a5a51bc515..c75958abd3 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeEmpty.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeEmpty.csproj
index e0c4a13fe0..75caecc893 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeEmpty.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeEmpty.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt16.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt16.csproj
index 8f5024e015..6bb2a68d9b 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt32.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt32.csproj
index 5611e1589b..c2f906fe4e 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt64.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt64.csproj
index ac6cabfba8..6a0e0bc7b6 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeObject.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeObject.csproj
index f3575eb3d6..7f9615f67a 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeObject.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeObject.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeSByte.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeSByte.csproj
index 74e0ac7b07..2bbb23935f 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeSingle.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeSingle.csproj
index b0b6d57899..7f6c159490 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeString.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeString.csproj
index 85c92fd9c5..7bbe3a2ac8 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeString.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt16.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt16.csproj
index 478d6f34bc..4e232821c8 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt32.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt32.csproj
index 23fb488437..2279c64242 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt64.csproj b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt64.csproj
index 701e766f7e..7b25b8eb36 100644
--- a/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/typecode/TypeCodeUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor1.csproj b/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor1.csproj
index a29abac8ff..4b7581ff4b 100644
--- a/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor1.csproj
+++ b/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor2.csproj b/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor2.csproj
index f968a0ebd5..1488f92a2f 100644
--- a/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor2.csproj
+++ b/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor3.csproj b/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor3.csproj
index 6da55127f8..f4e663f0d5 100644
--- a/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor3.csproj
+++ b/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionCtor3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionMessage.csproj b/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionMessage.csproj
index 482d8b150d..45d4e9b852 100644
--- a/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionMessage.csproj
+++ b/tests/src/CoreMangLib/cti/system/typeloadexception/TypeLoadExceptionMessage.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16CompareTo1.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16CompareTo1.csproj
index 80fdb88309..e1a8b2fcfd 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16CompareTo1.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16CompareTo1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16Equals1.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16Equals1.csproj
index cbf572a329..101fa8535b 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16Equals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16Equals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16Equals2.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16Equals2.csproj
index 2f898f67cd..9923db9a75 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16Equals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16Equals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToBoolean.csproj
index 6837fdd18e..5ddefb5586 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToByte.csproj
index 91115a751f..f311bb7c5b 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToChar.csproj
index 44f4642f2e..f6d17860d3 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDateTime.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDateTime.csproj
index 32e864191a..ff10b9ebd4 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDecimal.csproj
index ea526d5a67..ea1964451d 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDouble.csproj
index 57754ec013..91cf0c3796 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt16.csproj
index b666541ff5..695a1487ad 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt32.csproj
index 4b572905cd..3cdbaf3dc1 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt64.csproj
index 093fc54d1b..e5e73a4a5b 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToSByte.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToSByte.csproj
index 163822910f..292f973297 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToSingle.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToSingle.csproj
index ec6e979da3..5e4d56c41a 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToType.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToType.csproj
index 58d03cfa17..3fc53a482f 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToType.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt16.csproj
index 5b2fbf74f5..fa0a0fc29e 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt32.csproj
index be438583fd..8e3376e70d 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt64.csproj
index c88b39d570..c8a0423fcb 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16IConvertibleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse1.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse1.csproj
index 2ce7d80109..36fa138004 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse1.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse2.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse2.csproj
index 6b9d7bd008..8e57df1186 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse3.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse3.csproj
index 15042213db..f65ffb3419 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse3.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16Parse3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16ToString3.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16ToString3.csproj
index 950af6b1f4..a3b442c536 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16ToString3.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16ToString3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16ToString4.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16ToString4.csproj
index ca683bad29..54c2c158fe 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16ToString4.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16ToString4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint16/UInt16TryParse.csproj b/tests/src/CoreMangLib/cti/system/uint16/UInt16TryParse.csproj
index a6ac8cdcd0..e70827f3e6 100644
--- a/tests/src/CoreMangLib/cti/system/uint16/UInt16TryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint16/UInt16TryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32CompareTo2.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32CompareTo2.csproj
index 48c082edec..11758710a9 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32CompareTo2.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32CompareTo2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32Equals1.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32Equals1.csproj
index 3e831d0f73..9542b14c80 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32Equals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32Equals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32Equals2.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32Equals2.csproj
index 8d6aa0bf0a..8d4a47af12 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32Equals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32Equals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32GetHashCode.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32GetHashCode.csproj
index 85ab6d22c2..7e84b6a504 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32GetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32GetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToBoolean.csproj
index c5efb91f00..2712e3647b 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToByte.csproj
index 438f892771..16c86ddb6a 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToChar.csproj
index 43cfa743ea..5c83d78921 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToDecimal.csproj
index 77032a1476..33a9351f12 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToDouble.csproj
index 9bbba71ab2..1557ed7d08 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt16.csproj
index 89734d2759..7fa4cf4fa9 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt32.csproj
index a47f65c403..e2a4b02e21 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt64.csproj
index 2a93838f67..1467a6718d 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToSByte.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToSByte.csproj
index d0d5d50eab..821e2e2c8c 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToSingle.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToSingle.csproj
index 5d9a3e227c..16e0123d25 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToType.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToType.csproj
index ed0d595d89..f77841eacc 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToType.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt16.csproj
index a9f4b74fdc..b7ffb3a247 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt32.csproj
index e56a57a1bd..05f7152607 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt64.csproj
index 25f0978487..3711553ee9 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32IConvertibleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32MaxValue.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32MaxValue.csproj
index c7a31e3f5c..46c3b14375 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32MaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32MaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32MinValue.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32MinValue.csproj
index 91ccf18aef..9351ad2e7b 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32MinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32MinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse1.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse1.csproj
index b3f74d4d99..a719d100a4 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse1.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse2.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse2.csproj
index 36e22ee658..285890d49e 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse3.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse3.csproj
index dc29f3b841..4bd885ba96 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse3.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32Parse3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32ToString2.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32ToString2.csproj
index 69f919e84c..5e99347684 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32ToString2.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32ToString2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint32/UInt32TryParse.csproj b/tests/src/CoreMangLib/cti/system/uint32/UInt32TryParse.csproj
index e3d78642fb..4fd243cd80 100644
--- a/tests/src/CoreMangLib/cti/system/uint32/UInt32TryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint32/UInt32TryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64GetHashCode.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64GetHashCode.csproj
index 19d821dc9d..a2eba6308e 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64GetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64GetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToBoolean.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToBoolean.csproj
index adc08df10d..8e7918dad1 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToBoolean.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToBoolean.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToByte.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToByte.csproj
index a07a48a75b..ff91223235 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToChar.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToChar.csproj
index 165f25cb78..2aed669b8d 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToChar.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDateTime.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDateTime.csproj
index 84f8043244..0afb8ad762 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDateTime.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDateTime.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDecimal.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDecimal.csproj
index 0eef2007a2..0b0a50fcea 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDecimal.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDouble.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDouble.csproj
index a19cce628a..d50c6e9702 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDouble.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt16.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt16.csproj
index 2be022a244..9836ddd331 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt32.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt32.csproj
index a2d05cd173..0a0b286dc1 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt64.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt64.csproj
index cafec991e9..2a1c4f3bc4 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToSByte.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToSByte.csproj
index 7095a84289..449bcd1f7b 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToSByte.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToSingle.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToSingle.csproj
index 5cbd0d95e0..04d96e47ff 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToSingle.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToSingle.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToType.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToType.csproj
index abe509aad6..3c4771f26d 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToType.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt16.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt16.csproj
index 5fa0dff502..bda1cab403 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt16.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt32.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt32.csproj
index 087328ffc8..5f18bd8d75 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt64.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt64.csproj
index f6be59d831..1d942b6b2a 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64IConvertibleToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64MaxValue.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64MaxValue.csproj
index f36ae034de..0d85fcb6ce 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64MaxValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64MaxValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64MinValue.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64MinValue.csproj
index 28b995e1e7..ab5821834e 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64MinValue.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64MinValue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse1.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse1.csproj
index dd33407efe..1db2a88dba 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse1.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse2.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse2.csproj
index 238fc3035b..09486583fe 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse2.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse3.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse3.csproj
index 4ef7bc1fca..9d6f0bf56d 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse3.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64Parse3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64ToString2.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64ToString2.csproj
index 094aeb2d39..8428613424 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64ToString2.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64ToString2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uint64/UInt64TryParse.csproj b/tests/src/CoreMangLib/cti/system/uint64/UInt64TryParse.csproj
index 1c268ba958..6986a650d0 100644
--- a/tests/src/CoreMangLib/cti/system/uint64/UInt64TryParse.csproj
+++ b/tests/src/CoreMangLib/cti/system/uint64/UInt64TryParse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_UInt32.csproj b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_UInt32.csproj
index 5581805454..7159725362 100644
--- a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_UInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_UInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_UInt64.csproj b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_UInt64.csproj
index 84673c8167..35ebcf8371 100644
--- a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_UInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_UInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_VoidPtr.csproj b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_VoidPtr.csproj
index 131278c2dd..3ca8e64bf3 100644
--- a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_VoidPtr.csproj
+++ b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrCtor_VoidPtr.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrEquals.csproj b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrEquals.csproj
index 6b0ce0a2a6..379c24174a 100644
--- a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrGetHashCode.csproj
index e913321abc..a25e4d9cbc 100644
--- a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrSize.csproj b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrSize.csproj
index 69050eef8c..c765258383 100644
--- a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrSize.csproj
+++ b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrSize.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToPointer.csproj b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToPointer.csproj
index 7d7f1dd07c..e2c9def880 100644
--- a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToPointer.csproj
+++ b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToPointer.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToString.csproj b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToString.csproj
index 4d87714bd9..71daf431d9 100644
--- a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToString.csproj
+++ b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToUInt32.csproj b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToUInt32.csproj
index b0d9a1d536..a82948d21c 100644
--- a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToUInt32.csproj
+++ b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToUInt32.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToUInt64.csproj b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToUInt64.csproj
index d8023e5e68..3e045b03c4 100644
--- a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToUInt64.csproj
+++ b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrToUInt64.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrZero.csproj b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrZero.csproj
index 3707a4dc6f..5c18302fef 100644
--- a/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrZero.csproj
+++ b/tests/src/CoreMangLib/cti/system/uintptr/UIntPtrZero.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/valuetype/ValueTypeEquals.csproj b/tests/src/CoreMangLib/cti/system/valuetype/ValueTypeEquals.csproj
index 7f70a7feac..92e034bdc6 100644
--- a/tests/src/CoreMangLib/cti/system/valuetype/ValueTypeEquals.csproj
+++ b/tests/src/CoreMangLib/cti/system/valuetype/ValueTypeEquals.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/valuetype/ValueTypeEquals2.csproj b/tests/src/CoreMangLib/cti/system/valuetype/ValueTypeEquals2.csproj
index 119130c54d..6cf1fc1ca7 100644
--- a/tests/src/CoreMangLib/cti/system/valuetype/ValueTypeEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/valuetype/ValueTypeEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/version/VersionBuild.csproj b/tests/src/CoreMangLib/cti/system/version/VersionBuild.csproj
index 976a13b00a..cb233d5d71 100644
--- a/tests/src/CoreMangLib/cti/system/version/VersionBuild.csproj
+++ b/tests/src/CoreMangLib/cti/system/version/VersionBuild.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/version/VersionCompareTo2.csproj b/tests/src/CoreMangLib/cti/system/version/VersionCompareTo2.csproj
index 3ff809fc08..4bb358d305 100644
--- a/tests/src/CoreMangLib/cti/system/version/VersionCompareTo2.csproj
+++ b/tests/src/CoreMangLib/cti/system/version/VersionCompareTo2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/version/VersionCtor4.csproj b/tests/src/CoreMangLib/cti/system/version/VersionCtor4.csproj
index 8de3ac3d68..30600eb038 100644
--- a/tests/src/CoreMangLib/cti/system/version/VersionCtor4.csproj
+++ b/tests/src/CoreMangLib/cti/system/version/VersionCtor4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/version/VersionEquals1.csproj b/tests/src/CoreMangLib/cti/system/version/VersionEquals1.csproj
index 5e346c4c26..b20bb4ade0 100644
--- a/tests/src/CoreMangLib/cti/system/version/VersionEquals1.csproj
+++ b/tests/src/CoreMangLib/cti/system/version/VersionEquals1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/version/VersionEquals2.csproj b/tests/src/CoreMangLib/cti/system/version/VersionEquals2.csproj
index 6686abc663..f101b4231b 100644
--- a/tests/src/CoreMangLib/cti/system/version/VersionEquals2.csproj
+++ b/tests/src/CoreMangLib/cti/system/version/VersionEquals2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/version/VersionGetHashCode.csproj b/tests/src/CoreMangLib/cti/system/version/VersionGetHashCode.csproj
index 5d5fc181c7..e077a51bdf 100644
--- a/tests/src/CoreMangLib/cti/system/version/VersionGetHashCode.csproj
+++ b/tests/src/CoreMangLib/cti/system/version/VersionGetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/version/VersionMajor.csproj b/tests/src/CoreMangLib/cti/system/version/VersionMajor.csproj
index 0b9f8c1c79..5e1db0afa9 100644
--- a/tests/src/CoreMangLib/cti/system/version/VersionMajor.csproj
+++ b/tests/src/CoreMangLib/cti/system/version/VersionMajor.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/version/VersionRevision.csproj b/tests/src/CoreMangLib/cti/system/version/VersionRevision.csproj
index e6de823ac2..6c654f6024 100644
--- a/tests/src/CoreMangLib/cti/system/version/VersionRevision.csproj
+++ b/tests/src/CoreMangLib/cti/system/version/VersionRevision.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/version/VersionToString1.csproj b/tests/src/CoreMangLib/cti/system/version/VersionToString1.csproj
index 11d48dc715..9dc2e2540f 100644
--- a/tests/src/CoreMangLib/cti/system/version/VersionToString1.csproj
+++ b/tests/src/CoreMangLib/cti/system/version/VersionToString1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/version/VersionToString2.csproj b/tests/src/CoreMangLib/cti/system/version/VersionToString2.csproj
index eb529bbce7..135bcb9edb 100644
--- a/tests/src/CoreMangLib/cti/system/version/VersionToString2.csproj
+++ b/tests/src/CoreMangLib/cti/system/version/VersionToString2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor1_PSC.csproj b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor1_PSC.csproj
index a99692dc85..4c4dfe7021 100644
--- a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor1_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor1_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor2_PSC.csproj b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor2_PSC.csproj
index d59c45054b..683f18bc94 100644
--- a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor2_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor2_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor2b_PSC.csproj b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor2b_PSC.csproj
index 306e7f63bc..09d6fa1eac 100644
--- a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor2b_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceCtor2b_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceIsAlive_PSC.csproj b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceIsAlive_PSC.csproj
index db5e08dfab..4e7d4ec972 100644
--- a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceIsAlive_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceIsAlive_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceIsAliveb_PSC.csproj b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceIsAliveb_PSC.csproj
index 565e47c039..2361c0da8a 100644
--- a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceIsAliveb_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceIsAliveb_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceTargetb_PSC.csproj b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceTargetb_PSC.csproj
index 7d2b543d43..c87b53bfa8 100644
--- a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceTargetb_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceTargetb_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceTrackResurrection_cti_PSC.csproj b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceTrackResurrection_cti_PSC.csproj
index 1cbf48d51e..7ce7c83563 100644
--- a/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceTrackResurrection_cti_PSC.csproj
+++ b/tests/src/CoreMangLib/cti/system/weakreference/WeakReferenceTrackResurrection_cti_PSC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/tests/src/CoreMangLib/reflection/assembly/TestAssemblyAppBase.csproj b/tests/src/CoreMangLib/reflection/assembly/TestAssemblyAppBase.csproj
index a8a3c35da8..070b617c49 100644
--- a/tests/src/CoreMangLib/reflection/assembly/TestAssemblyAppBase.csproj
+++ b/tests/src/CoreMangLib/reflection/assembly/TestAssemblyAppBase.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/reflection/assembly/TestAssemblyNotAppBase.csproj b/tests/src/CoreMangLib/reflection/assembly/TestAssemblyNotAppBase.csproj
index a8a3c35da8..070b617c49 100644
--- a/tests/src/CoreMangLib/reflection/assembly/TestAssemblyNotAppBase.csproj
+++ b/tests/src/CoreMangLib/reflection/assembly/TestAssemblyNotAppBase.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/buffer/ASURT_99893.csproj b/tests/src/CoreMangLib/system/buffer/ASURT_99893.csproj
index ca33dcd5ec..8b8f226255 100644
--- a/tests/src/CoreMangLib/system/buffer/ASURT_99893.csproj
+++ b/tests/src/CoreMangLib/system/buffer/ASURT_99893.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_609271.csproj b/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_609271.csproj
index cc2941e55a..920d19f214 100644
--- a/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_609271.csproj
+++ b/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_609271.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_624201.csproj b/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_624201.csproj
index 4e883b9338..6464b17f3b 100644
--- a/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_624201.csproj
+++ b/tests/src/CoreMangLib/system/collections/generic/hashset/Regression_Dev10_624201.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/VSD/OpenDelegate.csproj b/tests/src/CoreMangLib/system/delegate/VSD/OpenDelegate.csproj
index 5a39b7582d..d1c0146186 100644
--- a/tests/src/CoreMangLib/system/delegate/VSD/OpenDelegate.csproj
+++ b/tests/src/CoreMangLib/system/delegate/VSD/OpenDelegate.csproj
@@ -6,14 +6,9 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/CoreMangLib/system/delegate/generics/NG_Standard.csproj b/tests/src/CoreMangLib/system/delegate/generics/NG_Standard.csproj
index dd18b75221..48633471c9 100644
--- a/tests/src/CoreMangLib/system/delegate/generics/NG_Standard.csproj
+++ b/tests/src/CoreMangLib/system/delegate/generics/NG_Standard.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/generics/NegativeGenerics.csproj b/tests/src/CoreMangLib/system/delegate/generics/NegativeGenerics.csproj
index 6e2506a5f5..786d73c362 100644
--- a/tests/src/CoreMangLib/system/delegate/generics/NegativeGenerics.csproj
+++ b/tests/src/CoreMangLib/system/delegate/generics/NegativeGenerics.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/generics/NullableTypes.csproj b/tests/src/CoreMangLib/system/delegate/generics/NullableTypes.csproj
index 8765fd8660..d9a18892ea 100644
--- a/tests/src/CoreMangLib/system/delegate/generics/NullableTypes.csproj
+++ b/tests/src/CoreMangLib/system/delegate/generics/NullableTypes.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/miscellaneous/Central.csproj b/tests/src/CoreMangLib/system/delegate/miscellaneous/Central.csproj
index 5ccec93b4b..f73b2e146b 100644
--- a/tests/src/CoreMangLib/system/delegate/miscellaneous/Central.csproj
+++ b/tests/src/CoreMangLib/system/delegate/miscellaneous/Central.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.csproj b/tests/src/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.csproj
index bc95b076ed..6569ad3723 100644
--- a/tests/src/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.csproj
+++ b/tests/src/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.reflect.xml b/tests/src/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.reflect.xml
new file mode 100644
index 0000000000..c7c5a30b6f
--- /dev/null
+++ b/tests/src/CoreMangLib/system/delegate/miscellaneous/ClosedStatic.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="ClosedStatic">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6010DelegateEqualsTwo.csproj b/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6010DelegateEqualsTwo.csproj
index 8e548b69ff..97ed8c3552 100644
--- a/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6010DelegateEqualsTwo.csproj
+++ b/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6010DelegateEqualsTwo.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6031GetHashCode.csproj b/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6031GetHashCode.csproj
index f64d30c2c2..47d4d859e8 100644
--- a/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6031GetHashCode.csproj
+++ b/tests/src/CoreMangLib/system/delegate/miscellaneous/Co6031GetHashCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/regressions/devdivbugs/113347/DDB113347.csproj b/tests/src/CoreMangLib/system/delegate/regressions/devdivbugs/113347/DDB113347.csproj
index 741ee6c2b6..29d6232cf9 100644
--- a/tests/src/CoreMangLib/system/delegate/regressions/devdivbugs/113347/DDB113347.csproj
+++ b/tests/src/CoreMangLib/system/delegate/regressions/devdivbugs/113347/DDB113347.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/threatmodel/public/TestClass.csproj b/tests/src/CoreMangLib/system/delegate/threatmodel/public/TestClass.csproj
index 9ddf31918f..5600b3cca0 100644
--- a/tests/src/CoreMangLib/system/delegate/threatmodel/public/TestClass.csproj
+++ b/tests/src/CoreMangLib/system/delegate/threatmodel/public/TestClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/threatmodel/public/TestClassFrameworkInternal.csproj b/tests/src/CoreMangLib/system/delegate/threatmodel/public/TestClassFrameworkInternal.csproj
index b43b589fb2..07f4938565 100644
--- a/tests/src/CoreMangLib/system/delegate/threatmodel/public/TestClassFrameworkInternal.csproj
+++ b/tests/src/CoreMangLib/system/delegate/threatmodel/public/TestClassFrameworkInternal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/threatmodel/tests/BindingTarget.csproj b/tests/src/CoreMangLib/system/delegate/threatmodel/tests/BindingTarget.csproj
index e7853339ee..842cb20b5c 100644
--- a/tests/src/CoreMangLib/system/delegate/threatmodel/tests/BindingTarget.csproj
+++ b/tests/src/CoreMangLib/system/delegate/threatmodel/tests/BindingTarget.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/threatmodel/tests/CritConstructorClass.csproj b/tests/src/CoreMangLib/system/delegate/threatmodel/tests/CritConstructorClass.csproj
index 6c6c1b748a..65b9159a94 100644
--- a/tests/src/CoreMangLib/system/delegate/threatmodel/tests/CritConstructorClass.csproj
+++ b/tests/src/CoreMangLib/system/delegate/threatmodel/tests/CritConstructorClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/threatmodel/tests/TestClass.csproj b/tests/src/CoreMangLib/system/delegate/threatmodel/tests/TestClass.csproj
index 9ddf31918f..5600b3cca0 100644
--- a/tests/src/CoreMangLib/system/delegate/threatmodel/tests/TestClass.csproj
+++ b/tests/src/CoreMangLib/system/delegate/threatmodel/tests/TestClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/delegate/threatmodel/tests/TestClassFrameworkInternal.csproj b/tests/src/CoreMangLib/system/delegate/threatmodel/tests/TestClassFrameworkInternal.csproj
index b43b589fb2..07f4938565 100644
--- a/tests/src/CoreMangLib/system/delegate/threatmodel/tests/TestClassFrameworkInternal.csproj
+++ b/tests/src/CoreMangLib/system/delegate/threatmodel/tests/TestClassFrameworkInternal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/exception/Data_Helper.csproj b/tests/src/CoreMangLib/system/exception/Data_Helper.csproj
index 5680c520e3..0155b7f0c0 100644
--- a/tests/src/CoreMangLib/system/exception/Data_Helper.csproj
+++ b/tests/src/CoreMangLib/system/exception/Data_Helper.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/guid/Guid_Parsing.csproj b/tests/src/CoreMangLib/system/guid/Guid_Parsing.csproj
index a81db8d6d6..065c6dd1c1 100644
--- a/tests/src/CoreMangLib/system/guid/Guid_Parsing.csproj
+++ b/tests/src/CoreMangLib/system/guid/Guid_Parsing.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/lazyt/LazyTTF.csproj b/tests/src/CoreMangLib/system/lazyt/LazyTTF.csproj
index a06f618db2..c6b0ee645a 100644
--- a/tests/src/CoreMangLib/system/lazyt/LazyTTF.csproj
+++ b/tests/src/CoreMangLib/system/lazyt/LazyTTF.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/reflection/assembly/server1.csproj b/tests/src/CoreMangLib/system/reflection/assembly/server1.csproj
index 6c72c4b5c0..ba2b8af84b 100644
--- a/tests/src/CoreMangLib/system/reflection/assembly/server1.csproj
+++ b/tests/src/CoreMangLib/system/reflection/assembly/server1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/reflection/assembly/server2.csproj b/tests/src/CoreMangLib/system/reflection/assembly/server2.csproj
index 8005b04805..208997dcb6 100644
--- a/tests/src/CoreMangLib/system/reflection/assembly/server2.csproj
+++ b/tests/src/CoreMangLib/system/reflection/assembly/server2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/reflection/assembly/server3.csproj b/tests/src/CoreMangLib/system/reflection/assembly/server3.csproj
index 5fda00a5c0..c4a71c6148 100644
--- a/tests/src/CoreMangLib/system/reflection/assembly/server3.csproj
+++ b/tests/src/CoreMangLib/system/reflection/assembly/server3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/reflection/assembly/server4.csproj b/tests/src/CoreMangLib/system/reflection/assembly/server4.csproj
index 38518011c6..ec5f0e858a 100644
--- a/tests/src/CoreMangLib/system/reflection/assembly/server4.csproj
+++ b/tests/src/CoreMangLib/system/reflection/assembly/server4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/resources/resourcemanager/CustomCulture.csproj b/tests/src/CoreMangLib/system/resources/resourcemanager/CustomCulture.csproj
index 224a75d1f8..7e078b8376 100644
--- a/tests/src/CoreMangLib/system/resources/resourcemanager/CustomCulture.csproj
+++ b/tests/src/CoreMangLib/system/resources/resourcemanager/CustomCulture.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/CoreMangLib/system/version/Version_Parsing.csproj b/tests/src/CoreMangLib/system/version/Version_Parsing.csproj
index 128ab0fb9d..b1e5ba9274 100644
--- a/tests/src/CoreMangLib/system/version/Version_Parsing.csproj
+++ b/tests/src/CoreMangLib/system/version/Version_Parsing.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Exceptions/Finalization/Finalizer.csproj b/tests/src/Exceptions/Finalization/Finalizer.csproj
index e16a943412..51f5dfeb75 100644
--- a/tests/src/Exceptions/Finalization/Finalizer.csproj
+++ b/tests/src/Exceptions/Finalization/Finalizer.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Exceptions/ForeignThread/CMakeLists.txt b/tests/src/Exceptions/ForeignThread/CMakeLists.txt
index 78bde48d59..132dfeedbf 100644
--- a/tests/src/Exceptions/ForeignThread/CMakeLists.txt
+++ b/tests/src/Exceptions/ForeignThread/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required (VERSION 2.6)
 
-if(NOT (CLR_CMAKE_TARGET_ARCH STREQUAL arm64))
-
 project (ForeignThreadExceptionsNative)
 
 include_directories(${INC_PLATFORM_DIR})
@@ -13,5 +11,3 @@ add_library (ForeignThreadExceptionsNative SHARED ${SOURCES})
 
 # add the install targets
 install (TARGETS ForeignThreadExceptionsNative DESTINATION bin)
-
-endif()
\ No newline at end of file
diff --git a/tests/src/Exceptions/ForeignThread/ForeignThreadExceptions.csproj b/tests/src/Exceptions/ForeignThread/ForeignThreadExceptions.csproj
index 382de1bb23..de6a88473e 100644
--- a/tests/src/Exceptions/ForeignThread/ForeignThreadExceptions.csproj
+++ b/tests/src/Exceptions/ForeignThread/ForeignThreadExceptions.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <DisableProjectBuild Condition=" '$(Platform)' == 'arm64' ">true</DisableProjectBuild> 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/AddMemoryPressureTest.csproj b/tests/src/GC/API/GC/AddMemoryPressureTest.csproj
index 7f74647211..d4a7c709a6 100644
--- a/tests/src/GC/API/GC/AddMemoryPressureTest.csproj
+++ b/tests/src/GC/API/GC/AddMemoryPressureTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/AddThresholdTest.csproj b/tests/src/GC/API/GC/AddThresholdTest.csproj
index f55a9b47b4..61aa463787 100644
--- a/tests/src/GC/API/GC/AddThresholdTest.csproj
+++ b/tests/src/GC/API/GC/AddThresholdTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/AddUsageTest.csproj b/tests/src/GC/API/GC/AddUsageTest.csproj
index 7d9a261ee3..a484e63c8d 100644
--- a/tests/src/GC/API/GC/AddUsageTest.csproj
+++ b/tests/src/GC/API/GC/AddUsageTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/Collect.csproj b/tests/src/GC/API/GC/Collect.csproj
index e0c15534b8..c8e68158e4 100644
--- a/tests/src/GC/API/GC/Collect.csproj
+++ b/tests/src/GC/API/GC/Collect.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/Collect0.csproj b/tests/src/GC/API/GC/Collect0.csproj
index c05a214a67..7fd1c95b03 100644
--- a/tests/src/GC/API/GC/Collect0.csproj
+++ b/tests/src/GC/API/GC/Collect0.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/Collect1.csproj b/tests/src/GC/API/GC/Collect1.csproj
index 89b7fadf6b..eab80cd651 100644
--- a/tests/src/GC/API/GC/Collect1.csproj
+++ b/tests/src/GC/API/GC/Collect1.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/Collect_Default_1.csproj b/tests/src/GC/API/GC/Collect_Default_1.csproj
index eb54db8f03..8800f55055 100644
--- a/tests/src/GC/API/GC/Collect_Default_1.csproj
+++ b/tests/src/GC/API/GC/Collect_Default_1.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/Collect_Default_2.csproj b/tests/src/GC/API/GC/Collect_Default_2.csproj
index f567281ab1..2f9020015c 100644
--- a/tests/src/GC/API/GC/Collect_Default_2.csproj
+++ b/tests/src/GC/API/GC/Collect_Default_2.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>1</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/Collect_Default_3.csproj b/tests/src/GC/API/GC/Collect_Default_3.csproj
index c8cd9de81f..dac1972dfa 100644
--- a/tests/src/GC/API/GC/Collect_Default_3.csproj
+++ b/tests/src/GC/API/GC/Collect_Default_3.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>2</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/Collect_Forced_1.csproj b/tests/src/GC/API/GC/Collect_Forced_1.csproj
index 6a0f9d01bf..6d49168516 100644
--- a/tests/src/GC/API/GC/Collect_Forced_1.csproj
+++ b/tests/src/GC/API/GC/Collect_Forced_1.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/Collect_Forced_2.csproj b/tests/src/GC/API/GC/Collect_Forced_2.csproj
index e4bcbc78ed..1d6e49a584 100644
--- a/tests/src/GC/API/GC/Collect_Forced_2.csproj
+++ b/tests/src/GC/API/GC/Collect_Forced_2.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>1</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/Collect_Forced_3.csproj b/tests/src/GC/API/GC/Collect_Forced_3.csproj
index a5227591d3..702845f54f 100644
--- a/tests/src/GC/API/GC/Collect_Forced_3.csproj
+++ b/tests/src/GC/API/GC/Collect_Forced_3.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>2</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/Collect_Optimized_1.csproj b/tests/src/GC/API/GC/Collect_Optimized_1.csproj
index a192c6cf8e..2f37bc87b3 100644
--- a/tests/src/GC/API/GC/Collect_Optimized_1.csproj
+++ b/tests/src/GC/API/GC/Collect_Optimized_1.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/Collect_Optimized_2.csproj b/tests/src/GC/API/GC/Collect_Optimized_2.csproj
index bfb638af39..e3de7de8dd 100644
--- a/tests/src/GC/API/GC/Collect_Optimized_2.csproj
+++ b/tests/src/GC/API/GC/Collect_Optimized_2.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>1</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/Collect_Optimized_3.csproj b/tests/src/GC/API/GC/Collect_Optimized_3.csproj
index f29ae64355..a6f740b1be 100644
--- a/tests/src/GC/API/GC/Collect_Optimized_3.csproj
+++ b/tests/src/GC/API/GC/Collect_Optimized_3.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>2</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/Collect_fail.csproj b/tests/src/GC/API/GC/Collect_fail.csproj
index aeed79d7f2..282762142f 100644
--- a/tests/src/GC/API/GC/Collect_fail.csproj
+++ b/tests/src/GC/API/GC/Collect_fail.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/Collect_neg.csproj b/tests/src/GC/API/GC/Collect_neg.csproj
index f64f6b3493..8a55f7df39 100644
--- a/tests/src/GC/API/GC/Collect_neg.csproj
+++ b/tests/src/GC/API/GC/Collect_neg.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/CollectionCountTest.csproj b/tests/src/GC/API/GC/CollectionCountTest.csproj
index 70593cc456..03dd25c2e1 100644
--- a/tests/src/GC/API/GC/CollectionCountTest.csproj
+++ b/tests/src/GC/API/GC/CollectionCountTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/Finalize.csproj b/tests/src/GC/API/GC/Finalize.csproj
index 3c72a347d8..383b326faf 100644
--- a/tests/src/GC/API/GC/Finalize.csproj
+++ b/tests/src/GC/API/GC/Finalize.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/GetGeneration.csproj b/tests/src/GC/API/GC/GetGeneration.csproj
index fb9b9acdd1..57691da694 100644
--- a/tests/src/GC/API/GC/GetGeneration.csproj
+++ b/tests/src/GC/API/GC/GetGeneration.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/GetGenerationWR.csproj b/tests/src/GC/API/GC/GetGenerationWR.csproj
index 19072a52bb..343fb04d09 100644
--- a/tests/src/GC/API/GC/GetGenerationWR.csproj
+++ b/tests/src/GC/API/GC/GetGenerationWR.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/GetGenerationWR2.csproj b/tests/src/GC/API/GC/GetGenerationWR2.csproj
index 6b109e9c8c..edafe56ca9 100644
--- a/tests/src/GC/API/GC/GetGenerationWR2.csproj
+++ b/tests/src/GC/API/GC/GetGenerationWR2.csproj
@@ -8,14 +8,10 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/GetGeneration_box.csproj b/tests/src/GC/API/GC/GetGeneration_box.csproj
index 391e0298af..032231f39c 100644
--- a/tests/src/GC/API/GC/GetGeneration_box.csproj
+++ b/tests/src/GC/API/GC/GetGeneration_box.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/GetGeneration_fail.csproj b/tests/src/GC/API/GC/GetGeneration_fail.csproj
index 42ff74dab2..9e62ffcea1 100644
--- a/tests/src/GC/API/GC/GetGeneration_fail.csproj
+++ b/tests/src/GC/API/GC/GetGeneration_fail.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/GetTotalMemory.csproj b/tests/src/GC/API/GC/GetTotalMemory.csproj
index b1336d3890..998ada09a8 100644
--- a/tests/src/GC/API/GC/GetTotalMemory.csproj
+++ b/tests/src/GC/API/GC/GetTotalMemory.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
diff --git a/tests/src/GC/API/GC/KeepAlive.cs b/tests/src/GC/API/GC/KeepAlive.cs
index df3d9d27c4..3174f89345 100644
--- a/tests/src/GC/API/GC/KeepAlive.cs
+++ b/tests/src/GC/API/GC/KeepAlive.cs
@@ -47,16 +47,23 @@ public class Test
     }
 
 
+    public static void RunTest2()
+    {
+        Dummy2 obj2 = new Dummy2();
+        obj2 = null;
+    }
+
+
     public static void RunTest()
     {
         Dummy obj = new Dummy();
-        Dummy2 obj2 = new Dummy2();
+
+        RunTest2();
 
         // *uncomment the for loop to make test fail with complus_jitminops set
         // by design as per briansul
 
         //for (int i=0; i<5; i++) {
-        obj2 = null;
         GC.Collect();
         GC.WaitForPendingFinalizers();
         //}
diff --git a/tests/src/GC/API/GC/KeepAlive.csproj b/tests/src/GC/API/GC/KeepAlive.csproj
index 820ce94e3e..21c9a0cd27 100644
--- a/tests/src/GC/API/GC/KeepAlive.csproj
+++ b/tests/src/GC/API/GC/KeepAlive.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/KeepAliveNull.csproj b/tests/src/GC/API/GC/KeepAliveNull.csproj
index f6cf1f8b80..263f3f21cd 100644
--- a/tests/src/GC/API/GC/KeepAliveNull.csproj
+++ b/tests/src/GC/API/GC/KeepAliveNull.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/KeepAliveRecur.csproj b/tests/src/GC/API/GC/KeepAliveRecur.csproj
index 0c21d81bdb..a7857f4ade 100644
--- a/tests/src/GC/API/GC/KeepAliveRecur.csproj
+++ b/tests/src/GC/API/GC/KeepAliveRecur.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/MaxGeneration.csproj b/tests/src/GC/API/GC/MaxGeneration.csproj
index d28b9b5638..8bfee7e264 100644
--- a/tests/src/GC/API/GC/MaxGeneration.csproj
+++ b/tests/src/GC/API/GC/MaxGeneration.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/ReRegisterForFinalize.csproj b/tests/src/GC/API/GC/ReRegisterForFinalize.csproj
index 1fca7197b4..1fc1674084 100644
--- a/tests/src/GC/API/GC/ReRegisterForFinalize.csproj
+++ b/tests/src/GC/API/GC/ReRegisterForFinalize.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/ReRegisterForFinalize_null.csproj b/tests/src/GC/API/GC/ReRegisterForFinalize_null.csproj
index 91e847e4b1..842108da2a 100644
--- a/tests/src/GC/API/GC/ReRegisterForFinalize_null.csproj
+++ b/tests/src/GC/API/GC/ReRegisterForFinalize_null.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/RemoveMemoryPressureTest.csproj b/tests/src/GC/API/GC/RemoveMemoryPressureTest.csproj
index 93601b8b58..b397694520 100644
--- a/tests/src/GC/API/GC/RemoveMemoryPressureTest.csproj
+++ b/tests/src/GC/API/GC/RemoveMemoryPressureTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/RemoveUsageTest.csproj b/tests/src/GC/API/GC/RemoveUsageTest.csproj
index 1ca100f303..9a2b10fa43 100644
--- a/tests/src/GC/API/GC/RemoveUsageTest.csproj
+++ b/tests/src/GC/API/GC/RemoveUsageTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/SuppressFinalize.csproj b/tests/src/GC/API/GC/SuppressFinalize.csproj
index 381c0040be..2e7de586a2 100644
--- a/tests/src/GC/API/GC/SuppressFinalize.csproj
+++ b/tests/src/GC/API/GC/SuppressFinalize.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/SuppressFinalize_Null.csproj b/tests/src/GC/API/GC/SuppressFinalize_Null.csproj
index 7737ffff00..bd720d09b5 100644
--- a/tests/src/GC/API/GC/SuppressFinalize_Null.csproj
+++ b/tests/src/GC/API/GC/SuppressFinalize_Null.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GC/TotalMemory.csproj b/tests/src/GC/API/GC/TotalMemory.csproj
index 541b4588d7..aabb5cd3fe 100644
--- a/tests/src/GC/API/GC/TotalMemory.csproj
+++ b/tests/src/GC/API/GC/TotalMemory.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GC/TotalMemory2.csproj b/tests/src/GC/API/GC/TotalMemory2.csproj
index ff52694a38..99450c0eef 100644
--- a/tests/src/GC/API/GC/TotalMemory2.csproj
+++ b/tests/src/GC/API/GC/TotalMemory2.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/AddrOfPinnedObject.csproj b/tests/src/GC/API/GCHandle/AddrOfPinnedObject.csproj
index abd89e896e..d95ce9d7a5 100644
--- a/tests/src/GC/API/GCHandle/AddrOfPinnedObject.csproj
+++ b/tests/src/GC/API/GCHandle/AddrOfPinnedObject.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/AddrOfPinnedObject_neg.csproj b/tests/src/GC/API/GCHandle/AddrOfPinnedObject_neg.csproj
index 962afa57fa..cdd222ff79 100644
--- a/tests/src/GC/API/GCHandle/AddrOfPinnedObject_neg.csproj
+++ b/tests/src/GC/API/GCHandle/AddrOfPinnedObject_neg.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Alloc.csproj b/tests/src/GC/API/GCHandle/Alloc.csproj
index 4efc3a55e9..29b2523e80 100644
--- a/tests/src/GC/API/GCHandle/Alloc.csproj
+++ b/tests/src/GC/API/GCHandle/Alloc.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Alloc_neg.csproj b/tests/src/GC/API/GCHandle/Alloc_neg.csproj
index bc96491e45..4ffca80631 100644
--- a/tests/src/GC/API/GCHandle/Alloc_neg.csproj
+++ b/tests/src/GC/API/GCHandle/Alloc_neg.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Alloc_neg2.csproj b/tests/src/GC/API/GCHandle/Alloc_neg2.csproj
index c4d3742127..177e5c1f00 100644
--- a/tests/src/GC/API/GCHandle/Alloc_neg2.csproj
+++ b/tests/src/GC/API/GCHandle/Alloc_neg2.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Casting.csproj b/tests/src/GC/API/GCHandle/Casting.csproj
index a6a0359022..478e2bf887 100644
--- a/tests/src/GC/API/GCHandle/Casting.csproj
+++ b/tests/src/GC/API/GCHandle/Casting.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Equality.csproj b/tests/src/GC/API/GCHandle/Equality.csproj
index b934870e81..a1e0569eb3 100644
--- a/tests/src/GC/API/GCHandle/Equality.csproj
+++ b/tests/src/GC/API/GCHandle/Equality.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Free.csproj b/tests/src/GC/API/GCHandle/Free.csproj
index 6a40dec304..96967a398a 100644
--- a/tests/src/GC/API/GCHandle/Free.csproj
+++ b/tests/src/GC/API/GCHandle/Free.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Free_neg.csproj b/tests/src/GC/API/GCHandle/Free_neg.csproj
index 4effbe8d78..62029e864f 100644
--- a/tests/src/GC/API/GCHandle/Free_neg.csproj
+++ b/tests/src/GC/API/GCHandle/Free_neg.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/HandleCopy.csproj b/tests/src/GC/API/GCHandle/HandleCopy.csproj
index 1cda49eabb..56a35ded9a 100644
--- a/tests/src/GC/API/GCHandle/HandleCopy.csproj
+++ b/tests/src/GC/API/GCHandle/HandleCopy.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/IsAllocated.csproj b/tests/src/GC/API/GCHandle/IsAllocated.csproj
index 73ca4dac9a..43ac2c47b3 100644
--- a/tests/src/GC/API/GCHandle/IsAllocated.csproj
+++ b/tests/src/GC/API/GCHandle/IsAllocated.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Normal.csproj b/tests/src/GC/API/GCHandle/Normal.csproj
index 247d2bfcbc..08b1476774 100644
--- a/tests/src/GC/API/GCHandle/Normal.csproj
+++ b/tests/src/GC/API/GCHandle/Normal.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/GCHandle/PinObj_neg.csproj b/tests/src/GC/API/GCHandle/PinObj_neg.csproj
index a2baa56b5f..1176ea2795 100644
--- a/tests/src/GC/API/GCHandle/PinObj_neg.csproj
+++ b/tests/src/GC/API/GCHandle/PinObj_neg.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Pinned.csproj b/tests/src/GC/API/GCHandle/Pinned.csproj
index f02c60558b..92dc93393f 100644
--- a/tests/src/GC/API/GCHandle/Pinned.csproj
+++ b/tests/src/GC/API/GCHandle/Pinned.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Target.csproj b/tests/src/GC/API/GCHandle/Target.csproj
index b0ed85408a..9a19241c5b 100644
--- a/tests/src/GC/API/GCHandle/Target.csproj
+++ b/tests/src/GC/API/GCHandle/Target.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Target_neg.csproj b/tests/src/GC/API/GCHandle/Target_neg.csproj
index 720162819c..55968e2a76 100644
--- a/tests/src/GC/API/GCHandle/Target_neg.csproj
+++ b/tests/src/GC/API/GCHandle/Target_neg.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/ToFromIntPtr.csproj b/tests/src/GC/API/GCHandle/ToFromIntPtr.csproj
index ea3afc6ee4..dff0b109e4 100644
--- a/tests/src/GC/API/GCHandle/ToFromIntPtr.csproj
+++ b/tests/src/GC/API/GCHandle/ToFromIntPtr.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandle/Weak.csproj b/tests/src/GC/API/GCHandle/Weak.csproj
index 268899ba2c..129c95461c 100644
--- a/tests/src/GC/API/GCHandle/Weak.csproj
+++ b/tests/src/GC/API/GCHandle/Weak.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandleCollector/Count.csproj b/tests/src/GC/API/GCHandleCollector/Count.csproj
index 63d71fec29..f251ec17ec 100644
--- a/tests/src/GC/API/GCHandleCollector/Count.csproj
+++ b/tests/src/GC/API/GCHandleCollector/Count.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandleCollector/CtorsAndProperties.csproj b/tests/src/GC/API/GCHandleCollector/CtorsAndProperties.csproj
index bd60afdbbf..fa8408881e 100644
--- a/tests/src/GC/API/GCHandleCollector/CtorsAndProperties.csproj
+++ b/tests/src/GC/API/GCHandleCollector/CtorsAndProperties.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandleCollector/NegTests.csproj b/tests/src/GC/API/GCHandleCollector/NegTests.csproj
index 5547564816..54904132cd 100644
--- a/tests/src/GC/API/GCHandleCollector/NegTests.csproj
+++ b/tests/src/GC/API/GCHandleCollector/NegTests.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCHandleCollector/Usage.csproj b/tests/src/GC/API/GCHandleCollector/Usage.csproj
index d2f614d93c..54f2da7d9c 100644
--- a/tests/src/GC/API/GCHandleCollector/Usage.csproj
+++ b/tests/src/GC/API/GCHandleCollector/Usage.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/GCSettings/ILatencyTest.csproj b/tests/src/GC/API/GCSettings/ILatencyTest.csproj
index 26bc92324d..b52abd35a8 100644
--- a/tests/src/GC/API/GCSettings/ILatencyTest.csproj
+++ b/tests/src/GC/API/GCSettings/ILatencyTest.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/API/GCSettings/InducedGen0GC.csproj b/tests/src/GC/API/GCSettings/InducedGen0GC.csproj
index 63945231fb..570f86127d 100644
--- a/tests/src/GC/API/GCSettings/InducedGen0GC.csproj
+++ b/tests/src/GC/API/GCSettings/InducedGen0GC.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/API/GCSettings/InducedGen1GC.csproj b/tests/src/GC/API/GCSettings/InducedGen1GC.csproj
index 28fd9fa6cc..65ba9d3a9f 100644
--- a/tests/src/GC/API/GCSettings/InducedGen1GC.csproj
+++ b/tests/src/GC/API/GCSettings/InducedGen1GC.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/API/GCSettings/InducedGen2GC.csproj b/tests/src/GC/API/GCSettings/InducedGen2GC.csproj
index 449e98c0fe..3224ea49d6 100644
--- a/tests/src/GC/API/GCSettings/InducedGen2GC.csproj
+++ b/tests/src/GC/API/GCSettings/InducedGen2GC.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/API/GCSettings/InputValidation.csproj b/tests/src/GC/API/GCSettings/InputValidation.csproj
index 5ada5c0f16..1fef8a6118 100644
--- a/tests/src/GC/API/GCSettings/InputValidation.csproj
+++ b/tests/src/GC/API/GCSettings/InputValidation.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/WeakReference/Finalize.csproj b/tests/src/GC/API/WeakReference/Finalize.csproj
index 158fad3205..aba9b0be5e 100644
--- a/tests/src/GC/API/WeakReference/Finalize.csproj
+++ b/tests/src/GC/API/WeakReference/Finalize.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/WeakReference/Finalize2.csproj b/tests/src/GC/API/WeakReference/Finalize2.csproj
index 6b484948bd..c93bae41aa 100644
--- a/tests/src/GC/API/WeakReference/Finalize2.csproj
+++ b/tests/src/GC/API/WeakReference/Finalize2.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/WeakReference/IsAlive.csproj b/tests/src/GC/API/WeakReference/IsAlive.csproj
index 6528f0207f..a21b9fc468 100644
--- a/tests/src/GC/API/WeakReference/IsAlive.csproj
+++ b/tests/src/GC/API/WeakReference/IsAlive.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/WeakReference/IsAlive_neg.csproj b/tests/src/GC/API/WeakReference/IsAlive_neg.csproj
index e5550cb279..25191e2af6 100644
--- a/tests/src/GC/API/WeakReference/IsAlive_neg.csproj
+++ b/tests/src/GC/API/WeakReference/IsAlive_neg.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/WeakReference/NullHandle.csproj b/tests/src/GC/API/WeakReference/NullHandle.csproj
index 34174dc476..f157581afe 100644
--- a/tests/src/GC/API/WeakReference/NullHandle.csproj
+++ b/tests/src/GC/API/WeakReference/NullHandle.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/WeakReference/Target.csproj b/tests/src/GC/API/WeakReference/Target.csproj
index b0ed85408a..9a19241c5b 100644
--- a/tests/src/GC/API/WeakReference/Target.csproj
+++ b/tests/src/GC/API/WeakReference/Target.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/API/WeakReference/TrackResurrection.csproj b/tests/src/GC/API/WeakReference/TrackResurrection.csproj
index 4f1ebbf4d7..54de594059 100644
--- a/tests/src/GC/API/WeakReference/TrackResurrection.csproj
+++ b/tests/src/GC/API/WeakReference/TrackResurrection.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments></CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/WeakReference/multipleWRs.csproj b/tests/src/GC/API/WeakReference/multipleWRs.csproj
index 745a638076..669ea50f46 100644
--- a/tests/src/GC/API/WeakReference/multipleWRs.csproj
+++ b/tests/src/GC/API/WeakReference/multipleWRs.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>10000</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/API/WeakReference/multipleWRs_1.csproj b/tests/src/GC/API/WeakReference/multipleWRs_1.csproj
index 74deaf86cd..0ba6721e2c 100644
--- a/tests/src/GC/API/WeakReference/multipleWRs_1.csproj
+++ b/tests/src/GC/API/WeakReference/multipleWRs_1.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>10000 track</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Coverage/271010.csproj b/tests/src/GC/Coverage/271010.csproj
index 6bfb03425a..04c6f4b505 100644
--- a/tests/src/GC/Coverage/271010.csproj
+++ b/tests/src/GC/Coverage/271010.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/Coverage/LargeObjectAlloc.csproj b/tests/src/GC/Coverage/LargeObjectAlloc.csproj
index 8fc6cb6827..7a6321ddad 100644
--- a/tests/src/GC/Coverage/LargeObjectAlloc.csproj
+++ b/tests/src/GC/Coverage/LargeObjectAlloc.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Coverage/LargeObjectAlloc2.csproj b/tests/src/GC/Coverage/LargeObjectAlloc2.csproj
index 1060fa842c..2304c58cd1 100644
--- a/tests/src/GC/Coverage/LargeObjectAlloc2.csproj
+++ b/tests/src/GC/Coverage/LargeObjectAlloc2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Coverage/delete_next_card_table.csproj b/tests/src/GC/Coverage/delete_next_card_table.csproj
index 0c80943169..b67ded6e41 100644
--- a/tests/src/GC/Coverage/delete_next_card_table.csproj
+++ b/tests/src/GC/Coverage/delete_next_card_table.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Coverage/smalloom.csproj b/tests/src/GC/Coverage/smalloom.csproj
index 916e0f4cda..3c8a037e6f 100644
--- a/tests/src/GC/Coverage/smalloom.csproj
+++ b/tests/src/GC/Coverage/smalloom.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/Features/BackgroundGC/concurrentspin2.csproj b/tests/src/GC/Features/BackgroundGC/concurrentspin2.csproj
index c47263f488..690e0d48e3 100644
--- a/tests/src/GC/Features/BackgroundGC/concurrentspin2.csproj
+++ b/tests/src/GC/Features/BackgroundGC/concurrentspin2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/BackgroundGC/foregroundgc.csproj b/tests/src/GC/Features/BackgroundGC/foregroundgc.csproj
index 43d164abb9..f1c1ace65a 100644
--- a/tests/src/GC/Features/BackgroundGC/foregroundgc.csproj
+++ b/tests/src/GC/Features/BackgroundGC/foregroundgc.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/Finalizer/finalizeio/finalizeio.csproj b/tests/src/GC/Features/Finalizer/finalizeio/finalizeio.csproj
index cc5deecc57..e15f438ce7 100644
--- a/tests/src/GC/Features/Finalizer/finalizeio/finalizeio.csproj
+++ b/tests/src/GC/Features/Finalizer/finalizeio/finalizeio.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/Finalizer/finalizeother/finalizearray.csproj b/tests/src/GC/Features/Finalizer/finalizeother/finalizearray.csproj
index 9aaaa9e789..f72bbc3b06 100644
--- a/tests/src/GC/Features/Finalizer/finalizeother/finalizearray.csproj
+++ b/tests/src/GC/Features/Finalizer/finalizeother/finalizearray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/Finalizer/finalizeother/finalizearraysleep.csproj b/tests/src/GC/Features/Finalizer/finalizeother/finalizearraysleep.csproj
index 7048db50ea..be5f8c8ce9 100644
--- a/tests/src/GC/Features/Finalizer/finalizeother/finalizearraysleep.csproj
+++ b/tests/src/GC/Features/Finalizer/finalizeother/finalizearraysleep.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/Finalizer/finalizeother/finalizedest.csproj b/tests/src/GC/Features/Finalizer/finalizeother/finalizedest.csproj
index 06d6df6381..25f827b90f 100644
--- a/tests/src/GC/Features/Finalizer/finalizeother/finalizedest.csproj
+++ b/tests/src/GC/Features/Finalizer/finalizeother/finalizedest.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/Finalizer/finalizeother/finalizeexcep.csproj b/tests/src/GC/Features/Finalizer/finalizeother/finalizeexcep.csproj
index 20f9188a16..d51c7dffbf 100644
--- a/tests/src/GC/Features/Finalizer/finalizeother/finalizeexcep.csproj
+++ b/tests/src/GC/Features/Finalizer/finalizeother/finalizeexcep.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/Finalizer/finalizeother/finalizeinherit.csproj b/tests/src/GC/Features/Finalizer/finalizeother/finalizeinherit.csproj
index f5d5e4e6b6..c78271a553 100644
--- a/tests/src/GC/Features/Finalizer/finalizeother/finalizeinherit.csproj
+++ b/tests/src/GC/Features/Finalizer/finalizeother/finalizeinherit.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/Finalizer/finalizeother/finalizenested.csproj b/tests/src/GC/Features/Finalizer/finalizeother/finalizenested.csproj
index e385d2b372..7cc3f4d1d1 100644
--- a/tests/src/GC/Features/Finalizer/finalizeother/finalizenested.csproj
+++ b/tests/src/GC/Features/Finalizer/finalizeother/finalizenested.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/HeapExpansion/Finalizer.csproj b/tests/src/GC/Features/HeapExpansion/Finalizer.csproj
index 724031f831..ebc5f36733 100644
--- a/tests/src/GC/Features/HeapExpansion/Finalizer.csproj
+++ b/tests/src/GC/Features/HeapExpansion/Finalizer.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/HeapExpansion/GCUtil_HeapExpansion.csproj b/tests/src/GC/Features/HeapExpansion/GCUtil_HeapExpansion.csproj
index 2799df8e57..fb0cb4d82a 100644
--- a/tests/src/GC/Features/HeapExpansion/GCUtil_HeapExpansion.csproj
+++ b/tests/src/GC/Features/HeapExpansion/GCUtil_HeapExpansion.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>    
diff --git a/tests/src/GC/Features/HeapExpansion/Handles.csproj b/tests/src/GC/Features/HeapExpansion/Handles.csproj
index 0aad5f9f8f..34a76b96f5 100644
--- a/tests/src/GC/Features/HeapExpansion/Handles.csproj
+++ b/tests/src/GC/Features/HeapExpansion/Handles.csproj
@@ -7,10 +7,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/tests/src/GC/Features/HeapExpansion/bestfit-finalize.csproj b/tests/src/GC/Features/HeapExpansion/bestfit-finalize.csproj
index 5ba3304e23..9740387190 100644
--- a/tests/src/GC/Features/HeapExpansion/bestfit-finalize.csproj
+++ b/tests/src/GC/Features/HeapExpansion/bestfit-finalize.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/HeapExpansion/bestfit-threaded.csproj b/tests/src/GC/Features/HeapExpansion/bestfit-threaded.csproj
index 1362d12206..0277100513 100644
--- a/tests/src/GC/Features/HeapExpansion/bestfit-threaded.csproj
+++ b/tests/src/GC/Features/HeapExpansion/bestfit-threaded.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/HeapExpansion/bestfit.csproj b/tests/src/GC/Features/HeapExpansion/bestfit.csproj
index 9ecaf00e54..2c6381824f 100644
--- a/tests/src/GC/Features/HeapExpansion/bestfit.csproj
+++ b/tests/src/GC/Features/HeapExpansion/bestfit.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>1 1000 50000</CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/HeapExpansion/bestfit_1.csproj b/tests/src/GC/Features/HeapExpansion/bestfit_1.csproj
index b0e2ea417c..9ece052284 100644
--- a/tests/src/GC/Features/HeapExpansion/bestfit_1.csproj
+++ b/tests/src/GC/Features/HeapExpansion/bestfit_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>1 1000 50000</CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/HeapExpansion/expandheap.csproj b/tests/src/GC/Features/HeapExpansion/expandheap.csproj
index 8f79ba6624..7e84c9ad39 100644
--- a/tests/src/GC/Features/HeapExpansion/expandheap.csproj
+++ b/tests/src/GC/Features/HeapExpansion/expandheap.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/HeapExpansion/plug.csproj b/tests/src/GC/Features/HeapExpansion/plug.csproj
index f3a362174a..5bf6229423 100644
--- a/tests/src/GC/Features/HeapExpansion/plug.csproj
+++ b/tests/src/GC/Features/HeapExpansion/plug.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/HeapExpansion/pluggaps.csproj b/tests/src/GC/Features/HeapExpansion/pluggaps.csproj
index 42ba45a58f..8a1f7a47e2 100644
--- a/tests/src/GC/Features/HeapExpansion/pluggaps.csproj
+++ b/tests/src/GC/Features/HeapExpansion/pluggaps.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivearray.csproj b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivearray.csproj
index 8e7c70a262..f0c64dc51f 100644
--- a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivearray.csproj
+++ b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivearray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivedirectedgraph.csproj b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivedirectedgraph.csproj
index 1eae248a7d..11eb346b0a 100644
--- a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivedirectedgraph.csproj
+++ b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivedirectedgraph.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivefinalize.csproj b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivefinalize.csproj
index 7df95a48bd..184d71c09c 100644
--- a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivefinalize.csproj
+++ b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivefinalize.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivehandle.csproj b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivehandle.csproj
index 774cdd4a68..1fdd8bd093 100644
--- a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivehandle.csproj
+++ b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivehandle.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivescope.csproj b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivescope.csproj
index 08a96ce864..72009cb838 100644
--- a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivescope.csproj
+++ b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivescope.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivetry.csproj b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivetry.csproj
index 8abb625466..ffd32bd7c3 100644
--- a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivetry.csproj
+++ b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivetry.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivetypes.csproj b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivetypes.csproj
index d84f2ae6df..b62b642b29 100644
--- a/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivetypes.csproj
+++ b/tests/src/GC/Features/KeepAlive/keepaliveother/keepalivetypes.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/LOHCompaction/lohcompact_stress.csproj b/tests/src/GC/Features/LOHCompaction/lohcompact_stress.csproj
index 70a990b260..4e820476ba 100644
--- a/tests/src/GC/Features/LOHCompaction/lohcompact_stress.csproj
+++ b/tests/src/GC/Features/LOHCompaction/lohcompact_stress.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/LOHCompaction/lohcompactapi.csproj b/tests/src/GC/Features/LOHCompaction/lohcompactapi.csproj
index a4b3e865c7..a10bed150d 100644
--- a/tests/src/GC/Features/LOHCompaction/lohcompactapi.csproj
+++ b/tests/src/GC/Features/LOHCompaction/lohcompactapi.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/LOHCompaction/lohcompactapi2.csproj b/tests/src/GC/Features/LOHCompaction/lohcompactapi2.csproj
index ec88794f92..941d1a3bd9 100644
--- a/tests/src/GC/Features/LOHCompaction/lohcompactapi2.csproj
+++ b/tests/src/GC/Features/LOHCompaction/lohcompactapi2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/LOHCompaction/lohcompactapi_exceptions.csproj b/tests/src/GC/Features/LOHCompaction/lohcompactapi_exceptions.csproj
index 70a2a22f2c..132efc4e1a 100644
--- a/tests/src/GC/Features/LOHCompaction/lohcompactapi_exceptions.csproj
+++ b/tests/src/GC/Features/LOHCompaction/lohcompactapi_exceptions.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/LOHCompaction/lohcompactscenariorepro.csproj b/tests/src/GC/Features/LOHCompaction/lohcompactscenariorepro.csproj
index aeb237d667..ffe296d9f4 100644
--- a/tests/src/GC/Features/LOHCompaction/lohcompactscenariorepro.csproj
+++ b/tests/src/GC/Features/LOHCompaction/lohcompactscenariorepro.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/LOHCompaction/lohpin.csproj b/tests/src/GC/Features/LOHCompaction/lohpin.csproj
index 21398c5fe0..efa0ab1e27 100644
--- a/tests/src/GC/Features/LOHCompaction/lohpin.csproj
+++ b/tests/src/GC/Features/LOHCompaction/lohpin.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/LOHFragmentation/THIRD-PARTY-NOTICES b/tests/src/GC/Features/LOHFragmentation/THIRD-PARTY-NOTICES
new file mode 100644
index 0000000000..254c195a82
--- /dev/null
+++ b/tests/src/GC/Features/LOHFragmentation/THIRD-PARTY-NOTICES
@@ -0,0 +1,28 @@
+.NET Core uses third-party libraries or other resources that may be
+distributed under licenses different than the .NET Core software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           dotnet@microsoft.com
+
+The attached notices are provided for information only.
+
+License notice for Red Gate Software Ltd
+----------------------------------------
+
+https://www.simple-talk.com/dotnet/.net-framework/the-dangers-of-the-large-object-heap/
+
+Copyright (c) 2009, Red Gate Software Ltd
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/tests/src/GC/Features/LOHFragmentation/lohfragmentation.csproj b/tests/src/GC/Features/LOHFragmentation/lohfragmentation.csproj
index c631399859..e10aa89f51 100644
--- a/tests/src/GC/Features/LOHFragmentation/lohfragmentation.csproj
+++ b/tests/src/GC/Features/LOHFragmentation/lohfragmentation.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/PartialCompaction/eco1.csproj b/tests/src/GC/Features/PartialCompaction/eco1.csproj
index 2b3f8e444e..01e10ced19 100644
--- a/tests/src/GC/Features/PartialCompaction/eco1.csproj
+++ b/tests/src/GC/Features/PartialCompaction/eco1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/PartialCompaction/partialcompactiontest.csproj b/tests/src/GC/Features/PartialCompaction/partialcompactiontest.csproj
index 865f1711e4..ea377c0578 100644
--- a/tests/src/GC/Features/PartialCompaction/partialcompactiontest.csproj
+++ b/tests/src/GC/Features/PartialCompaction/partialcompactiontest.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/PartialCompaction/partialcompactionwloh.csproj b/tests/src/GC/Features/PartialCompaction/partialcompactionwloh.csproj
index f7de9330ba..e8533977b1 100644
--- a/tests/src/GC/Features/PartialCompaction/partialcompactionwloh.csproj
+++ b/tests/src/GC/Features/PartialCompaction/partialcompactionwloh.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/Pinning/PinningOther/GCUtil_Pinning.csproj b/tests/src/GC/Features/Pinning/PinningOther/GCUtil_Pinning.csproj
index 2799df8e57..fb0cb4d82a 100644
--- a/tests/src/GC/Features/Pinning/PinningOther/GCUtil_Pinning.csproj
+++ b/tests/src/GC/Features/Pinning/PinningOther/GCUtil_Pinning.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>    
diff --git a/tests/src/GC/Features/Pinning/PinningOther/PinnedCollect.csproj b/tests/src/GC/Features/Pinning/PinningOther/PinnedCollect.csproj
index 2536f06318..6b99b05c1c 100644
--- a/tests/src/GC/Features/Pinning/PinningOther/PinnedCollect.csproj
+++ b/tests/src/GC/Features/Pinning/PinningOther/PinnedCollect.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/Pinning/PinningOther/PinnedHandle.csproj b/tests/src/GC/Features/Pinning/PinningOther/PinnedHandle.csproj
index e5d7b2dac9..b29c980775 100644
--- a/tests/src/GC/Features/Pinning/PinningOther/PinnedHandle.csproj
+++ b/tests/src/GC/Features/Pinning/PinningOther/PinnedHandle.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/Pinning/PinningOther/PinnedInt.csproj b/tests/src/GC/Features/Pinning/PinningOther/PinnedInt.csproj
index 86f2ad0715..d4cb7e1001 100644
--- a/tests/src/GC/Features/Pinning/PinningOther/PinnedInt.csproj
+++ b/tests/src/GC/Features/Pinning/PinningOther/PinnedInt.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/Pinning/PinningOther/PinnedMany.csproj b/tests/src/GC/Features/Pinning/PinningOther/PinnedMany.csproj
index 3fa2470c9e..87929e3a9c 100644
--- a/tests/src/GC/Features/Pinning/PinningOther/PinnedMany.csproj
+++ b/tests/src/GC/Features/Pinning/PinningOther/PinnedMany.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/Pinning/PinningOther/PinnedMultiple.csproj b/tests/src/GC/Features/Pinning/PinningOther/PinnedMultiple.csproj
index fc3c54fe85..93fe4b8c77 100644
--- a/tests/src/GC/Features/Pinning/PinningOther/PinnedMultiple.csproj
+++ b/tests/src/GC/Features/Pinning/PinningOther/PinnedMultiple.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/Pinning/PinningOther/PinnedObject.csproj b/tests/src/GC/Features/Pinning/PinningOther/PinnedObject.csproj
index 0f3193aee3..2c5f2c98a5 100644
--- a/tests/src/GC/Features/Pinning/PinningOther/PinnedObject.csproj
+++ b/tests/src/GC/Features/Pinning/PinningOther/PinnedObject.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/SustainedLowLatency/scenario.csproj b/tests/src/GC/Features/SustainedLowLatency/scenario.csproj
index 697a854548..cb1f7fe0ad 100644
--- a/tests/src/GC/Features/SustainedLowLatency/scenario.csproj
+++ b/tests/src/GC/Features/SustainedLowLatency/scenario.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Features/SustainedLowLatency/sustainedlowlatency_race.csproj b/tests/src/GC/Features/SustainedLowLatency/sustainedlowlatency_race.csproj
index 68da85882c..1afc2ee0e2 100644
--- a/tests/src/GC/Features/SustainedLowLatency/sustainedlowlatency_race.csproj
+++ b/tests/src/GC/Features/SustainedLowLatency/sustainedlowlatency_race.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Features/SustainedLowLatency/sustainedlowlatency_race_reverse.csproj b/tests/src/GC/Features/SustainedLowLatency/sustainedlowlatency_race_reverse.csproj
index e80685cee9..45754459d1 100644
--- a/tests/src/GC/Features/SustainedLowLatency/sustainedlowlatency_race_reverse.csproj
+++ b/tests/src/GC/Features/SustainedLowLatency/sustainedlowlatency_race_reverse.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/API/gc/collect.csproj b/tests/src/GC/LargeMemory/API/gc/collect.csproj
index 9b9f7d4dff..6556305122 100644
--- a/tests/src/GC/LargeMemory/API/gc/collect.csproj
+++ b/tests/src/GC/LargeMemory/API/gc/collect.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestExecutionArguments>2048</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/API/gc/getgeneration.csproj b/tests/src/GC/LargeMemory/API/gc/getgeneration.csproj
index 135258dfe4..c4e5e2b571 100644
--- a/tests/src/GC/LargeMemory/API/gc/getgeneration.csproj
+++ b/tests/src/GC/LargeMemory/API/gc/getgeneration.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestExecutionArguments>2048</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/API/gc/gettotalmemory.csproj b/tests/src/GC/LargeMemory/API/gc/gettotalmemory.csproj
index d3f38f621d..3c56022194 100644
--- a/tests/src/GC/LargeMemory/API/gc/gettotalmemory.csproj
+++ b/tests/src/GC/LargeMemory/API/gc/gettotalmemory.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestExecutionArguments>2048</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/API/gc/keepalive.csproj b/tests/src/GC/LargeMemory/API/gc/keepalive.csproj
index aea59e67f4..8599b42f17 100644
--- a/tests/src/GC/LargeMemory/API/gc/keepalive.csproj
+++ b/tests/src/GC/LargeMemory/API/gc/keepalive.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestExecutionArguments>2048</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/API/gc/largeobject.csproj b/tests/src/GC/LargeMemory/API/gc/largeobject.csproj
index cc0883396d..64ffadc623 100644
--- a/tests/src/GC/LargeMemory/API/gc/largeobject.csproj
+++ b/tests/src/GC/LargeMemory/API/gc/largeobject.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/API/gc/memcheck.csproj b/tests/src/GC/LargeMemory/API/gc/memcheck.csproj
index 36acd46576..e982e5f414 100644
--- a/tests/src/GC/LargeMemory/API/gc/memcheck.csproj
+++ b/tests/src/GC/LargeMemory/API/gc/memcheck.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/API/gc/reregisterforfinalize.csproj b/tests/src/GC/LargeMemory/API/gc/reregisterforfinalize.csproj
index 6b64acd098..248669826f 100644
--- a/tests/src/GC/LargeMemory/API/gc/reregisterforfinalize.csproj
+++ b/tests/src/GC/LargeMemory/API/gc/reregisterforfinalize.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestExecutionArguments>2048</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/API/gc/suppressfinalize.csproj b/tests/src/GC/LargeMemory/API/gc/suppressfinalize.csproj
index 27cf73e2d6..082002de27 100644
--- a/tests/src/GC/LargeMemory/API/gc/suppressfinalize.csproj
+++ b/tests/src/GC/LargeMemory/API/gc/suppressfinalize.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestExecutionArguments>2048</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/Allocation/finalizertest.csproj b/tests/src/GC/LargeMemory/Allocation/finalizertest.csproj
index 25b0b79565..7ab559b27f 100644
--- a/tests/src/GC/LargeMemory/Allocation/finalizertest.csproj
+++ b/tests/src/GC/LargeMemory/Allocation/finalizertest.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestExecutionArguments>2048</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/Allocation/largeexceptiontest.csproj b/tests/src/GC/LargeMemory/Allocation/largeexceptiontest.csproj
index ad6f5b143d..3758ee6a46 100644
--- a/tests/src/GC/LargeMemory/Allocation/largeexceptiontest.csproj
+++ b/tests/src/GC/LargeMemory/Allocation/largeexceptiontest.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestExecutionArguments>2048</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/Allocation/largeobject.csproj b/tests/src/GC/LargeMemory/Allocation/largeobject.csproj
index cc0883396d..64ffadc623 100644
--- a/tests/src/GC/LargeMemory/Allocation/largeobject.csproj
+++ b/tests/src/GC/LargeMemory/Allocation/largeobject.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/Allocation/memcheck.csproj b/tests/src/GC/LargeMemory/Allocation/memcheck.csproj
index 36acd46576..e982e5f414 100644
--- a/tests/src/GC/LargeMemory/Allocation/memcheck.csproj
+++ b/tests/src/GC/LargeMemory/Allocation/memcheck.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/LargeMemory/Regressions/largearraytest.csproj b/tests/src/GC/LargeMemory/Regressions/largearraytest.csproj
index 725fa57cc9..5f51676db1 100644
--- a/tests/src/GC/LargeMemory/Regressions/largearraytest.csproj
+++ b/tests/src/GC/LargeMemory/Regressions/largearraytest.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/LargeMemory/Regressions/pressureoverflow.csproj b/tests/src/GC/LargeMemory/Regressions/pressureoverflow.csproj
index 95ec1a4379..5aba151e5c 100644
--- a/tests/src/GC/LargeMemory/Regressions/pressureoverflow.csproj
+++ b/tests/src/GC/LargeMemory/Regressions/pressureoverflow.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Performance/Framework/GCPerfTestFramework.csproj b/tests/src/GC/Performance/Framework/GCPerfTestFramework.csproj
index d013349cc9..81c380e94a 100644
--- a/tests/src/GC/Performance/Framework/GCPerfTestFramework.csproj
+++ b/tests/src/GC/Performance/Framework/GCPerfTestFramework.csproj
@@ -7,13 +7,9 @@
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{07501894-7A01-4A0D-B9A2-3C72799A68BA}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GCPerfTestFramework</RootNamespace>
     <AssemblyName>GCPerfTestFramework</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
diff --git a/tests/src/GC/Performance/Tests/Allocation.csproj b/tests/src/GC/Performance/Tests/Allocation.csproj
index 139d5c5651..600c124fdb 100644
--- a/tests/src/GC/Performance/Tests/Allocation.csproj
+++ b/tests/src/GC/Performance/Tests/Allocation.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Performance/Tests/ConcurrentSpin.csproj b/tests/src/GC/Performance/Tests/ConcurrentSpin.csproj
index 3133000723..29fbed5e1c 100644
--- a/tests/src/GC/Performance/Tests/ConcurrentSpin.csproj
+++ b/tests/src/GC/Performance/Tests/ConcurrentSpin.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Performance/Tests/EEGC.csproj b/tests/src/GC/Performance/Tests/EEGC.csproj
index dea29ded9d..88560d8831 100644
--- a/tests/src/GC/Performance/Tests/EEGC.csproj
+++ b/tests/src/GC/Performance/Tests/EEGC.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Performance/Tests/GCSimulator.csproj b/tests/src/GC/Performance/Tests/GCSimulator.csproj
index 19db0eea7e..a73edc04a7 100644
--- a/tests/src/GC/Performance/Tests/GCSimulator.csproj
+++ b/tests/src/GC/Performance/Tests/GCSimulator.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Performance/Tests/LargeStrings.csproj b/tests/src/GC/Performance/Tests/LargeStrings.csproj
index 5fcfedfac6..d0d69400bf 100644
--- a/tests/src/GC/Performance/Tests/LargeStrings.csproj
+++ b/tests/src/GC/Performance/Tests/LargeStrings.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Performance/Tests/MidLife.csproj b/tests/src/GC/Performance/Tests/MidLife.csproj
index f2c9798799..0f395d7666 100644
--- a/tests/src/GC/Performance/Tests/MidLife.csproj
+++ b/tests/src/GC/Performance/Tests/MidLife.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Regressions/dev10bugs/536168/536168.csproj b/tests/src/GC/Regressions/dev10bugs/536168/536168.csproj
index e369e8b996..b625223046 100644
--- a/tests/src/GC/Regressions/dev10bugs/536168/536168.csproj
+++ b/tests/src/GC/Regressions/dev10bugs/536168/536168.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Regressions/v2.0-beta1/149926/149926.csproj b/tests/src/GC/Regressions/v2.0-beta1/149926/149926.csproj
index 5ce71fe8d8..04fad3a179 100644
--- a/tests/src/GC/Regressions/v2.0-beta1/149926/149926.csproj
+++ b/tests/src/GC/Regressions/v2.0-beta1/149926/149926.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Regressions/v2.0-beta1/289745/289745.csproj b/tests/src/GC/Regressions/v2.0-beta1/289745/289745.csproj
index 2e482c3124..615160d780 100644
--- a/tests/src/GC/Regressions/v2.0-beta1/289745/289745.csproj
+++ b/tests/src/GC/Regressions/v2.0-beta1/289745/289745.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Regressions/v2.0-beta1/289745/302560.csproj b/tests/src/GC/Regressions/v2.0-beta1/289745/302560.csproj
index 2e482c3124..615160d780 100644
--- a/tests/src/GC/Regressions/v2.0-beta1/289745/302560.csproj
+++ b/tests/src/GC/Regressions/v2.0-beta1/289745/302560.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Regressions/v2.0-beta2/426480/426480.csproj b/tests/src/GC/Regressions/v2.0-beta2/426480/426480.csproj
index 3cf41e2c4a..f20c392bbf 100644
--- a/tests/src/GC/Regressions/v2.0-beta2/426480/426480.csproj
+++ b/tests/src/GC/Regressions/v2.0-beta2/426480/426480.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Regressions/v2.0-beta2/445488/445488.csproj b/tests/src/GC/Regressions/v2.0-beta2/445488/445488.csproj
index 8135557152..07ffa34af3 100644
--- a/tests/src/GC/Regressions/v2.0-beta2/445488/445488.csproj
+++ b/tests/src/GC/Regressions/v2.0-beta2/445488/445488.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Regressions/v2.0-beta2/452950/452950.csproj b/tests/src/GC/Regressions/v2.0-beta2/452950/452950.csproj
index 5508ad5863..dafcb6bd32 100644
--- a/tests/src/GC/Regressions/v2.0-beta2/452950/452950.csproj
+++ b/tests/src/GC/Regressions/v2.0-beta2/452950/452950.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/GC/Regressions/v2.0-beta2/460373/460373.csproj b/tests/src/GC/Regressions/v2.0-beta2/460373/460373.csproj
index fc9548a1d4..90a383c479 100644
--- a/tests/src/GC/Regressions/v2.0-beta2/460373/460373.csproj
+++ b/tests/src/GC/Regressions/v2.0-beta2/460373/460373.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Regressions/v2.0-beta2/462651/462651.csproj b/tests/src/GC/Regressions/v2.0-beta2/462651/462651.csproj
index 4bf8dea2a7..8ebc88a934 100644
--- a/tests/src/GC/Regressions/v2.0-beta2/462651/462651.csproj
+++ b/tests/src/GC/Regressions/v2.0-beta2/462651/462651.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Regressions/v2.0-beta2/471729/471729.csproj b/tests/src/GC/Regressions/v2.0-beta2/471729/471729.csproj
index eb5ce4909c..190fa6129c 100644
--- a/tests/src/GC/Regressions/v2.0-beta2/471729/471729.csproj
+++ b/tests/src/GC/Regressions/v2.0-beta2/471729/471729.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Regressions/v2.0-beta2/476725/ManagedTest.csproj b/tests/src/GC/Regressions/v2.0-beta2/476725/ManagedTest.csproj
index 5af63de3c1..92f945768d 100644
--- a/tests/src/GC/Regressions/v2.0-beta2/476725/ManagedTest.csproj
+++ b/tests/src/GC/Regressions/v2.0-beta2/476725/ManagedTest.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>
diff --git a/tests/src/GC/Regressions/v2.0-beta2/485617/Managed.csproj b/tests/src/GC/Regressions/v2.0-beta2/485617/Managed.csproj
index 9ccbd12e0d..37dd937356 100644
--- a/tests/src/GC/Regressions/v2.0-beta2/485617/Managed.csproj
+++ b/tests/src/GC/Regressions/v2.0-beta2/485617/Managed.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>    
diff --git a/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj b/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj
index fe23500677..28cece9358 100644
--- a/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj
+++ b/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/tests/src/GC/Regressions/v2.0-rtm/544701/544701.cs b/tests/src/GC/Regressions/v2.0-rtm/544701/544701.cs
index 7148f084bc..cb66e0041e 100644
--- a/tests/src/GC/Regressions/v2.0-rtm/544701/544701.cs
+++ b/tests/src/GC/Regressions/v2.0-rtm/544701/544701.cs
@@ -35,17 +35,11 @@ internal class AllocBug
     {
         try
         {
-            Console.Write("Allocating ");
-            Console.Write(bytesToAlloc);
-            Console.Write(" bytes... ");
-
             byte[] buffer = new byte[bytesToAlloc];
-
-            Console.WriteLine("Passed");
         }
         catch (Exception)
         {
-            Console.WriteLine("Unexpected Exception: ");
+            Console.WriteLine("Unexpected Exception when allocating "+bytesToAlloc+" bytes.");
             ret = -1;
         }
     }
diff --git a/tests/src/GC/Regressions/v2.0-rtm/544701/544701.csproj b/tests/src/GC/Regressions/v2.0-rtm/544701/544701.csproj
index 1a2ff190d4..ba6a192350 100644
--- a/tests/src/GC/Regressions/v2.0-rtm/544701/544701.csproj
+++ b/tests/src/GC/Regressions/v2.0-rtm/544701/544701.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/GC/Scenarios/Affinity/affinitizer.csproj b/tests/src/GC/Scenarios/Affinity/affinitizer.csproj
index e67be53c6c..c5a6bd065b 100644
--- a/tests/src/GC/Scenarios/Affinity/affinitizer.csproj
+++ b/tests/src/GC/Scenarios/Affinity/affinitizer.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestKind>SharedLibrary</CLRTestKind>    
   </PropertyGroup>
diff --git a/tests/src/GC/Scenarios/BaseFinal/basefinal.csproj b/tests/src/GC/Scenarios/BaseFinal/basefinal.csproj
index 8c7af0a2f5..f75f2b55e1 100644
--- a/tests/src/GC/Scenarios/BaseFinal/basefinal.csproj
+++ b/tests/src/GC/Scenarios/BaseFinal/basefinal.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Scenarios/BinTree/bintree.csproj b/tests/src/GC/Scenarios/BinTree/bintree.csproj
index ebfc81d429..38d853c911 100644
--- a/tests/src/GC/Scenarios/BinTree/bintree.csproj
+++ b/tests/src/GC/Scenarios/BinTree/bintree.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestKind>BuildOnly</CLRTestKind> 
   </PropertyGroup>
diff --git a/tests/src/GC/Scenarios/BinTree/thdtree.csproj b/tests/src/GC/Scenarios/BinTree/thdtree.csproj
index ea77bd56f8..9a95cbd43e 100644
--- a/tests/src/GC/Scenarios/BinTree/thdtree.csproj
+++ b/tests/src/GC/Scenarios/BinTree/thdtree.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/BinTree/thdtreegrowingobj.csproj b/tests/src/GC/Scenarios/BinTree/thdtreegrowingobj.csproj
index b694da5a31..8691d79d92 100644
--- a/tests/src/GC/Scenarios/BinTree/thdtreegrowingobj.csproj
+++ b/tests/src/GC/Scenarios/BinTree/thdtreegrowingobj.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/BinTree/thdtreelivingobj.csproj b/tests/src/GC/Scenarios/BinTree/thdtreelivingobj.csproj
index da2375c480..64d9effab5 100644
--- a/tests/src/GC/Scenarios/BinTree/thdtreelivingobj.csproj
+++ b/tests/src/GC/Scenarios/BinTree/thdtreelivingobj.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Boxing/arrcpy.csproj b/tests/src/GC/Scenarios/Boxing/arrcpy.csproj
index f3c23d021f..cfc6ed6d13 100644
--- a/tests/src/GC/Scenarios/Boxing/arrcpy.csproj
+++ b/tests/src/GC/Scenarios/Boxing/arrcpy.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Boxing/doubLink.csproj b/tests/src/GC/Scenarios/Boxing/doubLink.csproj
index 25203aa886..de54efd0cc 100644
--- a/tests/src/GC/Scenarios/Boxing/doubLink.csproj
+++ b/tests/src/GC/Scenarios/Boxing/doubLink.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>    
diff --git a/tests/src/GC/Scenarios/Boxing/gcvariant.csproj b/tests/src/GC/Scenarios/Boxing/gcvariant.csproj
index e810bd5286..f1c69c9f39 100644
--- a/tests/src/GC/Scenarios/Boxing/gcvariant.csproj
+++ b/tests/src/GC/Scenarios/Boxing/gcvariant.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Boxing/gcvariant2.csproj b/tests/src/GC/Scenarios/Boxing/gcvariant2.csproj
index 5de655eed8..2c78d86040 100644
--- a/tests/src/GC/Scenarios/Boxing/gcvariant2.csproj
+++ b/tests/src/GC/Scenarios/Boxing/gcvariant2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Boxing/gcvariant3.csproj b/tests/src/GC/Scenarios/Boxing/gcvariant3.csproj
index 81fdb49c50..0bc8e5a618 100644
--- a/tests/src/GC/Scenarios/Boxing/gcvariant3.csproj
+++ b/tests/src/GC/Scenarios/Boxing/gcvariant3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Boxing/gcvariant4.csproj b/tests/src/GC/Scenarios/Boxing/gcvariant4.csproj
index 572a0b4107..12391760a0 100644
--- a/tests/src/GC/Scenarios/Boxing/gcvariant4.csproj
+++ b/tests/src/GC/Scenarios/Boxing/gcvariant4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Boxing/simpvariant.csproj b/tests/src/GC/Scenarios/Boxing/simpvariant.csproj
index 9be6fcae59..33f2188a29 100644
--- a/tests/src/GC/Scenarios/Boxing/simpvariant.csproj
+++ b/tests/src/GC/Scenarios/Boxing/simpvariant.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Boxing/vararystress.csproj b/tests/src/GC/Scenarios/Boxing/vararystress.csproj
index 66aecf1c75..55016b50fa 100644
--- a/tests/src/GC/Scenarios/Boxing/vararystress.csproj
+++ b/tests/src/GC/Scenarios/Boxing/vararystress.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Boxing/variantint.csproj b/tests/src/GC/Scenarios/Boxing/variantint.csproj
index ae43054f0d..30e62fd874 100644
--- a/tests/src/GC/Scenarios/Boxing/variantint.csproj
+++ b/tests/src/GC/Scenarios/Boxing/variantint.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Boxing/variantlinklist.csproj b/tests/src/GC/Scenarios/Boxing/variantlinklist.csproj
index 120851b420..819dd38e9c 100644
--- a/tests/src/GC/Scenarios/Boxing/variantlinklist.csproj
+++ b/tests/src/GC/Scenarios/Boxing/variantlinklist.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/DoublinkList/DoubLink.csproj b/tests/src/GC/Scenarios/DoublinkList/DoubLink.csproj
index 975bb480d3..e9c8a753ca 100644
--- a/tests/src/GC/Scenarios/DoublinkList/DoubLink.csproj
+++ b/tests/src/GC/Scenarios/DoublinkList/DoubLink.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>    
diff --git a/tests/src/GC/Scenarios/DoublinkList/DoubLink_V2.csproj b/tests/src/GC/Scenarios/DoublinkList/DoubLink_V2.csproj
index 935b2eb6e5..537fd3be31 100644
--- a/tests/src/GC/Scenarios/DoublinkList/DoubLink_V2.csproj
+++ b/tests/src/GC/Scenarios/DoublinkList/DoubLink_V2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>    
diff --git a/tests/src/GC/Scenarios/DoublinkList/dlbigleak.csproj b/tests/src/GC/Scenarios/DoublinkList/dlbigleak.csproj
index 93f15d999a..ba0824f7d9 100644
--- a/tests/src/GC/Scenarios/DoublinkList/dlbigleak.csproj
+++ b/tests/src/GC/Scenarios/DoublinkList/dlbigleak.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/DoublinkList/dlbigleakthd.csproj b/tests/src/GC/Scenarios/DoublinkList/dlbigleakthd.csproj
index c7f3b80b2f..564e215927 100644
--- a/tests/src/GC/Scenarios/DoublinkList/dlbigleakthd.csproj
+++ b/tests/src/GC/Scenarios/DoublinkList/dlbigleakthd.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/DoublinkList/dlbigleakthd_v2.csproj b/tests/src/GC/Scenarios/DoublinkList/dlbigleakthd_v2.csproj
index c7f3b80b2f..564e215927 100644
--- a/tests/src/GC/Scenarios/DoublinkList/dlbigleakthd_v2.csproj
+++ b/tests/src/GC/Scenarios/DoublinkList/dlbigleakthd_v2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/DoublinkList/dlcollect.csproj b/tests/src/GC/Scenarios/DoublinkList/dlcollect.csproj
index 0fb22fec24..f2bc4c3388 100644
--- a/tests/src/GC/Scenarios/DoublinkList/dlcollect.csproj
+++ b/tests/src/GC/Scenarios/DoublinkList/dlcollect.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/DoublinkList/dlstack.csproj b/tests/src/GC/Scenarios/DoublinkList/dlstack.csproj
index 5e385f06a3..4851452bde 100644
--- a/tests/src/GC/Scenarios/DoublinkList/dlstack.csproj
+++ b/tests/src/GC/Scenarios/DoublinkList/dlstack.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/DoublinkList/doublinkgen.csproj b/tests/src/GC/Scenarios/DoublinkList/doublinkgen.csproj
index ff63324435..9fa3eb4a49 100644
--- a/tests/src/GC/Scenarios/DoublinkList/doublinkgen.csproj
+++ b/tests/src/GC/Scenarios/DoublinkList/doublinkgen.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/DoublinkList/doublinknoleak.csproj b/tests/src/GC/Scenarios/DoublinkList/doublinknoleak.csproj
index c4b364faed..1138a71ff3 100644
--- a/tests/src/GC/Scenarios/DoublinkList/doublinknoleak.csproj
+++ b/tests/src/GC/Scenarios/DoublinkList/doublinknoleak.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <IsLongRunningGCTest>true</IsLongRunningGCTest>
   </PropertyGroup>
diff --git a/tests/src/GC/Scenarios/DoublinkList/doublinknoleak2.csproj b/tests/src/GC/Scenarios/DoublinkList/doublinknoleak2.csproj
index c1da855b0b..973be03de0 100644
--- a/tests/src/GC/Scenarios/DoublinkList/doublinknoleak2.csproj
+++ b/tests/src/GC/Scenarios/DoublinkList/doublinknoleak2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/DoublinkList/doublinkstay.csproj b/tests/src/GC/Scenarios/DoublinkList/doublinkstay.csproj
index 71fb1dc160..64936d2f75 100644
--- a/tests/src/GC/Scenarios/DoublinkList/doublinkstay.csproj
+++ b/tests/src/GC/Scenarios/DoublinkList/doublinkstay.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Dynamo/dynamo.csproj b/tests/src/GC/Scenarios/Dynamo/dynamo.csproj
index abf02743fb..6858ceb281 100644
--- a/tests/src/GC/Scenarios/Dynamo/dynamo.csproj
+++ b/tests/src/GC/Scenarios/Dynamo/dynamo.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>1000 40 191919</CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
diff --git a/tests/src/GC/Scenarios/FinalNStruct/finalnstruct.csproj b/tests/src/GC/Scenarios/FinalNStruct/finalnstruct.csproj
index dadbb7f330..9fa5fc1b7d 100644
--- a/tests/src/GC/Scenarios/FinalNStruct/finalnstruct.csproj
+++ b/tests/src/GC/Scenarios/FinalNStruct/finalnstruct.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/FinalNStruct/nstructresur.csproj b/tests/src/GC/Scenarios/FinalNStruct/nstructresur.csproj
index 6453511081..77fdaea316 100644
--- a/tests/src/GC/Scenarios/FinalNStruct/nstructresur.csproj
+++ b/tests/src/GC/Scenarios/FinalNStruct/nstructresur.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/FinalNStruct/nstructtun.csproj b/tests/src/GC/Scenarios/FinalNStruct/nstructtun.csproj
index 7b34eadd0b..102ef2ef77 100644
--- a/tests/src/GC/Scenarios/FinalNStruct/nstructtun.csproj
+++ b/tests/src/GC/Scenarios/FinalNStruct/nstructtun.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/FinalNStruct/strmap.csproj b/tests/src/GC/Scenarios/FinalNStruct/strmap.csproj
index a55099380a..1180a0e125 100644
--- a/tests/src/GC/Scenarios/FinalNStruct/strmap.csproj
+++ b/tests/src/GC/Scenarios/FinalNStruct/strmap.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>SharedLibrary</CLRTestKind>    
diff --git a/tests/src/GC/Scenarios/FinalizeTimeout/FinalizeTimeout.csproj b/tests/src/GC/Scenarios/FinalizeTimeout/FinalizeTimeout.csproj
index a8ff14e3b5..a3440bc4ed 100644
--- a/tests/src/GC/Scenarios/FinalizeTimeout/FinalizeTimeout.csproj
+++ b/tests/src/GC/Scenarios/FinalizeTimeout/FinalizeTimeout.csproj
@@ -7,7 +7,6 @@
     <AssemblyName>FinalizeTimeout</AssemblyName>
     <ProjectGuid>{3B0E8096-79D4-413F-9010-F68DF90073B5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <FileAlignment>512</FileAlignment>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/FragMan/fragman.csproj b/tests/src/GC/Scenarios/FragMan/fragman.csproj
index 017b6cb244..f24a554ce2 100644
--- a/tests/src/GC/Scenarios/FragMan/fragman.csproj
+++ b/tests/src/GC/Scenarios/FragMan/fragman.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/GCBase1/gc_base1.csproj b/tests/src/GC/Scenarios/GCBase1/gc_base1.csproj
index 46d75b39ff..075d830b77 100644
--- a/tests/src/GC/Scenarios/GCBase1/gc_base1.csproj
+++ b/tests/src/GC/Scenarios/GCBase1/gc_base1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestExecutionArguments>3 100</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/GC/Scenarios/GCBase1/gc_base1_1.csproj b/tests/src/GC/Scenarios/GCBase1/gc_base1_1.csproj
index 048b07dfac..23f6cb9ecf 100644
--- a/tests/src/GC/Scenarios/GCBase1/gc_base1_1.csproj
+++ b/tests/src/GC/Scenarios/GCBase1/gc_base1_1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestExecutionArguments>8 100</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/GC/Scenarios/GCBench/THIRD-PARTY-NOTICES b/tests/src/GC/Scenarios/GCBench/THIRD-PARTY-NOTICES
new file mode 100644
index 0000000000..d80ed8d8cc
--- /dev/null
+++ b/tests/src/GC/Scenarios/GCBench/THIRD-PARTY-NOTICES
@@ -0,0 +1,18 @@
+.NET Core uses third-party libraries or other resources that may be
+distributed under licenses different than the .NET Core software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           dotnet@microsoft.com
+
+The attached notices are provided for information only.
+
+License notice for An Artificial Garbage Collection Benchmark
+-------------------------------------------------------------
+
+http://hboehm.info/gc/gc_bench.html
+http://hboehm.info/gc/gc_bench/GCBench.c
+
+No specific license is given, so attributing and using in "good faith" 
+in the same way that it has been offered. We will delete upon request.
diff --git a/tests/src/GC/Scenarios/GCBench/gcbench.csproj b/tests/src/GC/Scenarios/GCBench/gcbench.csproj
index 79dea0db8c..f2c5452ad7 100644
--- a/tests/src/GC/Scenarios/GCBench/gcbench.csproj
+++ b/tests/src/GC/Scenarios/GCBench/gcbench.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj
index 28bf631264..efa945a999 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildAndRun</CLRTestKind>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_10.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_10.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_10.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_10.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_100.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_100.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_100.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_100.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_101.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_101.csproj
index 52970adcd6..654b0c003a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_101.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_101.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_102.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_102.csproj
index 18bd79b457..af0b6dbbd4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_102.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_102.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_103.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_103.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_103.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_103.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_104.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_104.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_104.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_104.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_105.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_105.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_105.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_105.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_106.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_106.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_106.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_106.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_107.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_107.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_107.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_107.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_108.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_108.csproj
index 02f5b6a6a4..1498c48f97 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_108.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_108.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_109.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_109.csproj
index 0b00ccf5d8..57f3e310fc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_109.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_109.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_11.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_11.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_11.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_11.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_110.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_110.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_110.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_110.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_111.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_111.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_111.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_111.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_112.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_112.csproj
index a3ad3bc996..e6175d3fa4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_112.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_112.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_113.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_113.csproj
index c10d2365db..239b25a8d3 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_113.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_113.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_114.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_114.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_114.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_114.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_115.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_115.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_115.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_115.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_116.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_116.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_116.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_116.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_117.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_117.csproj
index 02f5b6a6a4..1498c48f97 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_117.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_117.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_118.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_118.csproj
index 0b00ccf5d8..57f3e310fc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_118.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_118.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_119.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_119.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_119.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_119.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_12.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_12.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_12.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_12.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_120.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_120.csproj
index 9787e5def5..e2a13b3acf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_120.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_120.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_121.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_121.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_121.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_121.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_122.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_122.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_122.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_122.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_123.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_123.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_123.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_123.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_124.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_124.csproj
index 0d0bd63338..1feac43f3c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_124.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_124.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_125.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_125.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_125.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_125.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_126.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_126.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_126.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_126.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_127.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_127.csproj
index 18bd79b457..af0b6dbbd4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_127.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_127.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_128.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_128.csproj
index d64b1663c6..bfe48ccf64 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_128.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_128.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_129.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_129.csproj
index 067ee9f002..5f915119cb 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_129.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_129.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_13.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_13.csproj
index c5d2f29513..0237f45838 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_13.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_13.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_130.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_130.csproj
index 769e1a9367..6650b3491f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_130.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_130.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_131.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_131.csproj
index 04b041510d..4f59479aed 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_131.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_131.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_132.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_132.csproj
index 8e7e4a5ba3..fa9c9f123c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_132.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_132.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_133.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_133.csproj
index 5d17cacb87..92a17625a6 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_133.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_133.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_134.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_134.csproj
index ff730ee5af..5c782096b4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_134.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_134.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_135.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_135.csproj
index d1e8f1f0bc..296ee6051d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_135.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_135.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_136.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_136.csproj
index fa915a1286..b73d306835 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_136.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_136.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_137.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_137.csproj
index 31e270bbed..fe2e15b871 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_137.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_137.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_138.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_138.csproj
index 45154fecc6..61643d0e7e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_138.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_138.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_139.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_139.csproj
index 7425ada2af..8ecfe4117c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_139.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_139.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_14.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_14.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_14.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_14.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_140.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_140.csproj
index 7425ada2af..8ecfe4117c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_140.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_140.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_141.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_141.csproj
index 60996fd9d6..69ce1e0670 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_141.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_141.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_142.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_142.csproj
index 60996fd9d6..69ce1e0670 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_142.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_142.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_143.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_143.csproj
index f362e9bc6f..502e909c43 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_143.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_143.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_144.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_144.csproj
index 1c8b0916c5..2e2189ab5c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_144.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_144.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_145.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_145.csproj
index 517236d0a2..a0a47ebf1d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_145.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_145.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_146.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_146.csproj
index 9f04fd85e5..8edc30e958 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_146.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_146.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_147.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_147.csproj
index 5c1ba8c5ce..92bf92d272 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_147.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_147.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_148.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_148.csproj
index a636c1fe9b..b75f3579e5 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_148.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_148.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_149.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_149.csproj
index 6358df873c..1f8c3b8a01 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_149.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_149.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_15.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_15.csproj
index 18bd79b457..af0b6dbbd4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_15.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_15.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_150.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_150.csproj
index 6358df873c..1f8c3b8a01 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_150.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_150.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_151.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_151.csproj
index 6358df873c..1f8c3b8a01 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_151.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_151.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_152.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_152.csproj
index 01a96094f7..173a5b7dfc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_152.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_152.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_153.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_153.csproj
index b24a4c0168..24f68a7049 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_153.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_153.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_154.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_154.csproj
index a9b23c89f4..c9240fcf1d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_154.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_154.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_155.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_155.csproj
index 929a006091..6c67f897eb 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_155.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_155.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_156.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_156.csproj
index 929a006091..6c67f897eb 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_156.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_156.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_157.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_157.csproj
index 929a006091..6c67f897eb 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_157.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_157.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_158.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_158.csproj
index 094f7a3976..204e7488b6 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_158.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_158.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_159.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_159.csproj
index 929a006091..6c67f897eb 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_159.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_159.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_16.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_16.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_16.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_16.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_160.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_160.csproj
index 2799bcc4ad..307ae1d54a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_160.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_160.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_161.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_161.csproj
index bc5ca26f99..5a3e3eff0b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_161.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_161.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_162.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_162.csproj
index 0a61098b99..d0e9489583 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_162.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_162.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_163.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_163.csproj
index 7492550c63..e1c378036c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_163.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_163.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_164.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_164.csproj
index 506206f2a9..381546aa47 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_164.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_164.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_165.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_165.csproj
index e1d8720690..52f31251ec 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_165.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_165.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_166.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_166.csproj
index 844f3e9d88..18e945cac8 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_166.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_166.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_167.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_167.csproj
index f682d1758a..2dd4d3fae1 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_167.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_167.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_168.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_168.csproj
index 51c896dc8f..86cf5d4b48 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_168.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_168.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_169.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_169.csproj
index 8c3a304887..556dec944d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_169.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_169.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_17.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_17.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_17.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_17.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_170.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_170.csproj
index 51c896dc8f..86cf5d4b48 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_170.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_170.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_171.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_171.csproj
index 889f6373c0..3c7a845ae1 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_171.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_171.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_172.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_172.csproj
index c95c275ae8..f0939f6d47 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_172.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_172.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_173.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_173.csproj
index 953ed5bad6..b57c8953a6 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_173.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_173.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_174.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_174.csproj
index ec82fd36be..6b6d6473ef 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_174.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_174.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_175.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_175.csproj
index 7902bdb4b0..5e3b6f972b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_175.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_175.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_176.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_176.csproj
index 6fccb86f70..324818f41a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_176.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_176.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_177.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_177.csproj
index 6ec55d59ba..e41ce7cf1e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_177.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_177.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_178.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_178.csproj
index 16eb29e254..e3696e2926 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_178.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_178.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_179.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_179.csproj
index 48690d9a8d..4ad88f6f2a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_179.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_179.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 8517 -sdz 17 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_18.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_18.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_18.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_18.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_180.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_180.csproj
index 8c3a304887..556dec944d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_180.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_180.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_181.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_181.csproj
index f07235829c..25b51b6e22 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_181.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_181.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_182.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_182.csproj
index dbb960cf54..dfb58ec4fe 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_182.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_182.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_183.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_183.csproj
index 35740260d3..52133d3077 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_183.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_183.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_184.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_184.csproj
index 6d239a6374..d3496f2e24 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_184.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_184.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_185.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_185.csproj
index 31554ff8b0..2d2d584622 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_185.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_185.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_186.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_186.csproj
index e8bff83fe9..6a7886e0e3 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_186.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_186.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_187.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_187.csproj
index 4fe7d71661..fd3f1abc7f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_187.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_187.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_188.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_188.csproj
index 026cfa3658..4916da2dee 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_188.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_188.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_189.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_189.csproj
index c555d777aa..ae0f99088f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_189.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_189.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_19.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_19.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_19.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_19.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_190.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_190.csproj
index cccb593395..d00ec0c84a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_190.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_190.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_191.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_191.csproj
index a04eb3f455..abc4bca868 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_191.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_191.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_192.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_192.csproj
index ce1beaa606..ca8543596c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_192.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_192.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_193.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_193.csproj
index 611642df56..8c62ad48de 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_193.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_193.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_194.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_194.csproj
index 2f40446161..fe193fcb87 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_194.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_194.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_195.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_195.csproj
index e00f2f59ef..eda59d79cc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_195.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_195.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 7 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_196.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_196.csproj
index fa915a1286..b73d306835 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_196.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_196.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_197.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_197.csproj
index 0d0bd63338..1feac43f3c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_197.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_197.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_198.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_198.csproj
index f362e9bc6f..502e909c43 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_198.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_198.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_199.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_199.csproj
index 7492550c63..e1c378036c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_199.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_199.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_2.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_2.csproj
index c5d2f29513..0237f45838 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_2.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_2.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_20.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_20.csproj
index 02f5b6a6a4..1498c48f97 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_20.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_20.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_200.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_200.csproj
index 095832a407..59d9d9577a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_200.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_200.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_201.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_201.csproj
index effa6e6200..98c663b3bc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_201.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_201.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_202.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_202.csproj
index e8ab911503..081c5352f9 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_202.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_202.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_203.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_203.csproj
index 01a96094f7..173a5b7dfc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_203.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_203.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_204.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_204.csproj
index c95c275ae8..f0939f6d47 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_204.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_204.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_205.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_205.csproj
index 72383fd2ac..4314e03885 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_205.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_205.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 30000 -sdc 6000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_206.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_206.csproj
index 8fd4c882a0..987f8b9d5f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_206.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_206.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 6000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_207.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_207.csproj
index 8fb834afa3..3835ed8b3e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_207.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_207.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_208.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_208.csproj
index a3ad3bc996..e6175d3fa4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_208.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_208.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_209.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_209.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_209.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_209.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_21.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_21.csproj
index 0b00ccf5d8..57f3e310fc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_21.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_21.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_210.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_210.csproj
index 9787e5def5..e2a13b3acf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_210.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_210.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_211.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_211.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_211.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_211.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_212.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_212.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_212.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_212.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_213.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_213.csproj
index e59b54ddde..9c99e4901c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_213.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_213.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 2 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_214.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_214.csproj
index c5d2f29513..0237f45838 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_214.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_214.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_215.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_215.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_215.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_215.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_216.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_216.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_216.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_216.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_217.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_217.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_217.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_217.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_218.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_218.csproj
index 18bd79b457..af0b6dbbd4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_218.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_218.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_219.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_219.csproj
index a8e1814b97..549711542f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_219.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_219.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_22.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_22.csproj
index d230189fa8..49adca178a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_22.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_22.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_220.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_220.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_220.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_220.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_221.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_221.csproj
index 9787e5def5..e2a13b3acf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_221.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_221.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_222.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_222.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_222.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_222.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_223.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_223.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_223.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_223.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_224.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_224.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_224.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_224.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_225.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_225.csproj
index c5d2f29513..0237f45838 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_225.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_225.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_226.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_226.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_226.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_226.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_227.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_227.csproj
index 18bd79b457..af0b6dbbd4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_227.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_227.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_228.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_228.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_228.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_228.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_229.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_229.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_229.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_229.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_23.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_23.csproj
index 57aa7067b1..6768f7162a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_23.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_23.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_230.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_230.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_230.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_230.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_231.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_231.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_231.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_231.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_232.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_232.csproj
index 02f5b6a6a4..1498c48f97 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_232.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_232.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_233.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_233.csproj
index 0b00ccf5d8..57f3e310fc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_233.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_233.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_234.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_234.csproj
index d230189fa8..49adca178a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_234.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_234.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_235.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_235.csproj
index 57aa7067b1..6768f7162a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_235.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_235.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_236.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_236.csproj
index 095832a407..59d9d9577a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_236.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_236.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_237.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_237.csproj
index 09fa9fae34..637fd0a17d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_237.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_237.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_238.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_238.csproj
index f04be7b8e7..2bd3440778 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_238.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_238.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_239.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_239.csproj
index cf5c8d6610..da1674799e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_239.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_239.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_24.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_24.csproj
index 095832a407..59d9d9577a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_24.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_24.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_240.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_240.csproj
index c57f18a9c0..e9e5657dfd 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_240.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_240.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_241.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_241.csproj
index f8843a21d1..cdfeacca84 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_241.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_241.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_242.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_242.csproj
index 67d3756fc9..5708e61405 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_242.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_242.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_243.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_243.csproj
index f4f651f3ce..f23481f2a8 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_243.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_243.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_244.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_244.csproj
index 98851af8bd..0ee20fdff3 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_244.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_244.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_245.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_245.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_245.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_245.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_246.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_246.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_246.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_246.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_247.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_247.csproj
index 7362a8e401..bf23c1135e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_247.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_247.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_248.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_248.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_248.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_248.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_249.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_249.csproj
index 18bd79b457..af0b6dbbd4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_249.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_249.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_25.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_25.csproj
index 09fa9fae34..637fd0a17d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_25.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_25.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_250.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_250.csproj
index 9cc09c6aaa..ff1589fd30 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_250.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_250.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_251.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_251.csproj
index 44d3eff404..913cea9691 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_251.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_251.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_252.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_252.csproj
index c1fe9227ba..6fa364d0ab 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_252.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_252.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_253.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_253.csproj
index efcdab064e..21fc786d12 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_253.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_253.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_254.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_254.csproj
index 778580e6f5..b36daba11b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_254.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_254.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_255.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_255.csproj
index ea2db4b5d4..74ad334a8e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_255.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_255.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_256.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_256.csproj
index 0e9d792c4f..0b6dbd56af 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_256.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_256.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_257.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_257.csproj
index 7dbe2327a2..89c9960d37 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_257.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_257.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_258.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_258.csproj
index 7362a8e401..bf23c1135e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_258.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_258.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_259.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_259.csproj
index 9beab8b82e..7aea97397b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_259.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_259.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_26.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_26.csproj
index f04be7b8e7..2bd3440778 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_26.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_26.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_260.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_260.csproj
index adc336edd1..99e832c16b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_260.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_260.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_261.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_261.csproj
index 14b6724cc5..0f42395b95 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_261.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_261.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_262.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_262.csproj
index 9cdd17fc3b..a83cef5a2c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_262.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_262.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_263.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_263.csproj
index bb341bbb77..8c01edb1ec 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_263.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_263.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_264.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_264.csproj
index 703871f4db..af93e3add7 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_264.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_264.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_265.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_265.csproj
index c204dee412..0e94eda34b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_265.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_265.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_266.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_266.csproj
index 862fde07ad..b2c25e1630 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_266.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_266.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_267.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_267.csproj
index a56584ad57..72860b9411 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_267.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_267.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_268.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_268.csproj
index 95fa86f6dd..e8edf12cf4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_268.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_268.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_269.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_269.csproj
index 78a9cb9f2d..c38dcb73bf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_269.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_269.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_27.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_27.csproj
index cf5c8d6610..da1674799e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_27.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_27.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_270.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_270.csproj
index eb9930478f..1d249789ef 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_270.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_270.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_271.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_271.csproj
index 3d23b7bba3..bd87bd87cf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_271.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_271.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_272.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_272.csproj
index 1ad6e9c333..27d9611c0a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_272.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_272.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_273.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_273.csproj
index 4ab8a5c16a..bf02001f47 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_273.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_273.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_274.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_274.csproj
index 1eaea60135..2caa77576e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_274.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_274.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_275.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_275.csproj
index a0d4479fa5..54bbf07d55 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_275.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_275.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_276.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_276.csproj
index 9081154cd0..4b154f6be4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_276.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_276.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_277.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_277.csproj
index 5638a03ca7..e3b5a740fe 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_277.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_277.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_278.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_278.csproj
index 5872437487..8ce1c459ab 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_278.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_278.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_279.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_279.csproj
index d0539dacdc..af08b87678 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_279.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_279.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_28.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_28.csproj
index c57f18a9c0..e9e5657dfd 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_28.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_28.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_280.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_280.csproj
index 78a9cb9f2d..c38dcb73bf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_280.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_280.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_281.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_281.csproj
index b87addba2e..3b24edd209 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_281.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_281.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_282.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_282.csproj
index 011060b327..a24f9abe64 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_282.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_282.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_283.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_283.csproj
index f8a39eb69f..703b8d333a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_283.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_283.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_284.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_284.csproj
index a65f70770e..57275c2641 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_284.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_284.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_285.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_285.csproj
index f8d7eb32ee..015f3aa721 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_285.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_285.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_286.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_286.csproj
index cfe7ef7dfd..104a94d863 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_286.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_286.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_287.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_287.csproj
index 8d37b2cd14..7fa2c7f14c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_287.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_287.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_288.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_288.csproj
index fcd2162179..bb398fa986 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_288.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_288.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_289.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_289.csproj
index ef92fb47c0..c191514f57 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_289.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_289.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_29.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_29.csproj
index f8843a21d1..cdfeacca84 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_29.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_29.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_290.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_290.csproj
index 86efe43999..475dfcafd9 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_290.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_290.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_291.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_291.csproj
index bfcd0f46fa..df60056fde 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_291.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_291.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_292.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_292.csproj
index 9caec006eb..9701414bda 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_292.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_292.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_293.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_293.csproj
index ba4150f785..5b969240da 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_293.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_293.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_294.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_294.csproj
index 168604323a..78b9f38406 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_294.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_294.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_295.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_295.csproj
index ddd7aa6b08..48cae09bba 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_295.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_295.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_296.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_296.csproj
index aaf833c06a..a9ff73bb1f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_296.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_296.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_297.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_297.csproj
index 2bfc4806ce..c7875a0835 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_297.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_297.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_298.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_298.csproj
index 6ff594c657..44ca3461ec 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_298.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_298.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_299.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_299.csproj
index 171cef3bfb..f0c4ec0361 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_299.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_299.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_3.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_3.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_3.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_3.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_30.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_30.csproj
index 67d3756fc9..5708e61405 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_30.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_30.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_300.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_300.csproj
index 092501d7e6..212186b2bc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_300.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_300.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_301.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_301.csproj
index c706385522..307565636c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_301.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_301.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_302.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_302.csproj
index 6cb54a5381..0cc14c9bbf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_302.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_302.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_303.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_303.csproj
index 9b8e4990f6..580874ece4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_303.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_303.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_304.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_304.csproj
index 2662377b5a..e8bd6df7d3 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_304.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_304.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_305.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_305.csproj
index 2167a88631..5d6c47214a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_305.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_305.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_306.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_306.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_306.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_306.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_307.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_307.csproj
index 9787e5def5..e2a13b3acf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_307.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_307.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_308.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_308.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_308.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_308.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_309.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_309.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_309.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_309.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_31.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_31.csproj
index f4f651f3ce..f23481f2a8 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_31.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_31.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_310.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_310.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_310.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_310.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_311.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_311.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_311.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_311.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_312.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_312.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_312.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_312.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_313.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_313.csproj
index 52970adcd6..654b0c003a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_313.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_313.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_314.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_314.csproj
index 18bd79b457..af0b6dbbd4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_314.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_314.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_315.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_315.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_315.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_315.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_316.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_316.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_316.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_316.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_317.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_317.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_317.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_317.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_318.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_318.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_318.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_318.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_319.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_319.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_319.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_319.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_32.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_32.csproj
index 98851af8bd..0ee20fdff3 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_32.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_32.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_320.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_320.csproj
index 02f5b6a6a4..1498c48f97 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_320.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_320.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_321.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_321.csproj
index 0b00ccf5d8..57f3e310fc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_321.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_321.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_322.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_322.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_322.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_322.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_323.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_323.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_323.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_323.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_324.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_324.csproj
index a3ad3bc996..e6175d3fa4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_324.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_324.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_325.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_325.csproj
index c10d2365db..239b25a8d3 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_325.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_325.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_326.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_326.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_326.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_326.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_327.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_327.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_327.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_327.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_328.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_328.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_328.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_328.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_329.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_329.csproj
index 02f5b6a6a4..1498c48f97 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_329.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_329.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_33.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_33.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_33.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_33.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_330.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_330.csproj
index 0b00ccf5d8..57f3e310fc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_330.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_330.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_331.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_331.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_331.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_331.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_332.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_332.csproj
index 9787e5def5..e2a13b3acf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_332.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_332.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_333.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_333.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_333.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_333.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_334.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_334.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_334.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_334.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_335.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_335.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_335.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_335.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_336.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_336.csproj
index 0d0bd63338..1feac43f3c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_336.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_336.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_337.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_337.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_337.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_337.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_338.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_338.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_338.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_338.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_339.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_339.csproj
index 18bd79b457..af0b6dbbd4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_339.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_339.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_34.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_34.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_34.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_34.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_340.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_340.csproj
index d64b1663c6..bfe48ccf64 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_340.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_340.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_341.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_341.csproj
index 067ee9f002..5f915119cb 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_341.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_341.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_342.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_342.csproj
index 769e1a9367..6650b3491f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_342.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_342.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_343.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_343.csproj
index 04b041510d..4f59479aed 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_343.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_343.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_344.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_344.csproj
index 8e7e4a5ba3..fa9c9f123c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_344.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_344.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_345.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_345.csproj
index 5d17cacb87..92a17625a6 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_345.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_345.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_346.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_346.csproj
index ff730ee5af..5c782096b4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_346.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_346.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_347.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_347.csproj
index d1e8f1f0bc..296ee6051d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_347.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_347.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_348.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_348.csproj
index fa915a1286..b73d306835 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_348.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_348.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_349.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_349.csproj
index 31e270bbed..fe2e15b871 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_349.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_349.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_35.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_35.csproj
index 7362a8e401..bf23c1135e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_35.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_35.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_350.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_350.csproj
index 45154fecc6..61643d0e7e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_350.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_350.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_351.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_351.csproj
index 7425ada2af..8ecfe4117c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_351.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_351.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_352.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_352.csproj
index 7425ada2af..8ecfe4117c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_352.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_352.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_353.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_353.csproj
index 60996fd9d6..69ce1e0670 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_353.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_353.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_354.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_354.csproj
index 60996fd9d6..69ce1e0670 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_354.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_354.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_355.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_355.csproj
index f362e9bc6f..502e909c43 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_355.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_355.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_356.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_356.csproj
index 1c8b0916c5..2e2189ab5c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_356.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_356.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_357.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_357.csproj
index 517236d0a2..a0a47ebf1d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_357.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_357.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_358.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_358.csproj
index 9f04fd85e5..8edc30e958 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_358.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_358.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_359.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_359.csproj
index 5c1ba8c5ce..92bf92d272 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_359.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_359.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_36.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_36.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_36.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_36.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_360.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_360.csproj
index a636c1fe9b..b75f3579e5 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_360.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_360.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_361.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_361.csproj
index 6358df873c..1f8c3b8a01 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_361.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_361.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_362.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_362.csproj
index 6358df873c..1f8c3b8a01 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_362.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_362.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_363.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_363.csproj
index 6358df873c..1f8c3b8a01 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_363.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_363.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_364.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_364.csproj
index 01a96094f7..173a5b7dfc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_364.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_364.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_365.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_365.csproj
index b24a4c0168..24f68a7049 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_365.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_365.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_366.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_366.csproj
index a9b23c89f4..c9240fcf1d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_366.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_366.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_367.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_367.csproj
index 929a006091..6c67f897eb 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_367.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_367.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_368.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_368.csproj
index 929a006091..6c67f897eb 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_368.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_368.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_369.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_369.csproj
index 929a006091..6c67f897eb 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_369.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_369.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_37.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_37.csproj
index 18bd79b457..af0b6dbbd4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_37.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_37.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_370.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_370.csproj
index 094f7a3976..204e7488b6 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_370.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_370.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_371.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_371.csproj
index 929a006091..6c67f897eb 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_371.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_371.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_372.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_372.csproj
index 2799bcc4ad..307ae1d54a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_372.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_372.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_373.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_373.csproj
index bc5ca26f99..5a3e3eff0b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_373.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_373.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_374.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_374.csproj
index 0a61098b99..d0e9489583 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_374.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_374.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_375.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_375.csproj
index 7492550c63..e1c378036c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_375.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_375.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_376.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_376.csproj
index 506206f2a9..381546aa47 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_376.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_376.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_377.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_377.csproj
index e1d8720690..52f31251ec 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_377.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_377.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_378.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_378.csproj
index 844f3e9d88..18e945cac8 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_378.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_378.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_379.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_379.csproj
index f682d1758a..2dd4d3fae1 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_379.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_379.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_38.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_38.csproj
index 9cc09c6aaa..ff1589fd30 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_38.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_38.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_380.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_380.csproj
index 51c896dc8f..86cf5d4b48 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_380.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_380.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_381.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_381.csproj
index 8c3a304887..556dec944d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_381.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_381.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_382.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_382.csproj
index 51c896dc8f..86cf5d4b48 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_382.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_382.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_383.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_383.csproj
index 889f6373c0..3c7a845ae1 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_383.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_383.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_384.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_384.csproj
index c95c275ae8..f0939f6d47 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_384.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_384.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_385.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_385.csproj
index 953ed5bad6..b57c8953a6 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_385.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_385.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_386.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_386.csproj
index ec82fd36be..6b6d6473ef 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_386.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_386.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_387.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_387.csproj
index 7902bdb4b0..5e3b6f972b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_387.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_387.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_388.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_388.csproj
index 6fccb86f70..324818f41a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_388.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_388.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_389.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_389.csproj
index 6ec55d59ba..e41ce7cf1e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_389.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_389.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_39.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_39.csproj
index 44d3eff404..913cea9691 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_39.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_39.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_390.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_390.csproj
index 16eb29e254..e3696e2926 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_390.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_390.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_391.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_391.csproj
index 48690d9a8d..4ad88f6f2a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_391.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_391.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 8517 -sdz 17 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_392.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_392.csproj
index 8c3a304887..556dec944d 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_392.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_392.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_393.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_393.csproj
index f07235829c..25b51b6e22 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_393.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_393.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_394.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_394.csproj
index dbb960cf54..dfb58ec4fe 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_394.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_394.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_395.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_395.csproj
index 35740260d3..52133d3077 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_395.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_395.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_396.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_396.csproj
index 6d239a6374..d3496f2e24 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_396.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_396.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_397.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_397.csproj
index 31554ff8b0..2d2d584622 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_397.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_397.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 2 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_398.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_398.csproj
index e8bff83fe9..6a7886e0e3 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_398.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_398.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_399.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_399.csproj
index 4fe7d71661..fd3f1abc7f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_399.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_399.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_4.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_4.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_4.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_4.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_40.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_40.csproj
index c1fe9227ba..6fa364d0ab 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_40.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_40.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_400.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_400.csproj
index 026cfa3658..4916da2dee 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_400.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_400.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_401.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_401.csproj
index c555d777aa..ae0f99088f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_401.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_401.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_402.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_402.csproj
index cccb593395..d00ec0c84a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_402.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_402.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 4 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_403.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_403.csproj
index a04eb3f455..abc4bca868 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_403.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_403.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_404.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_404.csproj
index ce1beaa606..ca8543596c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_404.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_404.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_405.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_405.csproj
index 611642df56..8c62ad48de 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_405.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_405.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_406.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_406.csproj
index 2f40446161..fe193fcb87 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_406.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_406.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 5 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_407.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_407.csproj
index e00f2f59ef..eda59d79cc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_407.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_407.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 7 -tp 0 -dz 17 -sdz 17 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_408.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_408.csproj
index fa915a1286..b73d306835 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_408.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_408.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_409.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_409.csproj
index 0d0bd63338..1feac43f3c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_409.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_409.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_41.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_41.csproj
index efcdab064e..21fc786d12 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_41.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_41.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_410.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_410.csproj
index f362e9bc6f..502e909c43 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_410.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_410.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_411.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_411.csproj
index 7492550c63..e1c378036c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_411.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_411.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_412.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_412.csproj
index 095832a407..59d9d9577a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_412.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_412.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_413.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_413.csproj
index effa6e6200..98c663b3bc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_413.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_413.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_414.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_414.csproj
index e8ab911503..081c5352f9 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_414.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_414.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_415.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_415.csproj
index 01a96094f7..173a5b7dfc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_415.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_415.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_416.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_416.csproj
index c95c275ae8..f0939f6d47 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_416.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_416.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_417.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_417.csproj
index 72383fd2ac..4314e03885 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_417.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_417.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 30000 -sdc 6000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_418.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_418.csproj
index 8fd4c882a0..987f8b9d5f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_418.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_418.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 6000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_419.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_419.csproj
index 8fb834afa3..3835ed8b3e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_419.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_419.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_42.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_42.csproj
index 778580e6f5..b36daba11b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_42.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_42.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_420.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_420.csproj
index a3ad3bc996..e6175d3fa4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_420.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_420.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 17 -dc 20000 -sdc 8000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_421.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_421.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_421.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_421.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_422.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_422.csproj
index 9787e5def5..e2a13b3acf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_422.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_422.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_423.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_423.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_423.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_423.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_424.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_424.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_424.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_424.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_425.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_425.csproj
index 7019cde16d..d6acf36e50 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_425.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_425.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 7 -tp 0 -dz 17 -sdc 1024 -dc 10000 -sdz 17 -lt 2 -dp 0.1 -dw 0.0 -f</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_426.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_426.csproj
index e94370ee8b..87e1293a41 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_426.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_426.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 8 -tp 0 -dz 17 -sdc 1024 -dc 10000 -sdz 17 -lt 2 -dp 0.2 -dw 0.0 -f</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_427.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_427.csproj
index a6c162fcf5..610e7b0c40 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_427.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_427.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 10 -tp 0 -dz 17 -sdc 1024 -dc 10000 -sdz 17 -lt 2 -dp 0.2 -dw 0.0 -f</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_428.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_428.csproj
index fce90ba644..daad480c25 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_428.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_428.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 10 -tp 0 -dz 17 -sdc 1024 -dc 10000 -sdz 17 -lt 2 -dp 0.3 -dw 0.0 -f</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_429.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_429.csproj
index f6933d5f3f..8d28d63c00 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_429.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_429.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 8 -tp 0 -dz 17 -sdc 1024 -dc 10000 -sdz 17 -lt 2 -dp 0.3 -dw 0.1 -f</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_43.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_43.csproj
index ea2db4b5d4..74ad334a8e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_43.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_43.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_430.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_430.csproj
index ef92fb47c0..c191514f57 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_430.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_430.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_431.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_431.csproj
index 0b00ccf5d8..57f3e310fc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_431.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_431.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_432.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_432.csproj
index 5c1ba8c5ce..92bf92d272 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_432.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_432.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_44.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_44.csproj
index 0e9d792c4f..0b6dbd56af 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_44.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_44.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_45.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_45.csproj
index 7dbe2327a2..89c9960d37 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_45.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_45.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_46.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_46.csproj
index 7362a8e401..bf23c1135e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_46.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_46.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_47.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_47.csproj
index 9beab8b82e..7aea97397b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_47.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_47.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_48.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_48.csproj
index adc336edd1..99e832c16b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_48.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_48.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_49.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_49.csproj
index 14b6724cc5..0f42395b95 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_49.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_49.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_5.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_5.csproj
index 8555f50918..f9e01b1e6c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_5.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_5.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_50.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_50.csproj
index 9cdd17fc3b..a83cef5a2c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_50.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_50.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_51.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_51.csproj
index bb341bbb77..8c01edb1ec 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_51.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_51.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_52.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_52.csproj
index 703871f4db..af93e3add7 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_52.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_52.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_53.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_53.csproj
index c204dee412..0e94eda34b 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_53.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_53.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_54.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_54.csproj
index 862fde07ad..b2c25e1630 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_54.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_54.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_55.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_55.csproj
index a56584ad57..72860b9411 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_55.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_55.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_56.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_56.csproj
index 95fa86f6dd..e8edf12cf4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_56.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_56.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_57.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_57.csproj
index 78a9cb9f2d..c38dcb73bf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_57.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_57.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_58.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_58.csproj
index eb9930478f..1d249789ef 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_58.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_58.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_59.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_59.csproj
index 3d23b7bba3..bd87bd87cf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_59.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_59.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_6.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_6.csproj
index 18bd79b457..af0b6dbbd4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_6.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_6.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_60.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_60.csproj
index 1ad6e9c333..27d9611c0a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_60.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_60.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_61.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_61.csproj
index 4ab8a5c16a..bf02001f47 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_61.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_61.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_62.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_62.csproj
index 1eaea60135..2caa77576e 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_62.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_62.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_63.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_63.csproj
index a0d4479fa5..54bbf07d55 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_63.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_63.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_64.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_64.csproj
index 9081154cd0..4b154f6be4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_64.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_64.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_65.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_65.csproj
index 5638a03ca7..e3b5a740fe 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_65.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_65.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_66.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_66.csproj
index 5872437487..8ce1c459ab 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_66.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_66.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_67.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_67.csproj
index d0539dacdc..af08b87678 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_67.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_67.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_68.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_68.csproj
index 78a9cb9f2d..c38dcb73bf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_68.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_68.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_69.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_69.csproj
index b87addba2e..3b24edd209 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_69.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_69.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_7.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_7.csproj
index a8e1814b97..549711542f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_7.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_7.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_70.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_70.csproj
index 011060b327..a24f9abe64 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_70.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_70.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_71.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_71.csproj
index f8a39eb69f..703b8d333a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_71.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_71.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_72.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_72.csproj
index a65f70770e..57275c2641 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_72.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_72.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_73.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_73.csproj
index f8d7eb32ee..015f3aa721 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_73.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_73.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_74.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_74.csproj
index cfe7ef7dfd..104a94d863 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_74.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_74.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_75.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_75.csproj
index 8d37b2cd14..7fa2c7f14c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_75.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_75.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.0 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_76.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_76.csproj
index fcd2162179..bb398fa986 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_76.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_76.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_77.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_77.csproj
index ef92fb47c0..c191514f57 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_77.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_77.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_78.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_78.csproj
index 86efe43999..475dfcafd9 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_78.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_78.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_79.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_79.csproj
index bfcd0f46fa..df60056fde 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_79.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_79.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.4 -dw 0.8</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_8.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_8.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_8.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_8.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_80.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_80.csproj
index 9caec006eb..9701414bda 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_80.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_80.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_82.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_82.csproj
index 168604323a..78b9f38406 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_82.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_82.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_83.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_83.csproj
index ddd7aa6b08..48cae09bba 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_83.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_83.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_84.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_84.csproj
index aaf833c06a..a9ff73bb1f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_84.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_84.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.4 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_85.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_85.csproj
index 2bfc4806ce..c7875a0835 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_85.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_85.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_86.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_86.csproj
index 6ff594c657..44ca3461ec 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_86.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_86.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_87.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_87.csproj
index 171cef3bfb..f0c4ec0361 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_87.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_87.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_88.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_88.csproj
index 092501d7e6..212186b2bc 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_88.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_88.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_89.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_89.csproj
index c706385522..307565636c 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_89.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_89.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_9.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_9.csproj
index 9787e5def5..e2a13b3acf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_9.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_9.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_90.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_90.csproj
index 6cb54a5381..0cc14c9bbf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_90.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_90.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8517 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.8 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_91.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_91.csproj
index 9b8e4990f6..580874ece4 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_91.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_91.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_92.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_92.csproj
index 2662377b5a..e8bd6df7d3 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_92.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_92.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_93.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_93.csproj
index 2167a88631..5d6c47214a 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_93.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_93.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 3 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -f -dp 0.8 -dw 0.4</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_94.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_94.csproj
index 8bec5ac1ea..d9b64ce283 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_94.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_94.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_95.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_95.csproj
index 9787e5def5..e2a13b3acf 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_95.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_95.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_96.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_96.csproj
index f33f285652..63d5b81af2 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_96.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_96.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 4 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_97.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_97.csproj
index c4ca184761..70ba21d162 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_97.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_97.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 5 -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_98.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_98.csproj
index a9aeb9a962..649483765f 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_98.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_98.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 2 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_99.csproj b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_99.csproj
index eca729661f..c4289b8f75 100644
--- a/tests/src/GC/Scenarios/GCSimulator/GCSimulator_99.csproj
+++ b/tests/src/GC/Scenarios/GCSimulator/GCSimulator_99.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestExecutionArguments>-t 1 -tp 0 -dz 17 -sdz 8500 -dc 10000 -sdc 5000 -lt 3 -f -dp 0.0 -dw 0.0</CLRTestExecutionArguments>
diff --git a/tests/src/GC/Scenarios/GCStress/gcstress.csproj b/tests/src/GC/Scenarios/GCStress/gcstress.csproj
index 278586f0a3..0be4d081f5 100644
--- a/tests/src/GC/Scenarios/GCStress/gcstress.csproj
+++ b/tests/src/GC/Scenarios/GCStress/gcstress.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/LeakGen/leakgen.cs b/tests/src/GC/Scenarios/LeakGen/leakgen.cs
index 9235256f81..8ec65313a3 100644
--- a/tests/src/GC/Scenarios/LeakGen/leakgen.cs
+++ b/tests/src/GC/Scenarios/LeakGen/leakgen.cs
@@ -62,6 +62,10 @@ namespace LGen {
                 MakeLeak(iObj);
             }
 
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+            GC.Collect();
+
             Console.WriteLine("~LeakObject() was called {0} times.", LeakObject.icFinal);
             return (LeakObject.icFinal == iObj*iRep);
         }
@@ -80,12 +84,6 @@ namespace LGen {
                 mem[mem.Length-1] = 1;
             }
 
-            Mv_Obj = null;
-
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-            GC.Collect();
-
         }
 
 
diff --git a/tests/src/GC/Scenarios/LeakGen/leakgen.csproj b/tests/src/GC/Scenarios/LeakGen/leakgen.csproj
index 2da3dfa199..67f5486689 100644
--- a/tests/src/GC/Scenarios/LeakGen/leakgen.csproj
+++ b/tests/src/GC/Scenarios/LeakGen/leakgen.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/LeakGen/leakgenthrd.csproj b/tests/src/GC/Scenarios/LeakGen/leakgenthrd.csproj
index 8afa1e6e70..8d0bca9158 100644
--- a/tests/src/GC/Scenarios/LeakGen/leakgenthrd.csproj
+++ b/tests/src/GC/Scenarios/LeakGen/leakgenthrd.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/LeakWheel/leakwheel.csproj b/tests/src/GC/Scenarios/LeakWheel/leakwheel.csproj
index 8242df628e..773fdac851 100644
--- a/tests/src/GC/Scenarios/LeakWheel/leakwheel.csproj
+++ b/tests/src/GC/Scenarios/LeakWheel/leakwheel.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/MinLeakGen/minleakgen.csproj b/tests/src/GC/Scenarios/MinLeakGen/minleakgen.csproj
index b2a8e3f112..73c82a1254 100644
--- a/tests/src/GC/Scenarios/MinLeakGen/minleakgen.csproj
+++ b/tests/src/GC/Scenarios/MinLeakGen/minleakgen.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/NDPin/ndpin.csproj b/tests/src/GC/Scenarios/NDPin/ndpin.csproj
index e9b771634d..0cdb58e2c9 100644
--- a/tests/src/GC/Scenarios/NDPin/ndpin.csproj
+++ b/tests/src/GC/Scenarios/NDPin/ndpin.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/NDPin/ndpinfinal.csproj b/tests/src/GC/Scenarios/NDPin/ndpinfinal.csproj
index 0a7d465082..fd52d519f4 100644
--- a/tests/src/GC/Scenarios/NDPin/ndpinfinal.csproj
+++ b/tests/src/GC/Scenarios/NDPin/ndpinfinal.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/RanCollect/rancollect.csproj b/tests/src/GC/Scenarios/RanCollect/rancollect.csproj
index 4c17c9b26a..b8dbbcd38f 100644
--- a/tests/src/GC/Scenarios/RanCollect/rancollect.csproj
+++ b/tests/src/GC/Scenarios/RanCollect/rancollect.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
     <CLRTestExecutionArguments>7 40 4 77</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/GC/Scenarios/ReflectObj/reflectobj.csproj b/tests/src/GC/Scenarios/ReflectObj/reflectobj.csproj
index 9890c835e7..ae02ffb62c 100644
--- a/tests/src/GC/Scenarios/ReflectObj/reflectobj.csproj
+++ b/tests/src/GC/Scenarios/ReflectObj/reflectobj.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/ReflectObj/reflectobj.reflect.xml b/tests/src/GC/Scenarios/ReflectObj/reflectobj.reflect.xml
new file mode 100644
index 0000000000..27541391fc
--- /dev/null
+++ b/tests/src/GC/Scenarios/ReflectObj/reflectobj.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="reflectobj">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/GC/Scenarios/Resurrection/continue.csproj b/tests/src/GC/Scenarios/Resurrection/continue.csproj
index a292c8c7b4..1f594549f3 100644
--- a/tests/src/GC/Scenarios/Resurrection/continue.csproj
+++ b/tests/src/GC/Scenarios/Resurrection/continue.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Rootmem/rootmem.csproj b/tests/src/GC/Scenarios/Rootmem/rootmem.csproj
index e74a535334..78c14e6492 100644
--- a/tests/src/GC/Scenarios/Rootmem/rootmem.csproj
+++ b/tests/src/GC/Scenarios/Rootmem/rootmem.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/Samples/gc.cs b/tests/src/GC/Scenarios/Samples/gc.cs
index a6c1cfeb54..7ed11bc409 100644
--- a/tests/src/GC/Scenarios/Samples/gc.cs
+++ b/tests/src/GC/Scenarios/Samples/gc.cs
@@ -273,16 +273,21 @@ class Application {
     static public ResurrectObj ResObjHolder;    // Defaults to null
 
 
-    // This method demonstrates how the GC supports resurrection.
+    // These methods demonstrate how the GC supports resurrection.
     // NOTE: Resurrection is discouraged.
-    private static void ResurrectionDemo() {
-        Display(0, "\n\nDemo start: Object Resurrection.", +1);
-
+    private static void ResurrectionInit() {
         // Create a ResurrectionObj
         ResurrectObj obj = new ResurrectObj("Resurrection");
 
         // Destroy all strong references to the new ResurrectionObj
         obj = null;
+    }
+
+    private static void ResurrectionDemo() {
+        Display(0, "\n\nDemo start: Object Resurrection.", +1);
+
+        // Create a ResurrectionObj and drop it on the floor.
+        ResurrectionInit();
 
         // Force the GC to determine that the object is unreachable.
         Collect();
diff --git a/tests/src/GC/Scenarios/Samples/gc.csproj b/tests/src/GC/Scenarios/Samples/gc.csproj
index e5adb35525..4f027e17bd 100644
--- a/tests/src/GC/Scenarios/Samples/gc.csproj
+++ b/tests/src/GC/Scenarios/Samples/gc.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/ServerModel/servermodel.csproj b/tests/src/GC/Scenarios/ServerModel/servermodel.csproj
index dff52fc6ad..a63c15db3a 100644
--- a/tests/src/GC/Scenarios/ServerModel/servermodel.csproj
+++ b/tests/src/GC/Scenarios/ServerModel/servermodel.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestExecutionArguments>/numrequests:100</CLRTestExecutionArguments>
     <GCStressIncompatible>true</GCStressIncompatible>
     <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible>
diff --git a/tests/src/GC/Scenarios/SingLinkList/singlinkgen.csproj b/tests/src/GC/Scenarios/SingLinkList/singlinkgen.csproj
index 9b18cd738f..9f0d0c8ab0 100644
--- a/tests/src/GC/Scenarios/SingLinkList/singlinkgen.csproj
+++ b/tests/src/GC/Scenarios/SingLinkList/singlinkgen.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/SingLinkList/singlinkstay.csproj b/tests/src/GC/Scenarios/SingLinkList/singlinkstay.csproj
index b91a0b3897..a19508b4c5 100644
--- a/tests/src/GC/Scenarios/SingLinkList/singlinkstay.csproj
+++ b/tests/src/GC/Scenarios/SingLinkList/singlinkstay.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/StringCreator/stringcreator.csproj b/tests/src/GC/Scenarios/StringCreator/stringcreator.csproj
index 303eebfcbc..6f36c3e201 100644
--- a/tests/src/GC/Scenarios/StringCreator/stringcreator.csproj
+++ b/tests/src/GC/Scenarios/StringCreator/stringcreator.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/THDChaos/thdchaos.csproj b/tests/src/GC/Scenarios/THDChaos/thdchaos.csproj
index dce110ab59..186e21000f 100644
--- a/tests/src/GC/Scenarios/THDChaos/thdchaos.csproj
+++ b/tests/src/GC/Scenarios/THDChaos/thdchaos.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/THDList/thdlist.csproj b/tests/src/GC/Scenarios/THDList/thdlist.csproj
index 3002bff0d7..4e34d25888 100644
--- a/tests/src/GC/Scenarios/THDList/thdlist.csproj
+++ b/tests/src/GC/Scenarios/THDList/thdlist.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/WeakReference/weakreffinal.cs b/tests/src/GC/Scenarios/WeakReference/weakreffinal.cs
index a356cec433..754e88d7a1 100644
--- a/tests/src/GC/Scenarios/WeakReference/weakreffinal.cs
+++ b/tests/src/GC/Scenarios/WeakReference/weakreffinal.cs
@@ -22,6 +22,11 @@ namespace DefaultNamespace {
         public bool RunTest(int iObj,int iSwitch)
         {
             DeleteObj(iObj,iSwitch);
+
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+            GC.Collect();
+
             bool result = CheckResult(iObj,iSwitch);
             return result;
         }
@@ -48,11 +53,6 @@ namespace DefaultNamespace {
             {
                 rgNode[i] = null;
             }
-
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-            GC.Collect();
-
         }
 
         public bool CheckResult(int iObj,int iSwitch)
diff --git a/tests/src/GC/Scenarios/WeakReference/weakreffinal.csproj b/tests/src/GC/Scenarios/WeakReference/weakreffinal.csproj
index 5556a902d5..dc387b2429 100644
--- a/tests/src/GC/Scenarios/WeakReference/weakreffinal.csproj
+++ b/tests/src/GC/Scenarios/WeakReference/weakreffinal.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Scenarios/muldimjagary/muldimjagary.csproj b/tests/src/GC/Scenarios/muldimjagary/muldimjagary.csproj
index de33fdf59f..e5ee90e576 100644
--- a/tests/src/GC/Scenarios/muldimjagary/muldimjagary.csproj
+++ b/tests/src/GC/Scenarios/muldimjagary/muldimjagary.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj b/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj
index 9dd878b8db..7b42bd1b34 100644
--- a/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj
+++ b/tests/src/GC/Stress/Framework/ReliabilityFramework.csproj
@@ -8,15 +8,11 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{65972FF1-AE77-4CB3-B31D-9CA483DD9E2E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>testmix_gc.config /maximumExecutionTime:-1</CLRTestExecutionArguments>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/GC/Stress/Tests/573277.csproj b/tests/src/GC/Stress/Tests/573277.csproj
index 80c706090b..435b9f252a 100644
--- a/tests/src/GC/Stress/Tests/573277.csproj
+++ b/tests/src/GC/Stress/Tests/573277.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{884433BE-EA75-47B3-828F-B9EA730D5582}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/DirectedGraph.csproj b/tests/src/GC/Stress/Tests/DirectedGraph.csproj
index 2c26789c5e..011c53435c 100644
--- a/tests/src/GC/Stress/Tests/DirectedGraph.csproj
+++ b/tests/src/GC/Stress/Tests/DirectedGraph.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ED6A3929-8D0A-42E8-B47C-6AEBB5B437C2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/ExpandHeap.csproj b/tests/src/GC/Stress/Tests/ExpandHeap.csproj
index 1af3b917f1..7d19dbbf1c 100644
--- a/tests/src/GC/Stress/Tests/ExpandHeap.csproj
+++ b/tests/src/GC/Stress/Tests/ExpandHeap.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5B265761-E669-45A0-ACBC-E201CEEB6FB5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/GCQueue.csproj b/tests/src/GC/Stress/Tests/GCQueue.csproj
index 98324db8f7..a055d94f24 100644
--- a/tests/src/GC/Stress/Tests/GCQueue.csproj
+++ b/tests/src/GC/Stress/Tests/GCQueue.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{027838C9-88D1-43A2-AA53-C060E01D6008}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/GCSimulator.csproj b/tests/src/GC/Stress/Tests/GCSimulator.csproj
index 7ba96b5cc4..563a0d16db 100644
--- a/tests/src/GC/Stress/Tests/GCSimulator.csproj
+++ b/tests/src/GC/Stress/Tests/GCSimulator.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4CC5E4AA-510B-4007-8030-FE75A03D4384}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/GCVariant.csproj b/tests/src/GC/Stress/Tests/GCVariant.csproj
index 3d44a20fb6..de229f1426 100644
--- a/tests/src/GC/Stress/Tests/GCVariant.csproj
+++ b/tests/src/GC/Stress/Tests/GCVariant.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2F639404-9C80-4998-ADA0-DC14AA08C345}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/LargeObjectAlloc.csproj b/tests/src/GC/Stress/Tests/LargeObjectAlloc.csproj
index a2eb55fdeb..0d30ccf9ce 100644
--- a/tests/src/GC/Stress/Tests/LargeObjectAlloc.csproj
+++ b/tests/src/GC/Stress/Tests/LargeObjectAlloc.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5178EA44-6E0E-4FAA-9EEC-7D006003A2D3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/LargeObjectAlloc1.csproj b/tests/src/GC/Stress/Tests/LargeObjectAlloc1.csproj
index 0dc3f41d3f..30d82bfbac 100644
--- a/tests/src/GC/Stress/Tests/LargeObjectAlloc1.csproj
+++ b/tests/src/GC/Stress/Tests/LargeObjectAlloc1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7D8EC37D-E2C9-4688-91DF-D3BF6B437FF2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/LargeObjectAlloc2.csproj b/tests/src/GC/Stress/Tests/LargeObjectAlloc2.csproj
index 5ec112cff6..8309f11f35 100644
--- a/tests/src/GC/Stress/Tests/LargeObjectAlloc2.csproj
+++ b/tests/src/GC/Stress/Tests/LargeObjectAlloc2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C0433D66-2D49-48BF-A0ED-F165724DF311}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/LargeObjectAlloc3.csproj b/tests/src/GC/Stress/Tests/LargeObjectAlloc3.csproj
index df98c78787..20a85fb0e7 100644
--- a/tests/src/GC/Stress/Tests/LargeObjectAlloc3.csproj
+++ b/tests/src/GC/Stress/Tests/LargeObjectAlloc3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E7191BC4-3001-4CE4-85C3-9A017F0EB574}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/LargeObjectAlloc4.csproj b/tests/src/GC/Stress/Tests/LargeObjectAlloc4.csproj
index e4564a73bd..f13ba05790 100644
--- a/tests/src/GC/Stress/Tests/LargeObjectAlloc4.csproj
+++ b/tests/src/GC/Stress/Tests/LargeObjectAlloc4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3A3DCA9E-180C-4A8B-9617-0B9AB25CA1F1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/LargeObjectAllocPinned.csproj b/tests/src/GC/Stress/Tests/LargeObjectAllocPinned.csproj
index c5d45b1d7b..a2c778e6ba 100644
--- a/tests/src/GC/Stress/Tests/LargeObjectAllocPinned.csproj
+++ b/tests/src/GC/Stress/Tests/LargeObjectAllocPinned.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{41634CFB-AEEF-4F43-8185-8103B11F8F63}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/LeakGenThrd.csproj b/tests/src/GC/Stress/Tests/LeakGenThrd.csproj
index e66a7adc2c..1001801301 100644
--- a/tests/src/GC/Stress/Tests/LeakGenThrd.csproj
+++ b/tests/src/GC/Stress/Tests/LeakGenThrd.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{87991D6D-22D3-42C8-9293-E46A70945090}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/MulDimJagAry.csproj b/tests/src/GC/Stress/Tests/MulDimJagAry.csproj
index 0ee5d70196..9f925dec55 100644
--- a/tests/src/GC/Stress/Tests/MulDimJagAry.csproj
+++ b/tests/src/GC/Stress/Tests/MulDimJagAry.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{75DB9E96-7CC5-437A-87A5-85522502107F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/PlugGaps.csproj b/tests/src/GC/Stress/Tests/PlugGaps.csproj
index aa1a289b95..e295c2839f 100644
--- a/tests/src/GC/Stress/Tests/PlugGaps.csproj
+++ b/tests/src/GC/Stress/Tests/PlugGaps.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{439D8731-D45B-448B-8350-166E614A32C9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/RedBlackTree.csproj b/tests/src/GC/Stress/Tests/RedBlackTree.csproj
index 2223257b34..5a3606f755 100644
--- a/tests/src/GC/Stress/Tests/RedBlackTree.csproj
+++ b/tests/src/GC/Stress/Tests/RedBlackTree.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{97F5A396-20FA-4CF7-ADEE-D90EDEA45E1F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/SingLinkStay.csproj b/tests/src/GC/Stress/Tests/SingLinkStay.csproj
index 8d3b9d104f..80953b73e3 100644
--- a/tests/src/GC/Stress/Tests/SingLinkStay.csproj
+++ b/tests/src/GC/Stress/Tests/SingLinkStay.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DE79BE8C-2F24-4917-BAA0-39AE21C1006F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/StressAllocator.csproj b/tests/src/GC/Stress/Tests/StressAllocator.csproj
index 5dc5079be8..944bc79297 100644
--- a/tests/src/GC/Stress/Tests/StressAllocator.csproj
+++ b/tests/src/GC/Stress/Tests/StressAllocator.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CB644C00-AAB0-4E15-90B4-4E30915CAD29}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/ThdTreeGrowingObj.csproj b/tests/src/GC/Stress/Tests/ThdTreeGrowingObj.csproj
index 22444c5502..41ef5d0d59 100644
--- a/tests/src/GC/Stress/Tests/ThdTreeGrowingObj.csproj
+++ b/tests/src/GC/Stress/Tests/ThdTreeGrowingObj.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6C3F87D3-7402-4B3F-8B38-910C56A1BF9C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/allocationwithpins.csproj b/tests/src/GC/Stress/Tests/allocationwithpins.csproj
index 19904e5c7d..1bc7086a81 100644
--- a/tests/src/GC/Stress/Tests/allocationwithpins.csproj
+++ b/tests/src/GC/Stress/Tests/allocationwithpins.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4A36330F-5D98-4EB5-AA0A-D143EDD5E79B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/b115557.csproj b/tests/src/GC/Stress/Tests/b115557.csproj
index fcd05c72a9..d3830880e2 100644
--- a/tests/src/GC/Stress/Tests/b115557.csproj
+++ b/tests/src/GC/Stress/Tests/b115557.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{814622D8-13DE-472B-8AEF-E5E079A3EAAC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/bestfit-finalize.csproj b/tests/src/GC/Stress/Tests/bestfit-finalize.csproj
index fc1e240614..8b8dc82f40 100644
--- a/tests/src/GC/Stress/Tests/bestfit-finalize.csproj
+++ b/tests/src/GC/Stress/Tests/bestfit-finalize.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8688C7A2-DBC1-4FA3-A9FB-A25E1884CA00}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/concurrentspin2.csproj b/tests/src/GC/Stress/Tests/concurrentspin2.csproj
index 980158167d..c29e53be60 100644
--- a/tests/src/GC/Stress/Tests/concurrentspin2.csproj
+++ b/tests/src/GC/Stress/Tests/concurrentspin2.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AE9A01FB-EC5F-4C56-BB66-C69FB3D5018C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/doubLinkStay.csproj b/tests/src/GC/Stress/Tests/doubLinkStay.csproj
index 0b05441680..5d69f49852 100644
--- a/tests/src/GC/Stress/Tests/doubLinkStay.csproj
+++ b/tests/src/GC/Stress/Tests/doubLinkStay.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9A2EA55B-7568-4B71-BC4A-2A5ACA0AA555}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/pinstress.csproj b/tests/src/GC/Stress/Tests/pinstress.csproj
index 478b6d4a3a..58971abbe7 100644
--- a/tests/src/GC/Stress/Tests/pinstress.csproj
+++ b/tests/src/GC/Stress/Tests/pinstress.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{45D8732A-3994-46BE-A6F7-B6FCB4D66E56}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/GC/Stress/Tests/plug.csproj b/tests/src/GC/Stress/Tests/plug.csproj
index 904dcc52eb..c8d43e3c15 100644
--- a/tests/src/GC/Stress/Tests/plug.csproj
+++ b/tests/src/GC/Stress/Tests/plug.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{60AE03B0-7EE2-4EA5-A5D2-B95CA5F48E3B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;PROJECTK_BUILD</DefineConstants>
     <CLRTestKind>BuildOnly</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayNative.cpp b/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayNative.cpp
index 5fbfcc382f..0521e402af 100644
--- a/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayNative.cpp
+++ b/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayNative.cpp
@@ -19,7 +19,7 @@ const int ArraySIZE = 5;
 
 //Reverse PInvoke
 //Pass by value
-typedef BOOL (__stdcall *CallBackIn)(int size,bool arr[]);
+typedef BOOL (CALLBACK *CallBackIn)(int size,bool arr[]);
 extern "C" DLL_EXPORT BOOL DoCallBackIn(CallBackIn callback)
 {
 	//Init
@@ -62,7 +62,7 @@ extern "C" DLL_EXPORT BOOL DoCallBackIn(CallBackIn callback)
 	return true;
 }
 
-typedef BOOL (__stdcall *CallBackOut)(int size,bool arr[]);
+typedef BOOL (CALLBACK *CallBackOut)(int size,bool arr[]);
 extern "C" DLL_EXPORT BOOL DoCallBackOut(CallBackOut callback)
 {
 	bool * arr =(bool *)CoTaskMemAlloc(ArraySIZE);
@@ -87,7 +87,7 @@ extern "C" DLL_EXPORT BOOL DoCallBackOut(CallBackOut callback)
 	return true;
 }
 
-typedef BOOL (__stdcall *CallBackInOut)(int size,bool arr[]);
+typedef BOOL (CALLBACK *CallBackInOut)(int size,bool arr[]);
 extern "C" DLL_EXPORT BOOL DoCallBackInOut(CallBackInOut callback)
 {
 	//Init
@@ -128,7 +128,7 @@ extern "C" DLL_EXPORT BOOL DoCallBackInOut(CallBackInOut callback)
 
 //Reverse PInvoke
 //Pass by reference
-typedef BOOL (__stdcall *CallBackRefIn)(int size,bool ** arr);
+typedef BOOL (CALLBACK *CallBackRefIn)(int size,bool ** arr);
 extern "C" DLL_EXPORT BOOL DoCallBackRefIn(CallBackRefIn callback)
 {
 	//Init:true,false,true,false,true
@@ -172,7 +172,7 @@ extern "C" DLL_EXPORT BOOL DoCallBackRefIn(CallBackRefIn callback)
 	return true;
 }
 
-typedef BOOL (__stdcall *CallBackRefOut)(int size,bool ** arr);
+typedef BOOL (CALLBACK *CallBackRefOut)(int size,bool ** arr);
 extern "C" DLL_EXPORT BOOL DoCallBackRefOut(CallBackRefOut callback)
 {
 
@@ -198,7 +198,7 @@ extern "C" DLL_EXPORT BOOL DoCallBackRefOut(CallBackRefOut callback)
 	return true;
 }
 
-typedef BOOL (__stdcall *CallBackRefInOut)(int size,bool ** arr);
+typedef BOOL (CALLBACK *CallBackRefInOut)(int size,bool ** arr);
 extern "C" DLL_EXPORT BOOL DoCallBackRefInOut(CallBackRefInOut callback)
 {
 	//Init,true,false,true,false
diff --git a/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj b/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj
index 06452f1273..ddbf46e839 100644
--- a/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj
+++ b/tests/src/Interop/ArrayMarshalling/BoolArray/MarshalBoolArrayTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValNative.cpp b/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValNative.cpp
index 27de41a826..914172f440 100644
--- a/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValNative.cpp
+++ b/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValNative.cpp
@@ -185,84 +185,84 @@ Function
 /*----------------------------------------------------------------------------
 marshal sequential strut
 ----------------------------------------------------------------------------*/
-extern "C" DLL_EXPORT BOOL WINAPI TakeIntArraySeqStructByVal( S_INTArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeIntArraySeqStructByVal( S_INTArray s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
     INIT_EXPECTED( INT, ARRAY_SIZE );
     return Equals( s.arr, size, expected, ARRAY_SIZE );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeUIntArraySeqStructByVal( S_UINTArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeUIntArraySeqStructByVal( S_UINTArray s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
     INIT_EXPECTED( UINT, ARRAY_SIZE );
     return Equals( s.arr, size, expected, ARRAY_SIZE );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeShortArraySeqStructByVal( S_SHORTArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeShortArraySeqStructByVal( S_SHORTArray s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
     INIT_EXPECTED( SHORT, ARRAY_SIZE );
     return Equals( s.arr, size, expected, ARRAY_SIZE );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeWordArraySeqStructByVal( S_WORDArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeWordArraySeqStructByVal( S_WORDArray s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
     INIT_EXPECTED( WORD, ARRAY_SIZE );
     return Equals( s.arr, size, expected, ARRAY_SIZE );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLong64ArraySeqStructByVal( S_LONG64Array s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLong64ArraySeqStructByVal( S_LONG64Array s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
     INIT_EXPECTED( LONG64, ARRAY_SIZE );
     return Equals( s.arr, size, expected, ARRAY_SIZE );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeULong64ArraySeqStructByVal( S_ULONG64Array s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeULong64ArraySeqStructByVal( S_ULONG64Array s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
     INIT_EXPECTED( ULONG64, ARRAY_SIZE );
     return Equals( s.arr, size, expected, ARRAY_SIZE );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeDoubleArraySeqStructByVal( S_DOUBLEArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeDoubleArraySeqStructByVal( S_DOUBLEArray s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
     INIT_EXPECTED( DOUBLE, ARRAY_SIZE );
     return Equals( s.arr, size, expected, ARRAY_SIZE );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeFloatArraySeqStructByVal( S_FLOATArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeFloatArraySeqStructByVal( S_FLOATArray s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
     INIT_EXPECTED( FLOAT, ARRAY_SIZE );
     return Equals( s.arr, size, expected, ARRAY_SIZE );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeByteArraySeqStructByVal( S_BYTEArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeByteArraySeqStructByVal( S_BYTEArray s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
     INIT_EXPECTED( BYTE, ARRAY_SIZE );
     return Equals( s.arr, size, expected, ARRAY_SIZE );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeCharArraySeqStructByVal( S_CHARArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeCharArraySeqStructByVal( S_CHARArray s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
     INIT_EXPECTED( CHAR, ARRAY_SIZE );
     return Equals( s.arr, size, expected, ARRAY_SIZE );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeIntPtrArraySeqStructByVal(S_DWORD_PTRArray s, int size)
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeIntPtrArraySeqStructByVal(S_DWORD_PTRArray s, int size)
 {
 	CHECK_PARAM_NOT_EMPTY(s.arr);
 	INIT_EXPECTED( DWORD_PTR, ARRAY_SIZE);
 	return Equals(s.arr, size, expected, ARRAY_SIZE);
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLPSTRArraySeqStructByVal( S_LPSTRArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLPSTRArraySeqStructByVal( S_LPSTRArray s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
 
@@ -273,7 +273,7 @@ extern "C" DLL_EXPORT BOOL WINAPI TakeLPSTRArraySeqStructByVal( S_LPSTRArray s,
     return Equals( s.arr, size, expected, ARRAY_SIZE );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLPCSTRArraySeqStructByVal( S_LPCSTRArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLPCSTRArraySeqStructByVal( S_LPCSTRArray s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
 
@@ -286,7 +286,7 @@ extern "C" DLL_EXPORT BOOL WINAPI TakeLPCSTRArraySeqStructByVal( S_LPCSTRArray s
 
 
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeStructArraySeqStructByVal( S_StructArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeStructArraySeqStructByVal( S_StructArray s, int size )
 {
     CHECK_PARAM_NOT_EMPTY( s.arr );
 
@@ -297,69 +297,69 @@ extern "C" DLL_EXPORT BOOL WINAPI TakeStructArraySeqStructByVal( S_StructArray s
 /*----------------------------------------------------------------------------
 marshal sequential class
 ----------------------------------------------------------------------------*/
-extern "C" DLL_EXPORT BOOL WINAPI TakeIntArraySeqClassByVal( S_INTArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeIntArraySeqClassByVal( S_INTArray *s, int size )
 {
     return TakeIntArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeUIntArraySeqClassByVal( S_UINTArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeUIntArraySeqClassByVal( S_UINTArray *s, int size )
 {
     return TakeUIntArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeShortArraySeqClassByVal( S_SHORTArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeShortArraySeqClassByVal( S_SHORTArray *s, int size )
 {
     return TakeShortArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeWordArraySeqClassByVal( S_WORDArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeWordArraySeqClassByVal( S_WORDArray *s, int size )
 {
     return TakeWordArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLong64ArraySeqClassByVal( S_LONG64Array *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLong64ArraySeqClassByVal( S_LONG64Array *s, int size )
 {
     return TakeLong64ArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeULong64ArraySeqClassByVal( S_ULONG64Array *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeULong64ArraySeqClassByVal( S_ULONG64Array *s, int size )
 {
     return TakeULong64ArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeDoubleArraySeqClassByVal( S_DOUBLEArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeDoubleArraySeqClassByVal( S_DOUBLEArray *s, int size )
 {
     return TakeDoubleArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeFloatArraySeqClassByVal( S_FLOATArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeFloatArraySeqClassByVal( S_FLOATArray *s, int size )
 {
     return TakeFloatArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeByteArraySeqClassByVal( S_BYTEArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeByteArraySeqClassByVal( S_BYTEArray *s, int size )
 {
     return TakeByteArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeCharArraySeqClassByVal( S_CHARArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeCharArraySeqClassByVal( S_CHARArray *s, int size )
 {
     return TakeCharArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLPSTRArraySeqClassByVal( S_LPSTRArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLPSTRArraySeqClassByVal( S_LPSTRArray *s, int size )
 {
     return TakeLPSTRArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLPCSTRArraySeqClassByVal( S_LPCSTRArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLPCSTRArraySeqClassByVal( S_LPCSTRArray *s, int size )
 {
     return TakeLPCSTRArraySeqStructByVal( *s, size );
 }
 
 
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeStructArraySeqClassByVal( S_StructArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeStructArraySeqClassByVal( S_StructArray *s, int size )
 {
     return TakeStructArraySeqStructByVal( *s, size );
 }
@@ -367,69 +367,69 @@ extern "C" DLL_EXPORT BOOL WINAPI TakeStructArraySeqClassByVal( S_StructArray *s
 /*----------------------------------------------------------------------------
 marshal explicit struct
 ----------------------------------------------------------------------------*/
-extern "C" DLL_EXPORT BOOL WINAPI TakeIntArrayExpStructByVal( S_INTArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeIntArrayExpStructByVal( S_INTArray s, int size )
 {
     return TakeIntArraySeqStructByVal( s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeUIntArrayExpStructByVal( S_UINTArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeUIntArrayExpStructByVal( S_UINTArray s, int size )
 {
     return TakeUIntArraySeqStructByVal( s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeShortArrayExpStructByVal( S_SHORTArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeShortArrayExpStructByVal( S_SHORTArray s, int size )
 {
     return TakeShortArraySeqStructByVal( s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeWordArrayExpStructByVal( S_WORDArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeWordArrayExpStructByVal( S_WORDArray s, int size )
 {
     return TakeWordArraySeqStructByVal( s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLong64ArrayExpStructByVal( S_LONG64Array s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLong64ArrayExpStructByVal( S_LONG64Array s, int size )
 {
     return TakeLong64ArraySeqStructByVal( s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeULong64ArrayExpStructByVal( S_ULONG64Array s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeULong64ArrayExpStructByVal( S_ULONG64Array s, int size )
 {
     return TakeULong64ArraySeqStructByVal( s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeDoubleArrayExpStructByVal( S_DOUBLEArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeDoubleArrayExpStructByVal( S_DOUBLEArray s, int size )
 {
     return TakeDoubleArraySeqStructByVal( s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeFloatArrayExpStructByVal( S_FLOATArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeFloatArrayExpStructByVal( S_FLOATArray s, int size )
 {
     return TakeFloatArraySeqStructByVal( s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeByteArrayExpStructByVal( S_BYTEArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeByteArrayExpStructByVal( S_BYTEArray s, int size )
 {
     return TakeByteArraySeqStructByVal( s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeCharArrayExpStructByVal( S_CHARArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeCharArrayExpStructByVal( S_CHARArray s, int size )
 {
     return TakeCharArraySeqStructByVal( s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLPSTRArrayExpStructByVal( S_LPSTRArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLPSTRArrayExpStructByVal( S_LPSTRArray s, int size )
 {
     return TakeLPSTRArraySeqStructByVal( s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLPCSTRArrayExpStructByVal( S_LPCSTRArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLPCSTRArrayExpStructByVal( S_LPCSTRArray s, int size )
 {
     return TakeLPCSTRArraySeqStructByVal( s, size );
 }
 
 
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeStructArrayExpStructByVal( S_StructArray s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeStructArrayExpStructByVal( S_StructArray s, int size )
 {
     return TakeStructArraySeqStructByVal( s, size );
 }
@@ -437,69 +437,69 @@ extern "C" DLL_EXPORT BOOL WINAPI TakeStructArrayExpStructByVal( S_StructArray s
 /*----------------------------------------------------------------------------
 marshal explicit class
 ----------------------------------------------------------------------------*/
-extern "C" DLL_EXPORT BOOL WINAPI TakeIntArrayExpClassByVal( S_INTArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeIntArrayExpClassByVal( S_INTArray *s, int size )
 {
     return TakeIntArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeUIntArrayExpClassByVal( S_UINTArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeUIntArrayExpClassByVal( S_UINTArray *s, int size )
 {
     return TakeUIntArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeShortArrayExpClassByVal( S_SHORTArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeShortArrayExpClassByVal( S_SHORTArray *s, int size )
 {
     return TakeShortArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeWordArrayExpClassByVal( S_WORDArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeWordArrayExpClassByVal( S_WORDArray *s, int size )
 {
     return TakeWordArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLong64ArrayExpClassByVal( S_LONG64Array *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLong64ArrayExpClassByVal( S_LONG64Array *s, int size )
 {
     return TakeLong64ArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeULong64ArrayExpClassByVal( S_ULONG64Array *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeULong64ArrayExpClassByVal( S_ULONG64Array *s, int size )
 {
     return TakeULong64ArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeDoubleArrayExpClassByVal( S_DOUBLEArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeDoubleArrayExpClassByVal( S_DOUBLEArray *s, int size )
 {
     return TakeDoubleArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeFloatArrayExpClassByVal( S_FLOATArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeFloatArrayExpClassByVal( S_FLOATArray *s, int size )
 {
     return TakeFloatArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeByteArrayExpClassByVal( S_BYTEArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeByteArrayExpClassByVal( S_BYTEArray *s, int size )
 {
     return TakeByteArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeCharArrayExpClassByVal( S_CHARArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeCharArrayExpClassByVal( S_CHARArray *s, int size )
 {
     return TakeCharArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLPSTRArrayExpClassByVal( S_LPSTRArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLPSTRArrayExpClassByVal( S_LPSTRArray *s, int size )
 {
     return TakeLPSTRArraySeqStructByVal( *s, size );
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeLPCSTRArrayExpClassByVal( S_LPCSTRArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeLPCSTRArrayExpClassByVal( S_LPCSTRArray *s, int size )
 {
     return TakeLPCSTRArraySeqStructByVal( *s, size );
 }
 
 
 
-extern "C" DLL_EXPORT BOOL WINAPI TakeStructArrayExpClassByVal( S_StructArray *s, int size )
+extern "C" DLL_EXPORT BOOL NATIVEAPI TakeStructArrayExpClassByVal( S_StructArray *s, int size )
 {
     return TakeStructArraySeqStructByVal( *s, size );
 }
@@ -507,77 +507,77 @@ extern "C" DLL_EXPORT BOOL WINAPI TakeStructArrayExpClassByVal( S_StructArray *s
 /*----------------------------------------------------------------------------
 return a struct including a C array
 ----------------------------------------------------------------------------*/
-extern "C" DLL_EXPORT S_INTArray* WINAPI S_INTArray_Ret()
+extern "C" DLL_EXPORT S_INTArray* NATIVEAPI S_INTArray_Ret()
 {
     INIT_EXPECTED_STRUCT( S_INTArray, ARRAY_SIZE, INT );
 
     return expected;
 }
 
-extern "C" DLL_EXPORT S_UINTArray* WINAPI S_UINTArray_Ret()
+extern "C" DLL_EXPORT S_UINTArray* NATIVEAPI S_UINTArray_Ret()
 {
     INIT_EXPECTED_STRUCT( S_UINTArray, ARRAY_SIZE, UINT );
 
     return expected;
 }
 
-extern "C" DLL_EXPORT S_SHORTArray* WINAPI S_SHORTArray_Ret()
+extern "C" DLL_EXPORT S_SHORTArray* NATIVEAPI S_SHORTArray_Ret()
 {
     INIT_EXPECTED_STRUCT( S_SHORTArray, ARRAY_SIZE, SHORT );
 
     return expected;
 }
 
-extern "C" DLL_EXPORT S_WORDArray* WINAPI S_WORDArray_Ret()
+extern "C" DLL_EXPORT S_WORDArray* NATIVEAPI S_WORDArray_Ret()
 {
     INIT_EXPECTED_STRUCT( S_WORDArray, ARRAY_SIZE, WORD );
 
     return expected;
 }
 
-extern "C" DLL_EXPORT S_LONG64Array* WINAPI S_LONG64Array_Ret()
+extern "C" DLL_EXPORT S_LONG64Array* NATIVEAPI S_LONG64Array_Ret()
 {
     INIT_EXPECTED_STRUCT( S_LONG64Array, ARRAY_SIZE, LONG64 );
 
     return expected;
 }
 
-extern "C" DLL_EXPORT S_ULONG64Array* WINAPI S_ULONG64Array_Ret()
+extern "C" DLL_EXPORT S_ULONG64Array* NATIVEAPI S_ULONG64Array_Ret()
 {
     INIT_EXPECTED_STRUCT( S_ULONG64Array, ARRAY_SIZE, ULONG64 );
 
     return expected;
 }
 
-extern "C" DLL_EXPORT S_DOUBLEArray* WINAPI S_DOUBLEArray_Ret()
+extern "C" DLL_EXPORT S_DOUBLEArray* NATIVEAPI S_DOUBLEArray_Ret()
 {
     INIT_EXPECTED_STRUCT( S_DOUBLEArray, ARRAY_SIZE, DOUBLE );
 
     return expected;
 }
 
-extern "C" DLL_EXPORT S_FLOATArray* WINAPI S_FLOATArray_Ret()
+extern "C" DLL_EXPORT S_FLOATArray* NATIVEAPI S_FLOATArray_Ret()
 {
     INIT_EXPECTED_STRUCT( S_FLOATArray, ARRAY_SIZE, FLOAT );
 
     return expected;
 }
 
-extern "C" DLL_EXPORT S_BYTEArray* WINAPI S_BYTEArray_Ret()
+extern "C" DLL_EXPORT S_BYTEArray* NATIVEAPI S_BYTEArray_Ret()
 {
     INIT_EXPECTED_STRUCT( S_BYTEArray, ARRAY_SIZE, BYTE );
 
     return expected;
 }
 
-extern "C" DLL_EXPORT S_CHARArray* WINAPI S_CHARArray_Ret()
+extern "C" DLL_EXPORT S_CHARArray* NATIVEAPI S_CHARArray_Ret()
 {
     INIT_EXPECTED_STRUCT( S_CHARArray, ARRAY_SIZE, CHAR );
 
     return expected;
 }
 
-extern "C" DLL_EXPORT S_LPSTRArray* WINAPI S_LPSTRArray_Ret()
+extern "C" DLL_EXPORT S_LPSTRArray* NATIVEAPI S_LPSTRArray_Ret()
 {        
     S_LPSTRArray *expected = (S_LPSTRArray *)::CoTaskMemAlloc( sizeof(S_LPSTRArray) );
     for ( int i = 0; i < ARRAY_SIZE; ++i )
@@ -587,7 +587,7 @@ extern "C" DLL_EXPORT S_LPSTRArray* WINAPI S_LPSTRArray_Ret()
 }
 
 
-extern "C" DLL_EXPORT S_StructArray* WINAPI S_StructArray_Ret()
+extern "C" DLL_EXPORT S_StructArray* NATIVEAPI S_StructArray_Ret()
 {
     S_StructArray *expected = (S_StructArray *)::CoTaskMemAlloc( sizeof(S_StructArray) );
     for ( int i = 0; i < ARRAY_SIZE; ++i )
diff --git a/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj b/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
index 8584c0d1f0..cb68120e25 100644
--- a/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
+++ b/tests/src/Interop/ArrayMarshalling/ByValArray/MarshalArrayByValTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/BestFitMapping/BestFitMapping.csproj b/tests/src/Interop/BestFitMapping/BestFitMapping.csproj
index 531665d369..9a158cbfcb 100755
--- a/tests/src/Interop/BestFitMapping/BestFitMapping.csproj
+++ b/tests/src/Interop/BestFitMapping/BestFitMapping.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj b/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj
index 96a3eac2e7..ffe5b64d2a 100644
--- a/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj
+++ b/tests/src/Interop/FuncPtrAsDelegateParam/FuncPtrAsDelegateParam.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/ICastable/Castable.cs b/tests/src/Interop/ICastable/Castable.cs
index 9e119c1ccb..f2281deab2 100644
--- a/tests/src/Interop/ICastable/Castable.cs
+++ b/tests/src/Interop/ICastable/Castable.cs
@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
+using Console = Internal.Console;
+
 public interface IRetArg<T>
 {
     T ReturnArg(T t);
diff --git a/tests/src/Interop/ICastable/Castable.csproj b/tests/src/Interop/ICastable/Castable.csproj
index 874e35d566..c9ca0183ed 100644
--- a/tests/src/Interop/ICastable/Castable.csproj
+++ b/tests/src/Interop/ICastable/Castable.csproj
@@ -8,15 +8,11 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
+    <ReferenceSystemPrivateCoreLib>true</ReferenceSystemPrivateCoreLib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
diff --git a/tests/src/Interop/MarshalAPI/Copy/CopyByteArray.csproj b/tests/src/Interop/MarshalAPI/Copy/CopyByteArray.csproj
index c16125a740..b24fcdd662 100644
--- a/tests/src/Interop/MarshalAPI/Copy/CopyByteArray.csproj
+++ b/tests/src/Interop/MarshalAPI/Copy/CopyByteArray.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/Copy/CopyCharArray.csproj b/tests/src/Interop/MarshalAPI/Copy/CopyCharArray.csproj
index 926e25d29f..b0e256af3d 100644
--- a/tests/src/Interop/MarshalAPI/Copy/CopyCharArray.csproj
+++ b/tests/src/Interop/MarshalAPI/Copy/CopyCharArray.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/Copy/CopyDoubleArray.csproj b/tests/src/Interop/MarshalAPI/Copy/CopyDoubleArray.csproj
index aa385cf196..7f8d0d7b24 100644
--- a/tests/src/Interop/MarshalAPI/Copy/CopyDoubleArray.csproj
+++ b/tests/src/Interop/MarshalAPI/Copy/CopyDoubleArray.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/Copy/CopyInt16Array.csproj b/tests/src/Interop/MarshalAPI/Copy/CopyInt16Array.csproj
index 9dae7623d7..1f696ed251 100644
--- a/tests/src/Interop/MarshalAPI/Copy/CopyInt16Array.csproj
+++ b/tests/src/Interop/MarshalAPI/Copy/CopyInt16Array.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/Copy/CopyInt32Array.csproj b/tests/src/Interop/MarshalAPI/Copy/CopyInt32Array.csproj
index 4682f807e8..d3410a0f24 100644
--- a/tests/src/Interop/MarshalAPI/Copy/CopyInt32Array.csproj
+++ b/tests/src/Interop/MarshalAPI/Copy/CopyInt32Array.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/Copy/CopyInt64Array.csproj b/tests/src/Interop/MarshalAPI/Copy/CopyInt64Array.csproj
index dbd61a218c..8b2c02a657 100644
--- a/tests/src/Interop/MarshalAPI/Copy/CopyInt64Array.csproj
+++ b/tests/src/Interop/MarshalAPI/Copy/CopyInt64Array.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/Copy/CopyIntPtrArray.csproj b/tests/src/Interop/MarshalAPI/Copy/CopyIntPtrArray.csproj
index 3b585b3d8c..71eb32610a 100644
--- a/tests/src/Interop/MarshalAPI/Copy/CopyIntPtrArray.csproj
+++ b/tests/src/Interop/MarshalAPI/Copy/CopyIntPtrArray.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/Copy/CopySingleArray.csproj b/tests/src/Interop/MarshalAPI/Copy/CopySingleArray.csproj
index 4c4b732780..72d074a7c5 100644
--- a/tests/src/Interop/MarshalAPI/Copy/CopySingleArray.csproj
+++ b/tests/src/Interop/MarshalAPI/Copy/CopySingleArray.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPointerNative.cpp b/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPointerNative.cpp
index 4eeafcb4a3..230595787e 100644
--- a/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPointerNative.cpp
+++ b/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPointerNative.cpp
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <xplatform.h>
 
-extern "C" DLL_EXPORT bool __cdecl CheckFcnPtr(bool(__stdcall *fcnptr)(__int64))
+extern "C" DLL_EXPORT bool __cdecl CheckFcnPtr(bool(CALLBACK *fcnptr)(__int64))
 {
     if (fcnptr == 0)
     {
@@ -20,4 +20,4 @@ extern "C" DLL_EXPORT bool __cdecl CheckFcnPtr(bool(__stdcall *fcnptr)(__int64))
 int Return100()
 {
     return 100;
-}
\ No newline at end of file
+}
diff --git a/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj b/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
index 3c77080265..fe86cd24ef 100644
--- a/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
+++ b/tests/src/Interop/MarshalAPI/FunctionPointer/FunctionPtrTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/GetExceptionForHR/GetExceptionForHR.csproj b/tests/src/Interop/MarshalAPI/GetExceptionForHR/GetExceptionForHR.csproj
index 6c67da2231..9f1bc7bd0f 100644
--- a/tests/src/Interop/MarshalAPI/GetExceptionForHR/GetExceptionForHR.csproj
+++ b/tests/src/Interop/MarshalAPI/GetExceptionForHR/GetExceptionForHR.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/GetNativeVariantForObject/GetNativeVariantForObject.csproj b/tests/src/Interop/MarshalAPI/GetNativeVariantForObject/GetNativeVariantForObject.csproj
index a8ef547e17..6ef3c98f13 100644
--- a/tests/src/Interop/MarshalAPI/GetNativeVariantForObject/GetNativeVariantForObject.csproj
+++ b/tests/src/Interop/MarshalAPI/GetNativeVariantForObject/GetNativeVariantForObject.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <NoWarn>0618;0649</NoWarn>
   </PropertyGroup>
diff --git a/tests/src/Interop/MarshalAPI/GetObjectForNativeVariant/GetObjectForNativeVariant.csproj b/tests/src/Interop/MarshalAPI/GetObjectForNativeVariant/GetObjectForNativeVariant.csproj
index 73db4a620f..4bc3b639f0 100644
--- a/tests/src/Interop/MarshalAPI/GetObjectForNativeVariant/GetObjectForNativeVariant.csproj
+++ b/tests/src/Interop/MarshalAPI/GetObjectForNativeVariant/GetObjectForNativeVariant.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/GetObjectsForNativeVariants/GetObjectsForNativeVariants.csproj b/tests/src/Interop/MarshalAPI/GetObjectsForNativeVariants/GetObjectsForNativeVariants.csproj
index 56c7142527..da6e9cd99b 100644
--- a/tests/src/Interop/MarshalAPI/GetObjectsForNativeVariants/GetObjectsForNativeVariants.csproj
+++ b/tests/src/Interop/MarshalAPI/GetObjectsForNativeVariants/GetObjectsForNativeVariants.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj b/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
index e30592db68..b02b40ca2b 100644
--- a/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
+++ b/tests/src/Interop/MarshalAPI/IUnknown/IUnknownTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/MarshalStructure/MarshalStructure.csproj b/tests/src/Interop/MarshalAPI/MarshalStructure/MarshalStructure.csproj
index bf039d1511..9083ab0c30 100644
--- a/tests/src/Interop/MarshalAPI/MarshalStructure/MarshalStructure.csproj
+++ b/tests/src/Interop/MarshalAPI/MarshalStructure/MarshalStructure.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/Miscellaneous/AutoLayoutStructure.csproj b/tests/src/Interop/MarshalAPI/Miscellaneous/AutoLayoutStructure.csproj
index b784a94cbf..19858c1ef0 100644
--- a/tests/src/Interop/MarshalAPI/Miscellaneous/AutoLayoutStructure.csproj
+++ b/tests/src/Interop/MarshalAPI/Miscellaneous/AutoLayoutStructure.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/Miscellaneous/MarshalClassTests.csproj b/tests/src/Interop/MarshalAPI/Miscellaneous/MarshalClassTests.csproj
index 8a4bfcf041..e698c96c2b 100644
--- a/tests/src/Interop/MarshalAPI/Miscellaneous/MarshalClassTests.csproj
+++ b/tests/src/Interop/MarshalAPI/Miscellaneous/MarshalClassTests.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <NoWarn>0618;0649</NoWarn>
   </PropertyGroup>
diff --git a/tests/src/Interop/MarshalAPI/OffsetOf/OffsetOf.csproj b/tests/src/Interop/MarshalAPI/OffsetOf/OffsetOf.csproj
index 01f07a97d1..4997b15849 100644
--- a/tests/src/Interop/MarshalAPI/OffsetOf/OffsetOf.csproj
+++ b/tests/src/Interop/MarshalAPI/OffsetOf/OffsetOf.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <NoWarn>0618;0649;0169</NoWarn>
   </PropertyGroup>
diff --git a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteByte.csproj b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteByte.csproj
index 32186531b6..4a206ae9a0 100644
--- a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteByte.csproj
+++ b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteByte.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt16.csproj b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt16.csproj
index b03737a45f..b540fb180d 100644
--- a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt16.csproj
+++ b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt16.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt32.csproj b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt32.csproj
index f1ba3aa19d..7b6a948b61 100644
--- a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt32.csproj
+++ b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt32.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt64.csproj b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt64.csproj
index 3bf2520110..91e6ea75c7 100644
--- a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt64.csproj
+++ b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteInt64.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteIntPtr.csproj b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteIntPtr.csproj
index 34b6fc083b..366a5c5f27 100644
--- a/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteIntPtr.csproj
+++ b/tests/src/Interop/MarshalAPI/ReadWrite/ReadWriteIntPtr.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/MarshalAPI/String/StringMarshalingTest.csproj b/tests/src/Interop/MarshalAPI/String/StringMarshalingTest.csproj
index e823f7a29c..04df58eee2 100644
--- a/tests/src/Interop/MarshalAPI/String/StringMarshalingTest.csproj
+++ b/tests/src/Interop/MarshalAPI/String/StringMarshalingTest.csproj
@@ -8,15 +8,10 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
diff --git a/tests/src/Interop/MarshalAPI/UnsafeAddrOfPinnedArrayElement/UnsafeAddrOfPinnedArrayElement.csproj b/tests/src/Interop/MarshalAPI/UnsafeAddrOfPinnedArrayElement/UnsafeAddrOfPinnedArrayElement.csproj
index 5b8e3c438d..468929b6b7 100644
--- a/tests/src/Interop/MarshalAPI/UnsafeAddrOfPinnedArrayElement/UnsafeAddrOfPinnedArrayElement.csproj
+++ b/tests/src/Interop/MarshalAPI/UnsafeAddrOfPinnedArrayElement/UnsafeAddrOfPinnedArrayElement.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <NoWarn>0618</NoWarn>
   </PropertyGroup>
diff --git a/tests/src/Interop/NativeCallable/NativeCallableDll.cpp b/tests/src/Interop/NativeCallable/NativeCallableDll.cpp
index 0eb82914f1..ea82352e15 100644
--- a/tests/src/Interop/NativeCallable/NativeCallableDll.cpp
+++ b/tests/src/Interop/NativeCallable/NativeCallableDll.cpp
@@ -4,9 +4,9 @@
 
 #include <xplatform.h> 
 
-typedef int (WINAPI *CALLBACKADDPROC)(int n);
+typedef int (NATIVEAPI *CALLBACKADDPROC)(int n);
 
-extern "C" DLL_EXPORT int WINAPI CallManagedAdd(CALLBACKADDPROC pCallbackAddProc, int n)
+extern "C" DLL_EXPORT int NATIVEAPI CallManagedAdd(CALLBACKADDPROC pCallbackAddProc, int n)
 {
     return pCallbackAddProc(n);
 }
diff --git a/tests/src/Interop/NativeCallable/NativeCallableTest.cs b/tests/src/Interop/NativeCallable/NativeCallableTest.cs
index 0dcc184b4a..c0b057b7ef 100644
--- a/tests/src/Interop/NativeCallable/NativeCallableTest.cs
+++ b/tests/src/Interop/NativeCallable/NativeCallableTest.cs
@@ -10,6 +10,8 @@ using System.Reflection.Emit;
 using System.Runtime.InteropServices;
 using System.Threading;
 
+using Console = Internal.Console;
+
 public class Program
 {
     public static class NativeMethods
diff --git a/tests/src/Interop/NativeCallable/NativeCallableTest.csproj b/tests/src/Interop/NativeCallable/NativeCallableTest.csproj
index a4e9018cfc..e60057859f 100644
--- a/tests/src/Interop/NativeCallable/NativeCallableTest.csproj
+++ b/tests/src/Interop/NativeCallable/NativeCallableTest.csproj
@@ -8,14 +8,10 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
+    <ReferenceSystemPrivateCoreLib>true</ReferenceSystemPrivateCoreLib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
diff --git a/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj b/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj
index 09853fe402..ffa509e84a 100644
--- a/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj
+++ b/tests/src/Interop/PrimitiveMarshalling/Bool/BoolTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj b/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj
index 16c628ad3b..152781fe06 100644
--- a/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj
+++ b/tests/src/Interop/PrimitiveMarshalling/EnumMarshalling/EnumTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj b/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj
index 7d35b16796..fcdd0f5711 100644
--- a/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj
+++ b/tests/src/Interop/PrimitiveMarshalling/UIntPtr/PInvokeUIntPtrTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/PrimitiveMarshalling/UIntPtr/UIntPtrNative.cpp b/tests/src/Interop/PrimitiveMarshalling/UIntPtr/UIntPtrNative.cpp
index d280d955b8..43cde2546d 100644
--- a/tests/src/Interop/PrimitiveMarshalling/UIntPtr/UIntPtrNative.cpp
+++ b/tests/src/Interop/PrimitiveMarshalling/UIntPtr/UIntPtrNative.cpp
@@ -10,7 +10,10 @@ UINT_PTR uintPtrNative = 2000;
 UINT_PTR uintPtrReturn = 3000;
 UINT_PTR uintPtrErrReturn = 4000;
 
-extern "C" DLL_EXPORT UINT_PTR WINAPI Marshal_In(/*[in]*/UINT_PTR uintPtr)
+//
+// PInvokeUIntPtrTest.cs declares that all of these APIs use STDCALL.
+//
+extern "C" DLL_EXPORT UINT_PTR __stdcall Marshal_In(/*[in]*/UINT_PTR uintPtr)
 {
     //Check the input
     if(uintPtr != uintPtrManaged)
@@ -24,7 +27,7 @@ extern "C" DLL_EXPORT UINT_PTR WINAPI Marshal_In(/*[in]*/UINT_PTR uintPtr)
     return uintPtrReturn;
 }
 
-extern "C" DLL_EXPORT UINT_PTR WINAPI Marshal_InOut(/*[In,Out]*/UINT_PTR uintPtr)
+extern "C" DLL_EXPORT UINT_PTR __stdcall Marshal_InOut(/*[In,Out]*/UINT_PTR uintPtr)
 {
     //Check the input
     if(uintPtr != uintPtrManaged)
@@ -42,7 +45,7 @@ extern "C" DLL_EXPORT UINT_PTR WINAPI Marshal_InOut(/*[In,Out]*/UINT_PTR uintPtr
     return uintPtrReturn;
 }
 
-extern "C" DLL_EXPORT UINT_PTR WINAPI Marshal_Out(/*[Out]*/UINT_PTR uintPtr)
+extern "C" DLL_EXPORT UINT_PTR __stdcall Marshal_Out(/*[Out]*/UINT_PTR uintPtr)
 {
     uintPtr = uintPtrNative;
 
@@ -50,7 +53,7 @@ extern "C" DLL_EXPORT UINT_PTR WINAPI Marshal_Out(/*[Out]*/UINT_PTR uintPtr)
     return uintPtrReturn;
 }
 
-extern "C" DLL_EXPORT UINT_PTR WINAPI MarshalPointer_In(/*[in]*/UINT_PTR *puintPtr)
+extern "C" DLL_EXPORT UINT_PTR __stdcall MarshalPointer_In(/*[in]*/UINT_PTR *puintPtr)
 {
     //Check the input
     if(*puintPtr != uintPtrManaged)
@@ -63,7 +66,7 @@ extern "C" DLL_EXPORT UINT_PTR WINAPI MarshalPointer_In(/*[in]*/UINT_PTR *puintP
     return uintPtrReturn;
 }
 
-extern "C" DLL_EXPORT UINT_PTR WINAPI MarshalPointer_InOut(/*[in,out]*/UINT_PTR *puintPtr)
+extern "C" DLL_EXPORT UINT_PTR __stdcall MarshalPointer_InOut(/*[in,out]*/UINT_PTR *puintPtr)
 {
     //Check the input
     if(*puintPtr != uintPtrManaged)
@@ -80,7 +83,7 @@ extern "C" DLL_EXPORT UINT_PTR WINAPI MarshalPointer_InOut(/*[in,out]*/UINT_PTR
     return uintPtrReturn;
 }
 
-extern "C" DLL_EXPORT UINT_PTR WINAPI MarshalPointer_Out(/*[out]*/ UINT_PTR *puintPtr)
+extern "C" DLL_EXPORT UINT_PTR __stdcall MarshalPointer_Out(/*[out]*/ UINT_PTR *puintPtr)
 {
     *puintPtr = uintPtrNative;
 
diff --git a/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj b/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj
index 426573d4d7..ce40a9b168 100644
--- a/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj
+++ b/tests/src/Interop/RefCharArray/RefCharArrayTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/RefInt/RefIntTest.csproj b/tests/src/Interop/RefInt/RefIntTest.csproj
index 7a8c64980e..32722397ae 100644
--- a/tests/src/Interop/RefInt/RefIntTest.csproj
+++ b/tests/src/Interop/RefInt/RefIntTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/SimpleStruct/SimpleStruct.csproj b/tests/src/Interop/SimpleStruct/SimpleStruct.csproj
index 205c8a13d8..7b46b9b9b6 100644
--- a/tests/src/Interop/SimpleStruct/SimpleStruct.csproj
+++ b/tests/src/Interop/SimpleStruct/SimpleStruct.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/SimpleStruct/SimpleStructNative.cpp b/tests/src/Interop/SimpleStruct/SimpleStructNative.cpp
index fb855a42e8..87c41bdc3a 100644
--- a/tests/src/Interop/SimpleStruct/SimpleStructNative.cpp
+++ b/tests/src/Interop/SimpleStruct/SimpleStructNative.cpp
@@ -81,7 +81,7 @@ DLL_EXPORT ExplStruct* _cdecl CdeclSimpleExplStruct(ExplStruct p,BOOL *result)
 }
 
 extern "C"
-DLL_EXPORT voidPtr __stdcall GetFptr(int i)
+DLL_EXPORT voidPtr NATIVEAPI GetFptr(int i)
 {
 	switch(i)
 	{
diff --git a/tests/src/Interop/SizeConst/SizeConstTest.csproj b/tests/src/Interop/SizeConst/SizeConstTest.csproj
index 70c1fa7917..4c12f32d02 100644
--- a/tests/src/Interop/SizeConst/SizeConstTest.csproj
+++ b/tests/src/Interop/SizeConst/SizeConstTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,7 +31,7 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
+    <ProjectReference Include="..\..\Common\CoreCLRTestLibrary\CoreCLRTestLibrary.csproj">
       <Project>{c8c0dc74-fac4-45b1-81fe-70c4808366e0}</Project>
       <Name>CoreCLRTestLibrary</Name>
     </ProjectReference>
diff --git a/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj b/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj
index 6ff6c46199..88a0330578 100755
--- a/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj
+++ b/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp b/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp
index 3f72126acc..b440c52ef5 100755
--- a/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp
+++ b/tests/src/Interop/StringMarshalling/LPSTR/LPSTRTestNative.cpp
@@ -143,8 +143,11 @@ extern "C" DLL_EXPORT BOOL __cdecl RPinvoke_DelMarshal_InOut(Test_DelMarshal_InO
     return TRUE;
 }
 
+//
+// PInvokeDef.cs explicitly declares that RPinvoke_DelMarshalPointer_Out uses STDCALL
+//
 typedef LPCSTR (__cdecl * Test_DelMarshalPointer_Out)(/*[out]*/ LPSTR * s);
-extern "C" DLL_EXPORT BOOL WINAPI RPinvoke_DelMarshalPointer_Out(Test_DelMarshalPointer_Out d)
+extern "C" DLL_EXPORT BOOL __stdcall RPinvoke_DelMarshalPointer_Out(Test_DelMarshalPointer_Out d)
 {
     LPSTR str;
     LPCSTR ret = d(&str);
@@ -173,8 +176,11 @@ extern "C" DLL_EXPORT BOOL WINAPI RPinvoke_DelMarshalPointer_Out(Test_DelMarshal
     return TRUE;
 }
 
+//
+// PInvokeDef.cs explicitly declares that ReverseP_MarshalStrB_InOut uses STDCALL
+//
 typedef LPSTR (__stdcall * Test_Del_MarshalStrB_InOut)(/*[in,out]*/ LPSTR s);
-extern "C" DLL_EXPORT  BOOL WINAPI ReverseP_MarshalStrB_InOut(Test_Del_MarshalStrB_InOut d, /*[in]*/ LPCSTR s)
+extern "C" DLL_EXPORT  BOOL __stdcall ReverseP_MarshalStrB_InOut(Test_Del_MarshalStrB_InOut d, /*[in]*/ LPCSTR s)
 {
     LPSTR ret = d((LPSTR)s);
     LPCSTR expected = "Return";
@@ -197,4 +203,4 @@ extern "C" DLL_EXPORT  BOOL WINAPI ReverseP_MarshalStrB_InOut(Test_Del_MarshalSt
         return FALSE;
     }
     return TRUE;
-}
\ No newline at end of file
+}
diff --git a/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj b/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj
index d7151e3aaa..59b0b00447 100644
--- a/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj
+++ b/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTest.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp b/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp
index 91b9b63d8e..bc3fa07ae6 100755
--- a/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp
+++ b/tests/src/Interop/StringMarshalling/LPTSTR/LPTSTRTestNative.cpp
@@ -101,7 +101,7 @@ extern "C" DLL_EXPORT LPWSTR MarshalPointer_Out(/*[out]*/ LPWSTR *s)
 }
 
 typedef LPTSTR (__stdcall * Test_Del_MarshalStrB_InOut)(/*[in,out]*/ LPTSTR s);
-extern "C" DLL_EXPORT BOOL __stdcall ReverseP_MarshalStrB_InOut(Test_Del_MarshalStrB_InOut d, /*[in]*/ LPCTSTR  s)
+extern "C" DLL_EXPORT BOOL NATIVEAPI ReverseP_MarshalStrB_InOut(Test_Del_MarshalStrB_InOut d, /*[in]*/ LPCTSTR  s)
 {
     LPTSTR ret = d((LPTSTR)s);
     LPTSTR expectedret =(LPTSTR)W("Native");
@@ -127,7 +127,7 @@ extern "C" DLL_EXPORT BOOL __stdcall ReverseP_MarshalStrB_InOut(Test_Del_Marshal
 }
 
 typedef LPTSTR (__cdecl * Test_Del_MarshalStrB_Out)(/*[out]*/ LPTSTR * s);
-extern "C" DLL_EXPORT BOOL __stdcall ReverseP_MarshalStrB_Out(Test_Del_MarshalStrB_Out d)
+extern "C" DLL_EXPORT BOOL NATIVEAPI ReverseP_MarshalStrB_Out(Test_Del_MarshalStrB_Out d)
 {
     LPTSTR s;
     LPTSTR ret = d((LPTSTR*)&s);
diff --git a/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj b/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj
index 32f4317f66..69d28bddc8 100644
--- a/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj
+++ b/tests/src/Interop/StringMarshalling/UTF8/UTF8Test.csproj
@@ -8,15 +8,10 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
diff --git a/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj b/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
index 47729f3cb4..63d0d06360 100644
--- a/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
+++ b/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj b/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj
index 426ef5befb..17eb2fd5f8 100644
--- a/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj
+++ b/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutSeq.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E66554-8C8E-4141-85CF-D0CD6A0CD0B0}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>  
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp b/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp
index 08954434ae..e690a7c25c 100644
--- a/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp
+++ b/tests/src/Interop/StructMarshalling/PInvoke/MarshalStructAsParamDLL.cpp
@@ -3,7 +3,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 //							EXPORTED METHODS
 ///////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal(InnerSequential inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal(InnerSequential inner)
 {
 	if(!IsCorrectInnerSequential(&inner))
 	{
@@ -15,7 +15,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal(InnerSequentia
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef(InnerSequential* inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef(InnerSequential* inner)
 {
 	if(!IsCorrectInnerSequential(inner))
 	{
@@ -26,7 +26,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef(InnerSequentia
 	ChangeInnerSequential(inner);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn(InnerSequential* inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn(InnerSequential* inner)
 {
 	if(!IsCorrectInnerSequential(inner))
 	{
@@ -38,7 +38,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn(InnerSequent
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut(InnerSequential inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut(InnerSequential inner)
 {
 	if(!IsCorrectInnerSequential(&inner))
 	{
@@ -50,14 +50,14 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut(InnerSequen
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut(InnerSequential* inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut(InnerSequential* inner)
 {
 	ChangeInnerSequential(inner);
 	return TRUE;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal2(InnerArraySequential outer)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal2(InnerArraySequential outer)
 {
 	if(!IsCorrectInnerArraySequential(&outer))
 	{
@@ -69,7 +69,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal2(InnerArraySeq
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef2(InnerArraySequential* outer)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef2(InnerArraySequential* outer)
 {
 	if(!IsCorrectInnerArraySequential(outer))
 	{
@@ -80,7 +80,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef2(InnerArraySeq
 	ChangeInnerArraySequential(outer);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn2(InnerArraySequential* outer)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn2(InnerArraySequential* outer)
 {
 	if(!IsCorrectInnerArraySequential(outer))
 	{
@@ -91,7 +91,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn2(InnerArrayS
 	ChangeInnerArraySequential(outer);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut2(InnerArraySequential outer)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut2(InnerArraySequential outer)
 {
 	if(!IsCorrectInnerArraySequential(&outer))
 	{
@@ -106,7 +106,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut2(InnerArray
 	}
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut2(InnerArraySequential* outer)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut2(InnerArraySequential* outer)
 {
 	for(int i = 0;i<NumArrElements;i++)
 	{
@@ -121,7 +121,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut2(InnerArray
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal3(CharSetAnsiSequential str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal3(CharSetAnsiSequential str1)
 {
 	if(!IsCorrectCharSetAnsiSequential(&str1))
 	{
@@ -132,7 +132,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal3(CharSetAnsiSe
 	ChangeCharSetAnsiSequential(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef3(CharSetAnsiSequential* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef3(CharSetAnsiSequential* str1)
 {
 	if(!IsCorrectCharSetAnsiSequential(str1))
 	{
@@ -143,7 +143,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef3(CharSetAnsiSe
 	ChangeCharSetAnsiSequential(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn3(CharSetAnsiSequential* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn3(CharSetAnsiSequential* str1)
 {
 	if(!IsCorrectCharSetAnsiSequential(str1))
 	{
@@ -154,7 +154,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn3(CharSetAnsi
 	ChangeCharSetAnsiSequential(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut3(CharSetAnsiSequential str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut3(CharSetAnsiSequential str1)
 {
 	if(!IsCorrectCharSetAnsiSequential(&str1))
 	{
@@ -165,7 +165,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut3(CharSetAns
 	str1.f2 = 'n';
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut3(CharSetAnsiSequential* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut3(CharSetAnsiSequential* str1)
 {
 	TP_CoTaskMemFree((void*)(str1->f1));
 	str1->f1 = CoStrDup("change string");
@@ -174,7 +174,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut3(CharSetAns
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal4(CharSetUnicodeSequential str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal4(CharSetUnicodeSequential str1)
 {
 	if(!IsCorrectCharSetUnicodeSequential(&str1))
 	{
@@ -185,7 +185,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal4(CharSetUnicod
 	ChangeCharSetUnicodeSequential(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef4(CharSetUnicodeSequential* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef4(CharSetUnicodeSequential* str1)
 {
 	if(!IsCorrectCharSetUnicodeSequential(str1))
 	{
@@ -196,7 +196,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef4(CharSetUnicod
 	ChangeCharSetUnicodeSequential(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn4(CharSetUnicodeSequential* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn4(CharSetUnicodeSequential* str1)
 {
 	if(!IsCorrectCharSetUnicodeSequential(str1))
 	{
@@ -207,7 +207,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn4(CharSetUnic
 	ChangeCharSetUnicodeSequential(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut4(CharSetUnicodeSequential str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut4(CharSetUnicodeSequential str1)
 {
 	if(!IsCorrectCharSetUnicodeSequential(&str1))
 	{
@@ -218,7 +218,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut4(CharSetUni
 	str1.f2 = L'n';
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut4(CharSetUnicodeSequential* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut4(CharSetUnicodeSequential* str1)
 {
 	if(str1->f1 != 0 || str1->f2 != 0)
 		return false;
@@ -227,7 +227,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut4(CharSetUni
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal6(NumberSequential str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal6(NumberSequential str1)
 {
 	if(!IsCorrectNumberSequential(&str1))
 	{
@@ -238,7 +238,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal6(NumberSequent
 	ChangeNumberSequential(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef6(NumberSequential* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef6(NumberSequential* str1)
 {
 	if(!IsCorrectNumberSequential(str1))
 	{
@@ -249,7 +249,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef6(NumberSequent
 	ChangeNumberSequential(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn6(NumberSequential* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn6(NumberSequential* str1)
 {
 	if(!IsCorrectNumberSequential(str1))
 	{
@@ -261,7 +261,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn6(NumberSeque
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut6(NumberSequential str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut6(NumberSequential str1)
 {
 	if(!IsCorrectNumberSequential(&str1))
 	{
@@ -271,14 +271,14 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut6(NumberSequ
 	}
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut6(NumberSequential* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut6(NumberSequential* str1)
 {
 	ChangeNumberSequential(str1);
 	return TRUE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal7(S3 str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal7(S3 str1)
 {
 	if(!IsCorrectS3(&str1))
 	{
@@ -290,7 +290,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal7(S3 str1)
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef7(S3* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef7(S3* str1)
 {
 	if(!IsCorrectS3(str1))
 	{
@@ -300,7 +300,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef7(S3* str1)
 	ChangeS3(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn7(S3* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn7(S3* str1)
 {
 	if(!IsCorrectS3(str1))
 	{
@@ -312,7 +312,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn7(S3* str1)
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut7(S3 str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut7(S3 str1)
 {
 	if(!IsCorrectS3(&str1))
 	{
@@ -324,13 +324,13 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut7(S3 str1)
 	return TRUE;
 
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut7(S3* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut7(S3* str1)
 {
 	ChangeS3(str1);
 	return TRUE;
 }
 ////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal8(S5 str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal8(S5 str1)
 {
 	if(!IsCorrectS5(&str1))
 	{
@@ -341,7 +341,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal8(S5 str1)
 	ChangeS5(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef8(S5* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef8(S5* str1)
 {
 	if(!IsCorrectS5(str1))
 	{
@@ -353,7 +353,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef8(S5* str1)
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn8(S5* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn8(S5* str1)
 {
 	if(!IsCorrectS5(str1))
 	{
@@ -364,7 +364,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn8(S5* str1)
 	ChangeS5(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut8(S5* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut8(S5* str1)
 {
 	ChangeS5(str1);
 	return TRUE;
@@ -372,7 +372,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut8(S5* str1)
 
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal9(StringStructSequentialAnsi str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal9(StringStructSequentialAnsi str1)
 {
 	if(!IsCorrectStringStructSequentialAnsi(&str1))
 	{
@@ -383,7 +383,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal9(StringStructS
 	ChangeStringStructSequentialAnsi(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef9(StringStructSequentialAnsi* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef9(StringStructSequentialAnsi* str1)
 {
 	if(!IsCorrectStringStructSequentialAnsi(str1))
 	{
@@ -395,7 +395,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef9(StringStructS
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn9(StringStructSequentialAnsi* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn9(StringStructSequentialAnsi* str1)
 {
 	if(!IsCorrectStringStructSequentialAnsi(str1))
 	{
@@ -406,7 +406,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn9(StringStruc
 	ChangeStringStructSequentialAnsi(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut9(StringStructSequentialAnsi str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut9(StringStructSequentialAnsi str1)
 {
 	if(!IsCorrectStringStructSequentialAnsi(&str1))
 	{
@@ -416,7 +416,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut9(StringStru
 	}
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut9(StringStructSequentialAnsi* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut9(StringStructSequentialAnsi* str1)
 {
 	ChangeStringStructSequentialAnsi(str1);
 
@@ -425,7 +425,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut9(StringStru
 
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal10(StringStructSequentialUnicode str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal10(StringStructSequentialUnicode str1)
 {
 	if(!IsCorrectStringStructSequentialUnicode(&str1))
 	{
@@ -436,7 +436,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal10(StringStruct
 	ChangeStringStructSequentialUnicode(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef10(StringStructSequentialUnicode* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef10(StringStructSequentialUnicode* str1)
 {
 	if(!IsCorrectStringStructSequentialUnicode(str1))
 	{
@@ -448,7 +448,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef10(StringStruct
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn10(StringStructSequentialUnicode* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn10(StringStructSequentialUnicode* str1)
 {
 	if(!IsCorrectStringStructSequentialUnicode(str1))
 	{
@@ -459,7 +459,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn10(StringStru
 	ChangeStringStructSequentialUnicode(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut10(StringStructSequentialUnicode str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut10(StringStructSequentialUnicode str1)
 {
 	if(!IsCorrectStringStructSequentialUnicode(&str1))
 	{
@@ -469,7 +469,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut10(StringStr
 	}
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut10(StringStructSequentialUnicode* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut10(StringStructSequentialUnicode* str1)
 {
 	ChangeStringStructSequentialUnicode(str1);
 
@@ -477,7 +477,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut10(StringStr
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal11(S8 str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal11(S8 str1)
 {
 	if(!IsCorrectS8(&str1))
 	{
@@ -488,7 +488,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal11(S8 str1)
 	ChangeS8(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef11(S8* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef11(S8* str1)
 {
 	if(!IsCorrectS8(str1))
 	{
@@ -500,7 +500,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef11(S8* str1)
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn11(S8* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn11(S8* str1)
 {
 	if(!IsCorrectS8(str1))
 	{
@@ -511,7 +511,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn11(S8* str1)
 	ChangeS8(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut11(S8 str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut11(S8 str1)
 {
 	if(!IsCorrectS8(&str1))
 	{
@@ -523,7 +523,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut11(S8 str1)
 	str1.ui32 = 256;
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut11(S8* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut11(S8* str1)
 {
 	ChangeS8(str1);
 
@@ -535,7 +535,7 @@ extern "C" void NtestMethod(S9 str1)
 {
 	printf("\tAction of the delegate");
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal12(S9 str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal12(S9 str1)
 {
 	if(str1.i32 != 128 ||
 		str1.myDelegate1 == NULL)
@@ -546,7 +546,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal12(S9 str1)
 	str1.myDelegate1 = NULL;
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef12(S9* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef12(S9* str1)
 {
 	if(str1->i32 != 128 ||
 		str1->myDelegate1 == NULL)
@@ -560,7 +560,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef12(S9* str1)
 	}
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn12(S9* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn12(S9* str1)
 {
 	if(str1->i32 != 128 ||
 		str1->myDelegate1 == NULL)
@@ -574,7 +574,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn12(S9* str1)
 	}
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut12(S9 str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut12(S9 str1)
 {
 	if(str1.i32 != 128 ||
 		str1.myDelegate1 == NULL)
@@ -585,7 +585,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut12(S9 str1)
 	str1.myDelegate1 = NULL;
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut12(S9* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut12(S9* str1)
 {
 	str1->i32 = 256;
 	str1->myDelegate1 = NtestMethod;
@@ -594,7 +594,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut12(S9* str1)
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal13(S10 str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal13(S10 str1)
 {
 	if(!IsCorrectS10(&str1))
 	{
@@ -605,7 +605,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal13(S10 str1)
 	ChangeS10(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef13(S10* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef13(S10* str1)
 {
 	if(!IsCorrectS10(str1))
 	{
@@ -617,7 +617,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef13(S10* str1)
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn13(S10* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn13(S10* str1)
 {
 	if(!IsCorrectS10(str1))
 	{
@@ -628,7 +628,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn13(S10* str1)
 	ChangeS10(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut13(S10 str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut13(S10 str1)
 {
 	if(!IsCorrectS10(&str1))
 	{
@@ -639,7 +639,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut13(S10 str1)
 	str1.s.i = 64;
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut13(S10* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut13(S10* str1)
 {
 	ChangeS10(str1);
 
@@ -647,7 +647,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut13(S10* str1
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal14(S11 str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByVal14(S11 str1)
 {
 	if( str1.i32 != 0 || str1.i != 32 )
 		return FALSE;
@@ -655,7 +655,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByVal14(S11 str1)
 	str1.i = 64;
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef14(S11* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRef14(S11* str1)
 {
 	if(str1->i32 != 0 || str1->i != 32)
 		return FALSE;
@@ -666,7 +666,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRef14(S11* str1)
 		return TRUE;
 	}
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn14(S11* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefIn14(S11* str1)
 {
 	if(str1->i32 != 0 || str1->i != 32)
 		return FALSE;
@@ -677,21 +677,21 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefIn14(S11* str1)
 		return TRUE;
 	}
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByValOut14(S11 str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByValOut14(S11 str1)
 {
 	if( str1.i32 != (LPINT)32 || str1.i != 32 )
 		return FALSE;
 	str1.i = 64;
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsSeqByRefOut14(S11* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsSeqByRefOut14(S11* str1)
 {
 	str1->i32 = reinterpret_cast<LPINT>(static_cast<INT_PTR>(str1->i));
 	str1->i = 64;
 	return TRUE;
 }
 //////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValINNER2(INNER2 inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByValINNER2(INNER2 inner)
 {
 	if(!IsCorrectINNER2(&inner))
 	{
@@ -703,7 +703,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValINNER2(INNER2 i
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefINNER2(INNER2* inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefINNER2(INNER2* inner)
 {
 	if(!IsCorrectINNER2(inner))
 	{
@@ -714,7 +714,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefINNER2(INNER2*
 	ChangeINNER2(inner);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInINNER2(INNER2* inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefInINNER2(INNER2* inner)
 {
 	if(!IsCorrectINNER2(inner))
 	{
@@ -726,7 +726,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInINNER2(INNER2
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValOutINNER2(INNER2 inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByValOutINNER2(INNER2 inner)
 {
 	if(!IsCorrectINNER2(&inner))
 	{
@@ -738,14 +738,14 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValOutINNER2(INNER
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutINNER2(INNER2* inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefOutINNER2(INNER2* inner)
 {
 	//change struct
 	ChangeINNER2(inner);
 	return TRUE;
 }
 /////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValInnerExplicit(InnerExplicit inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByValInnerExplicit(InnerExplicit inner)
 {
 	if((&inner)->f1 != 1 || memcmp((&inner)->f3, "some string",11*sizeof(char)) != 0)
 	{
@@ -757,7 +757,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValInnerExplicit(I
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInnerExplicit(InnerExplicit* inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefInnerExplicit(InnerExplicit* inner)
 {
 	if(inner->f1 != 1 || memcmp(inner->f3, "some string",11*sizeof(char)) != 0)
 	{
@@ -769,7 +769,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInnerExplicit(I
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInInnerExplicit(InnerExplicit* inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefInInnerExplicit(InnerExplicit* inner)
 {
 	if(inner->f1 != 1 || memcmp(inner->f3, "some string",11*sizeof(char)) != 0)
 	{
@@ -781,7 +781,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInInnerExplicit
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutInnerExplicit(InnerExplicit* inner)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefOutInnerExplicit(InnerExplicit* inner)
 {
 	if(inner->f1 != 0 || inner->f2 != 0.0)
 	{
@@ -795,7 +795,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutInnerExplici
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValInnerArrayExplicit(InnerArrayExplicit outer2)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByValInnerArrayExplicit(InnerArrayExplicit outer2)
 {
 	for(int i = 0;i<NumArrElements;i++)
 	{
@@ -813,7 +813,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValInnerArrayExpli
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInnerArrayExplicit(InnerArrayExplicit* outer2)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefInnerArrayExplicit(InnerArrayExplicit* outer2)
 {
 	for(int i = 0;i<NumArrElements;i++)
 	{
@@ -837,7 +837,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInnerArrayExpli
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInInnerArrayExplicit(InnerArrayExplicit* outer2)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefInInnerArrayExplicit(InnerArrayExplicit* outer2)
 {
 	for(int i = 0;i<NumArrElements;i++)
 	{
@@ -859,7 +859,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInInnerArrayExp
 	outer2->s.f4 = CoStrDup("change string2");
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutInnerArrayExplicit(InnerArrayExplicit* outer2)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefOutInnerArrayExplicit(InnerArrayExplicit* outer2)
 {
 	for(int i =0;i<NumArrElements;i++)
 	{
@@ -871,7 +871,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutInnerArrayEx
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValOUTER3(OUTER3 outer3)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByValOUTER3(OUTER3 outer3)
 {
 	if(!IsCorrectOUTER3(&outer3))
 	{
@@ -882,7 +882,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValOUTER3(OUTER3 o
 	ChangeOUTER3(&outer3);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOUTER3(OUTER3* outer3)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefOUTER3(OUTER3* outer3)
 {
 	if(!IsCorrectOUTER3(outer3))
 	{
@@ -893,7 +893,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOUTER3(OUTER3*
 	ChangeOUTER3(outer3);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInOUTER3(OUTER3* outer3)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefInOUTER3(OUTER3* outer3)
 {
 	if(!IsCorrectOUTER3(outer3))
 	{
@@ -904,14 +904,14 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInOUTER3(OUTER3
 	ChangeOUTER3(outer3);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutOUTER3(OUTER3* outer3)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefOutOUTER3(OUTER3* outer3)
 {
 	ChangeOUTER3(outer3);
 	return TRUE;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValU(U str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByValU(U str1)
 {
 	if(!IsCorrectU(&str1))
 	{
@@ -922,7 +922,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValU(U str1)
 	ChangeU(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefU(U* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefU(U* str1)
 {
 	if(!IsCorrectU(str1))
 	{
@@ -934,7 +934,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefU(U* str1)
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInU(U* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefInU(U* str1)
 {
 	if(!IsCorrectU(str1))
 	{
@@ -945,7 +945,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInU(U* str1)
 	ChangeU(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutU(U* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefOutU(U* str1)
 {
 	ChangeU(str1);
 
@@ -953,7 +953,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutU(U* str1)
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValByteStructPack2Explicit(ByteStructPack2Explicit str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByValByteStructPack2Explicit(ByteStructPack2Explicit str1)
 {
 	if(!IsCorrectByteStructPack2Explicit(&str1))
 	{
@@ -964,7 +964,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValByteStructPack2
 	ChangeByteStructPack2Explicit(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefByteStructPack2Explicit(ByteStructPack2Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefByteStructPack2Explicit(ByteStructPack2Explicit* str1)
 {
 	if(!IsCorrectByteStructPack2Explicit(str1))
 	{
@@ -976,7 +976,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefByteStructPack2
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInByteStructPack2Explicit(ByteStructPack2Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefInByteStructPack2Explicit(ByteStructPack2Explicit* str1)
 {
 	if(!IsCorrectByteStructPack2Explicit(str1))
 	{
@@ -987,7 +987,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInByteStructPac
 	ChangeByteStructPack2Explicit(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutByteStructPack2Explicit(ByteStructPack2Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefOutByteStructPack2Explicit(ByteStructPack2Explicit* str1)
 {
 	ChangeByteStructPack2Explicit(str1);
 
@@ -995,7 +995,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutByteStructPa
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValShortStructPack4Explicit(ShortStructPack4Explicit str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByValShortStructPack4Explicit(ShortStructPack4Explicit str1)
 {
 	if(!IsCorrectShortStructPack4Explicit(&str1))
 	{
@@ -1006,7 +1006,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValShortStructPack
 	ChangeShortStructPack4Explicit(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefShortStructPack4Explicit(ShortStructPack4Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefShortStructPack4Explicit(ShortStructPack4Explicit* str1)
 {
 	if(!IsCorrectShortStructPack4Explicit(str1))
 	{
@@ -1018,7 +1018,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefShortStructPack
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInShortStructPack4Explicit(ShortStructPack4Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefInShortStructPack4Explicit(ShortStructPack4Explicit* str1)
 {
 	if(!IsCorrectShortStructPack4Explicit(str1))
 	{
@@ -1029,7 +1029,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInShortStructPa
 	ChangeShortStructPack4Explicit(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutShortStructPack4Explicit(ShortStructPack4Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefOutShortStructPack4Explicit(ShortStructPack4Explicit* str1)
 {
 	ChangeShortStructPack4Explicit(str1);
 
@@ -1037,7 +1037,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutShortStructP
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValIntStructPack8Explicit(IntStructPack8Explicit str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByValIntStructPack8Explicit(IntStructPack8Explicit str1)
 {
 	if(!IsCorrectIntStructPack8Explicit(&str1))
 	{
@@ -1048,7 +1048,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValIntStructPack8E
 	ChangeIntStructPack8Explicit(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefIntStructPack8Explicit(IntStructPack8Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefIntStructPack8Explicit(IntStructPack8Explicit* str1)
 {
 	if(!IsCorrectIntStructPack8Explicit(str1))
 	{
@@ -1060,7 +1060,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefIntStructPack8E
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInIntStructPack8Explicit(IntStructPack8Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefInIntStructPack8Explicit(IntStructPack8Explicit* str1)
 {
 	if(!IsCorrectIntStructPack8Explicit(str1))
 	{
@@ -1071,7 +1071,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInIntStructPack
 	ChangeIntStructPack8Explicit(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutIntStructPack8Explicit(IntStructPack8Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefOutIntStructPack8Explicit(IntStructPack8Explicit* str1)
 {
 	ChangeIntStructPack8Explicit(str1);
 
@@ -1079,7 +1079,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutIntStructPac
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValLongStructPack16Explicit(LongStructPack16Explicit str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByValLongStructPack16Explicit(LongStructPack16Explicit str1)
 {
 	if(!IsCorrectLongStructPack16Explicit(&str1))
 	{
@@ -1090,7 +1090,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByValLongStructPack1
 	ChangeLongStructPack16Explicit(&str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefLongStructPack16Explicit(LongStructPack16Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefLongStructPack16Explicit(LongStructPack16Explicit* str1)
 {
 	if(!IsCorrectLongStructPack16Explicit(str1))
 	{
@@ -1102,7 +1102,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefLongStructPack1
 	return TRUE;
 }
 
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInLongStructPack16Explicit(LongStructPack16Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefInLongStructPack16Explicit(LongStructPack16Explicit* str1)
 {
 	if(!IsCorrectLongStructPack16Explicit(str1))
 	{
@@ -1113,7 +1113,7 @@ extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefInLongStructPac
 	ChangeLongStructPack16Explicit(str1);
 	return TRUE;
 }
-extern "C" DLL_EXPORT BOOL WINAPI MarshalStructAsParam_AsExpByRefOutLongStructPack16Explicit(LongStructPack16Explicit* str1)
+extern "C" DLL_EXPORT BOOL NATIVEAPI MarshalStructAsParam_AsExpByRefOutLongStructPack16Explicit(LongStructPack16Explicit* str1)
 {
 	ChangeLongStructPack16Explicit(str1);
 
diff --git a/tests/src/Interop/common/xplatform.h b/tests/src/Interop/common/xplatform.h
index c84ac9b1de..36c4e56f02 100644
--- a/tests/src/Interop/common/xplatform.h
+++ b/tests/src/Interop/common/xplatform.h
@@ -53,9 +53,14 @@
 
 #endif //_WIN32
 
-#ifndef WINAPI
-#define WINAPI __stdcall
-#endif
+// The default P/Invoke calling convetion is STDCALL on Window, but CDECL on Unix.
+#ifdef _WIN32
+#define CALLBACK    __stdcall
+#define NATIVEAPI   __stdcall
+#else // _WIN32
+#define CALLBACK
+#define NATIVEAPI
+#endif // !_WIN32
 
 #ifndef _MSC_VER
 #if __i386__
diff --git a/tests/src/JIT/BBT/Scenario4/Not-Int32.ilproj b/tests/src/JIT/BBT/Scenario4/Not-Int32.ilproj
index 0276a57d15..536677358b 100644
--- a/tests/src/JIT/BBT/Scenario4/Not-Int32.ilproj
+++ b/tests/src/JIT/BBT/Scenario4/Not-Int32.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/JIT/CheckProjects/CheckProjects.cs b/tests/src/JIT/CheckProjects/CheckProjects.cs
new file mode 100644
index 0000000000..dc44d2e634
--- /dev/null
+++ b/tests/src/JIT/CheckProjects/CheckProjects.cs
@@ -0,0 +1,437 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.IO;
+using System.Xml.Serialization;
+using System.Text;
+using System.Xml.Linq;
+
+// Verify that jit test project files specify DebugType properly.
+// Returns error status (-1) if any project files are in error.
+
+internal class ScanProjectFiles
+{
+    private static bool s_showNeedsFixOnly = true;
+    private static bool s_tryAndFix = true;
+    private static int s_projCount = 0;
+    private static int s_needsFixCount = 0;
+    private static int s_deferredFixCount = 0;
+    private static int s_fixedCount = 0;
+
+    private static int Main(string[] args)
+    {
+        // If invoked w/o args, locate jit test project dir from
+        // CORE_ROOT, and scan only.
+        //
+        // If invoked w args, locate and try to fix project files.
+        string projectRoot = null;
+
+        if (args.Length == 0)
+        {
+            s_tryAndFix = false;
+
+            // CORE_ROOT should be something like
+            //  c:\repos\coreclr\bin\tests\Windows_NT.x64.Checked\Tests\Core_Root
+            // or
+            //  D:\j\workspace\x64_release_w---0575cb46\bin\tests\Windows_NT.x64.Release\Tests\Core_Root
+            // We want
+            //  c:\repos\coreclr\tests\src\JIT
+            string coreRoot = System.Environment.GetEnvironmentVariable("CORE_ROOT");
+
+            if (coreRoot == null)
+            {
+                Console.WriteLine("CORE_ROOT must be set");
+                return -1;
+            }
+
+            int binIndex = coreRoot.IndexOf("bin");
+
+            if (binIndex < 0)
+            {
+                Console.WriteLine("CORE_ROOT must be set to full path to repo test dir; was '{0}'.",
+                    coreRoot);
+                return -1;
+            }
+
+            string repoRoot = coreRoot.Substring(0, binIndex);
+
+            projectRoot = Path.Combine(repoRoot, "tests", "src", "JIT");
+        }
+        else if (args.Length != 1)
+        {
+            Console.WriteLine("Usage: CheckProjects [<dir>]");
+            Console.WriteLine("If optional <dir> is specified,"
+                + " all project files under <dir> will be scanned and updates will be attempted.");
+            return -1;
+        }
+        else
+        {
+            projectRoot = args[0];
+        }
+
+        Console.WriteLine("Scanning{0}projects under {1}",
+            s_tryAndFix ? " and attempting to update " : " ", projectRoot);
+
+        if (!Directory.Exists(projectRoot))
+        {
+            Console.WriteLine("Project directory does not exist");
+            return -1;
+        }
+
+        DirectoryInfo projectRootDir = new DirectoryInfo(projectRoot);
+
+        foreach (FileInfo f in projectRootDir.GetFiles("*.*proj", SearchOption.AllDirectories))
+        {
+            ParseAndUpdateProj(f.FullName, s_tryAndFix);
+        }
+
+        Console.WriteLine("{0} projects, {1} needed fixes, {2} fixes deferred, {3} were fixed",
+            s_projCount, s_needsFixCount, s_deferredFixCount, s_fixedCount);
+
+        // Return error status if there are unfixed projects
+        return (s_needsFixCount == 0 ? 100 : -1);
+    }
+
+    // Load up a project file and look for key attributes.
+    // Optionally try and update. Return true if modified.
+    private static bool ParseAndUpdateProj(string projFile, bool tryUpdate)
+    {
+        s_projCount++;
+        // Guess at expected settings by looking for suffixes...
+        string projFileBase = Path.GetFileNameWithoutExtension(projFile);
+
+        bool isDebugTypeTest = projFileBase.EndsWith("_d") || projFileBase.EndsWith("_do") || projFileBase.EndsWith("_dbg");
+        bool isRelTypeTest = projFileBase.EndsWith("_r") || projFileBase.EndsWith("_ro") || projFileBase.EndsWith("_rel");
+        bool isNotOptTypeTest = projFileBase.EndsWith("_r") || projFileBase.EndsWith("_d");
+        bool isOptTypeTest = projFileBase.EndsWith("_ro") || projFileBase.EndsWith("_do") || projFileBase.EndsWith("_opt");
+        bool isSpecificTest = isDebugTypeTest || isRelTypeTest;
+        bool updated = false;
+
+        try
+        {
+            XElement root = XElement.Load(projFile);
+            string nn = "{" + root.Name.NamespaceName + "}";
+            IEnumerable<XElement> props = from el in root.Descendants(nn + "PropertyGroup") select el;
+            bool hasReleaseCondition = false;
+            bool hasDebugCondition = false;
+            string oddness = null;
+            string debugVal = null;
+            bool needsFix = false;
+            XElement bestPropertyGroupNode = null;
+            XElement lastPropertyGroupNode = null;
+            List<XElement> debugTypePropertyGroupNodes = new List<XElement>();
+            foreach (XElement prop in props)
+            {
+                lastPropertyGroupNode = prop;
+                XAttribute condition = prop.Attribute("Condition");
+                bool isReleaseCondition = false;
+                bool isDebugCondition = false;
+                if (condition != null)
+                {
+                    isReleaseCondition = condition.Value.Contains("Release");
+                    isDebugCondition = condition.Value.Contains("Debug");
+
+                    if (isReleaseCondition || isDebugCondition)
+                    {
+                        bestPropertyGroupNode = prop;
+                    }
+                }
+
+                XElement debugType = prop.Element(nn + "DebugType");
+
+                if (debugType != null)
+                {
+                    debugTypePropertyGroupNodes.Add(prop);
+
+                    // If <DebugType> appears multiple times, all should agree.
+                    string newDebugVal = debugType.Value;
+                    if (newDebugVal.Equals(""))
+                    {
+                        newDebugVal = "blank";
+                    }
+
+                    if (debugVal != null)
+                    {
+                        if (!debugType.Value.Equals(newDebugVal))
+                        {
+                            oddness = "ConflictingDebugType";
+                        }
+                    }
+
+                    debugVal = newDebugVal;
+
+                    if (condition != null)
+                    {
+                        if (isReleaseCondition == isDebugCondition)
+                        {
+                            oddness = "RelDebugDisagree";
+                        }
+
+                        hasReleaseCondition |= isReleaseCondition;
+                        hasDebugCondition |= isDebugCondition;
+                    }
+                    else
+                    {
+                        if (hasReleaseCondition || hasDebugCondition)
+                        {
+                            oddness = "CondAndUncond";
+                        }
+                    }
+                }
+            }
+
+            if (oddness == null)
+            {
+                if (hasReleaseCondition && !hasDebugCondition)
+                {
+                    oddness = "RelButNotDbg";
+                }
+                else if (!hasReleaseCondition && hasDebugCondition)
+                {
+                    oddness = "DbgButNotRel";
+                }
+            }
+
+            bool hasDebugType = debugTypePropertyGroupNodes.Count > 0;
+
+            // Analyze suffix convention mismatches
+            string suffixNote = "SuffixNone";
+
+            if (isSpecificTest)
+            {
+                if (!hasDebugType || oddness != null || hasReleaseCondition || hasDebugCondition)
+                {
+                    suffixNote = "SuffixProblem";
+                    needsFix = true;
+                }
+                else
+                {
+                    if (isRelTypeTest)
+                    {
+                        if (debugVal.Equals("pdbonly", StringComparison.OrdinalIgnoreCase)
+                            || debugVal.Equals("none", StringComparison.OrdinalIgnoreCase)
+                            || debugVal.Equals("blank", StringComparison.OrdinalIgnoreCase))
+                        {
+                            suffixNote = "SuffixRelOk";
+                        }
+                        else
+                        {
+                            suffixNote = "SuffixRelTestNot";
+                            needsFix = true;
+                        }
+                    }
+                    else if (isDebugTypeTest)
+                    {
+                        if (debugVal.Equals("full", StringComparison.OrdinalIgnoreCase))
+                        {
+                            suffixNote = "SuffixDbgOk";
+                        }
+                        else
+                        {
+                            suffixNote = "SuffixDbgTestNot";
+                            needsFix = true;
+                        }
+                    }
+                }
+            }
+
+            if (!hasDebugType)
+            {
+                needsFix = true;
+            }
+
+            if (oddness != null)
+            {
+                needsFix = true;
+            }
+
+            // If there is no debug type at all, we generally want to
+            // turn this into a release/optimize test. However for the
+            // CodeGenBringUpTests we want to introduce the full spectrum
+            // of flavors. We'll skip them for now.
+            bool isBringUp = projFile.Contains("CodeGenBringUpTests");
+
+            if (needsFix)
+            {
+                if (!isBringUp)
+                {
+                    s_needsFixCount++;
+                }
+                else
+                {
+                    s_deferredFixCount++;
+                }
+            }
+
+            if (needsFix || !s_showNeedsFixOnly)
+            {
+                if (!hasDebugType)
+                {
+                    Console.WriteLine("{0} DebugType-n/a-{1}", projFile, suffixNote);
+                }
+                else if (oddness != null)
+                {
+                    Console.WriteLine("{0} DebugType-Odd-{1}-{2}", projFile, oddness, suffixNote);
+                }
+                else if (hasReleaseCondition || hasDebugCondition)
+                {
+                    Console.WriteLine("{0} DebugType-{1}-Conditional-{2}", projFile, debugVal, suffixNote);
+                }
+                else
+                {
+                    Console.WriteLine("{0} DebugType-{1}-Unconditional-{2}", projFile, debugVal, suffixNote);
+                }
+            }
+
+            // If a fix is needed, give it a shot!
+            if (!needsFix || !tryUpdate)
+            {
+                return false;
+            }
+
+            // Add new elements just after the conditional rel/debug
+            // property group entries, if possible.
+            if (bestPropertyGroupNode == null)
+            {
+                bestPropertyGroupNode = lastPropertyGroupNode;
+            }
+
+            if (bestPropertyGroupNode == null)
+            {
+                Console.WriteLine(".... no prop group, can't fix");
+                return false;
+            }
+
+            if (isBringUp)
+            {
+                Console.WriteLine("Bring up test, deferring fix");
+                return false;
+            }
+
+            if (debugTypePropertyGroupNodes.Count == 0)
+            {
+                // Fix projects that don't mention debug type at all.
+                Console.WriteLine(".... no DebugType, attempting fix ....");
+
+                XElement newPropGroup = new XElement(nn + "PropertyGroup",
+                    new XElement(nn + "DebugType", isDebugTypeTest ? "Full" : "PdbOnly"),
+                    new XElement(nn + "Optimize", isNotOptTypeTest ? "False" : "True"));
+
+                bestPropertyGroupNode.AddAfterSelf(newPropGroup);
+
+                // Write out updated project file
+                using (StreamWriter outFile = File.CreateText(projFile))
+                {
+                    root.Save(outFile);
+                    updated = true;
+                    s_fixedCount++;
+                }
+            }
+            else if (debugTypePropertyGroupNodes.Count == 1)
+            {
+                // Fix projects with just one mention of debug type.
+                Console.WriteLine(".... one DebugType, attempting fix ....");
+
+                XElement prop = debugTypePropertyGroupNodes.First();
+                XAttribute condition = prop.Attribute("Condition");
+
+                // If there is no condition then this is likely a suffix mismatch
+                if ((condition == null) && suffixNote.Equals("SuffixDbgTestNot"))
+                {
+                    Console.WriteLine("Unconditional debug test w/ suffix issue");
+
+                    // Do case analysis of suffix and debugType/Opt, then update.
+                    XElement debugType = prop.Element(nn + "DebugType");
+                    XElement optimize = prop.Element(nn + "Optimize");
+
+                    // We know DebugType is set, but Optimize may not be.
+                    if (optimize == null)
+                    {
+                        optimize = new XElement(nn + "Optimize");
+                        prop.Add(optimize);
+                    }
+
+                    bool modified = false;
+
+                    if (isDebugTypeTest && !isOptTypeTest)
+                    {
+                        // "d" suffix --
+                        debugType.Value = "full";
+                        optimize.Value = "False";
+                        modified = true;
+                    }
+                    else if (isDebugTypeTest && isOptTypeTest)
+                    {
+                        // "do" suffix --
+                        debugType.Value = "full";
+                        optimize.Value = "True";
+                        modified = true;
+                    }
+
+                    if (modified)
+                    {
+                        // Write out updated project file
+                        using (StreamWriter outFile = File.CreateText(projFile))
+                        {
+                            root.Save(outFile);
+                            updated = true;
+                            s_fixedCount++;
+                        }
+                    }
+                }
+                else
+                {
+                    XElement newPropGroup = new XElement(prop);
+                    newPropGroup.RemoveAttributes();
+                    prop.RemoveNodes();
+                    bestPropertyGroupNode.AddAfterSelf(newPropGroup);
+
+                    // Write out updated project file
+                    using (StreamWriter outFile = File.CreateText(projFile))
+                    {
+                        root.Save(outFile);
+                        updated = true;
+                        s_fixedCount++;
+                    }
+                }
+            }
+            else
+            {
+                // Multiple property groups specifying DebugType. Remove any that are conditional.
+                Console.WriteLine(".... multiple DebugTypes, attempting fix ....");
+                bool modified = false;
+                foreach (XElement prop in debugTypePropertyGroupNodes)
+                {
+                    XAttribute condition = prop.Attribute("Condition");
+
+                    if (condition != null)
+                    {
+                        prop.RemoveNodes();
+                        modified = true;
+                    }
+                }
+
+                if (modified)
+                {
+                    // Write out updated project file
+                    using (StreamWriter outFile = File.CreateText(projFile))
+                    {
+                        root.Save(outFile);
+                        updated = true;
+                        s_fixedCount++;
+                    }
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine("{0} DebugType-fail {1}", projFile, e.Message);
+        }
+
+        return updated;
+    }
+}
diff --git a/tests/src/JIT/CheckProjects/CheckProjects.csproj b/tests/src/JIT/CheckProjects/CheckProjects.csproj
new file mode 100644
index 0000000000..3bc83992bb
--- /dev/null
+++ b/tests/src/JIT/CheckProjects/CheckProjects.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CheckProjects.cs" />
+  </ItemGroup>
+  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/Add1.csproj b/tests/src/JIT/CodeGenBringUpTests/Add1.csproj
index 480d1507eb..45e82a08dc 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Add1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Add1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -31,10 +27,6 @@
   <ItemGroup>
     <Compile Include="Add1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/And1.csproj b/tests/src/JIT/CodeGenBringUpTests/And1.csproj
index a7c9fe6992..a1b56208af 100644
--- a/tests/src/JIT/CodeGenBringUpTests/And1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/And1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EC2FB8A8-7EE7-4E70-875B-E4FAC488B4DF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="And1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/AndRef.csproj b/tests/src/JIT/CodeGenBringUpTests/AndRef.csproj
index 6234219b06..0508d1d0dd 100644
--- a/tests/src/JIT/CodeGenBringUpTests/AndRef.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/AndRef.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{48FBF3A6-B6AF-4FEF-84D1-1706206A94F1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="AndRef.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Args4.csproj b/tests/src/JIT/CodeGenBringUpTests/Args4.csproj
index 3c6f2e688b..bae295954b 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Args4.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Args4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F26CBB40-4DFB-42C0-BEBB-26F5BC7B36B5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Args4.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Args5.csproj b/tests/src/JIT/CodeGenBringUpTests/Args5.csproj
index 50b09e7fc3..7b155ffdf8 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Args5.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Args5.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{30993D25-1F0D-4CF4-98C0-5F6470B87382}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Args5.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Array1.cs b/tests/src/JIT/CodeGenBringUpTests/Array1.cs
new file mode 100644
index 0000000000..0281615186
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/Array1.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static void Array1(int[] a)
+    {
+        a[1] = 5;
+    }
+
+    static int Main()
+    {
+        int[] a = {1, 2, 3, 4};
+        Array1(a);
+
+        if (a[1] != 5) return Fail;
+        return Pass;
+    }
+}
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/Array1.csproj b/tests/src/JIT/CodeGenBringUpTests/Array1.csproj
new file mode 100644
index 0000000000..ad3bd77927
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/Array1.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{7E3680E3-36FC-4B6B-841A-80B8D0C4394C}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <IlasmRoundTrip>true</IlasmRoundTrip>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Array1.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/Array2.cs b/tests/src/JIT/CodeGenBringUpTests/Array2.cs
new file mode 100644
index 0000000000..e73b2712db
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/Array2.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int Array2(int[] a)
+    {
+        return a[1];
+    }
+
+    static int Main()
+    {
+        int[] a = {1, 2, 3, 4};
+        if (Array2(a) != 2) return Fail;
+        return Pass;
+    }
+}
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/Array2.csproj b/tests/src/JIT/CodeGenBringUpTests/Array2.csproj
new file mode 100644
index 0000000000..99fc6a333f
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/Array2.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4689170F-4BC1-4592-9753-CD4209D950D7}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <IlasmRoundTrip>true</IlasmRoundTrip>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Array2.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/Array3.cs b/tests/src/JIT/CodeGenBringUpTests/Array3.cs
new file mode 100644
index 0000000000..a6bab21d57
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/Array3.cs
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int Array3()
+    {
+        int[] a = {1, 2, 3, 4};
+        a[1] = 5;
+        return a[1];
+    }
+
+    static int Main()
+    {
+        if (Array3() != 5) return Fail;
+        return Pass;
+    }
+}
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/Array3.csproj b/tests/src/JIT/CodeGenBringUpTests/Array3.csproj
new file mode 100644
index 0000000000..df5457fa44
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/Array3.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B4FE2E03-298E-41B8-A32C-8FD0F1BF7E8C}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <IlasmRoundTrip>true</IlasmRoundTrip>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Array3.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/Array4.cs b/tests/src/JIT/CodeGenBringUpTests/Array4.cs
new file mode 100644
index 0000000000..938ab97ae2
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/Array4.cs
@@ -0,0 +1,25 @@
+    // Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int Array4(int i) {
+        int[] a = {1, 2, 3, 4};
+        return a[i];
+    }
+
+    static int Main()
+    {
+        if (Array4(1) != 2) return Fail;
+        return Pass;
+    }
+}
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/Array4.csproj b/tests/src/JIT/CodeGenBringUpTests/Array4.csproj
new file mode 100644
index 0000000000..f7843f79c1
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/Array4.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{11F01248-05A0-4FA0-9345-75273E7276C9}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <IlasmRoundTrip>true</IlasmRoundTrip>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Array4.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/ArrayExc.cs b/tests/src/JIT/CodeGenBringUpTests/ArrayExc.cs
new file mode 100644
index 0000000000..7822467113
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/ArrayExc.cs
@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int ArrayExc()
+    {
+        int[] a = {1, 2, 3, 4};
+        return a[5];
+    }
+
+    static int Main()
+    {
+        try
+        {
+            ArrayExc();
+            return Fail;
+        }
+        catch (System.IndexOutOfRangeException)
+        {
+            // OK
+        }
+        return Pass;
+    }
+}
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/ArrayExc.csproj b/tests/src/JIT/CodeGenBringUpTests/ArrayExc.csproj
new file mode 100644
index 0000000000..a0c1210d9e
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/ArrayExc.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DBC775DF-5D8A-42A5-87A5-CC51AAAABE3C}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <IlasmRoundTrip>true</IlasmRoundTrip>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ArrayExc.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/ArrayJagged.cs b/tests/src/JIT/CodeGenBringUpTests/ArrayJagged.cs
new file mode 100644
index 0000000000..1f0ec014aa
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/ArrayJagged.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int ArrayJagged(int i)
+    {
+        int[][] a = new int[2][];
+        a[0] = new int[2] {0, 1};
+        a[1] = new int[2] {2, 3};
+        return a[1][i];
+    }
+
+    static int Main()
+    {
+        if (ArrayJagged(1) != 3) return Fail;
+        return Pass;
+    }
+}
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/ArrayJagged.csproj b/tests/src/JIT/CodeGenBringUpTests/ArrayJagged.csproj
new file mode 100644
index 0000000000..aa2117af05
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/ArrayJagged.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0E6C1DC4-EFF7-45CC-8A27-37BA07AC30EE}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <IlasmRoundTrip>true</IlasmRoundTrip>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ArrayJagged.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/ArrayMD1.cs b/tests/src/JIT/CodeGenBringUpTests/ArrayMD1.cs
new file mode 100644
index 0000000000..642cd98ca6
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/ArrayMD1.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int ArrayMD1()
+    {
+        int[,] a = {{1, 2}, {3, 4}};
+        return a[0, 1];
+    }
+
+    static int Main()
+    {
+        if (ArrayMD1() != 2) return Fail;
+        return Pass;
+    }
+}
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/ArrayMD1.csproj b/tests/src/JIT/CodeGenBringUpTests/ArrayMD1.csproj
new file mode 100644
index 0000000000..0794281244
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/ArrayMD1.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{30A8AD2E-3B3B-4813-88E1-9EF2E75BB685}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <IlasmRoundTrip>true</IlasmRoundTrip>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ArrayMD1.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/ArrayMD2.cs b/tests/src/JIT/CodeGenBringUpTests/ArrayMD2.cs
new file mode 100644
index 0000000000..dba9dcc3d4
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/ArrayMD2.cs
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int ArrayMD2(int x, int y)
+    {
+        int[,] a = new int[2, 3];
+        a[x, y] = 42;
+        return a[x, y];
+    }
+
+    static int Main()
+    {
+        if (ArrayMD2(1, 1) != 42) return Fail;
+        return Pass;
+    }
+}
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/ArrayMD2.csproj b/tests/src/JIT/CodeGenBringUpTests/ArrayMD2.csproj
new file mode 100644
index 0000000000..9d227723e4
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/ArrayMD2.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C46B2CCD-C66B-40C8-A031-67FED61AFEDB}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <IlasmRoundTrip>true</IlasmRoundTrip>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ArrayMD2.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/ArrayObj.cs b/tests/src/JIT/CodeGenBringUpTests/ArrayObj.cs
new file mode 100644
index 0000000000..75426b6fc6
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/ArrayObj.cs
@@ -0,0 +1,36 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    class Dummy
+    {
+        public int field;
+        public Dummy(int f)
+        {
+            field = f;
+        }
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int ArrayObj(int i)
+    {
+        Dummy[] a = {new Dummy(0), new Dummy(1), new Dummy(2), new Dummy(3), new Dummy(4),
+                     new Dummy(5), new Dummy(6), new Dummy(7), new Dummy(8), new Dummy(9)};
+        return a[i].field;
+    }
+
+    static int Main()
+    {
+        if (ArrayObj(1) != 1) return Fail;
+        return Pass;
+    }
+}
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/ArrayObj.csproj b/tests/src/JIT/CodeGenBringUpTests/ArrayObj.csproj
new file mode 100644
index 0000000000..a4fc3f49a2
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/ArrayObj.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{AA342BCA-74DE-41AC-88E9-5608E2DCFFAB}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <IlasmRoundTrip>true</IlasmRoundTrip>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ArrayObj.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/AsgAdd1.csproj b/tests/src/JIT/CodeGenBringUpTests/AsgAdd1.csproj
index 41ef18cb4c..e2c8b143d8 100644
--- a/tests/src/JIT/CodeGenBringUpTests/AsgAdd1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/AsgAdd1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2DBCC16D-CB12-43D1-A4B8-9E82BE1DB891}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="AsgAdd1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/AsgAnd1.csproj b/tests/src/JIT/CodeGenBringUpTests/AsgAnd1.csproj
index d3e1aee077..315583c4f6 100644
--- a/tests/src/JIT/CodeGenBringUpTests/AsgAnd1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/AsgAnd1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{18FD8738-0685-482B-9D97-CEB598AAAC5A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="AsgAnd1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/AsgOr1.csproj b/tests/src/JIT/CodeGenBringUpTests/AsgOr1.csproj
index 89c8dc1958..2cfc54c89e 100644
--- a/tests/src/JIT/CodeGenBringUpTests/AsgOr1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/AsgOr1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DD8C7C31-7DB5-4933-97B0-06D168BC0AAC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="AsgOr1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/AsgSub1.csproj b/tests/src/JIT/CodeGenBringUpTests/AsgSub1.csproj
index cc575471d1..53057676af 100644
--- a/tests/src/JIT/CodeGenBringUpTests/AsgSub1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/AsgSub1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DF621757-F7D5-463A-A05A-83E95C1C6A43}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="AsgSub1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/AsgXor1.csproj b/tests/src/JIT/CodeGenBringUpTests/AsgXor1.csproj
index 47b8114908..8def2dc6c9 100644
--- a/tests/src/JIT/CodeGenBringUpTests/AsgXor1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/AsgXor1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6E410935-3438-46EC-A9EC-7065F924EFF9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="AsgXor1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/BinaryRMW.csproj b/tests/src/JIT/CodeGenBringUpTests/BinaryRMW.csproj
index 8a15f39558..b558f926eb 100644
--- a/tests/src/JIT/CodeGenBringUpTests/BinaryRMW.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/BinaryRMW.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{33381DC7-E1DD-4BD8-AD2A-E7A80FF04E69}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="BinaryRMW.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Call1.csproj b/tests/src/JIT/CodeGenBringUpTests/Call1.csproj
index 8b51978df3..5c6879a500 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Call1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Call1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{00D2D1B1-A33B-4829-AD48-50A92EA5DEBD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Call1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/CnsBool.csproj b/tests/src/JIT/CodeGenBringUpTests/CnsBool.csproj
index 1b63fbe9d2..afad4cf1bb 100644
--- a/tests/src/JIT/CodeGenBringUpTests/CnsBool.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/CnsBool.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2AE191D9-FD91-4142-81CE-18D80591912F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="CnsBool.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/CnsLng1.csproj b/tests/src/JIT/CodeGenBringUpTests/CnsLng1.csproj
index 19d6a4ec11..3911dfc0b2 100644
--- a/tests/src/JIT/CodeGenBringUpTests/CnsLng1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/CnsLng1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1B74852B-B366-4360-9A7D-EDD6B9B57E9F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="CnsLng1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblAdd.csproj b/tests/src/JIT/CodeGenBringUpTests/DblAdd.csproj
index 69f670ebd8..0b8aeefd47 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblAdd.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblAdd.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{49521A1C-DBFB-43B1-8DA5-7DC4F8C4014D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblAdd.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblAddConst.csproj b/tests/src/JIT/CodeGenBringUpTests/DblAddConst.csproj
index bbcc11fafc..0d061442bc 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblAddConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblAddConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3E4DB71E-E26A-4341-95D8-E4E3809FCE51}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblAddConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblArea.csproj b/tests/src/JIT/CodeGenBringUpTests/DblArea.csproj
index db5eac4744..8ef5f1f7c7 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblArea.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblArea.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B5AE199C-B9D1-40C3-97B7-C6BC0442EC58}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblArea.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblArray.csproj b/tests/src/JIT/CodeGenBringUpTests/DblArray.csproj
index d9acbe2a65..60db1a024a 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblArray.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblArray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{807D6049-D7FA-4853-AEF9-CD0F35EBAC04}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblArray.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblAvg2.csproj b/tests/src/JIT/CodeGenBringUpTests/DblAvg2.csproj
index 1c53f5af57..4c638eb3e2 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblAvg2.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblAvg2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D02780E7-82B2-4635-9801-3E1AC43CF81E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblAvg2.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblAvg6.csproj b/tests/src/JIT/CodeGenBringUpTests/DblAvg6.csproj
index af98342e94..53c19ab961 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblAvg6.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblAvg6.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{53D84277-AB6B-4A8D-AF43-1E74CF0C9F9E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblAvg6.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblCall1.csproj b/tests/src/JIT/CodeGenBringUpTests/DblCall1.csproj
index a16b1028db..5093f78a6a 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblCall1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblCall1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0594F687-7354-477F-B288-8C641A4504D9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblCall1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblCall2.csproj b/tests/src/JIT/CodeGenBringUpTests/DblCall2.csproj
index 43ea6bd79f..a3cb58ea97 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblCall2.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblCall2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AE134EB2-06E1-4561-8148-7347F0D012B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblCall2.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblDist.csproj b/tests/src/JIT/CodeGenBringUpTests/DblDist.csproj
index 6c5216df82..b1fbb6dbf4 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblDist.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblDist.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5C28FFAA-5D37-4C77-82B2-EFB0898FDDA5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblDist.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblDiv.csproj b/tests/src/JIT/CodeGenBringUpTests/DblDiv.csproj
index 320f24c4db..5fdc369474 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblDiv.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblDiv.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6495306C-4297-411A-8241-DDD40D48B417}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblDiv.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblDivConst.csproj b/tests/src/JIT/CodeGenBringUpTests/DblDivConst.csproj
index 909c0d498a..36577a211a 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblDivConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblDivConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F73DF77B-3C94-4516-B306-1C2E289E27A7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblDivConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblFillArray.csproj b/tests/src/JIT/CodeGenBringUpTests/DblFillArray.csproj
index 3a1508a6e7..b1845427fb 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblFillArray.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblFillArray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0D34AE89-A07E-4941-BE41-7922EC86AA8B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblFillArray.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblMul.csproj b/tests/src/JIT/CodeGenBringUpTests/DblMul.csproj
index ab2bba9e87..f92c082d06 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblMul.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblMul.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A4839CEC-6C25-4A8E-A4A8-5FB0C9768A9B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblMul.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblMulConst.csproj b/tests/src/JIT/CodeGenBringUpTests/DblMulConst.csproj
index 40dad4af7d..027283c4c3 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblMulConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblMulConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C06A0898-7C4E-4925-91C4-2979C4F85BC2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblMulConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblNeg.csproj b/tests/src/JIT/CodeGenBringUpTests/DblNeg.csproj
index a2391bca87..0f42506dc5 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblNeg.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblNeg.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E865D57F-CCEC-4E7F-9F0F-2E2F0D127036}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblNeg.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblRem.csproj b/tests/src/JIT/CodeGenBringUpTests/DblRem.csproj
index 9efb75f4ab..d83fdb6940 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblRem.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblRem.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4638A427-7835-4808-9F14-29CCBC365B75}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblRem.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblRoots.csproj b/tests/src/JIT/CodeGenBringUpTests/DblRoots.csproj
index 21b1d6c2a8..9b4eb9b0da 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblRoots.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblRoots.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{31ED8057-A96E-42B4-8102-EE3078061981}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblRoots.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblSub.csproj b/tests/src/JIT/CodeGenBringUpTests/DblSub.csproj
index 3ff9aacf40..e8a937e301 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblSub.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblSub.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{067E8F6D-F184-4E15-93A7-A0C7FC200F7F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblSub.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblSubConst.csproj b/tests/src/JIT/CodeGenBringUpTests/DblSubConst.csproj
index 68ec522516..0445b00ec0 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblSubConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblSubConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F5F8FF1D-D925-42D4-B868-FA1BA4462C04}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblSubConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DblVar.csproj b/tests/src/JIT/CodeGenBringUpTests/DblVar.csproj
index 49fca7f95c..05bdcd3401 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DblVar.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DblVar.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5D2FC578-A17E-4B33-8DDA-B8E972D42C41}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DblVar.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/DivConst.csproj b/tests/src/JIT/CodeGenBringUpTests/DivConst.csproj
index db7df567ac..7d692d45bc 100644
--- a/tests/src/JIT/CodeGenBringUpTests/DivConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/DivConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EC6FD253-5247-4D8C-887E-453B5647A0A7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="DivConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Eq1.csproj b/tests/src/JIT/CodeGenBringUpTests/Eq1.csproj
index d594e34ce9..0bde3763b5 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Eq1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Eq1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{601DE23D-7202-4226-8E50-554C33D770B3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Eq1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPAdd.csproj b/tests/src/JIT/CodeGenBringUpTests/FPAdd.csproj
index 80e2e9c550..01e7970081 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPAdd.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPAdd.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E15C9AD4-4D8B-43F2-AAFD-ED827609BB6F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPAdd.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPAddConst.csproj b/tests/src/JIT/CodeGenBringUpTests/FPAddConst.csproj
index a1ac64eba1..09b0f605bb 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPAddConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPAddConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{16E9D09B-7144-4E01-90C8-A3DB37EF6597}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPAddConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPArea.csproj b/tests/src/JIT/CodeGenBringUpTests/FPArea.csproj
index a5c4217565..52a6b38cc1 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPArea.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPArea.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B8479512-8916-4897-9E68-426F4A6D0F01}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPArea.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPArray.csproj b/tests/src/JIT/CodeGenBringUpTests/FPArray.csproj
index 8925472e7f..6066d44e18 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPArray.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPArray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9760C40A-013F-47FB-861C-6BBF2D66ECB9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPArray.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPAvg2.csproj b/tests/src/JIT/CodeGenBringUpTests/FPAvg2.csproj
index 8a43978e3b..bc72df7894 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPAvg2.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPAvg2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DBD3DBBD-FD2A-48DF-B8F6-E80B4B75CCFD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPAvg2.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPAvg6.csproj b/tests/src/JIT/CodeGenBringUpTests/FPAvg6.csproj
index 96a586791a..aa653d3c04 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPAvg6.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPAvg6.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BA4A14E7-0679-4E85-9B24-6452FB89C775}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPAvg6.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPCall1.csproj b/tests/src/JIT/CodeGenBringUpTests/FPCall1.csproj
index 4f7dca0080..88f17cc93b 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPCall1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPCall1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{00123B77-935C-4C54-9F54-A7D78398FD9C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPCall1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPCall2.csproj b/tests/src/JIT/CodeGenBringUpTests/FPCall2.csproj
index bf06a2edfd..744728f6db 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPCall2.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPCall2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{39E0910F-28E2-4192-BCF5-5537C53821F8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPCall2.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPConvDbl2Lng.csproj b/tests/src/JIT/CodeGenBringUpTests/FPConvDbl2Lng.csproj
index 3c884a5343..d2f4670e74 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPConvDbl2Lng.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPConvDbl2Lng.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0DB625F4-2A3D-41EF-B6DC-DA83A931B927}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPConvDbl2Lng.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPConvF2F.csproj b/tests/src/JIT/CodeGenBringUpTests/FPConvF2F.csproj
index 9a972cbece..0161f718b0 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPConvF2F.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPConvF2F.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{85DD13D6-24C0-40F1-AE6C-A37B75326B00}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPConvF2F.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPConvF2I.csproj b/tests/src/JIT/CodeGenBringUpTests/FPConvF2I.csproj
index f0b2dc4953..ac35332aca 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPConvF2I.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPConvF2I.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F62205FB-539C-4A6D-9092-F0DD246272DE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPConvF2I.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPConvF2Lng.csproj b/tests/src/JIT/CodeGenBringUpTests/FPConvF2Lng.csproj
index 75fc1de76d..f304d1c5ac 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPConvF2Lng.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPConvF2Lng.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5108EA79-1A39-4902-ADB1-AE38EEBA5B37}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPConvF2Lng.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPConvI2F.csproj b/tests/src/JIT/CodeGenBringUpTests/FPConvI2F.csproj
index 9e0cdd8897..581b22c9b0 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPConvI2F.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPConvI2F.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5E0A08A8-D02D-4036-8A2E-41BDFF64CB55}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPConvI2F.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPDist.csproj b/tests/src/JIT/CodeGenBringUpTests/FPDist.csproj
index 0de60882a9..a25551e551 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPDist.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPDist.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5976F27D-32E2-451E-9F8F-3C1C5E7F156F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPDist.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPDiv.csproj b/tests/src/JIT/CodeGenBringUpTests/FPDiv.csproj
index f4b61f4645..1f74506e4d 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPDiv.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPDiv.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{23AF0DA5-1A8B-4D1F-91DB-E18684070F7D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPDiv.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPDivConst.csproj b/tests/src/JIT/CodeGenBringUpTests/FPDivConst.csproj
index 14a860f174..6191f12e81 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPDivConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPDivConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1DA6A5C9-51BB-44D3-84BF-873C6C092C81}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPDivConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPError.csproj b/tests/src/JIT/CodeGenBringUpTests/FPError.csproj
index bc16b570db..4088d5641f 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPError.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPError.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AD783D08-47A8-4E7F-A3B6-7B63249807F1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPError.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPFillArray.csproj b/tests/src/JIT/CodeGenBringUpTests/FPFillArray.csproj
index 3205982b02..05fa94e787 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPFillArray.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPFillArray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DBCD155F-1BD2-4091-BEC7-0A9A15809BDC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPFillArray.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPMath.csproj b/tests/src/JIT/CodeGenBringUpTests/FPMath.csproj
index 35d67a1a6e..39a9c5c6e5 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPMath.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPMath.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2E1104E1-ED87-4A8C-8486-5D6BB480EED4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPMath.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPMul.csproj b/tests/src/JIT/CodeGenBringUpTests/FPMul.csproj
index 4805cde914..d0d088eff8 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPMul.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPMul.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A33856BD-BD42-47BF-A187-0077FF8C2098}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPMul.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPMulConst.csproj b/tests/src/JIT/CodeGenBringUpTests/FPMulConst.csproj
index 3b4a869c26..45151e725b 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPMulConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPMulConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{43EA703F-C5E5-4680-B8FB-B2F46CA52FC6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPMulConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPNeg.csproj b/tests/src/JIT/CodeGenBringUpTests/FPNeg.csproj
index bd9bf2fe19..61dfadbf37 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPNeg.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPNeg.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{458ADB44-4020-4022-9C25-A439D1BCC464}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPNeg.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPRem.csproj b/tests/src/JIT/CodeGenBringUpTests/FPRem.csproj
index 662c016a69..79b1ff3dc0 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPRem.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPRem.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{113FDD73-F8D5-44AF-9FB6-A7802A8C854D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPRem.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPRoots.csproj b/tests/src/JIT/CodeGenBringUpTests/FPRoots.csproj
index b4504d78ae..a95c65d0fb 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPRoots.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPRoots.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F27C3C89-5B9D-465F-AE6B-05F2468B2CEF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPRoots.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPSmall.csproj b/tests/src/JIT/CodeGenBringUpTests/FPSmall.csproj
index 13e6b68ff2..b826377431 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPSmall.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPSmall.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0A27F4DF-A230-4627-873B-1D876608FA22}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPSmall.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPSub.csproj b/tests/src/JIT/CodeGenBringUpTests/FPSub.csproj
index 18b33b8b3f..dd0e5be0d0 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPSub.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPSub.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{702DAA7C-306F-4A97-895B-963B1028D213}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPSub.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPSubConst.csproj b/tests/src/JIT/CodeGenBringUpTests/FPSubConst.csproj
index 505b089d65..74fc592a50 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPSubConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPSubConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C5B2EBAF-D3EA-4721-88F5-FB384F5F7CCE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPSubConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FPVar.csproj b/tests/src/JIT/CodeGenBringUpTests/FPVar.csproj
index 10463a6ac8..9b6e79dae8 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FPVar.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FPVar.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D4BEBCBF-BE59-481E-BD88-ABED5B835EF3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FPVar.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FactorialRec.csproj b/tests/src/JIT/CodeGenBringUpTests/FactorialRec.csproj
index c76107cbcc..8dd417f371 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FactorialRec.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FactorialRec.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{83E74202-B9F5-4D34-9D6E-D973704945DC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FactorialRec.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FibLoop.csproj b/tests/src/JIT/CodeGenBringUpTests/FibLoop.csproj
index b5e204f9db..22f9a23b23 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FibLoop.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FibLoop.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1DEFC2A4-774B-4F2E-B54A-E25B5D8350ED}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FibLoop.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/FiboRec.csproj b/tests/src/JIT/CodeGenBringUpTests/FiboRec.csproj
index 9184e9180f..02261a42c9 100644
--- a/tests/src/JIT/CodeGenBringUpTests/FiboRec.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/FiboRec.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{770811BC-832C-498F-881C-F545A1884BCD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="FiboRec.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Gcd.csproj b/tests/src/JIT/CodeGenBringUpTests/Gcd.csproj
index 0c04d922de..ceb75d97cf 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Gcd.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Gcd.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5CAE1B00-512F-400D-B309-A288BF958E7E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Gcd.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Ge1.csproj b/tests/src/JIT/CodeGenBringUpTests/Ge1.csproj
index ff180e3824..ca5e984b32 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Ge1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Ge1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E424FF93-E659-4516-97CC-AFC137659014}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Ge1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Gt1.csproj b/tests/src/JIT/CodeGenBringUpTests/Gt1.csproj
index 7bf84403a7..2c8e2b52b0 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Gt1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Gt1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9823F80E-FE94-44AC-893F-2313ACF001D4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Gt1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Ind1.csproj b/tests/src/JIT/CodeGenBringUpTests/Ind1.csproj
index ae65600474..4e9a5c9a37 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Ind1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Ind1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{42A00689-632D-4DDC-AFAD-EDD86049802E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Ind1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/InitObj.csproj b/tests/src/JIT/CodeGenBringUpTests/InitObj.csproj
index e408d4986f..93851e0110 100644
--- a/tests/src/JIT/CodeGenBringUpTests/InitObj.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/InitObj.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B6669424-4F8E-4154-BF4D-B74694CF722E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="InitObj.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/InstanceCalls.csproj b/tests/src/JIT/CodeGenBringUpTests/InstanceCalls.csproj
index 49aff4e5ef..36b1b4821a 100644
--- a/tests/src/JIT/CodeGenBringUpTests/InstanceCalls.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/InstanceCalls.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9CF5C43B-8490-4FB3-8F07-663467331AD6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="InstanceCalls.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/IntArraySum.csproj b/tests/src/JIT/CodeGenBringUpTests/IntArraySum.csproj
index 745504f406..e5d86a1da2 100644
--- a/tests/src/JIT/CodeGenBringUpTests/IntArraySum.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/IntArraySum.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6B30834D-CDDE-4A1D-A318-9753ADB594A6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="IntArraySum.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/IntConv.csproj b/tests/src/JIT/CodeGenBringUpTests/IntConv.csproj
index aecc1c9052..cd411a5c19 100644
--- a/tests/src/JIT/CodeGenBringUpTests/IntConv.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/IntConv.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{078DBDAF-A26F-4FEB-90B1-E0A008CD577A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="IntConv.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrue1.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrue1.csproj
index ba1505ccd0..27d1a7b9ea 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrue1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrue1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D17EE755-3FDC-410E-B07E-3E37B5789A7C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrue1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueEqDbl.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueEqDbl.csproj
index 2b5040def3..4b3f6a9c8f 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueEqDbl.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueEqDbl.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{70A42499-9E99-48D7-A74A-F5531CC17251}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueEqDbl.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueEqFP.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueEqFP.csproj
index 55b21f94e2..e48c54d78d 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueEqFP.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueEqFP.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{07AD9B89-51A7-4138-A6F9-37F439AC85CF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueEqFP.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueEqInt1.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueEqInt1.csproj
index b22506d8f6..fd79d7bc1b 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueEqInt1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueEqInt1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4EAE9BB8-3DF7-4384-902B-3412CB887E01}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueEqInt1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueGeDbl.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueGeDbl.csproj
index e449f5401d..08eb851f58 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueGeDbl.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueGeDbl.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5928DD1E-853B-4858-834B-0DFC7C6E26EB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueGeDbl.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueGeFP.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueGeFP.csproj
index 7bb5d57ead..5a0fd1595c 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueGeFP.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueGeFP.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{20D9F28D-DD1D-4777-9CE2-5D5E208EF3E5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueGeFP.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueGeInt1.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueGeInt1.csproj
index 05ae671cc2..38c165c782 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueGeInt1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueGeInt1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1C0ADAC5-E54D-4AC1-8251-1F8D0D26CDA6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueGeInt1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueGtDbl.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueGtDbl.csproj
index 8f8719d5c7..ab09d8337d 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueGtDbl.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueGtDbl.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2EF18A15-DC9E-4D76-91DC-F73D31E03FFB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueGtDbl.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueGtFP.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueGtFP.csproj
index 73e21e5017..db9d655c42 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueGtFP.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueGtFP.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4E456F57-82E0-43FD-B947-DE3C65E8F1C4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueGtFP.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueGtInt1.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueGtInt1.csproj
index eac1960e88..b271b3425f 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueGtInt1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueGtInt1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B4A2FF5F-9801-48CB-A00E-591860F7714E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueGtInt1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueLeDbl.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueLeDbl.csproj
index 1a4486925e..dd8c7f109d 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueLeDbl.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueLeDbl.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3FE7D8DF-9246-49C4-9D6A-BC796006F78C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueLeDbl.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueLeFP.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueLeFP.csproj
index f0fc80d797..e3404abdbc 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueLeFP.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueLeFP.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ACE1DAA5-86B8-4C29-90E4-F8D32E8658A5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueLeFP.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueLeInt1.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueLeInt1.csproj
index f8bd22eb42..c16dca4be6 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueLeInt1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueLeInt1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{87187E04-7D15-494A-BFD5-A07D2BBB4686}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueLeInt1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueLtDbl.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueLtDbl.csproj
index c1698ca51d..d35cddafe5 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueLtDbl.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueLtDbl.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5A6D6A91-B009-46C9-9A18-4866F846241F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueLtDbl.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueLtFP.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueLtFP.csproj
index bf698bc0e0..0185415ef9 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueLtFP.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueLtFP.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D1AC9448-46B7-4B29-9A85-8F0372E5C228}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueLtFP.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueLtInt1.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueLtInt1.csproj
index b177d9b2d5..0e5c5a848b 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueLtInt1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueLtInt1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{564359DF-BE79-42F2-AB6E-8518217527E7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueLtInt1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueNeDbl.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueNeDbl.csproj
index 954beed221..4d16babee6 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueNeDbl.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueNeDbl.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{48C6ABBC-8D33-4FD8-B6A8-A60FEE178245}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueNeDbl.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueNeFP.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueNeFP.csproj
index 94b68080c3..a4943653a0 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueNeFP.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueNeFP.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C7D855D1-A996-4112-A7E9-AD1E4E07B186}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueNeFP.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/JTrueNeInt1.csproj b/tests/src/JIT/CodeGenBringUpTests/JTrueNeInt1.csproj
index 50ae8d39ac..6a7c6b19f4 100644
--- a/tests/src/JIT/CodeGenBringUpTests/JTrueNeInt1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/JTrueNeInt1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{20AE49CC-1ADA-4B14-B7EB-C961B4C0FC16}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="JTrueNeInt1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Jmp1.csproj b/tests/src/JIT/CodeGenBringUpTests/Jmp1.csproj
index 97a8c70d05..a1a1139c1a 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Jmp1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Jmp1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E46BA38F-3EA5-4A56-B0EF-A6F646073C76}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Jmp1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Le1.csproj b/tests/src/JIT/CodeGenBringUpTests/Le1.csproj
index b9fd245f07..b974c23af7 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Le1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Le1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{369A6DB8-B0C9-41E5-84DB-C0CA2FCF92CB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Le1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/LeftShift.csproj b/tests/src/JIT/CodeGenBringUpTests/LeftShift.csproj
index 52416a3409..6f0e2535d2 100644
--- a/tests/src/JIT/CodeGenBringUpTests/LeftShift.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/LeftShift.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C6DC8E85-DCD2-49A0-977D-CE9795552632}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="LeftShift.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/LngConv.csproj b/tests/src/JIT/CodeGenBringUpTests/LngConv.csproj
index 54ed57f619..bba716950a 100644
--- a/tests/src/JIT/CodeGenBringUpTests/LngConv.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/LngConv.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8BA7A4A1-EBB6-44CD-828B-F2BA5523691A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="LngConv.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Localloc.csproj b/tests/src/JIT/CodeGenBringUpTests/Localloc.csproj
index 4ab35377ad..ce0c741210 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Localloc.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Localloc.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{650B07D3-9BC0-4EF8-8557-44200EC13261}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -31,10 +27,6 @@
   <ItemGroup>
     <Compile Include="Localloc.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocB_N.cs b/tests/src/JIT/CodeGenBringUpTests/LocallocB_N.cs
new file mode 100644
index 0000000000..3d01df6aed
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocB_N.cs
@@ -0,0 +1,68 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+
+using System;
+using System.Runtime.CompilerServices;
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    // Reduce all values to byte
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe bool CHECK(byte check, byte expected) {
+        return check == expected;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe int LocallocB_N(int n)
+    {
+        byte* a = stackalloc byte[n];
+
+        for (int i = 0; i < n; i++)
+        {
+            a[i] = (byte) i;
+        }
+
+        for (int i = 0; i < n; i++)
+        {
+            if (!CHECK(a[i], (byte) i)) return i;
+        }
+
+        return -1;
+    }
+
+    public static int Main()
+    {
+        int ret;
+
+        ret = LocallocB_N(1);
+        if (ret != -1) {
+            Console.WriteLine("LocallocB_N - Test 1: Failed on index: " + ret);
+            return Fail;
+        }
+
+        ret = LocallocB_N(5);
+        if (ret != -1) {
+            Console.WriteLine("LocallocB_N - Test 2: Failed on index: " + ret);
+            return Fail;
+        }
+
+        ret = LocallocB_N(117);
+        if (ret != -1) {
+            Console.WriteLine("LocallocB_N - Test 3: Failed on index: " + ret);
+            return Fail;
+        }
+
+        ret = LocallocB_N(5001);
+        if (ret != -1) {
+            Console.WriteLine("LocallocB_N - Test 4: Failed on index: " + ret);
+            return Fail;
+        }
+
+        return Pass;
+    }
+}
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocB_N.csproj b/tests/src/JIT/CodeGenBringUpTests/LocallocB_N.csproj
new file mode 100644
index 0000000000..4b23894e56
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocB_N.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{38302715-A140-493E-AEF4-3E8F9EE99195}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LocallocB_N.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocB_N_PSP.cs b/tests/src/JIT/CodeGenBringUpTests/LocallocB_N_PSP.cs
new file mode 100644
index 0000000000..4dd836ec46
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocB_N_PSP.cs
@@ -0,0 +1,77 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+
+using System;
+using System.Runtime.CompilerServices;
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    // Reduce all values to byte
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe bool CHECK(byte check, byte expected) {
+        return check == expected;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe int LocallocB_N_PSP(int n)
+    {
+        byte* a = stackalloc byte[n];
+        int i;
+        for (i = 0; i < n; i++)
+        {
+            a[i] = (byte) i;
+        }
+
+        i = 0;
+        try
+        {
+            for (; i < n; i++)
+            {
+                if (!CHECK(a[i], (byte) i)) return i;
+            }
+        }
+        catch
+        {
+            Console.WriteLine("ERROR!!!");
+            return i;
+        }
+
+        return -1;
+    }
+
+    public static int Main()
+    {
+        int ret;
+
+        ret = LocallocB_N_PSP(1);
+        if (ret != -1) {
+            Console.WriteLine("LocallocB_N_PSP - Test 1: Failed on index: " + ret);
+            return Fail;
+        }
+
+        ret = LocallocB_N_PSP(5);
+        if (ret != -1) {
+            Console.WriteLine("LocallocB_N_PSP - Test 2: Failed on index: " + ret);
+            return Fail;
+        }
+
+        ret = LocallocB_N_PSP(117);
+        if (ret != -1) {
+            Console.WriteLine("LocallocB_N_PSP - Test 3: Failed on index: " + ret);
+            return Fail;
+        }
+
+        ret = LocallocB_N_PSP(5001);
+        if (ret != -1) {
+            Console.WriteLine("LocallocB_N_PSP - Test 4: Failed on index: " + ret);
+            return Fail;
+        }
+
+        return Pass;
+    }
+}
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocB_N_PSP.csproj b/tests/src/JIT/CodeGenBringUpTests/LocallocB_N_PSP.csproj
new file mode 100644
index 0000000000..079264cf82
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocB_N_PSP.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6222AF08-F765-44C2-B48C-3C040D62303F}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LocallocB_N_PSP.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1.cs b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1.cs
new file mode 100644
index 0000000000..59a0db4075
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+
+using System;
+using System.Runtime.CompilerServices;
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    // Reduce all values to byte
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe bool CHECK(byte check, byte expected) {
+        return check == expected;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe int LocallocCnstB1()
+    {
+        byte* a = stackalloc byte[1];
+        for (int i = 0; i < 1; i++)
+        {
+            a[i] = (byte) i;
+        }
+
+        for (int i = 0; i < 1; i++)
+        {
+            if (!CHECK(a[i], (byte) i)) return i;
+        }
+
+        return -1;
+    }
+
+    public static int Main()
+    {
+        int ret;
+
+        ret = LocallocCnstB1();
+        if (ret != -1) {
+            Console.WriteLine("LocallocCnstB1: Failed on index: " + ret);
+            return Fail;
+        }
+
+        return Pass;
+    }
+}
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1.csproj b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1.csproj
new file mode 100644
index 0000000000..669255ec00
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4240086D-0722-4E93-A6DD-BF779715CE73}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LocallocCnstB1.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117.cs b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117.cs
new file mode 100644
index 0000000000..b399379f62
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+
+using System;
+using System.Runtime.CompilerServices;
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    // Reduce all values to byte
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe bool CHECK(byte check, byte expected) {
+        return check == expected;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe int LocallocCnstB117()
+    {
+        byte* a = stackalloc byte[117];
+        for (int i = 0; i < 117; i++)
+        {
+            a[i] = (byte) i;
+        }
+
+        for (int i = 0; i < 117; i++)
+        {
+            if (!CHECK(a[i], (byte) i)) return i;
+        }
+
+        return -1;
+    }
+
+    public static int Main()
+    {
+        int ret;
+
+        ret = LocallocCnstB117();
+        if (ret != -1) {
+            Console.WriteLine("LocallocCnstB117: Failed on index: " + ret);
+            return Fail;
+        }
+
+        return Pass;
+    }
+}
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117.csproj b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117.csproj
new file mode 100644
index 0000000000..239a2e624f
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5A0F2889-91F1-4670-A4AF-9AF0598E22B7}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LocallocCnstB117.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117_PSP.cs b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117_PSP.cs
new file mode 100644
index 0000000000..4518f0a725
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117_PSP.cs
@@ -0,0 +1,59 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+
+using System;
+using System.Runtime.CompilerServices;
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    // Reduce all values to byte
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe bool CHECK(byte check, byte expected) {
+        return check == expected;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe int LocallocCnstB117_PSP()
+    {
+        byte* a = stackalloc byte[117];
+        int i;
+        for (i = 0; i < 117; i++)
+        {
+            a[i] = (byte) i;
+        }
+
+        i = 0;
+        try
+        {
+            for (; i < 117; i++)
+            {
+                if (!CHECK(a[i], (byte) i)) return i;
+            }
+        }
+        catch
+        {
+            Console.WriteLine("ERROR!!!");
+            return i;
+        }
+
+        return -1;
+    }
+
+    public static int Main()
+    {
+        int ret;
+
+        ret = LocallocCnstB117_PSP();
+        if (ret != -1) {
+            Console.WriteLine("LocallocCnstB117_PSP: Failed on index: " + ret);
+            return Fail;
+        }
+
+        return Pass;
+    }
+}
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117_PSP.csproj b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117_PSP.csproj
new file mode 100644
index 0000000000..b4dbad35d2
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB117_PSP.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C82D33B6-5779-4E19-8220-1DEA587203B1}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LocallocCnstB117_PSP.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1_PSP.cs b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1_PSP.cs
new file mode 100644
index 0000000000..834d1d80f1
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1_PSP.cs
@@ -0,0 +1,59 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+
+using System;
+using System.Runtime.CompilerServices;
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    // Reduce all values to byte
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe bool CHECK(byte check, byte expected) {
+        return check == expected;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe int LocallocCnstB1_PSP()
+    {
+        byte* a = stackalloc byte[1];
+        int i;
+        for (i = 0; i < 1; i++)
+        {
+            a[i] = (byte) i;
+        }
+
+        i = 0;
+        try
+        {
+            for (; i < 1; i++)
+            {
+                if (!CHECK(a[i], (byte) i)) return i;
+            }
+        }
+        catch
+        {
+            Console.WriteLine("ERROR!!!");
+            return i;
+        }
+
+        return -1;
+    }
+
+    public static int Main()
+    {
+        int ret;
+
+        ret = LocallocCnstB1_PSP();
+        if (ret != -1) {
+            Console.WriteLine("LocallocCnstB1_PSP: Failed on index: " + ret);
+            return Fail;
+        }
+
+        return Pass;
+    }
+}
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1_PSP.csproj b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1_PSP.csproj
new file mode 100644
index 0000000000..696a5c5cbe
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB1_PSP.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{18F8266B-2F59-4058-8FE6-6B8368CD0D0F}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LocallocCnstB1_PSP.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5.cs b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5.cs
new file mode 100644
index 0000000000..81c34b4b57
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+
+using System;
+using System.Runtime.CompilerServices;
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    // Reduce all values to byte
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe bool CHECK(byte check, byte expected) {
+        return check == expected;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe int LocallocCnstB5()
+    {
+        byte* a = stackalloc byte[5];
+        for (int i = 0; i < 5; i++)
+        {
+            a[i] = (byte) i;
+        }
+
+        for (int i = 0; i < 5; i++)
+        {
+            if (!CHECK(a[i], (byte) i)) return i;
+        }
+
+        return -1;
+    }
+
+    public static int Main()
+    {
+        int ret;
+
+        ret = LocallocCnstB5();
+        if (ret != -1) {
+            Console.WriteLine("LocallocCnstB5: Failed on index: " + ret);
+            return Fail;
+        }
+
+        return Pass;
+    }
+}
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5.csproj b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5.csproj
new file mode 100644
index 0000000000..7d3c080eb0
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{061E4E38-14A9-4305-AD27-5A01A95E9FCE}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LocallocCnstB5.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001.cs b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001.cs
new file mode 100644
index 0000000000..27557bd421
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001.cs
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+
+using System;
+using System.Runtime.CompilerServices;
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    // Reduce all values to byte
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe bool CHECK(byte check, byte expected) {
+        return check == expected;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe int LocallocCnstB5001()
+    {
+        byte* a = stackalloc byte[5001];
+        for (int i = 0; i < 5001; i++)
+        {
+            a[i] = (byte) i;
+        }
+
+        for (int i = 0; i < 5001; i++)
+        {
+            if (!CHECK(a[i], (byte) i)) return i;
+        }
+
+        return -1;
+    }
+
+    public static int Main()
+    {
+        int ret;
+
+        ret = LocallocCnstB5001();
+        if (ret != -1) {
+            Console.WriteLine("LocallocCnstB5001: Failed on index: " + ret);
+            return Fail;
+        }
+
+        return Pass;
+    }
+}
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001.csproj b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001.csproj
new file mode 100644
index 0000000000..65b3ff1ad4
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E7B36F3A-CD18-4F21-8898-CA43C5FDEA1E}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LocallocCnstB5001.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001_PSP.cs b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001_PSP.cs
new file mode 100644
index 0000000000..ce411de38e
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001_PSP.cs
@@ -0,0 +1,59 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+
+using System;
+using System.Runtime.CompilerServices;
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    // Reduce all values to byte
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe bool CHECK(byte check, byte expected) {
+        return check == expected;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe int LocallocCnstB5001_PSP()
+    {
+        byte* a = stackalloc byte[5001];
+        int i;
+        for (i = 0; i < 5001; i++)
+        {
+            a[i] = (byte) i;
+        }
+
+        i = 0;
+        try
+        {
+            for (; i < 5001; i++)
+            {
+                if (!CHECK(a[i], (byte) i)) return i;
+            }
+        }
+        catch
+        {
+            Console.WriteLine("ERROR!!!");
+            return i;
+        }
+
+        return -1;
+    }
+
+    public static int Main()
+    {
+        int ret;
+
+        ret = LocallocCnstB5001_PSP();
+        if (ret != -1) {
+            Console.WriteLine("LocallocCnstB5001_PSP: Failed on index: " + ret);
+            return Fail;
+        }
+
+        return Pass;
+    }
+}
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001_PSP.csproj b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001_PSP.csproj
new file mode 100644
index 0000000000..40c3b170fd
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5001_PSP.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{1EB5785A-2050-4AD1-820B-F46CCCC3C65A}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LocallocCnstB5001_PSP.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5_PSP.cs b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5_PSP.cs
new file mode 100644
index 0000000000..f19b4fc7af
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5_PSP.cs
@@ -0,0 +1,59 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+
+using System;
+using System.Runtime.CompilerServices;
+public class BringUpTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    // Reduce all values to byte
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe bool CHECK(byte check, byte expected) {
+        return check == expected;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    public static unsafe int LocallocCnstB5_PSP()
+    {
+        byte* a = stackalloc byte[5];
+        int i;
+        for (i = 0; i < 5; i++)
+        {
+            a[i] = (byte) i;
+        }
+
+        i = 0;
+        try
+        {
+            for (; i < 5; i++)
+            {
+                if (!CHECK(a[i], (byte) i)) return i;
+            }
+        }
+        catch
+        {
+            Console.WriteLine("ERROR!!!");
+            return i;
+        }
+
+        return -1;
+    }
+
+    public static int Main()
+    {
+        int ret;
+
+        ret = LocallocCnstB5_PSP();
+        if (ret != -1) {
+            Console.WriteLine("LocallocCnstB5_PSP: Failed on index: " + ret);
+            return Fail;
+        }
+
+        return Pass;
+    }
+}
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5_PSP.csproj b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5_PSP.csproj
new file mode 100644
index 0000000000..10e269b43c
--- /dev/null
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocCnstB5_PSP.csproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5F015026-51D0-4EF7-B538-24E8864F31D6}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="LocallocCnstB5_PSP.cs" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/CodeGenBringUpTests/LocallocLarge.csproj b/tests/src/JIT/CodeGenBringUpTests/LocallocLarge.csproj
index 2741389887..dc1c95bf98 100644
--- a/tests/src/JIT/CodeGenBringUpTests/LocallocLarge.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/LocallocLarge.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C5578A39-72FF-4D25-99DA-96A8A99C6740}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -31,10 +27,6 @@
   <ItemGroup>
     <Compile Include="LocallocLarge.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/LongArgsAndReturn.csproj b/tests/src/JIT/CodeGenBringUpTests/LongArgsAndReturn.csproj
index 246be04a4f..e5cd51cf3e 100644
--- a/tests/src/JIT/CodeGenBringUpTests/LongArgsAndReturn.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/LongArgsAndReturn.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FC3E9CEC-7659-471A-8B2E-8CFB3FBFDB4E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="LongArgsAndReturn.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Lt1.csproj b/tests/src/JIT/CodeGenBringUpTests/Lt1.csproj
index fe4bc0f106..1551769926 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Lt1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Lt1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A7850EBD-6701-473E-8686-99535F0794A6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Lt1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/ModConst.csproj b/tests/src/JIT/CodeGenBringUpTests/ModConst.csproj
index 14cfdb5138..c109ca378b 100644
--- a/tests/src/JIT/CodeGenBringUpTests/ModConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/ModConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{314823E3-7BB2-4C19-BA04-5AC565215BA3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="ModConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Ne1.csproj b/tests/src/JIT/CodeGenBringUpTests/Ne1.csproj
index c11af459ce..744319b9ae 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Ne1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Ne1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5CE4D180-D559-4EA1-8A81-22FC79E4D255}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Ne1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/NegRMW.csproj b/tests/src/JIT/CodeGenBringUpTests/NegRMW.csproj
index 4aa1c4b4a2..f4222df6bd 100644
--- a/tests/src/JIT/CodeGenBringUpTests/NegRMW.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/NegRMW.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EBB57E43-0868-4482-86EF-8E330A10BB54}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="NegRMW.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/NestedCall.csproj b/tests/src/JIT/CodeGenBringUpTests/NestedCall.csproj
index 0691a3dc7c..016b92aceb 100644
--- a/tests/src/JIT/CodeGenBringUpTests/NestedCall.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/NestedCall.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6D20F54D-C743-4459-A7BD-A8C631CC648A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="NestedCall.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/NotAndNeg.csproj b/tests/src/JIT/CodeGenBringUpTests/NotAndNeg.csproj
index 8bc55a4f67..837ca6b7fd 100644
--- a/tests/src/JIT/CodeGenBringUpTests/NotAndNeg.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/NotAndNeg.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{17BA157B-5321-4381-94E3-BBC37B314FAF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="NotAndNeg.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/NotRMW.csproj b/tests/src/JIT/CodeGenBringUpTests/NotRMW.csproj
index 07c96a0261..5259753206 100644
--- a/tests/src/JIT/CodeGenBringUpTests/NotRMW.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/NotRMW.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DC4B97D9-D69D-4A34-899A-57AE1C949841}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="NotRMW.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/ObjAlloc.csproj b/tests/src/JIT/CodeGenBringUpTests/ObjAlloc.csproj
index d6c089e1f7..70a965d5ce 100644
--- a/tests/src/JIT/CodeGenBringUpTests/ObjAlloc.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/ObjAlloc.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{06705BB1-9365-4916-A426-7534584A1B5D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="ObjAlloc.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/OpMembersOfStructLocal.csproj b/tests/src/JIT/CodeGenBringUpTests/OpMembersOfStructLocal.csproj
index 6809d7f26b..d92748514f 100644
--- a/tests/src/JIT/CodeGenBringUpTests/OpMembersOfStructLocal.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/OpMembersOfStructLocal.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BF639075-28D1-4E40-808F-A181F76B7005}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="OpMembersOfStructLocal.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Or1.csproj b/tests/src/JIT/CodeGenBringUpTests/Or1.csproj
index fabb9770c6..f9ac1c31b4 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Or1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Or1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BADC0930-22AC-4F76-B3ED-6C0F78D1549E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Or1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/OrRef.csproj b/tests/src/JIT/CodeGenBringUpTests/OrRef.csproj
index 230fe95999..6f6425310c 100644
--- a/tests/src/JIT/CodeGenBringUpTests/OrRef.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/OrRef.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B793D123-1F28-452A-8528-2CF812B8EEBB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="OrRef.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/RecursiveTailCall.csproj b/tests/src/JIT/CodeGenBringUpTests/RecursiveTailCall.csproj
index c3cb6fc6c8..be94ecc694 100644
--- a/tests/src/JIT/CodeGenBringUpTests/RecursiveTailCall.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/RecursiveTailCall.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0E11223F-B3A0-46A3-BA5D-A7B5F9D56996}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="RecursiveTailCall.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/RightShiftRef.csproj b/tests/src/JIT/CodeGenBringUpTests/RightShiftRef.csproj
index 3562262359..328b02e748 100644
--- a/tests/src/JIT/CodeGenBringUpTests/RightShiftRef.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/RightShiftRef.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{14A2768C-E5E0-4156-B05C-229600CC539B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="RightShiftRef.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Rotate.csproj b/tests/src/JIT/CodeGenBringUpTests/Rotate.csproj
index baa4c52576..5180017b02 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Rotate.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Rotate.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Rotate.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Shift.csproj b/tests/src/JIT/CodeGenBringUpTests/Shift.csproj
index 2189ed3dd5..6b1cd162e3 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Shift.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Shift.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AF7F2478-9B49-4776-BEAF-0BF8916E2D79}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Shift.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/StaticCalls.csproj b/tests/src/JIT/CodeGenBringUpTests/StaticCalls.csproj
index 1480648fdb..de127ca559 100644
--- a/tests/src/JIT/CodeGenBringUpTests/StaticCalls.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/StaticCalls.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{136C849D-3517-40D8-BA2A-1F903377762D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="StaticCalls.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/StaticValueField.csproj b/tests/src/JIT/CodeGenBringUpTests/StaticValueField.csproj
index 901cbd032b..9fd97c7501 100644
--- a/tests/src/JIT/CodeGenBringUpTests/StaticValueField.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/StaticValueField.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A60BCC3F-1672-4EC4-A4D5-30A7AE8AC437}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="StaticValueField.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/StructFldAddr.csproj b/tests/src/JIT/CodeGenBringUpTests/StructFldAddr.csproj
index a9aefbee98..4d757f871d 100644
--- a/tests/src/JIT/CodeGenBringUpTests/StructFldAddr.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/StructFldAddr.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B9F2D613-B3BF-46D1-A762-ADE0656DF394}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="StructFldAddr.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/StructInstMethod.csproj b/tests/src/JIT/CodeGenBringUpTests/StructInstMethod.csproj
index d4bba0f35c..f13de10bdf 100644
--- a/tests/src/JIT/CodeGenBringUpTests/StructInstMethod.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/StructInstMethod.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3A283369-FD98-4661-9B73-17BDAC3C2A70}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="StructInstMethod.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Sub1.csproj b/tests/src/JIT/CodeGenBringUpTests/Sub1.csproj
index cfbc908173..7e7686800f 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Sub1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Sub1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F94C1DAC-C9C6-4BE3-80BF-C4B21F273764}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Sub1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/SubRef.csproj b/tests/src/JIT/CodeGenBringUpTests/SubRef.csproj
index befff751a5..c6b1f24d66 100644
--- a/tests/src/JIT/CodeGenBringUpTests/SubRef.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/SubRef.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B0409C23-6BC6-40F5-9386-36A69B746C65}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="SubRef.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Swap.csproj b/tests/src/JIT/CodeGenBringUpTests/Swap.csproj
index b97d170841..239ff730cc 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Swap.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Swap.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E56C9935-95B9-498A-B221-DF044409D530}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Swap.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Switch.csproj b/tests/src/JIT/CodeGenBringUpTests/Switch.csproj
index eaa188d7e3..9080d371ed 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Switch.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Switch.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9A3ADDB6-4396-46CF-B079-FC16DFFABE93}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Switch.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/UDivConst.csproj b/tests/src/JIT/CodeGenBringUpTests/UDivConst.csproj
index 8649c561cc..f861978b10 100644
--- a/tests/src/JIT/CodeGenBringUpTests/UDivConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/UDivConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{53C70B64-C175-43BF-A98A-719868D6D695}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="UDivConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/UModConst.csproj b/tests/src/JIT/CodeGenBringUpTests/UModConst.csproj
index d3ba4c3829..c3afc8af4f 100644
--- a/tests/src/JIT/CodeGenBringUpTests/UModConst.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/UModConst.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D7512FD8-08E1-4BB6-8701-E3FEEAE4FF66}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="UModConst.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Unbox.csproj b/tests/src/JIT/CodeGenBringUpTests/Unbox.csproj
index c646b871cc..f6bfc21490 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Unbox.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Unbox.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3C4D424C-B4CE-4C7F-B780-9330CBFED274}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -31,10 +27,6 @@
   <ItemGroup>
     <Compile Include="Unbox.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/Xor1.csproj b/tests/src/JIT/CodeGenBringUpTests/Xor1.csproj
index 3670831b85..d7051fc760 100644
--- a/tests/src/JIT/CodeGenBringUpTests/Xor1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/Xor1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{05C1DF3A-D956-412E-B80C-C3FFC3317D7F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="Xor1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/XorRef.csproj b/tests/src/JIT/CodeGenBringUpTests/XorRef.csproj
index 5795c705c2..4adbf6ffb2 100644
--- a/tests/src/JIT/CodeGenBringUpTests/XorRef.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/XorRef.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{60284420-DDEE-40F0-AB57-A2C4011D07C2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="XorRef.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/addref.csproj b/tests/src/JIT/CodeGenBringUpTests/addref.csproj
index f4c474d491..5c2c260341 100644
--- a/tests/src/JIT/CodeGenBringUpTests/addref.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/addref.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C1518A76-6C68-48EF-94E0-BE79A4514530}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="addref.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/div1.csproj b/tests/src/JIT/CodeGenBringUpTests/div1.csproj
index 4380e97f12..48074524c0 100644
--- a/tests/src/JIT/CodeGenBringUpTests/div1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/div1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{037FCF39-2055-43DA-9C66-972DDBEB15AC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="div1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/div2.csproj b/tests/src/JIT/CodeGenBringUpTests/div2.csproj
index 96b5a02b1d..25b34f9194 100644
--- a/tests/src/JIT/CodeGenBringUpTests/div2.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/div2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A5293BBE-2081-4701-9F04-3A5D756325A1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="div2.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/divref.csproj b/tests/src/JIT/CodeGenBringUpTests/divref.csproj
index 0f6f610ec9..18c8a748fe 100644
--- a/tests/src/JIT/CodeGenBringUpTests/divref.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/divref.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BFA9B638-76C9-4709-B18B-225B3F74B0E7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="divref.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/mul1.csproj b/tests/src/JIT/CodeGenBringUpTests/mul1.csproj
index cf6cdcce74..aa43502af6 100644
--- a/tests/src/JIT/CodeGenBringUpTests/mul1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/mul1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7ACF6404-4F4D-4D63-8E5F-A41DCC72B6C3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="mul1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/mul2.csproj b/tests/src/JIT/CodeGenBringUpTests/mul2.csproj
index 60aaa1c8da..792559c38e 100644
--- a/tests/src/JIT/CodeGenBringUpTests/mul2.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/mul2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{72FF9A1A-6612-41FD-86D2-C069608C2799}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="mul2.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/mul3.csproj b/tests/src/JIT/CodeGenBringUpTests/mul3.csproj
index a7dffb8477..c8fe79836b 100644
--- a/tests/src/JIT/CodeGenBringUpTests/mul3.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/mul3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9EE64E0C-595B-47BF-B8C0-96BDDA260461}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="mul3.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/mul4.csproj b/tests/src/JIT/CodeGenBringUpTests/mul4.csproj
index 87346029f2..d7bafe6136 100644
--- a/tests/src/JIT/CodeGenBringUpTests/mul4.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/mul4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{271C8E26-550D-4506-9BF8-D87805D5FEF6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="mul4.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/rem1.csproj b/tests/src/JIT/CodeGenBringUpTests/rem1.csproj
index 7a2635be45..ae5efe85bc 100644
--- a/tests/src/JIT/CodeGenBringUpTests/rem1.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/rem1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D45A5B16-BE6F-45E4-A88D-39DDD6DD2157}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="rem1.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/CodeGenBringUpTests/struct16args.csproj b/tests/src/JIT/CodeGenBringUpTests/struct16args.csproj
index 99e90c4655..70197a2ba0 100644
--- a/tests/src/JIT/CodeGenBringUpTests/struct16args.csproj
+++ b/tests/src/JIT/CodeGenBringUpTests/struct16args.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FE68C94B-7263-4C2B-B8DC-BD8ACA669B07}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -30,10 +26,6 @@
   <ItemGroup>
     <Compile Include="struct16args.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/Arrays/Complex1.csproj b/tests/src/JIT/Directed/Arrays/Complex1.csproj
index 9165d8b5f6..6c91d8bbf0 100644
--- a/tests/src/JIT/Directed/Arrays/Complex1.csproj
+++ b/tests/src/JIT/Directed/Arrays/Complex1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C340AEBB-36A4-40E8-A453-F9D2B48F608A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/Arrays/Complex2.csproj b/tests/src/JIT/Directed/Arrays/Complex2.csproj
index ab56291a78..6922873f94 100644
--- a/tests/src/JIT/Directed/Arrays/Complex2.csproj
+++ b/tests/src/JIT/Directed/Arrays/Complex2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D463FFF1-0A34-407F-88C4-4723901908DF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/Arrays/Simple1.csproj b/tests/src/JIT/Directed/Arrays/Simple1.csproj
index e8377c0b64..7766350d42 100644
--- a/tests/src/JIT/Directed/Arrays/Simple1.csproj
+++ b/tests/src/JIT/Directed/Arrays/Simple1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{21D66817-79E2-4E66-8839-EBC4B4BAD6C1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/Arrays/Simple2.csproj b/tests/src/JIT/Directed/Arrays/Simple2.csproj
index 74d173f1fe..45ea30b752 100644
--- a/tests/src/JIT/Directed/Arrays/Simple2.csproj
+++ b/tests/src/JIT/Directed/Arrays/Simple2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F45F852A-B9E9-4597-B399-ABBC969EAC91}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj
index ad719cc69f..8e9a077a7f 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{06FF6E07-2815-4FEA-AA0B-C0E1BB05C639}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj
index 6fa16672c4..511d778491 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3E071870-A2AA-4839-8DDF-5F3EF4133D3E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj
index 2f104387db..4d4cea9327 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A5CE024A-361E-410B-B204-98FDF9C81FA8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj
index c463c8e31e..32619832df 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{33E41A22-DC44-48D9-8EE2-C2902F1564EE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj
index 38790a8780..b3ff2a24c4 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B85EBA3F-2BD0-481B-8D1D-A0901EA5B2D0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj
index 9f3b050ccf..eda39d775b 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{580234A2-D854-4FD7-B11D-4C39794E1F55}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj
index c81c109e32..4c9a5482b5 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BFEB52A3-D9BC-4E2C-8BA1-63C1B21C2997}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj
index bcfbcd2225..d591f182b6 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5C1E8BD3-C9F1-4012-9B93-34EE5455A917}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj
index de22d673ad..1d4e82df4f 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{54DE4A9A-0626-41A5-A7EC-BFA52D1A304C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj
index 0b9517b300..cbd97086e1 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{28415558-9857-4A66-B920-5A25CF2E31FF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj
index 28f9b20d57..bfb9cfc604 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EF8FB27D-5647-414A-8338-DC7EA477A1A4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj
index 661fa6fb3f..b18725cfd3 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FE6CDFB3-27C3-4C8D-906C-0776A7EDE97E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj
index 1b751c2f6c..02d6ab8e8b 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4B6D76B8-71D7-43DF-8DE3-DC1360344968}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj
index 3565ca3d58..38587f0f13 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9F2D4F98-AFAA-401A-9221-46823FF7F7F5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj
index 73f35f984a..1bb753da30 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CFB3552B-D349-4AA8-BBE3-47ED82315402}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj
index cacc36444f..a494d15ec2 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F0FCA1DB-0D7C-4ECD-8DC5-B00EAAB13D7D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj
index 1c569329d9..f416947f51 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CC8CCFBD-780E-471B-B7B3-82C7E89A8A80}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj
index 7bf6c3743f..848ede4fe3 100644
--- a/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj
+++ b/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{040A8014-313A-4277-AB3D-5D6C9928AC7B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/Convert/FPZero.csproj b/tests/src/JIT/Directed/Convert/FPZero.csproj
index f0eea11dd2..870e4ed456 100644
--- a/tests/src/JIT/Directed/Convert/FPZero.csproj
+++ b/tests/src/JIT/Directed/Convert/FPZero.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/Convert/implicitConv.ilproj b/tests/src/JIT/Directed/Convert/implicitConv.ilproj
index 6e3f6f5794..b2b32c672d 100644
--- a/tests/src/JIT/Directed/Convert/implicitConv.ilproj
+++ b/tests/src/JIT/Directed/Convert/implicitConv.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/Convert/minopts_convu1.ilproj b/tests/src/JIT/Directed/Convert/minopts_convu1.ilproj
index 81412194e8..19a655c7ef 100644
--- a/tests/src/JIT/Directed/Convert/minopts_convu1.ilproj
+++ b/tests/src/JIT/Directed/Convert/minopts_convu1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj b/tests/src/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj
index dc5101f1c0..b796fcfdc3 100644
--- a/tests/src/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj
+++ b/tests/src/JIT/Directed/ExcepFilters/excepobj/excepobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="excepobj.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/ExcepFilters/fault/fault.ilproj b/tests/src/JIT/Directed/ExcepFilters/fault/fault.ilproj
index ba2f5e5d7a..8cba22a489 100644
--- a/tests/src/JIT/Directed/ExcepFilters/fault/fault.ilproj
+++ b/tests/src/JIT/Directed/ExcepFilters/fault/fault.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="fault.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/ExcepFilters/mixed/mixed.ilproj b/tests/src/JIT/Directed/ExcepFilters/mixed/mixed.ilproj
index 9aa707fd19..a8b1098389 100644
--- a/tests/src/JIT/Directed/ExcepFilters/mixed/mixed.ilproj
+++ b/tests/src/JIT/Directed/ExcepFilters/mixed/mixed.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj b/tests/src/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj
index 1e68e7f466..49f2aad9fb 100644
--- a/tests/src/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj
+++ b/tests/src/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mixed3.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj b/tests/src/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj
index 88023124e5..6d88d9465c 100644
--- a/tests/src/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj
+++ b/tests/src/JIT/Directed/FaultHandlers/CallOrder/CallOrder.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="CallOrder.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj b/tests/src/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj
index abf1c8e696..1d073fd685 100644
--- a/tests/src/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj
+++ b/tests/src/JIT/Directed/FaultHandlers/Nesting/Nesting.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Nesting.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj b/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj
index fa9c635743..9fe1293674 100644
--- a/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj
+++ b/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Simple.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj b/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj
index ff84708a5f..f6a12b5903 100644
--- a/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj
+++ b/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="PInvokeTail.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
index 532d12782e..ea51f6e203 100644
--- a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
+++ b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="TailWinApi.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj b/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj
index d2cf45766a..7b74c279a9 100644
--- a/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj
+++ b/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -26,7 +24,7 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <JitOptimizationSensitive>true</JitOptimizationSensitive>    
+    <JitOptimizationSensitive>true</JitOptimizationSensitive>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="JitTailcall2.il" />
@@ -35,6 +33,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/IL/Tailcall/jitTailcall1.ilproj b/tests/src/JIT/Directed/IL/Tailcall/jitTailcall1.ilproj
index 80a5375cfb..daff450829 100644
--- a/tests/src/JIT/Directed/IL/Tailcall/jitTailcall1.ilproj
+++ b/tests/src/JIT/Directed/IL/Tailcall/jitTailcall1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="JitTailcall1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/IL/leave/leave1.ilproj b/tests/src/JIT/Directed/IL/leave/leave1.ilproj
index 6021aa8c8a..6a7040a5c6 100644
--- a/tests/src/JIT/Directed/IL/leave/leave1.ilproj
+++ b/tests/src/JIT/Directed/IL/leave/leave1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="leave2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj b/tests/src/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj
index 462249a166..123ec6df5a 100644
--- a/tests/src/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj
+++ b/tests/src/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/IL/rethrow/Rethrow1.ilproj b/tests/src/JIT/Directed/IL/rethrow/Rethrow1.ilproj
index 9dd56bc0d9..539d3c5545 100644
--- a/tests/src/JIT/Directed/IL/rethrow/Rethrow1.ilproj
+++ b/tests/src/JIT/Directed/IL/rethrow/Rethrow1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="rethrow1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/IL/rethrow/Rethrow2.ilproj b/tests/src/JIT/Directed/IL/rethrow/Rethrow2.ilproj
index 515285512a..458b0e25f9 100644
--- a/tests/src/JIT/Directed/IL/rethrow/Rethrow2.ilproj
+++ b/tests/src/JIT/Directed/IL/rethrow/Rethrow2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="rethrow2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj b/tests/src/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj
index 3a1fab97b6..a36d53e4b8 100644
--- a/tests/src/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj
+++ b/tests/src/JIT/Directed/Misc/SIDEEFFECTS/BadRegArgs.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="BadRegArgs.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj b/tests/src/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj
index 16ced7c7ee..a02b254fcf 100644
--- a/tests/src/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj
+++ b/tests/src/JIT/Directed/Misc/SIDEEFFECTS/SideEffects.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="SideEffects.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.il b/tests/src/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.il
index f7dce286ee..36d1c1a6e2 100644
--- a/tests/src/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.il
+++ b/tests/src/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.il
@@ -2989,12 +2989,12 @@ call void Thread_EA::Dispatch(method explicit instance void *(int32), int32)
 {
   .maxstack  4
   .entrypoint
-  .locals (class [mscorlib]System.Threading.Thread[] thrd,
+  .locals (class [System.Threading.Thread]System.Threading.Thread[] thrd,
            class Thread_EA ThdObj,
            int32 V_2)
 
   IL_0000:  ldc.i4     0xa
-  IL_0005:  newarr     [mscorlib]System.Threading.Thread
+  IL_0005:  newarr     [System.Threading.Thread]System.Threading.Thread
   IL_000a:  stloc.0
   IL_000b:  newobj     instance void Thread_EA::.ctor()
   IL_0010:  stloc.1
@@ -3018,13 +3018,13 @@ call void Thread_EA::Dispatch(method explicit instance void *(int32), int32)
   IL_0044:  ldloc.2
   IL_0045:  ldloc.1
   IL_0046:  ldftn      instance void Thread_EA::Run()
-  IL_004c:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(class [mscorlib]System.Object,native int)
-  IL_0051:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+  IL_004c:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(class [mscorlib]System.Object,native int)
+  IL_0051:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
   IL_0056:  stelem.ref
   IL_0057:  ldloc.0
   IL_0058:  ldloc.2
   IL_0059:  ldelem.ref
-  IL_005a:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+  IL_005a:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
   IL_005f:  br         IL_0030
 
   IL_0064:  ldc.i4     0x0
@@ -3042,7 +3042,7 @@ call void Thread_EA::Dispatch(method explicit instance void *(int32), int32)
   IL_0082:  ldloc.0
   IL_0083:  ldloc.2
   IL_0084:  ldelem.ref
-  IL_0085:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+  IL_0085:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
   IL_008a:  br         IL_006f
 
   IL_008f:  call       class [mscorlib]System.IO.TextWriter [System.Console]System.Console::get_Out()
diff --git a/tests/src/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.ilproj b/tests/src/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.ilproj
index ed7a95cbdd..888f4235b5 100644
--- a/tests/src/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.ilproj
+++ b/tests/src/JIT/Directed/Misc/function_pointer/MutualThdRecur-fptr.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj b/tests/src/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj
index 848f5849c4..1096507249 100644
--- a/tests/src/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj
+++ b/tests/src/JIT/Directed/Misc/function_pointer/funcptrtest.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="funcptrtest.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj b/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj
index ceb0d9a465..029180531a 100644
--- a/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj
+++ b/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_d.csproj b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_d.csproj
index 9e009ab214..5268adb529 100644
--- a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_d.csproj
+++ b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_do.csproj b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_do.csproj
index 2a99859eab..8429b2b1b5 100644
--- a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_do.csproj
+++ b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_r.csproj b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_r.csproj
index 9323e65859..763e0241ea 100644
--- a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_r.csproj
+++ b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_ro.csproj b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_ro.csproj
index 060a20413b..f2fc4d4888 100644
--- a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_ro.csproj
+++ b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_d.csproj b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_d.csproj
index ffe02bcd37..962005f752 100644
--- a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_d.csproj
+++ b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_do.csproj b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_do.csproj
index cb329e0649..674de4db0b 100644
--- a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_do.csproj
+++ b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_r.csproj b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_r.csproj
index bef2f257b9..dd4dc207e4 100644
--- a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_r.csproj
+++ b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_ro.csproj b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_ro.csproj
index 2286ad8599..56bfd0255e 100644
--- a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_ro.csproj
+++ b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/helper.csproj b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/helper.csproj
index d7f3b67439..dd94625c7a 100644
--- a/tests/src/JIT/Directed/PREFIX/PrimitiveVT/helper.csproj
+++ b/tests/src/JIT/Directed/PREFIX/PrimitiveVT/helper.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.ilproj
index 17f5fe8b4f..399826baa7 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/Box_Unbox.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Box_Unbox.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj
index 6038771f5b..7dbf75a9d5 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/Desktop/add.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/add.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/add.ilproj
index 7d99b09f4a..67af2da391 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/add.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
index fac158928f..271f47ae70 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Condition="'$(BuildArch)' == 'x86'" Include="arglist.il" />
     <Compile Condition="'$(BuildArch)' == 'x64'" Include="arglist64.il" />
@@ -38,6 +34,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/array_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/array_tests.ilproj
index 728d48bbb7..d02b90fa0e 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/array_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/array_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="array_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/cpblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/cpblk.ilproj
index e029b51eef..ea28d7937c 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/cpblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/cpblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cpblk.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/cpobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/cpobj.ilproj
index a936ae2fb8..5a2b28ae1c 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/cpobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/cpobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cpobj.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/field_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/field_tests.ilproj
index 6e503944ca..ab8edf1a1b 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/field_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/field_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="field_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/fielda_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/fielda_tests.ilproj
index d69861314d..c961c51978 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/fielda_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/fielda_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="fielda_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj
index 4f47047d18..fd3e0ee08b 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/initblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initblk.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/initobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/initobj.ilproj
index 4907c7c3c1..73d6574384 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/initobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/initobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initobj.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/ldind_stind.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/ldind_stind.ilproj
index 0d66c870a4..cac75ff5a4 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/ldind_stind.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/ldind_stind.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_stind.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/ldloca.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/ldloca.ilproj
index 5283e08701..45fc5f3ddc 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/ldloca.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/ldloca.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloca.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/ldobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/ldobj.ilproj
index d914f68568..997e74cf9c 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/ldobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/ldobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldobj.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/1/localloc.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/1/localloc.ilproj
index b249d83731..265ca1feca 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/1/localloc.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/1/localloc.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="localloc.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.ilproj
index 17f5fe8b4f..399826baa7 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/Box_Unbox.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Box_Unbox.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/add.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/add.ilproj
index 6038771f5b..7dbf75a9d5 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/add.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
index fac158928f..271f47ae70 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Condition="'$(BuildArch)' == 'x86'" Include="arglist.il" />
     <Compile Condition="'$(BuildArch)' == 'x64'" Include="arglist64.il" />
@@ -38,6 +34,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/array_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/array_tests.ilproj
index 728d48bbb7..d02b90fa0e 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/array_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/array_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="array_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/cpblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/cpblk.ilproj
index e029b51eef..ea28d7937c 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/cpblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/cpblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cpblk.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/cpobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/cpobj.ilproj
index 61762bda0d..11cbde9244 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/cpobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/cpobj.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/field_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/field_tests.ilproj
index 6e503944ca..ab8edf1a1b 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/field_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/field_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="field_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/fielda_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/fielda_tests.ilproj
index d69861314d..c961c51978 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/fielda_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/fielda_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="fielda_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/initblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/initblk.ilproj
index 4f47047d18..fd3e0ee08b 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/initblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/initblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initblk.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/initobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/initobj.ilproj
index 4907c7c3c1..73d6574384 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/initobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/initobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initobj.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/ldind_stind.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/ldind_stind.ilproj
index 0d66c870a4..cac75ff5a4 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/ldind_stind.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/ldind_stind.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_stind.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/ldloca.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/ldloca.ilproj
index 5283e08701..45fc5f3ddc 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/ldloca.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/ldloca.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloca.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/ldobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/ldobj.ilproj
index f569434412..80cc4d4a7b 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/ldobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/ldobj.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/2/localloc.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/2/localloc.ilproj
index 5603a37f12..a3620b7890 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/2/localloc.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/2/localloc.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.ilproj
index 17f5fe8b4f..399826baa7 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/Box_Unbox.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Box_Unbox.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj
index 6038771f5b..7dbf75a9d5 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/Desktop/add.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/add.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/add.ilproj
index 7d99b09f4a..67af2da391 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/add.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
index fac158928f..271f47ae70 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Condition="'$(BuildArch)' == 'x86'" Include="arglist.il" />
     <Compile Condition="'$(BuildArch)' == 'x64'" Include="arglist64.il" />
@@ -38,6 +34,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/array_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/array_tests.ilproj
index 728d48bbb7..d02b90fa0e 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/array_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/array_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="array_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/cpblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/cpblk.ilproj
index e029b51eef..ea28d7937c 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/cpblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/cpblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cpblk.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/cpobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/cpobj.ilproj
index a936ae2fb8..5a2b28ae1c 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/cpobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/cpobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cpobj.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/field_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/field_tests.ilproj
index 6e503944ca..ab8edf1a1b 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/field_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/field_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="field_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/fielda_tests.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/fielda_tests.ilproj
index d69861314d..c961c51978 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/fielda_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/fielda_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="fielda_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/initblk.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/initblk.ilproj
index 4f47047d18..fd3e0ee08b 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/initblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/initblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initblk.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj
index 4907c7c3c1..73d6574384 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/initobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initobj.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/ldind_stind.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/ldind_stind.ilproj
index 0d66c870a4..cac75ff5a4 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/ldind_stind.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/ldind_stind.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_stind.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj
index 5283e08701..45fc5f3ddc 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/ldloca.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloca.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/ldobj.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/ldobj.ilproj
index d914f68568..997e74cf9c 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/ldobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/ldobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldobj.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/unaligned/4/localloc.ilproj b/tests/src/JIT/Directed/PREFIX/unaligned/4/localloc.ilproj
index b249d83731..265ca1feca 100644
--- a/tests/src/JIT/Directed/PREFIX/unaligned/4/localloc.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/unaligned/4/localloc.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="localloc.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/Box_Unbox.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/Box_Unbox.ilproj
index 17f5fe8b4f..399826baa7 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/Box_Unbox.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/Box_Unbox.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Box_Unbox.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj
index 6038771f5b..7dbf75a9d5 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/Desktop/add.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/add.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/add.ilproj
index 9d1fbaf548..75b79b0eeb 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/add.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/add.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
index fac158928f..271f47ae70 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Condition="'$(BuildArch)' == 'x86'" Include="arglist.il" />
     <Compile Condition="'$(BuildArch)' == 'x64'" Include="arglist64.il" />
@@ -38,6 +34,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/array_tests.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/array_tests.ilproj
index 728d48bbb7..d02b90fa0e 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/array_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/array_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="array_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/cpblk.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/cpblk.ilproj
index e029b51eef..ea28d7937c 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/cpblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/cpblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cpblk.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/cpobj.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/cpobj.ilproj
index a936ae2fb8..5a2b28ae1c 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/cpobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/cpobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cpobj.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/field_tests.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/field_tests.ilproj
index 6e503944ca..ab8edf1a1b 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/field_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/field_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="field_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/fielda_tests.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/fielda_tests.ilproj
index d69861314d..c961c51978 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/fielda_tests.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/fielda_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="fielda_tests.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/initblk.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/initblk.ilproj
index 4f47047d18..fd3e0ee08b 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/initblk.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/initblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initblk.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/initobj.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/initobj.ilproj
index 4907c7c3c1..73d6574384 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/initobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/initobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initobj.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/ldind_stind.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/ldind_stind.ilproj
index 0d66c870a4..cac75ff5a4 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/ldind_stind.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/ldind_stind.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_stind.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj
index 5283e08701..45fc5f3ddc 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/ldloca.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloca.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/ldobj.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/ldobj.ilproj
index d914f68568..997e74cf9c 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/ldobj.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/ldobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldobj.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/PREFIX/volatile/1/localloc.ilproj b/tests/src/JIT/Directed/PREFIX/volatile/1/localloc.ilproj
index b249d83731..265ca1feca 100644
--- a/tests/src/JIT/Directed/PREFIX/volatile/1/localloc.ilproj
+++ b/tests/src/JIT/Directed/PREFIX/volatile/1/localloc.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="localloc.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/RVAInit/extended.ilproj b/tests/src/JIT/Directed/RVAInit/extended.ilproj
index d77e9d37a3..3258624c15 100644
--- a/tests/src/JIT/Directed/RVAInit/extended.ilproj
+++ b/tests/src/JIT/Directed/RVAInit/extended.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/RVAInit/gcref1.ilproj b/tests/src/JIT/Directed/RVAInit/gcref1.ilproj
index fac69be8bf..1a2ce49165 100644
--- a/tests/src/JIT/Directed/RVAInit/gcref1.ilproj
+++ b/tests/src/JIT/Directed/RVAInit/gcref1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="gcref1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/RVAInit/gcref2.ilproj b/tests/src/JIT/Directed/RVAInit/gcref2.ilproj
index eca9de6d22..53969289e8 100644
--- a/tests/src/JIT/Directed/RVAInit/gcref2.ilproj
+++ b/tests/src/JIT/Directed/RVAInit/gcref2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="gcref2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/RVAInit/nested.ilproj b/tests/src/JIT/Directed/RVAInit/nested.ilproj
index e35aa41b00..833ab8dccd 100644
--- a/tests/src/JIT/Directed/RVAInit/nested.ilproj
+++ b/tests/src/JIT/Directed/RVAInit/nested.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="nested.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/RVAInit/oddsize.ilproj b/tests/src/JIT/Directed/RVAInit/oddsize.ilproj
index e1403f3384..7e22d9ffb4 100644
--- a/tests/src/JIT/Directed/RVAInit/oddsize.ilproj
+++ b/tests/src/JIT/Directed/RVAInit/oddsize.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="oddsize.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/RVAInit/overlap.ilproj b/tests/src/JIT/Directed/RVAInit/overlap.ilproj
index c05d4a0be3..deb1648c6a 100644
--- a/tests/src/JIT/Directed/RVAInit/overlap.ilproj
+++ b/tests/src/JIT/Directed/RVAInit/overlap.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/RVAInit/simple.ilproj b/tests/src/JIT/Directed/RVAInit/simple.ilproj
index c8ce25286e..c21b855dcf 100644
--- a/tests/src/JIT/Directed/RVAInit/simple.ilproj
+++ b/tests/src/JIT/Directed/RVAInit/simple.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="simple.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj b/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj
index 19c8c5861a..d164910c8d 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C2EEBDC3-4DA0-45FD-9805-FA0608F754B7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj b/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj
index d4b9b2e096..4ab523f61a 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{435C204F-7509-4599-B6C5-2DA2D362E664}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj b/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj
index d7dbb04575..6026d407f1 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A1038D6D-50D2-494B-933D-74034583F3F8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj b/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj
index 5c4c10c025..7f91c7d064 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{462CD1A6-B52A-428D-91A7-026ABC26C3A9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj b/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj
index bdb14c1a86..975dc66d40 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B41121E9-EC15-484E-9E96-46E89CBB1EEB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj b/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj
index 9dd9b68d71..31f02d4181 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B06A2649-0937-45B1-8B5E-7433847BB664}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj b/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj
index a811c3292d..ddb2a11c2c 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{582ED7B9-78A9-46E2-96AD-940C44257BD9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj b/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj
index e0e6f4bac6..2155674610 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{041F2129-8E15-4840-8D17-08FE1B99C98A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj b/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj
index d0d54ee5b6..f3360da1a4 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{81036274-5786-483C-BD52-854B882B4F21}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj b/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj
index 8259844d7a..d142b81eb2 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8E3058EB-0198-4796-AEAD-E09965A73E00}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj b/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj
index 40aa870064..476b8cf70e 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BDA62694-2760-4AF9-BE5D-ECE6A09A210B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj b/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj
index fdc416dedb..3a0fc03ea5 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EDAC3DEE-ED77-4180-A1DE-FF67AC42944B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StrAccess/straccess4.csproj b/tests/src/JIT/Directed/StrAccess/straccess4.csproj
index 833fad11f1..7f228cc0a5 100644
--- a/tests/src/JIT/Directed/StrAccess/straccess4.csproj
+++ b/tests/src/JIT/Directed/StrAccess/straccess4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F8C60870-9D7D-4C91-BD33-1D11A4151FA7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructABI/StructABI.csproj b/tests/src/JIT/Directed/StructABI/StructABI.csproj
index 83ba92e3d0..c1065f8641 100644
--- a/tests/src/JIT/Directed/StructABI/StructABI.csproj
+++ b/tests/src/JIT/Directed/StructABI/StructABI.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,16 +8,16 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4B4B0F32-3E78-40B7-A0AD-B844F36CB3B2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"></PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -26,7 +26,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="StructABI.cs" />
-
     <Compile Include="StructABI.Windows.cs" Condition="'$(OSGroup)' == 'Windows_NT'" />
     <Compile Include="StructABI.Unix.cs" Condition="'$(OSGroup)' == 'Linux' Or '$(OSGroup)' == 'FreeBSD'" />
     <Compile Include="StructABI.OSX.cs" Condition="'$(OSGroup)' == 'OSX'" />
@@ -35,4 +34,4 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/StructABI/structfieldparam_r.csproj b/tests/src/JIT/Directed/StructABI/structfieldparam_r.csproj
index a1ad373e51..15660d67a1 100644
--- a/tests/src/JIT/Directed/StructABI/structfieldparam_r.csproj
+++ b/tests/src/JIT/Directed/StructABI/structfieldparam_r.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/StructABI/structfieldparam_ro.csproj b/tests/src/JIT/Directed/StructABI/structfieldparam_ro.csproj
index da98dd6c53..d8bfc61845 100644
--- a/tests/src/JIT/Directed/StructABI/structfieldparam_ro.csproj
+++ b/tests/src/JIT/Directed/StructABI/structfieldparam_ro.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/StructPromote/SP1.csproj b/tests/src/JIT/Directed/StructPromote/SP1.csproj
index d1dd65365a..7df6b121e2 100644
--- a/tests/src/JIT/Directed/StructPromote/SP1.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B94CE6E4-D2CB-4E77-9E66-BAF7399256FC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructPromote/SP1a.csproj b/tests/src/JIT/Directed/StructPromote/SP1a.csproj
index 1e766906c5..d9bd4663cd 100644
--- a/tests/src/JIT/Directed/StructPromote/SP1a.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1a.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AFBEE14D-A543-4A38-B88F-D5917D534798}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructPromote/SP1a2.csproj b/tests/src/JIT/Directed/StructPromote/SP1a2.csproj
index 94d1a82c6f..c7cdb128cd 100644
--- a/tests/src/JIT/Directed/StructPromote/SP1a2.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1a2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{679BD4B8-7FB3-4760-A68E-5E0C6B73FE8F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructPromote/SP1b.csproj b/tests/src/JIT/Directed/StructPromote/SP1b.csproj
index 7a747dbcf4..bcf1f31c07 100644
--- a/tests/src/JIT/Directed/StructPromote/SP1b.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1b.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DF40DD16-C1FE-4FE9-BB21-3FDAE7676EF0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructPromote/SP1c.csproj b/tests/src/JIT/Directed/StructPromote/SP1c.csproj
index daf6ad2f6a..1f8c8f90df 100644
--- a/tests/src/JIT/Directed/StructPromote/SP1c.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1c.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{26BA48DF-909E-4139-8CDB-33B774A96D36}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructPromote/SP1d.csproj b/tests/src/JIT/Directed/StructPromote/SP1d.csproj
index 1274175038..65f5d4b260 100644
--- a/tests/src/JIT/Directed/StructPromote/SP1d.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP1d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BFBD12A9-470A-436D-889B-A094C4B56B5E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructPromote/SP2.csproj b/tests/src/JIT/Directed/StructPromote/SP2.csproj
index 4ecbdcd93b..6d5007c371 100644
--- a/tests/src/JIT/Directed/StructPromote/SP2.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A3AD0A96-D8B7-4756-87A4-BD0322816E36}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructPromote/SP2a.csproj b/tests/src/JIT/Directed/StructPromote/SP2a.csproj
index 38be2768bd..247945a07b 100644
--- a/tests/src/JIT/Directed/StructPromote/SP2a.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP2a.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A503DC41-F9A6-4CB8-9069-3866B40DF3E1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructPromote/SP2b.csproj b/tests/src/JIT/Directed/StructPromote/SP2b.csproj
index 38f17ab6ef..2a49a558e9 100644
--- a/tests/src/JIT/Directed/StructPromote/SP2b.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP2b.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{49F28797-569B-46CE-BE57-F303CB612942}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructPromote/SP2c.csproj b/tests/src/JIT/Directed/StructPromote/SP2c.csproj
index 952d2746b5..3458ecd64b 100644
--- a/tests/src/JIT/Directed/StructPromote/SP2c.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SP2c.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C263A317-B5CA-40F1-A159-0662059DDA12}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructPromote/SpAddr.csproj b/tests/src/JIT/Directed/StructPromote/SpAddr.csproj
index 94bebd08d5..c6694bd7c6 100644
--- a/tests/src/JIT/Directed/StructPromote/SpAddr.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SpAddr.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CBD9D3F5-8F73-460F-8801-D684254D45EA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj b/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj
index e15e0f15d2..31a88dd65c 100644
--- a/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj
+++ b/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9B2CCDC2-D6CE-4568-A419-AC79613BC235}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/TypedReference/TypedReference.csproj b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
index 3f4d1e3825..36cd9b760b 100644
--- a/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
+++ b/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
@@ -8,19 +8,16 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{47849C79-F7B8-47C6-BBA7-8E6FCE66B9F1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"></PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -36,9 +33,5 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj b/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj
index e4a9529960..bb98f819d8 100644
--- a/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{34026C3E-193C-45CF-B55D-8FAB068D4F79}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj
index ba2fb73394..1cc4c5c3b2 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ADCBCB5C-816B-4C9D-8223-2DD2B43F9135}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj
index 2ed18a6850..fd6e0f0969 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C1B8B8B2-2070-42F0-9A03-D73F1DECC019}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj
index c9be76214b..be973c38f5 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{857EEB5A-1D43-4B59-871A-3B36121450C3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj
index 3c40e0103d..e6b804a03e 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5A3575BA-0E0B-4736-954D-5A8ADD77DC2B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_d.csproj b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_d.csproj
index 01bd354bd5..f99a7d8d60 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_d.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2E795F75-9DA6-4D10-9C32-C1D3FB854231}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_do.csproj b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_do.csproj
index 204e08aea1..635f3305da 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_do.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_do.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1FB4BDC4-7EDD-4EF9-8F2F-363F7E83F31B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_r.csproj b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_r.csproj
index ace6e53bb4..897737fbe8 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_r.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FDFA7555-C1FF-400D-8DBC-5672E2E76494}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj
index cb9c69fe91..beb3e5ad9e 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop2_cs_ro.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4499F174-5CA5-4447-81A0-A8E3BA1908D7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop3_il_d.ilproj b/tests/src/JIT/Directed/UnrollLoop/loop3_il_d.ilproj
index 82287cdf19..6ada403635 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop3_il_d.ilproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop3_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop3_il_r.ilproj b/tests/src/JIT/Directed/UnrollLoop/loop3_il_r.ilproj
index 173fb77f74..45ce110601 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop3_il_r.ilproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop3_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="loop3.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj
index 89e92970df..2e3450dc87 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{96C8C125-C97D-43D0-AA6F-817C6792C359}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj
index ddb3702e6c..55b4947035 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D4CAEC15-F75F-419B-80E9-6FA9E89AFE48}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj
index d77d89892c..695bae92b4 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5627E983-E7DD-482C-A316-F84B97EDBB81}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj
index b97b5c69ed..63f2eaaf65 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6659CA3F-F648-4C54-8911-FA18239A2434}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj
index 78d4b256ad..953edac964 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{79804B5E-FE7E-4A45-88B5-D06A4B3707EC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj
index 36eb47f4e8..829c62c4c4 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{61A46528-0278-4494-8866-2B7E3D492CCB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj
index 7dc344c432..3c5f1cc245 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95390053-5AC5-4774-A8D5-76F4C8DBC526}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj
index 6c995fe638..a41f31a39d 100644
--- a/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj
+++ b/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F388A679-EDA8-4E0F-A785-267276D0AD3F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/array-il/_Arrayscomplex3.ilproj b/tests/src/JIT/Directed/array-il/_Arrayscomplex3.ilproj
index b68ed327b9..bb4bab43f4 100644
--- a/tests/src/JIT/Directed/array-il/_Arrayscomplex3.ilproj
+++ b/tests/src/JIT/Directed/array-il/_Arrayscomplex3.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,39 +8,30 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="complex3.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/array-il/_Arrayssimple3.ilproj b/tests/src/JIT/Directed/array-il/_Arrayssimple3.ilproj
index c48f3895ed..851aec57f0 100644
--- a/tests/src/JIT/Directed/array-il/_Arrayssimple3.ilproj
+++ b/tests/src/JIT/Directed/array-il/_Arrayssimple3.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="simple3.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj
index 4b60885ce0..8377f53a05 100644
--- a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0CB92C28-D5CF-4A9B-A81C-F10D64AC6CF6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj
index 8c81d37548..1cf3da6e0e 100644
--- a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0C9B9A3F-D3C7-428F-A506-DF7E3181DB71}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj
index 5d04b40309..40a65202e1 100644
--- a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{15117C50-064B-4992-BC03-B906D93F047F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj
index 23917bc579..3992603ebb 100644
--- a/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0D23EE48-E442-4EE5-B127-3DC280B2B889}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj
index de3e07cfe7..bdfeaeac36 100644
--- a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E5D8C71F-1106-4C4E-A8D6-EA07D7BF539A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj
index 17edf3a7cf..731244c187 100644
--- a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{79877703-8483-436B-ACFA-BF2B50481554}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj
index b304b766b2..61f35e9d24 100644
--- a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{536E8197-14E4-4CA4-B1FC-9D27262872B1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj
index 5462fc07df..a07b13d30c 100644
--- a/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A94D7295-DA3D-4786-9DEF-98DDB6D79EC2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj
index 6de3885650..b13e2f1654 100644
--- a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E042222A-C186-4FD5-BB45-E56FFAF991AA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj
index e91c946ed6..6ce81cd1df 100644
--- a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E7423379-89CE-47F0-B061-4815CA6FC255}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj
index 3685e5f1bb..f0d83b8fb1 100644
--- a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BBFF3FF7-F0FD-450C-B9FB-FBA92A277DBF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj
index e4912fdb85..5eba3ff731 100644
--- a/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{54477C8E-60C4-48D4-8429-4B1428E42367}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj
index 7116fa07b5..d3acaeb5a6 100644
--- a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1490A130-4F0A-48E4-A1C4-CAC746323EA1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj
index d0a3bb7de9..a346fc3756 100644
--- a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A8195820-0DEC-4D0A-A888-436B1A7EA86F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj
index 16b1dbc0ff..e3f699a4a4 100644
--- a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{664785E7-9173-4339-A392-29FC0C81056F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj
index 66adfe584e..7d74663b79 100644
--- a/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EC9581B4-923D-4636-804D-3BA5F08BED1E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj
index c17e8f0b6d..cecaa45ca8 100644
--- a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3FE2BCF6-9DF5-4E3C-835A-864F0DD91039}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj
index 0ccfc8fd78..7855096ce9 100644
--- a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DAF9B805-0C25-4FF0-AA69-C38B16ED4E97}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj
index 1d4653e468..7923dccc52 100644
--- a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AF73E1CF-2E8B-484E-B329-763BB8B3DDDA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj
index cb97705846..7bce3765ab 100644
--- a/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B4142D79-8996-44CE-825A-0304C3689970}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj
index 1af11b9df8..e0b57064ec 100644
--- a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3CA70F86-9BB1-4B6A-B5AC-5C207ADB4BE9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj
index 1e67778e58..65741c476a 100644
--- a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ED3654C6-EE52-4A83-961F-C1D5E5DE1217}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj
index 2aa63ef1c5..426809dd2f 100644
--- a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B7449C08-3EB0-4595-BB7F-309CEFE7C470}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj
index 0369a0c9af..9727f8f8a0 100644
--- a/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EF7BE6ED-DED6-46CE-9819-F3F8493C5044}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj
index d3f2261563..cea3fa0b9a 100644
--- a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{04B7DA69-8E80-41E2-9848-4B7CFAA910FF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj
index f114c9636d..2b7af611d6 100644
--- a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E5322C32-4281-4593-B946-5DCD14477CF1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj
index 427a7564b0..fed83a8301 100644
--- a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C0EA83A7-EE72-4F9F-BC23-7D821507D4B2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj
index 28046b385d..f85ecfab67 100644
--- a/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3D50935B-1230-47C1-8C70-377AC2E8C542}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj
index b657ea8728..917b0d1e7d 100644
--- a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CC4CA6EE-5174-4CFA-93A9-88AD042AE43F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj
index 01d630f13d..c735228f21 100644
--- a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F5C7053B-BD47-46DE-8246-F81941FA537D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj
index 2a3f627cf6..5e593b1cee 100644
--- a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{340B2533-5C07-4261-ABE8-0C39C62A8F2B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj
index 9b44109b8b..fac6318d46 100644
--- a/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F4E4BCA0-1BCF-4351-A95A-C59D35DE24BE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj
index 3ab8d3517a..523913581f 100644
--- a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{80D23E5D-DB08-4B4F-913F-ED296B0500EC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj
index c5bc686197..102fec071b 100644
--- a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6BD00E0F-28A3-4308-9E6B-1DDCC0BA7B0B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj
index 515f5d5a1c..a6c01d901c 100644
--- a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3AF47F6E-E823-4D10-91D2-D1D2291D860D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj
index 5000a7e413..036b5a9c57 100644
--- a/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5729818E-5D7B-45A0-A79F-F6F9AA782223}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj
index e70c90c66e..bc7e122d34 100644
--- a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{234F2BCE-6D53-4033-8D90-D7A2C3262397}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj
index bb95929427..b153d1a6bb 100644
--- a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C62E1AAB-2705-440F-A499-43CA515CBE64}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj
index 96a181c058..05a04ce34a 100644
--- a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D51AD44D-4256-45A6-BDDB-3CE41038CB4F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj
index 60c514dd9d..9eb7db1e52 100644
--- a/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3295C952-BD8B-41B7-A94A-3B80A88832ED}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj
index 9466ec9502..d507464c57 100644
--- a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{56E43EC3-FB57-4C31-AA48-EF6DFE5F7DAF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj
index 4ff18b8280..50e89a9d96 100644
--- a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2A0DB37C-22D9-405A-9EB5-74B5EA151067}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj
index 34f3123576..014fca06a5 100644
--- a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EE0062CC-6F5F-4235-B6EF-4D3B18BFB776}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj
index 1371f860cb..f3fd226215 100644
--- a/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{77488FE6-99C2-478A-BF45-76B7192B05F3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj
index 79dcaa9c3e..552a05e03f 100644
--- a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9AB352DA-BC41-4FD6-9974-571B2894D873}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj
index fe0567b46d..3988a49143 100644
--- a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3683291A-FC9F-459E-87CC-25F401C2DEAA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj
index f8fae86a9e..69d08c2a36 100644
--- a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5206C50D-0D7C-4593-A659-3D51FFA19454}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj
index 7b402bb5db..7a0334dee7 100644
--- a/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B608C48E-89BD-4D20-8DA5-B1DBA234D893}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj
index 7d994a388e..2f8756dbff 100644
--- a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{083D1F5E-6CF7-4B78-B940-439A8CCA0157}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj
index 238b3ef5af..de18408794 100644
--- a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4B961CFE-BB95-4937-9882-E0656590CB30}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj
index ac6426396e..dd39445c6e 100644
--- a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F7C875D0-CC56-4BA0-ABEC-A1DB51C9BEB9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj
index 8bed3fb130..77e800448a 100644
--- a/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4646A951-3BC6-4ECA-8884-A26246FA86B6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj
index a09e7782fa..6928c07d14 100644
--- a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{787F11B6-3900-430B-A6FC-9FE7157625EE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj
index c4d0b1bd6d..e8a27431b2 100644
--- a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{074BA388-8FD2-4B1E-B762-6A31236813C6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj
index ec4385aa90..133fd6ae9d 100644
--- a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E4FC4ED5-8385-4667-9C1C-1AAAB167E2C5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj
index 5067895831..808c2c4067 100644
--- a/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D0FE1238-7277-4663-B545-63D2A8B30F97}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj
index ecda3afd55..89bd43fac9 100644
--- a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5E015DDE-3EC4-43FB-A2BE-C07446B944E8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj
index eb8acf6d7f..50a0a3a125 100644
--- a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D2E40B34-682E-4615-A404-DB62775DD4D0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj
index 4ec9965c21..824fcd166f 100644
--- a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7EED0C6A-CE76-4E71-AF16-806C00CEA1D4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj
index 26c51068bf..74888ae5f5 100644
--- a/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3AEBCD23-397B-4952-815A-BA1F23DDF951}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj
index cf2bbb5fc1..d6ef9014b7 100644
--- a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{139F6A41-C301-4740-A7E7-F4491588F8CF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj
index f9fac8c33a..07c1bdb50c 100644
--- a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5E41B7A6-61CC-4AF4-9A41-50662EE3AF9C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj
index a690f2c2f3..9469c11139 100644
--- a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EAC06643-6BE2-42A5-85C3-C5D5BD463067}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj
index 3d1cba0bef..2939a53dad 100644
--- a/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj
+++ b/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A62D095E-4206-4D11-8762-11DDD63E931E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/compiler/FilterToHandler.ilproj b/tests/src/JIT/Directed/coverage/compiler/FilterToHandler.ilproj
index 88659207f2..cda7c47b52 100644
--- a/tests/src/JIT/Directed/coverage/compiler/FilterToHandler.ilproj
+++ b/tests/src/JIT/Directed/coverage/compiler/FilterToHandler.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj
index bd1d45c030..2a8df2372a 100644
--- a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E6D99C96-0E6F-49BB-A9E7-898345BB88EB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj
index c0d43c38d6..86f4356fbd 100644
--- a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5B790B31-497A-486B-A30C-67F013E370CA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj
index 4da2c90bb0..dea0a1b662 100644
--- a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66CF5824-3763-47A8-ABEA-E8C583DB765F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj
index bb64852157..a9e9ff6653 100644
--- a/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2BDC4E05-9BC3-46E0-B75C-A69451E3DD5E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj
index ad491f2088..1aebc167f0 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj
index 2088900072..b238c517e3 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj
index d32ce5d34c..8f05623e81 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj
index 17b7f72003..dfb6a9093f 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj
index 5bb7b06213..7183aa8f58 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj
index 7d6db85ff6..1acf267bf1 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj
index 4f07c17c56..ea95b94d24 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj
index 6323d53a55..fb3c8a0495 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj
index 7ee3aa15bf..d67b3f11b7 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj
index e229904f4d..985fb0796f 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj
index a5c785fd75..b1eac53850 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj
index 588b319e2c..ac122107ac 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj
index 510e40b637..e81b2f8567 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj
index 890e3f672b..d5634948a4 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj
index 69fef2ca48..f12d7765b0 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj
index f054901016..5c194d22e2 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj
index 81a5a713a4..0355ad813c 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj
index 3e86d36591..2664f75415 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj
index 40f3576813..15366b5ed6 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj
index a22f629433..bcc22994a7 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj
index 66141cb790..7d6cf7c895 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj
index cf92bbfe35..8a5bd429b5 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldfldstatic1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj
index 71073995ef..08b2e054cf 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj
index 161c7595b5..ed41dbf1ab 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj
index a34c688c62..ea1c3a6e16 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj
index 9a059c208c..be1d8b9272 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj
index 97b4d61be0..706a880877 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj
index 1fabcc696f..925c572f9e 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj
index b7de6f8b2c..bccfad4e3e 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj
index 0947193f13..4b2d00cadc 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj
index eaabf5f7fd..f14b1a42e2 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj
index 9caa203432..c90b4e9b79 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_d.ilproj
index 795770cd51..3f19efd780 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_d.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_r.ilproj
index 63073e06ad..611081d027 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stfldstatic1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_d.ilproj
index 32f575af57..ea05ff433c 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_d.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_r.ilproj
index f91eaa8fbb..04167e39d8 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="subovfun1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj
index 550223e885..323052112c 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj
index 0dcdfc00ee..8bd4d537c6 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj
index 059aa63bd7..797ec02152 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj
index 5bc6b272c0..37aae31da8 100644
--- a/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/importer/badendfinally.ilproj b/tests/src/JIT/Directed/coverage/importer/badendfinally.ilproj
index cc5e10b775..3aba180dbc 100644
--- a/tests/src/JIT/Directed/coverage/importer/badendfinally.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/badendfinally.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/badtailcall.ilproj b/tests/src/JIT/Directed/coverage/importer/badtailcall.ilproj
index 0042fc15ab..67646f38c5 100644
--- a/tests/src/JIT/Directed/coverage/importer/badtailcall.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/badtailcall.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj b/tests/src/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj
index d7e7608deb..2a045aa702 100644
--- a/tests/src/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/byrefsubbyref1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/calli2.ilproj b/tests/src/JIT/Directed/coverage/importer/calli2.ilproj
index 931c118af7..4c90709a0d 100644
--- a/tests/src/JIT/Directed/coverage/importer/calli2.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/calli2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/ceeillegal.ilproj b/tests/src/JIT/Directed/coverage/importer/ceeillegal.ilproj
index 4766514ad0..1932820ad3 100644
--- a/tests/src/JIT/Directed/coverage/importer/ceeillegal.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/ceeillegal.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj b/tests/src/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj
index f4032c5c81..a5246d083b 100644
--- a/tests/src/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/ldelemnullarr2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/ldfldstatic1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/ldfldstatic1_il_r.ilproj
index 6746372cc9..0be733ae58 100644
--- a/tests/src/JIT/Directed/coverage/importer/ldfldstatic1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/ldfldstatic1_il_r.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj b/tests/src/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj
index 5f0da3598e..cdc9b7872a 100644
--- a/tests/src/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/ldfldunboxedvt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj b/tests/src/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj
index 7f98be66db..59fb42bd01 100644
--- a/tests/src/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/ldvirtftnsideeffect.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/nullsdarr.ilproj b/tests/src/JIT/Directed/coverage/importer/nullsdarr.ilproj
index 44ab288918..2cf5280814 100644
--- a/tests/src/JIT/Directed/coverage/importer/nullsdarr.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/nullsdarr.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/refanytype1.ilproj b/tests/src/JIT/Directed/coverage/importer/refanytype1.ilproj
index a276296e7c..94a645078e 100644
--- a/tests/src/JIT/Directed/coverage/importer/refanytype1.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/refanytype1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_d.ilproj
index 50d1a3ee2d..fd5c9f08a2 100644
--- a/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_r.ilproj
index 69d3dabde5..6e8388bdde 100644
--- a/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/stfldstatic1_il_r.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj b/tests/src/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj
index b3938673b0..e0ef3aadcb 100644
--- a/tests/src/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/subovfun1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj b/tests/src/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj
index 089a438a01..0242967f1b 100644
--- a/tests/src/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/subovfun1_il_r.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/volatilldind.ilproj b/tests/src/JIT/Directed/coverage/importer/volatilldind.ilproj
index 916fa1ae64..7e10a928c7 100644
--- a/tests/src/JIT/Directed/coverage/importer/volatilldind.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/volatilldind.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/importer/volatilstind.ilproj b/tests/src/JIT/Directed/coverage/importer/volatilstind.ilproj
index 8188e9e5e8..305cde703f 100644
--- a/tests/src/JIT/Directed/coverage/importer/volatilstind.ilproj
+++ b/tests/src/JIT/Directed/coverage/importer/volatilstind.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj
index daf55272e9..c617b9a128 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C17DAACE-3DBA-4199-90E2-96F991712114}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj
index b61c71087d..2e3040f04a 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5540B7B2-2011-400F-9DF6-3A35CF7C4004}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj
index 17d8ac1f21..bed36da9d5 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5536EDEC-592C-4855-8560-839687B39DEF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj
index 04af66584f..7d8c25d7f4 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F99AADDF-CFF0-43F7-9AC9-D19E5A72DBBE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj
index d559008868..75fd194638 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj
index 6940a152ce..8425399eda 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/Desktop/callipinvoke_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="callipinvoke.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj
index fea459f56e..792bfb1911 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj
index 261331178b..49c15f447d 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/arrgetlen_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="arrgetlen.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj b/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj
index 85e6960a82..88f2d6b4fb 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/callipinvoke.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj
index eff3bc83ea..f741aeaff5 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0F8D7570-F2F9-48EC-8337-D30A7E3E804E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj
index 8d206d9923..950d54d128 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{74D4B57D-1DCD-4AA9-B60E-76892E52EA3A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj
index f112ea370b..c15c36481e 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{692088EB-4644-4378-B391-3C06C532281C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj
index 55e2d2b1e3..d21f563c37 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{670924CC-25CB-4669-9106-89971679F2C7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj
index 0f1f0b9d3d..d8b77309f7 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FFFA3954-E59A-4071-86EC-06DA7A87B349}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj
index ecf6b682ea..0f232938a6 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{86DB00A7-72CA-4FCC-9A62-9AF981C699FD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj
index e6c840d63d..7c0bab525b 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EBF6CE8E-B096-4B19-A8FB-08AF2C2E34A6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj
index 14bc157f41..c78da58cee 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{01804A6B-5548-41C8-BE15-95585B0375EC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj
index c5405c4a29..b5e1e9858d 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{526DCCAB-BFA3-423A-AE11-A23C49639EF4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj
index 0331fd56ea..854ce99c81 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{17AEDCD1-89CD-4206-B76C-0161143AC72F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj
index 627d131cdd..2fbf735be8 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{836AD7B3-35E6-49F0-AA37-AB051B84E559}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj
index 62eca656c3..e242f62061 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B5EFBD85-B7E4-4521-8614-AD95F48DFAA3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj
index 433e35bddc..5011180ed4 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{635215B3-122F-499D-8CAB-22F00651EA12}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj
index 20ad103d29..bd5a28f4a6 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{969159A4-B449-49AB-85BC-816C4EF69BD7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj
index 2450d48912..42ad30125a 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{252285C6-BDDB-4826-9E93-7702B02E4BF9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj
index c20762695e..c2b803e06f 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{62C4714A-E180-41FC-B44F-9B87B2375A23}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj
index 38bc0571d4..ade18722ea 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66387298-3248-499D-BBC1-908CABCDC93D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj
index 4cd91ae181..fa38bd35cf 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{682F6F7E-6292-4FEA-B9C5-B40FF34E961D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj
index 9342bad37b..869a0656b8 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D2BEDF6D-C783-44FA-AADD-BC6227726261}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj
index ad1f948746..6656bc137d 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A4C13469-BE68-490F-8B97-F8F0D94D7121}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj
index 47354abe88..71cdb3abcc 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FE50A648-7B41-4F1D-8B76-AF8691895B3F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj
index 30c22ef9b1..c694a12617 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A2B2449A-76A8-48F4-8543-AC20026C5148}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj
index f9bb187b33..4b3dba680e 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F3421840-6516-40F1-842E-323DF63B3329}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj
index 98371f1c69..402aa77971 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8073C7BD-50CE-4CE1-8790-FE34E1D110E8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj
index dc812fa103..249e27cbd6 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C311BEB7-F49A-400B-9FA9-D42156D8AF59}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj
index 13fbe345ec..2458e843df 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5DA2C5C2-46DE-43A7-8AFE-52546BD11F8F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj
index 9ac380e517..5a8da94aeb 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{70A1E75C-C1E9-4FA8-982D-1EFFAE36C08B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj
index 0989a0b903..b1913e26b6 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1D591B1-0CE7-4F36-A258-F0CDE36CAC05}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj
index bab2222320..7ddedaef5c 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj
index c3fd889a84..826ffb31b0 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/lcliimpl_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="lcliimpl.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj
index f00cf25333..1ef1539473 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj
index f0a2ca58e2..8df98b69ff 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj
index 37378dd3a1..51bbf6251a 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj
index 5c382c3efb..80ca6369f3 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ldsshrstsfld_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,27 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldsshrstsfld.il" />
   </ItemGroup>
@@ -36,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj
index a43d7d2752..48e081732d 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj
index 2473fdd773..c665e0b63b 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ldvirtftncalli_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldvirtftncalli.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj
index ef082dcee9..bfebd4ddb5 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj
index 8f5f943a47..09a39b8f71 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj
index ec115893c1..cff019768e 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj
index 6d03359021..6c6a63e1a2 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovfldiv2_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ovfldiv2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj
index effa9848b0..83287fe57d 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj
index 463c697a19..7418860300 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj
index f1a414e2f6..a5f0042a1d 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj
index 8b3d0258d7..70460781f1 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/ovflrem2_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ovflrem2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_d.ilproj
index 50d1a3ee2d..fd5c9f08a2 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_r.ilproj
index bc1984fea8..c4789da668 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic1_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stfldstatic1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj
index da13722f18..3cb4dbd446 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj
index 2888d93011..24755eefac 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/stfldstatic2_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stfldstatic2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj
index 8482730166..2439dcd948 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj
index 3d19a607e5..e9468d5e30 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/subbyref_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="subbyref.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj
index 9a7b469a37..7720236111 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj
index 20e012cddc..b07f2e05f8 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly1_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="switchdefaultonly1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj
index 54c1999f9a..20b692f270 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj
index c09a34deae..812db7d44d 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly2_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="switchdefaultonly2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj
index 8ade89886e..bf768d0043 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj
index b514f3067b..95e4935eea 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/switchdefaultonly3_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="switchdefaultonly3.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/tls1.ilproj b/tests/src/JIT/Directed/coverage/oldtests/tls1.ilproj
index 10ce051b92..bfbdc8dd74 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/tls1.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/tls1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript>
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/coverage/oldtests/tls2.ilproj b/tests/src/JIT/Directed/coverage/oldtests/tls2.ilproj
index e320cd8db8..1b1e7b194a 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/tls2.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/tls2.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript>
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj
index 65759fde5c..7a477503d0 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
     <ProjectReference Include="tls1.ilproj" />
     <ProjectReference Include="tls2.ilproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj
index 8dc9f69f1b..1283d84c39 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,27 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="tlstest.il" />
   </ItemGroup>
@@ -39,11 +35,6 @@
     <ProjectReference Include="tls1.ilproj" />
     <ProjectReference Include="tls2.ilproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj
index fcca8f24f6..dc6b3cfe79 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj
index 8811618c56..c5a38212a5 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/trashreg_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="trashreg.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj
index 396485a671..f4a3a4ae03 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj
index 0d928ecdab..35ad9ae9d6 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/volatilecpobj_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="volatilecpobj.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj b/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj
index 5ff230edbc..bdccd9be38 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj b/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj
index de8bc5cd61..75d84970e8 100644
--- a/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj
+++ b/tests/src/JIT/Directed/coverage/oldtests/zeroinit_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="zeroinit.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/forceinlining/AttributeConflict.ilproj b/tests/src/JIT/Directed/forceinlining/AttributeConflict.ilproj
index 2e8926695e..3f6d9135cb 100644
--- a/tests/src/JIT/Directed/forceinlining/AttributeConflict.ilproj
+++ b/tests/src/JIT/Directed/forceinlining/AttributeConflict.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj b/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj
index 623b2279a7..8a63e85a31 100644
--- a/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj
+++ b/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/forceinlining/NegativeCases.ilproj b/tests/src/JIT/Directed/forceinlining/NegativeCases.ilproj
index 261f43e8ca..fc2780ba65 100644
--- a/tests/src/JIT/Directed/forceinlining/NegativeCases.ilproj
+++ b/tests/src/JIT/Directed/forceinlining/NegativeCases.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/forceinlining/NoMetaData.csproj b/tests/src/JIT/Directed/forceinlining/NoMetaData.csproj
index 9da577b969..50c3d55a84 100644
--- a/tests/src/JIT/Directed/forceinlining/NoMetaData.csproj
+++ b/tests/src/JIT/Directed/forceinlining/NoMetaData.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/forceinlining/PositiveCases.ilproj b/tests/src/JIT/Directed/forceinlining/PositiveCases.ilproj
index 4e5e863e13..af97d60669 100644
--- a/tests/src/JIT/Directed/forceinlining/PositiveCases.ilproj
+++ b/tests/src/JIT/Directed/forceinlining/PositiveCases.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/forceinlining/Recursion.csproj b/tests/src/JIT/Directed/forceinlining/Recursion.csproj
index 49851c579b..98e7fc9025 100644
--- a/tests/src/JIT/Directed/forceinlining/Recursion.csproj
+++ b/tests/src/JIT/Directed/forceinlining/Recursion.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/gettypetypeof/gettypetypeofmatrix.csproj b/tests/src/JIT/Directed/gettypetypeof/gettypetypeofmatrix.csproj
index f183426609..cb9ac508b1 100644
--- a/tests/src/JIT/Directed/gettypetypeof/gettypetypeofmatrix.csproj
+++ b/tests/src/JIT/Directed/gettypetypeof/gettypetypeofmatrix.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj
index cf820cc825..84e81b7021 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{21FE6A95-5B17-4AC7-B5CB-32594DDE8172}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj
index 970d86a633..ffb022396f 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ADEEA3D1-B67B-456E-8F2B-6DCCACC2D34C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj
index 78868b798c..3c406d8fba 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{85BA4D30-89D2-400E-87EE-16A73C104C11}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj
index 90aae392eb..d6517aace8 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73F2BEC9-2696-44E4-BBD5-51E95E3BCC99}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj
index 99c82b66eb..9312b90007 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{81F3AFF3-023A-4CE5-8BAA-271BB68FB133}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj b/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj
index 7d09218180..2a25035c84 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F0EFE7B4-4364-45C6-8491-E5F5F127CDD1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj
index 6a873f9777..dab9493339 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj
index e45e0194eb..4e6e0925ef 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj
index 31728bbc27..c98b81d0d0 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj
index e912102c76..1d9c9f8460 100644
--- a/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj
+++ b/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj
index a8a5fb5614..7a1af52ca1 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6EAEA64D-0062-4D88-ADDE-4169E502FF59}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj
index 956dfd5d64..6058afb21a 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BB831C2F-A50B-4845-895F-63626C532CFA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj
index e22c84495f..ce00195975 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8711F254-3E93-4F1E-B2B3-DB6E34CE10B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj
index fcef9d6ee2..6db9970d41 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1EC5A52D-60F5-4F1F-B85D-81E81F1C765A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow1.cs b/tests/src/JIT/Directed/intrinsic/pow/pow1.cs
index dc6e1a1b83..6f2921d78f 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow1.cs
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow1.cs
@@ -129,7 +129,7 @@ internal class pow1
         x = 1;
         y = Double.NaN;
         z = Math.Pow(x, y);
-        if (!Double.IsNaN(z))
+        if (z != 1)
         {
             Console.WriteLine("x: {0}, y: {1}, Pow(x,y): {2}", x, y, z);
             pass = false;
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj
index f8524f3c34..940705cd82 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BA376677-A1BA-430A-A03F-0348CCDED059}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj
index 8968c02b73..1d6beb9837 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E36836E5-9AEE-4B23-835E-1C6CDA002DBA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj
index ca5cd5ab9c..991ef9c29f 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{04AF3C38-9796-4C40-B6CF-4A9F48BB5076}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj
index 719bff5894..3dc3e7ad2c 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BFB8EFE5-7236-437E-A3C2-5811D340B056}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj
index 6acbf20717..57ff38654f 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4F00E4F2-9957-4845-91A3-D2E903014B68}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj
index 188c2d88fd..e22d872553 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B310070F-A72B-49F2-B75F-09F072EE595D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj
index aee7c47307..290b105108 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{463BD49E-2227-483E-8E08-FCB431FC9C54}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj
index c8eaf028c8..294233a192 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BA483BED-BD99-4AE0-B4DC-42BF573F054D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj
index fbc5ba929a..79a80bb688 100644
--- a/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj
+++ b/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C3FB16BB-A1CB-4294-B154-A8704C95F0D4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/leave/catch1_d.ilproj b/tests/src/JIT/Directed/leave/catch1_d.ilproj
index 2696a91083..5a0a5aec94 100644
--- a/tests/src/JIT/Directed/leave/catch1_d.ilproj
+++ b/tests/src/JIT/Directed/leave/catch1_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/leave/catch1_r.ilproj b/tests/src/JIT/Directed/leave/catch1_r.ilproj
index 04c91f7d17..287f03882d 100644
--- a/tests/src/JIT/Directed/leave/catch1_r.ilproj
+++ b/tests/src/JIT/Directed/leave/catch1_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="catch1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/leave/catch2_d.ilproj b/tests/src/JIT/Directed/leave/catch2_d.ilproj
index 90f91c4484..006d84d2b3 100644
--- a/tests/src/JIT/Directed/leave/catch2_d.ilproj
+++ b/tests/src/JIT/Directed/leave/catch2_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/leave/catch2_r.ilproj b/tests/src/JIT/Directed/leave/catch2_r.ilproj
index 1e67b7f333..9543cd484e 100644
--- a/tests/src/JIT/Directed/leave/catch2_r.ilproj
+++ b/tests/src/JIT/Directed/leave/catch2_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="catch2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/leave/catch3_d.ilproj b/tests/src/JIT/Directed/leave/catch3_d.ilproj
index a3c315317c..7e4c5e6b77 100644
--- a/tests/src/JIT/Directed/leave/catch3_d.ilproj
+++ b/tests/src/JIT/Directed/leave/catch3_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/leave/catch3_r.ilproj b/tests/src/JIT/Directed/leave/catch3_r.ilproj
index 3a5fd1e287..f0d9a4bc51 100644
--- a/tests/src/JIT/Directed/leave/catch3_r.ilproj
+++ b/tests/src/JIT/Directed/leave/catch3_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="catch3.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/leave/filter1_d.ilproj b/tests/src/JIT/Directed/leave/filter1_d.ilproj
index f1dc73b737..96b779f71f 100644
--- a/tests/src/JIT/Directed/leave/filter1_d.ilproj
+++ b/tests/src/JIT/Directed/leave/filter1_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/leave/filter1_r.ilproj b/tests/src/JIT/Directed/leave/filter1_r.ilproj
index 0e0986e07d..f53c678948 100644
--- a/tests/src/JIT/Directed/leave/filter1_r.ilproj
+++ b/tests/src/JIT/Directed/leave/filter1_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="filter1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/leave/filter2_d.ilproj b/tests/src/JIT/Directed/leave/filter2_d.ilproj
index 15d9e4c774..814a738417 100644
--- a/tests/src/JIT/Directed/leave/filter2_d.ilproj
+++ b/tests/src/JIT/Directed/leave/filter2_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/leave/filter2_r.ilproj b/tests/src/JIT/Directed/leave/filter2_r.ilproj
index 95d774f044..e2bf9cb5ac 100644
--- a/tests/src/JIT/Directed/leave/filter2_r.ilproj
+++ b/tests/src/JIT/Directed/leave/filter2_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="filter2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/leave/filter3_d.ilproj b/tests/src/JIT/Directed/leave/filter3_d.ilproj
index 55b21c7b81..2b0bb43c52 100644
--- a/tests/src/JIT/Directed/leave/filter3_d.ilproj
+++ b/tests/src/JIT/Directed/leave/filter3_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/leave/filter3_r.ilproj b/tests/src/JIT/Directed/leave/filter3_r.ilproj
index d17e0c5d06..195c7162a6 100644
--- a/tests/src/JIT/Directed/leave/filter3_r.ilproj
+++ b/tests/src/JIT/Directed/leave/filter3_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="filter3.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/leave/try1_d.ilproj b/tests/src/JIT/Directed/leave/try1_d.ilproj
index 6649bce515..96c697db68 100644
--- a/tests/src/JIT/Directed/leave/try1_d.ilproj
+++ b/tests/src/JIT/Directed/leave/try1_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/leave/try1_r.ilproj b/tests/src/JIT/Directed/leave/try1_r.ilproj
index 85f069311a..9edb7367d6 100644
--- a/tests/src/JIT/Directed/leave/try1_r.ilproj
+++ b/tests/src/JIT/Directed/leave/try1_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="try1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/leave/try2_d.ilproj b/tests/src/JIT/Directed/leave/try2_d.ilproj
index abf6693c6f..602c2ee5cd 100644
--- a/tests/src/JIT/Directed/leave/try2_d.ilproj
+++ b/tests/src/JIT/Directed/leave/try2_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/leave/try2_r.ilproj b/tests/src/JIT/Directed/leave/try2_r.ilproj
index 27caf6715b..8e9ee62af1 100644
--- a/tests/src/JIT/Directed/leave/try2_r.ilproj
+++ b/tests/src/JIT/Directed/leave/try2_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="try2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/leave/try3_d.ilproj b/tests/src/JIT/Directed/leave/try3_d.ilproj
index eb6c067599..d9b19fb515 100644
--- a/tests/src/JIT/Directed/leave/try3_d.ilproj
+++ b/tests/src/JIT/Directed/leave/try3_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/leave/try3_r.ilproj b/tests/src/JIT/Directed/leave/try3_r.ilproj
index 12c4bb1116..2d0d053a3b 100644
--- a/tests/src/JIT/Directed/leave/try3_r.ilproj
+++ b/tests/src/JIT/Directed/leave/try3_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="try3.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/lifetime/lifetime1.csproj b/tests/src/JIT/Directed/lifetime/lifetime1.csproj
index 14e03a4ee9..8e5dfea35b 100644
--- a/tests/src/JIT/Directed/lifetime/lifetime1.csproj
+++ b/tests/src/JIT/Directed/lifetime/lifetime1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EF78FAFF-1A60-4ACA-B8F0-8B3C14D89C5F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/lifetime/lifetime2.csproj b/tests/src/JIT/Directed/lifetime/lifetime2.csproj
index b5a3146db6..f8620c04a3 100644
--- a/tests/src/JIT/Directed/lifetime/lifetime2.csproj
+++ b/tests/src/JIT/Directed/lifetime/lifetime2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D08BDFE0-70D1-4465-9AF3-1D95BA27F8AF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj b/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj
index 59d2a410df..40782d6154 100644
--- a/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj
+++ b/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DF9F4DF1-EE55-4CF4-9362-F8AD0646EE31}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj b/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj
index ae4b20a6f6..932b06db0f 100644
--- a/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj
+++ b/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D773D72F-F59F-47FE-8BC1-5B77C374CDED}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj b/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj
index 45e404c8a9..7971b0f529 100644
--- a/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj
+++ b/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BF7A1709-11C5-4C19-9335-946A65F7B71C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj b/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj
index fdea7a5200..efa6fd5bd2 100644
--- a/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj
+++ b/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9AB77F8B-4584-4AE3-BD06-C538D83F72C0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/newarr/newarr.csproj b/tests/src/JIT/Directed/newarr/newarr.csproj
index e7c681ff03..1e59965fad 100644
--- a/tests/src/JIT/Directed/newarr/newarr.csproj
+++ b/tests/src/JIT/Directed/newarr/newarr.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{996021AF-AB49-4B39-A3C7-3D874E9B4230}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj b/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj
index 9f3ad3435f..1227703cfe 100644
--- a/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj b/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj
index 557245a432..0d79b3b0f5 100644
--- a/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj b/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj
index ccb575ddd2..178ccebf79 100644
--- a/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj b/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj
index 8e8c9e6446..033bc3b07d 100644
--- a/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj b/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj
index 30cf49990d..5ca272194c 100644
--- a/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj b/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj
index 6efda5a5f1..8ca3b2900d 100644
--- a/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj b/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj
index 5ca46ee28a..76a908f353 100644
--- a/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/boxunboxenum_d.csproj b/tests/src/JIT/Directed/nullabletypes/boxunboxenum_d.csproj
index b707967440..9c6d9e1aa3 100644
--- a/tests/src/JIT/Directed/nullabletypes/boxunboxenum_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/boxunboxenum_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/boxunboxenum_do.csproj b/tests/src/JIT/Directed/nullabletypes/boxunboxenum_do.csproj
index 548ec39e12..63a911caf8 100644
--- a/tests/src/JIT/Directed/nullabletypes/boxunboxenum_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/boxunboxenum_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/boxunboxenum_r.csproj b/tests/src/JIT/Directed/nullabletypes/boxunboxenum_r.csproj
index d3b991a716..684d2a7518 100644
--- a/tests/src/JIT/Directed/nullabletypes/boxunboxenum_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/boxunboxenum_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj b/tests/src/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj
index a8ac0b5447..877edf61e6 100644
--- a/tests/src/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj b/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj
index dd04ece2ab..10dbc2b632 100644
--- a/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj b/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj
index ce3c88033b..2d26249562 100644
--- a/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj b/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj
index b64525be11..a7d0e679df 100644
--- a/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj b/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj
index 9b65d14370..4f5a6887e8 100644
--- a/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassenum_d.csproj b/tests/src/JIT/Directed/nullabletypes/castclassenum_d.csproj
index 62ee76b677..10f27a6480 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassenum_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassenum_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassenum_do.csproj b/tests/src/JIT/Directed/nullabletypes/castclassenum_do.csproj
index 9b7cd29d0b..6b1c02e167 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassenum_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassenum_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassenum_r.csproj b/tests/src/JIT/Directed/nullabletypes/castclassenum_r.csproj
index e90f844fa1..7c23fdbe29 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassenum_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassenum_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassenum_ro.csproj b/tests/src/JIT/Directed/nullabletypes/castclassenum_ro.csproj
index 1f59571497..4f1ec4605f 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassenum_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassenum_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassinterface_d.csproj b/tests/src/JIT/Directed/nullabletypes/castclassinterface_d.csproj
index 6cd108b5e7..3a14a6510c 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassinterface_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassinterface_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassinterface_do.csproj b/tests/src/JIT/Directed/nullabletypes/castclassinterface_do.csproj
index 0f46e584d6..2d74bc0fa0 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassinterface_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassinterface_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassinterface_r.csproj b/tests/src/JIT/Directed/nullabletypes/castclassinterface_r.csproj
index 261764524b..64102b68ff 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassinterface_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassinterface_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassinterface_ro.csproj b/tests/src/JIT/Directed/nullabletypes/castclassinterface_ro.csproj
index d9b3322c77..932ece4cbe 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassinterface_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassinterface_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj b/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj
index 78ce99d0c0..8176413603 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj b/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj
index 14f13e3874..227e94f76a 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj b/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj
index db14d6e973..5e775e2fa3 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj b/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj
index 3901561fd4..ec87d3a3aa 100644
--- a/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj b/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj
index 980c5ac723..6b7289218a 100644
--- a/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj b/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj
index 726d4b2e7a..75e219e132 100644
--- a/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj b/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj
index ee5bd8496d..6733652bc9 100644
--- a/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj b/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj
index e19dc21089..72a1234a61 100644
--- a/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj b/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj
index c444e552b0..6e1b9867af 100644
--- a/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj b/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj
index c96cc91499..d93e5e8f33 100644
--- a/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj b/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj
index 5e4bd66f4a..fc99c3b2eb 100644
--- a/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj b/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj
index 34a2b73cc1..83c5d21473 100644
--- a/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj b/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj
index 16ba577f99..675a473ed4 100644
--- a/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj b/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj
index e792df3a8f..cdb9512d41 100644
--- a/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj b/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj
index 034a3b2483..047d272830 100644
--- a/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj b/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj
index 06934c5c2d..817d41f79d 100644
--- a/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj b/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj
index eae13fa979..a9c2ad2b7d 100644
--- a/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj b/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj
index b07cb2e4b6..18a0f5ebe0 100644
--- a/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj b/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj
index ad709a164a..3eaee993f0 100644
--- a/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj b/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj
index ef456c9e91..506643650a 100644
--- a/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinst2_d.csproj b/tests/src/JIT/Directed/nullabletypes/isinst2_d.csproj
index 20467f8721..88d54da334 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinst2_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinst2_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinst2_do.csproj b/tests/src/JIT/Directed/nullabletypes/isinst2_do.csproj
index ea35e31225..12b9285d2a 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinst2_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinst2_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinst2_r.csproj b/tests/src/JIT/Directed/nullabletypes/isinst2_r.csproj
index a45e96cf9f..bbdac6848b 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinst2_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinst2_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinst2_ro.csproj b/tests/src/JIT/Directed/nullabletypes/isinst2_ro.csproj
index f90c9558ed..6b73987eff 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinst2_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinst2_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinst_d.csproj b/tests/src/JIT/Directed/nullabletypes/isinst_d.csproj
index 3b12dad45d..6777a43788 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinst_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinst_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinst_do.csproj b/tests/src/JIT/Directed/nullabletypes/isinst_do.csproj
index 4f4fd59431..5ba3726fbb 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinst_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinst_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinst_r.csproj b/tests/src/JIT/Directed/nullabletypes/isinst_r.csproj
index 4207ebba0b..8ee24d0be4 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinst_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinst_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinst_ro.csproj b/tests/src/JIT/Directed/nullabletypes/isinst_ro.csproj
index 257583b13e..962a183abd 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinst_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinst_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstboxed_d.csproj b/tests/src/JIT/Directed/nullabletypes/isinstboxed_d.csproj
index c2f3895bba..9aa079447b 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstboxed_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstboxed_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstboxed_do.csproj b/tests/src/JIT/Directed/nullabletypes/isinstboxed_do.csproj
index 5a6b26070b..0ccbc54a71 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstboxed_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstboxed_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstboxed_r.csproj b/tests/src/JIT/Directed/nullabletypes/isinstboxed_r.csproj
index 7736d4a8b0..e7208d6c76 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstboxed_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstboxed_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstboxed_ro.csproj b/tests/src/JIT/Directed/nullabletypes/isinstboxed_ro.csproj
index 3616ae1725..633ac85c2f 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstboxed_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstboxed_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstenum_d.csproj b/tests/src/JIT/Directed/nullabletypes/isinstenum_d.csproj
index ad696bc104..3e90a5321a 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstenum_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstenum_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstenum_do.csproj b/tests/src/JIT/Directed/nullabletypes/isinstenum_do.csproj
index 741948559f..6a031593c6 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstenum_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstenum_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstenum_r.csproj b/tests/src/JIT/Directed/nullabletypes/isinstenum_r.csproj
index 1a2a076b5f..673cd2e16e 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstenum_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstenum_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstenum_ro.csproj b/tests/src/JIT/Directed/nullabletypes/isinstenum_ro.csproj
index dd98319355..9f06c3ee52 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstenum_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstenum_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstgenerics_d.csproj b/tests/src/JIT/Directed/nullabletypes/isinstgenerics_d.csproj
index d794c90533..1ff52d67f2 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstgenerics_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstgenerics_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstgenerics_do.csproj b/tests/src/JIT/Directed/nullabletypes/isinstgenerics_do.csproj
index c98615c371..95fc60cdd3 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstgenerics_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstgenerics_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstgenerics_r.csproj b/tests/src/JIT/Directed/nullabletypes/isinstgenerics_r.csproj
index bf40451f36..c5bf1143e5 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstgenerics_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstgenerics_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj b/tests/src/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj
index 6fe129256d..e2e745ac2c 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstinterface_d.csproj b/tests/src/JIT/Directed/nullabletypes/isinstinterface_d.csproj
index 6e5d9e69cf..fdbe5fa053 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstinterface_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstinterface_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstinterface_do.csproj b/tests/src/JIT/Directed/nullabletypes/isinstinterface_do.csproj
index a79bfbbb56..2e1276dd7b 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstinterface_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstinterface_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstinterface_r.csproj b/tests/src/JIT/Directed/nullabletypes/isinstinterface_r.csproj
index a9b86efbd3..ad0bf81b2d 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstinterface_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstinterface_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstinterface_ro.csproj b/tests/src/JIT/Directed/nullabletypes/isinstinterface_ro.csproj
index d772b058b7..b8dd7bdf40 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstinterface_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstinterface_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj b/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj
index 5cbe359364..5854d019bb 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj b/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj
index 269f4b7d92..8145f94909 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj b/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj
index f49abd588b..68ff8ce48a 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj b/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj
index f1be01a43b..6d67829d36 100644
--- a/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj b/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj
index 3516406c3f..e9c2606734 100644
--- a/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj b/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj
index 319d640004..002ef28513 100644
--- a/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj b/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj
index 9042ddd211..eccff9e5ed 100644
--- a/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj b/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj
index c3d9de15a7..ad6320fed5 100644
--- a/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.csproj b/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.csproj
index f016100fdb..dd52e16388 100644
--- a/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.csproj b/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.csproj
index 596bd515f6..0deeae5561 100644
--- a/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.csproj b/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.csproj
index f9cd632d6c..209e5dd7ac 100644
--- a/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.csproj b/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.csproj
index a84fa872ce..bc58748570 100644
--- a/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/value_d.csproj b/tests/src/JIT/Directed/nullabletypes/value_d.csproj
index d4288ce6fe..1f007b1fc1 100644
--- a/tests/src/JIT/Directed/nullabletypes/value_d.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/value_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/value_do.csproj b/tests/src/JIT/Directed/nullabletypes/value_do.csproj
index de30d0ebf5..b2a81eed65 100644
--- a/tests/src/JIT/Directed/nullabletypes/value_do.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/value_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/value_r.csproj b/tests/src/JIT/Directed/nullabletypes/value_r.csproj
index 767d39d2df..121ec6fae3 100644
--- a/tests/src/JIT/Directed/nullabletypes/value_r.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/value_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/nullabletypes/value_ro.csproj b/tests/src/JIT/Directed/nullabletypes/value_ro.csproj
index 3a92cda944..0e09639146 100644
--- a/tests/src/JIT/Directed/nullabletypes/value_ro.csproj
+++ b/tests/src/JIT/Directed/nullabletypes/value_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj b/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj
index 2ba782e815..746179a67f 100644
--- a/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj
+++ b/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj b/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj
index b1cc093231..e85f1d8bcf 100644
--- a/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj
+++ b/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj b/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj
index a614ff7c66..92c62ab474 100644
--- a/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj
+++ b/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj b/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj
index ec2eb2e5a3..2a60a26822 100644
--- a/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj
+++ b/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj b/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj
index b75d37863e..d6063efb7d 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj b/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj
index cfb3471ec9..6334a20d26 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj b/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj
index 25f165e8c9..c0b62f29fa 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj b/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj
index cd47917f5a..3e5de7257b 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj b/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj
index b2071b0f3e..402e06a7fd 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj b/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj
index e86000743c..7d247ed84b 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj b/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj
index 6bc431a82f..5574f4317b 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj b/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj
index d27ceecd10..97f6cf4172 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj b/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj
index 8175f992fc..889be7812c 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj b/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj
index 4c787b601c..73db72055c 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\PREFIX\PrimitiveVT\helper.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj b/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj
index 25840a621d..1a335c5535 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj b/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj
index 40fa2e245c..53badbe132 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="nativeinthelper.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj b/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj
index 5c782e7b31..14bb07d9d5 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj b/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj
index 9913d93566..aec70d81fc 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj b/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj
index 28e81b8bde..211a2b5377 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj b/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj
index db11161cbe..b6d77ab798 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj b/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj
index 9361b07010..d23bdaf86e 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj b/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj
index d012b34eae..3ac17c3b74 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj b/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj
index afb1a510a1..8710250b44 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj b/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj
index 4a72942da7..116f89af13 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/perffix/primitivevt/nativeinthelper.ilproj b/tests/src/JIT/Directed/perffix/primitivevt/nativeinthelper.ilproj
index 1eaf6a2083..3a77c8875b 100644
--- a/tests/src/JIT/Directed/perffix/primitivevt/nativeinthelper.ilproj
+++ b/tests/src/JIT/Directed/perffix/primitivevt/nativeinthelper.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/pinning/object-pin/object-pin.ilproj b/tests/src/JIT/Directed/pinning/object-pin/object-pin.ilproj
index 70422447ea..81a3e31b5b 100644
--- a/tests/src/JIT/Directed/pinning/object-pin/object-pin.ilproj
+++ b/tests/src/JIT/Directed/pinning/object-pin/object-pin.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -30,9 +28,8 @@
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-    <ProjectReference Include="CMakelists.txt"/>
+    <ProjectReference Include="CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj b/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj
index 2c5932ae35..35d185a386 100644
--- a/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="calli_excep.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/pinvoke/jump.ilproj b/tests/src/JIT/Directed/pinvoke/jump.ilproj
index 8bd0e4e64e..2434443ff0 100644
--- a/tests/src/JIT/Directed/pinvoke/jump.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/jump.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="jump.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/jit/Directed/pinvoke/pinvoke-bug.cs b/tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs
index 2d4b5f6aea..2d4b5f6aea 100644
--- a/tests/src/jit/Directed/pinvoke/pinvoke-bug.cs
+++ b/tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs
diff --git a/tests/src/JIT/Directed/pinvoke/pinvoke-bug.csproj b/tests/src/JIT/Directed/pinvoke/pinvoke-bug.csproj
new file mode 100644
index 0000000000..6edfc403ba
--- /dev/null
+++ b/tests/src/JIT/Directed/pinvoke/pinvoke-bug.csproj
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="pinvoke-bug.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj b/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj
index 78cf4471fe..d94315a478 100644
--- a/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj
+++ b/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.il b/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.il
index 1e3b310829..56b3144a69 100644
--- a/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.il
+++ b/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.il
@@ -161,7 +161,7 @@
     IL_001d:  callvirt   instance bool [mscorlib]System.Threading.WaitHandle::WaitOne()
     IL_0022:  pop
     IL_0023:  ldc.i4     0x3e8
-    IL_0028:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0028:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_002d:  nop
     IL_002e:  call       void [mscorlib]System.GC::Collect()
     IL_0033:  nop
@@ -178,22 +178,22 @@
   {
     .entrypoint
     .maxstack  3
-    .locals init (class [mscorlib]System.Threading.Thread V_0,
+    .locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
              int32 V_1)
     IL_0000:  nop
     IL_0001:  ldnull
     IL_0002:  ldftn      void Repro::GCHole()
-    IL_0008:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0008:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_000d:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_000d:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0012:  stloc.0
     IL_0013:  ldloc.0
-    IL_0014:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_0014:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0019:  nop
     IL_001a:  call       void Repro::Trigger()
     IL_001f:  nop
     IL_0020:  ldloc.0
-    IL_0021:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0021:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_0026:  nop
     IL_0027:  ldc.i4.s   100
     IL_0029:  stloc.1
diff --git a/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj b/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj
index a17e4868be..878c5bb9b5 100644
--- a/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/pinvoke/sin.csproj b/tests/src/JIT/Directed/pinvoke/sin.csproj
index ceabb95fdc..058c7bfbe8 100644
--- a/tests/src/JIT/Directed/pinvoke/sin.csproj
+++ b/tests/src/JIT/Directed/pinvoke/sin.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj b/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj
index 445e5bea13..7ebe7b2275 100644
--- a/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj
+++ b/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj b/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj
index d53215118b..764c279e34 100644
--- a/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/sysinfo_il.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sysinfo.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/pinvoke/tail.ilproj b/tests/src/JIT/Directed/pinvoke/tail.ilproj
index 4788eef1a7..3f00df9d37 100644
--- a/tests/src/JIT/Directed/pinvoke/tail.ilproj
+++ b/tests/src/JIT/Directed/pinvoke/tail.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="tail.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/refbyref/byref2iu_il_d.ilproj b/tests/src/JIT/Directed/refbyref/byref2iu_il_d.ilproj
index b947170475..7744a105fb 100644
--- a/tests/src/JIT/Directed/refbyref/byref2iu_il_d.ilproj
+++ b/tests/src/JIT/Directed/refbyref/byref2iu_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/refbyref/byref2iu_il_r.ilproj b/tests/src/JIT/Directed/refbyref/byref2iu_il_r.ilproj
index 541b665639..1b0d1e956e 100644
--- a/tests/src/JIT/Directed/refbyref/byref2iu_il_r.ilproj
+++ b/tests/src/JIT/Directed/refbyref/byref2iu_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/refbyref/byrefconvert_il_d.ilproj b/tests/src/JIT/Directed/refbyref/byrefconvert_il_d.ilproj
index d3fe079bca..e38a69bf46 100644
--- a/tests/src/JIT/Directed/refbyref/byrefconvert_il_d.ilproj
+++ b/tests/src/JIT/Directed/refbyref/byrefconvert_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/refbyref/byrefconvert_il_r.ilproj b/tests/src/JIT/Directed/refbyref/byrefconvert_il_r.ilproj
index f8e2b4a781..945f0bc4d1 100644
--- a/tests/src/JIT/Directed/refbyref/byrefconvert_il_r.ilproj
+++ b/tests/src/JIT/Directed/refbyref/byrefconvert_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="byrefconvert.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/refbyref/ref2byref_il_d.ilproj b/tests/src/JIT/Directed/refbyref/ref2byref_il_d.ilproj
index 3a0e22393c..91f163b5e6 100644
--- a/tests/src/JIT/Directed/refbyref/ref2byref_il_d.ilproj
+++ b/tests/src/JIT/Directed/refbyref/ref2byref_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/refbyref/ref2byref_il_r.ilproj b/tests/src/JIT/Directed/refbyref/ref2byref_il_r.ilproj
index 899044d506..a0217f66be 100644
--- a/tests/src/JIT/Directed/refbyref/ref2byref_il_r.ilproj
+++ b/tests/src/JIT/Directed/refbyref/ref2byref_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/refbyref/ref2iu_il_d.ilproj b/tests/src/JIT/Directed/refbyref/ref2iu_il_d.ilproj
index 29a908f980..5dafc9f416 100644
--- a/tests/src/JIT/Directed/refbyref/ref2iu_il_d.ilproj
+++ b/tests/src/JIT/Directed/refbyref/ref2iu_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/refbyref/ref2iu_il_r.ilproj b/tests/src/JIT/Directed/refbyref/ref2iu_il_r.ilproj
index 40b16b0391..e294b31391 100644
--- a/tests/src/JIT/Directed/refbyref/ref2iu_il_r.ilproj
+++ b/tests/src/JIT/Directed/refbyref/ref2iu_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj b/tests/src/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj
index 8e86d7bcce..53babfb678 100644
--- a/tests/src/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj
+++ b/tests/src/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj b/tests/src/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj
index 68572297f5..3b95565ac8 100644
--- a/tests/src/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj
+++ b/tests/src/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj b/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj
index f4dba81ab8..29d243eb40 100644
--- a/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj
+++ b/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj b/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj
index 08a76e005b..2e74b28742 100644
--- a/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj
+++ b/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj b/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj
index 278c85d630..37666c9844 100644
--- a/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj
+++ b/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj b/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj
index 619b380b8e..42750bf44f 100644
--- a/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj
+++ b/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj b/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj
index 3ea10f765c..747ffc2ef8 100644
--- a/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj
+++ b/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/int16_cs_d.csproj b/tests/src/JIT/Directed/shift/int16_cs_d.csproj
index 8bbcee53f0..f83ae11a39 100644
--- a/tests/src/JIT/Directed/shift/int16_cs_d.csproj
+++ b/tests/src/JIT/Directed/shift/int16_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6FDF315A-5225-461E-895D-301CC2050F61}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int16_cs_do.csproj b/tests/src/JIT/Directed/shift/int16_cs_do.csproj
index 4d9e47f123..9af2592baf 100644
--- a/tests/src/JIT/Directed/shift/int16_cs_do.csproj
+++ b/tests/src/JIT/Directed/shift/int16_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{709C9072-CB04-41B3-8D13-6B8FF3C2B7FA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int16_cs_r.csproj b/tests/src/JIT/Directed/shift/int16_cs_r.csproj
index 438d50d874..45e28882f5 100644
--- a/tests/src/JIT/Directed/shift/int16_cs_r.csproj
+++ b/tests/src/JIT/Directed/shift/int16_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1395D6FB-EECE-4F71-AA76-596BD19E9DFF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int16_cs_ro.csproj b/tests/src/JIT/Directed/shift/int16_cs_ro.csproj
index 1586232235..a07f5df491 100644
--- a/tests/src/JIT/Directed/shift/int16_cs_ro.csproj
+++ b/tests/src/JIT/Directed/shift/int16_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6C120650-2F5F-497F-B549-AECD705C3298}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int16_d.csproj b/tests/src/JIT/Directed/shift/int16_d.csproj
index f764e281e1..690dee9fcf 100644
--- a/tests/src/JIT/Directed/shift/int16_d.csproj
+++ b/tests/src/JIT/Directed/shift/int16_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{243A642E-779B-4660-9FAE-F40A3E117598}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
-    <Optimize>
-    </Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="int16.cs" />
@@ -37,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/int16_do.csproj b/tests/src/JIT/Directed/shift/int16_do.csproj
index 597fe79b93..ef9e87bc6c 100644
--- a/tests/src/JIT/Directed/shift/int16_do.csproj
+++ b/tests/src/JIT/Directed/shift/int16_do.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{89E37000-896E-4DD5-BE59-AB3AE8E0452D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/int16_r.csproj b/tests/src/JIT/Directed/shift/int16_r.csproj
index 2fa5e68f1e..b42825e8b4 100644
--- a/tests/src/JIT/Directed/shift/int16_r.csproj
+++ b/tests/src/JIT/Directed/shift/int16_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6A409898-4C54-4952-8D10-4805CF04E3E4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int16_ro.csproj b/tests/src/JIT/Directed/shift/int16_ro.csproj
index 7f9eb2c001..18524df77e 100644
--- a/tests/src/JIT/Directed/shift/int16_ro.csproj
+++ b/tests/src/JIT/Directed/shift/int16_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{60D2F293-AE51-496E-BF9D-8220AE7E3F32}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int32_cs_d.csproj b/tests/src/JIT/Directed/shift/int32_cs_d.csproj
index 877b43ca91..07a215b852 100644
--- a/tests/src/JIT/Directed/shift/int32_cs_d.csproj
+++ b/tests/src/JIT/Directed/shift/int32_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6CEC3ED9-1237-45C7-9C94-4E75BCFC3C2C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int32_cs_do.csproj b/tests/src/JIT/Directed/shift/int32_cs_do.csproj
index 95e557e0c9..7a7abb9256 100644
--- a/tests/src/JIT/Directed/shift/int32_cs_do.csproj
+++ b/tests/src/JIT/Directed/shift/int32_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6CD15AD8-C9CE-4B0C-9EFA-29253F2C01F4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int32_cs_r.csproj b/tests/src/JIT/Directed/shift/int32_cs_r.csproj
index 91618a6242..84f0231272 100644
--- a/tests/src/JIT/Directed/shift/int32_cs_r.csproj
+++ b/tests/src/JIT/Directed/shift/int32_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D962E02D-75D1-4A3A-A1A8-7AAE32E86D75}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int32_cs_ro.csproj b/tests/src/JIT/Directed/shift/int32_cs_ro.csproj
index d8b186c5ed..183819e88f 100644
--- a/tests/src/JIT/Directed/shift/int32_cs_ro.csproj
+++ b/tests/src/JIT/Directed/shift/int32_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{693C6DD6-4F3E-44A5-AE97-600BC5780DB3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int32_d.csproj b/tests/src/JIT/Directed/shift/int32_d.csproj
index bdfc6ba44f..cae9c2d12b 100644
--- a/tests/src/JIT/Directed/shift/int32_d.csproj
+++ b/tests/src/JIT/Directed/shift/int32_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{622F3173-9D02-4B96-B9B2-0A20085CEA9F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
-    <Optimize>
-    </Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="int32.cs" />
@@ -37,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/int32_do.csproj b/tests/src/JIT/Directed/shift/int32_do.csproj
index 0a6de6abbe..8c4ee8e742 100644
--- a/tests/src/JIT/Directed/shift/int32_do.csproj
+++ b/tests/src/JIT/Directed/shift/int32_do.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4151BEBB-509B-426C-8799-5831EAB1A501}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/int32_r.csproj b/tests/src/JIT/Directed/shift/int32_r.csproj
index a8b8db24d8..fcf4d577be 100644
--- a/tests/src/JIT/Directed/shift/int32_r.csproj
+++ b/tests/src/JIT/Directed/shift/int32_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2E5E4849-02BA-4A67-8BFC-C8234F9ED3FA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int32_ro.csproj b/tests/src/JIT/Directed/shift/int32_ro.csproj
index 875fa86f27..bb96918c30 100644
--- a/tests/src/JIT/Directed/shift/int32_ro.csproj
+++ b/tests/src/JIT/Directed/shift/int32_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DA129426-1577-4548-AEFF-FA3E9DD4C238}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int64_d.csproj b/tests/src/JIT/Directed/shift/int64_d.csproj
index cd8b51c45e..284002a458 100644
--- a/tests/src/JIT/Directed/shift/int64_d.csproj
+++ b/tests/src/JIT/Directed/shift/int64_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D988E826-E0FF-473E-B16F-1D1361B77055}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
-    <Optimize>
-    </Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="int64.cs" />
@@ -37,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/int64_do.csproj b/tests/src/JIT/Directed/shift/int64_do.csproj
index 383d142378..93c5531d1e 100644
--- a/tests/src/JIT/Directed/shift/int64_do.csproj
+++ b/tests/src/JIT/Directed/shift/int64_do.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BFDC05E3-EE2D-4653-AF6B-B5427AC9C865}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/int64_r.csproj b/tests/src/JIT/Directed/shift/int64_r.csproj
index 4be26a124f..fffa0c5235 100644
--- a/tests/src/JIT/Directed/shift/int64_r.csproj
+++ b/tests/src/JIT/Directed/shift/int64_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{96C34EDA-804F-4071-B942-F5A7C4E22F15}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int64_ro.csproj b/tests/src/JIT/Directed/shift/int64_ro.csproj
index a0fce3f642..0f6be09103 100644
--- a/tests/src/JIT/Directed/shift/int64_ro.csproj
+++ b/tests/src/JIT/Directed/shift/int64_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EBCBCA18-E205-4D9A-9337-3663A2067DCF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/int8_il_d.ilproj b/tests/src/JIT/Directed/shift/int8_il_d.ilproj
index ea80495dfb..f9b8a011fd 100644
--- a/tests/src/JIT/Directed/shift/int8_il_d.ilproj
+++ b/tests/src/JIT/Directed/shift/int8_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/shift/int8_il_r.ilproj b/tests/src/JIT/Directed/shift/int8_il_r.ilproj
index 58a4b6901a..112baf7fef 100644
--- a/tests/src/JIT/Directed/shift/int8_il_r.ilproj
+++ b/tests/src/JIT/Directed/shift/int8_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="int8.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/nativeint_il_d.ilproj b/tests/src/JIT/Directed/shift/nativeint_il_d.ilproj
index 51cba7a1cb..1946dee61e 100644
--- a/tests/src/JIT/Directed/shift/nativeint_il_d.ilproj
+++ b/tests/src/JIT/Directed/shift/nativeint_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/shift/nativeint_il_r.ilproj b/tests/src/JIT/Directed/shift/nativeint_il_r.ilproj
index dd32e0e99e..004166b91a 100644
--- a/tests/src/JIT/Directed/shift/nativeint_il_r.ilproj
+++ b/tests/src/JIT/Directed/shift/nativeint_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="nativeint.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/nativeuint_il_d.ilproj b/tests/src/JIT/Directed/shift/nativeuint_il_d.ilproj
index 291f76c6ff..947de2621a 100644
--- a/tests/src/JIT/Directed/shift/nativeuint_il_d.ilproj
+++ b/tests/src/JIT/Directed/shift/nativeuint_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Directed/shift/nativeuint_il_r.ilproj b/tests/src/JIT/Directed/shift/nativeuint_il_r.ilproj
index ab224ed03b..cf7741dc9a 100644
--- a/tests/src/JIT/Directed/shift/nativeuint_il_r.ilproj
+++ b/tests/src/JIT/Directed/shift/nativeuint_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="nativeuint.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/uint16_cs_d.csproj b/tests/src/JIT/Directed/shift/uint16_cs_d.csproj
index 13e591a155..7c51b5d6e7 100644
--- a/tests/src/JIT/Directed/shift/uint16_cs_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E359F45E-5837-4D77-8A21-2ED8FDD8F894}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint16_cs_do.csproj b/tests/src/JIT/Directed/shift/uint16_cs_do.csproj
index 70e0e0941f..d2bdbb81c9 100644
--- a/tests/src/JIT/Directed/shift/uint16_cs_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{561C7872-03CA-44A3-A6C1-84F6C90EE90F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint16_cs_r.csproj b/tests/src/JIT/Directed/shift/uint16_cs_r.csproj
index 0a0d2cf478..8499aef67d 100644
--- a/tests/src/JIT/Directed/shift/uint16_cs_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8614A72B-7562-42F2-B617-2638780BB28E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj b/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj
index 3e7488420b..3918ab52e7 100644
--- a/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8125A0B7-986E-4A6F-A86D-E6D4B46716CA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint16_d.csproj b/tests/src/JIT/Directed/shift/uint16_d.csproj
index fd35c22b0d..b39666712e 100644
--- a/tests/src/JIT/Directed/shift/uint16_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A5F2C5A6-CFED-460C-BA3C-CC12B7D65B04}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
-    <Optimize>
-    </Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="uint16.cs" />
@@ -37,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/uint16_do.csproj b/tests/src/JIT/Directed/shift/uint16_do.csproj
index 4315d485b9..5d3c66c4de 100644
--- a/tests/src/JIT/Directed/shift/uint16_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_do.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F89754F7-86E1-44EE-A3EE-2256FF7CB6DA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/uint16_r.csproj b/tests/src/JIT/Directed/shift/uint16_r.csproj
index c2957d3147..1e5e2bc298 100644
--- a/tests/src/JIT/Directed/shift/uint16_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D82E4648-8B61-4440-9A33-A1A573819CDA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint16_ro.csproj b/tests/src/JIT/Directed/shift/uint16_ro.csproj
index 7e241559c1..c6990005d0 100644
--- a/tests/src/JIT/Directed/shift/uint16_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint16_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{77044369-D426-49C1-B738-4FBB1C88B20F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint32_cs_d.csproj b/tests/src/JIT/Directed/shift/uint32_cs_d.csproj
index c48ff044a5..fea5e56b44 100644
--- a/tests/src/JIT/Directed/shift/uint32_cs_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D1DB2E34-A5F3-46EC-9CBA-6C952AE50EF6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint32_cs_do.csproj b/tests/src/JIT/Directed/shift/uint32_cs_do.csproj
index 72dc534e63..de9724b783 100644
--- a/tests/src/JIT/Directed/shift/uint32_cs_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{33869AC4-FDC0-481E-BA88-DEAD9629BDF0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint32_cs_r.csproj b/tests/src/JIT/Directed/shift/uint32_cs_r.csproj
index 1f13bb5c4f..522af474ed 100644
--- a/tests/src/JIT/Directed/shift/uint32_cs_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F595FF0D-D7F5-4D91-9265-0875DA1DEEDB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj b/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj
index 44d047bfa3..55a14c2dca 100644
--- a/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6B2D1E6F-69BC-43FB-9749-376324A45285}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint32_d.csproj b/tests/src/JIT/Directed/shift/uint32_d.csproj
index efb0a3d30e..d094c04a2e 100644
--- a/tests/src/JIT/Directed/shift/uint32_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7B10C9CA-7BA5-4D17-9E04-F497B26150FB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
-    <Optimize>
-    </Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="uint32.cs" />
@@ -37,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/uint32_do.csproj b/tests/src/JIT/Directed/shift/uint32_do.csproj
index 7f1fb833b7..b591d22d13 100644
--- a/tests/src/JIT/Directed/shift/uint32_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_do.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B9C90B98-C141-43C4-B7AD-A80A11194326}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/uint32_r.csproj b/tests/src/JIT/Directed/shift/uint32_r.csproj
index 4d791b2650..c9605cdc2b 100644
--- a/tests/src/JIT/Directed/shift/uint32_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FB91C947-292D-4338-89C4-CE25442BC21A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint32_ro.csproj b/tests/src/JIT/Directed/shift/uint32_ro.csproj
index 175e647db3..ed8fc302c3 100644
--- a/tests/src/JIT/Directed/shift/uint32_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint32_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3DA358E2-D2B8-4160-AAE8-353C355FC767}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint64Opt_d.csproj b/tests/src/JIT/Directed/shift/uint64Opt_d.csproj
index dc1d1e1b7a..d204586a66 100644
--- a/tests/src/JIT/Directed/shift/uint64Opt_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint64Opt_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1562736B-261A-40CC-8AFE-C0F1C2892DEB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
-    <Optimize>
-    </Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="uint64Opt.cs" />
@@ -37,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/uint64Opt_do.csproj b/tests/src/JIT/Directed/shift/uint64Opt_do.csproj
index cbef86f528..b9693f6f2e 100644
--- a/tests/src/JIT/Directed/shift/uint64Opt_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint64Opt_do.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8FB8C934-E5DA-4A20-930B-5C30BE80831A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/uint64Opt_r.csproj b/tests/src/JIT/Directed/shift/uint64Opt_r.csproj
index 157c0abaec..12561c0efa 100644
--- a/tests/src/JIT/Directed/shift/uint64Opt_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint64Opt_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint64Opt_ro.csproj b/tests/src/JIT/Directed/shift/uint64Opt_ro.csproj
index c7e008d96d..f421606189 100644
--- a/tests/src/JIT/Directed/shift/uint64Opt_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint64Opt_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{50453737-C530-4473-8D14-123A43C9DA9F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint64_d.csproj b/tests/src/JIT/Directed/shift/uint64_d.csproj
index 883a0bc55b..3c98fd656e 100644
--- a/tests/src/JIT/Directed/shift/uint64_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint64_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1562736B-261A-40CC-8AFE-C0F1C2892DEB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
-    <Optimize>
-    </Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="uint64.cs" />
@@ -37,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/uint64_do.csproj b/tests/src/JIT/Directed/shift/uint64_do.csproj
index 14d2886329..bbb0ef013f 100644
--- a/tests/src/JIT/Directed/shift/uint64_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint64_do.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8FB8C934-E5DA-4A20-930B-5C30BE80831A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/uint64_r.csproj b/tests/src/JIT/Directed/shift/uint64_r.csproj
index 3210eec35c..778cb5f6bb 100644
--- a/tests/src/JIT/Directed/shift/uint64_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint64_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DB8A5DD9-466F-484E-AEBA-2B78F1FF3633}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint64_ro.csproj b/tests/src/JIT/Directed/shift/uint64_ro.csproj
index 0a92f64b8e..2a331223ac 100644
--- a/tests/src/JIT/Directed/shift/uint64_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint64_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{50453737-C530-4473-8D14-123A43C9DA9F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint8_cs_d.csproj b/tests/src/JIT/Directed/shift/uint8_cs_d.csproj
index b4e5008c65..13a7959bca 100644
--- a/tests/src/JIT/Directed/shift/uint8_cs_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E27869B0-3B87-4C49-816E-456917FF793B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint8_cs_do.csproj b/tests/src/JIT/Directed/shift/uint8_cs_do.csproj
index a1d4f78a5a..eed4e3a391 100644
--- a/tests/src/JIT/Directed/shift/uint8_cs_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6843A842-DCA4-4EA5-95FB-9164F6067A34}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint8_cs_r.csproj b/tests/src/JIT/Directed/shift/uint8_cs_r.csproj
index c5f1cf7b8e..4c71805837 100644
--- a/tests/src/JIT/Directed/shift/uint8_cs_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0AB7BA45-9C43-4DC0-AF1E-5F51E7C5194A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj b/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj
index 1f39ca07f3..4a117ffec4 100644
--- a/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EB897B42-FC20-4AAA-BD9D-34FA116BF84B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint8_d.csproj b/tests/src/JIT/Directed/shift/uint8_d.csproj
index b5b0fd2281..221414f4b6 100644
--- a/tests/src/JIT/Directed/shift/uint8_d.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C640C7D2-7131-45B4-90DF-A8B02E394867}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
-    <Optimize>
-    </Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="uint8.cs" />
@@ -37,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/uint8_do.csproj b/tests/src/JIT/Directed/shift/uint8_do.csproj
index 71cfa3223e..33c716478f 100644
--- a/tests/src/JIT/Directed/shift/uint8_do.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_do.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DD34B3DA-9910-497A-8475-10301F94FE15}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/shift/uint8_r.csproj b/tests/src/JIT/Directed/shift/uint8_r.csproj
index 583ea9844f..8f46e435bb 100644
--- a/tests/src/JIT/Directed/shift/uint8_r.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A4D554D9-407B-4D76-AEC2-6ABCE064AA15}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/shift/uint8_ro.csproj b/tests/src/JIT/Directed/shift/uint8_ro.csproj
index a29823a464..0166c02a49 100644
--- a/tests/src/JIT/Directed/shift/uint8_ro.csproj
+++ b/tests/src/JIT/Directed/shift/uint8_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3CC950C2-CFBD-499A-8A32-AE359C46F96A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Directed/tailcall/tailcall.il b/tests/src/JIT/Directed/tailcall/tailcall.il
index eabc6dd194..49c1b59d4c 100644
--- a/tests/src/JIT/Directed/tailcall/tailcall.il
+++ b/tests/src/JIT/Directed/tailcall/tailcall.il
@@ -122,7 +122,7 @@
     IL_0014:  ldc.i4.s   100
     IL_0016:  bne.un.s   IL_0051
 
-    IL_0018:  call       string [mscorlib]System.Environment::get_StackTrace()
+    IL_0018:  call       string [system.runtime.extensions]System.Environment::get_StackTrace()
     IL_001d:  stloc.0
     IL_001e:  ldloc.0
     IL_001f:  ldstr      "Main"
@@ -138,7 +138,7 @@
     IL_003c:  ldstr      "Test Failed"
     IL_0041:  call       void [System.Console]System.Console::WriteLine(string)
     IL_0046:  ldc.i4.0
-    IL_0047:  call       void [mscorlib]System.Environment::Exit(int32)
+    IL_0047:  call       void [system.runtime.extensions]System.Environment::Exit(int32)
     IL_004c:  call       void [mscorlib]System.GC::Collect()
     IL_0051:  ldarg.0
     IL_0052:  dup
@@ -225,7 +225,7 @@
     IL_0019:  bne.un.s   IL_0054
 
     IL_001b:  call       void [mscorlib]System.GC::Collect()
-    IL_0020:  call       string [mscorlib]System.Environment::get_StackTrace()
+    IL_0020:  call       string [system.runtime.extensions]System.Environment::get_StackTrace()
     IL_0025:  stloc.0
     IL_0026:  ldloc.0
     IL_0027:  ldstr      "Main"
@@ -241,7 +241,7 @@
     IL_0044:  ldstr      "Test Failed"
     IL_0049:  call       void [System.Console]System.Console::WriteLine(string)
     IL_004e:  ldc.i4.0
-    IL_004f:  call       void [mscorlib]System.Environment::Exit(int32)
+    IL_004f:  call       void [system.runtime.extensions]System.Environment::Exit(int32)
     IL_0054:  ldarg.0
     IL_0055:  dup
     IL_0056:  ldfld      int32 Class1::'value'
diff --git a/tests/src/JIT/Directed/tailcall/tailcall.ilproj b/tests/src/JIT/Directed/tailcall/tailcall.ilproj
index d5a73d9e39..d10e3f80d3 100644
--- a/tests/src/JIT/Directed/tailcall/tailcall.ilproj
+++ b/tests/src/JIT/Directed/tailcall/tailcall.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/throwbox/fault.ilproj b/tests/src/JIT/Directed/throwbox/fault.ilproj
index ba2f5e5d7a..8cba22a489 100644
--- a/tests/src/JIT/Directed/throwbox/fault.ilproj
+++ b/tests/src/JIT/Directed/throwbox/fault.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="fault.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/throwbox/filter.ilproj b/tests/src/JIT/Directed/throwbox/filter.ilproj
index 33bfd220b2..988b58b59a 100644
--- a/tests/src/JIT/Directed/throwbox/filter.ilproj
+++ b/tests/src/JIT/Directed/throwbox/filter.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="filter.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/throwbox/finally.ilproj b/tests/src/JIT/Directed/throwbox/finally.ilproj
index 9be433dd0d..79003f3536 100644
--- a/tests/src/JIT/Directed/throwbox/finally.ilproj
+++ b/tests/src/JIT/Directed/throwbox/finally.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="finally.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/throwbox/rethrow.ilproj b/tests/src/JIT/Directed/throwbox/rethrow.ilproj
index 7e3ed99802..a47cbad129 100644
--- a/tests/src/JIT/Directed/throwbox/rethrow.ilproj
+++ b/tests/src/JIT/Directed/throwbox/rethrow.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="rethrow.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/tls/MutualRecurThd-TLS.il b/tests/src/JIT/Directed/tls/MutualRecurThd-TLS.il
index 9d7e1e8ff7..90786a79ec 100644
--- a/tests/src/JIT/Directed/tls/MutualRecurThd-TLS.il
+++ b/tests/src/JIT/Directed/tls/MutualRecurThd-TLS.il
@@ -3245,7 +3245,7 @@ stsfld	int32 Thread_EA::TLSFieldData
 {
   .entrypoint
   .maxstack  4
-  .locals (class [mscorlib]System.Threading.Thread[] thrd,
+  .locals (class [System.Threading.Thread]System.Threading.Thread[] thrd,
            class Thread_EA ThdObj,
            int32 V_2)
 
@@ -3254,7 +3254,7 @@ call       class [mscorlib]System.IO.TextWriter [mscorlib]System.IO.TextWriter::
 call       void [System.Console]System.Console::SetOut(class [mscorlib]System.IO.TextWriter)
 
   IL_0000:  ldc.i4     0xa
-  IL_0005:  newarr     [mscorlib]System.Threading.Thread
+  IL_0005:  newarr     [System.Threading.Thread]System.Threading.Thread
   IL_000a:  stloc.0
   IL_000b:  newobj     instance void Thread_EA::.ctor()
   IL_0010:  stloc.1
@@ -3278,13 +3278,13 @@ call       void [System.Console]System.Console::SetOut(class [mscorlib]System.IO
   IL_0044:  ldloc.2
   IL_0045:  ldloc.1
   IL_0046:  ldftn      instance void Thread_EA::Run()
-  IL_004c:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(class [mscorlib]System.Object,native int)
-  IL_0051:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+  IL_004c:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(class [mscorlib]System.Object,native int)
+  IL_0051:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
   IL_0056:  stelem.ref
   IL_0057:  ldloc.0
   IL_0058:  ldloc.2
   IL_0059:  ldelem.ref
-  IL_005a:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+  IL_005a:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
   IL_005f:  br         IL_0030
 
   IL_0064:  ldc.i4     0x0
@@ -3302,7 +3302,7 @@ call       void [System.Console]System.Console::SetOut(class [mscorlib]System.IO
   IL_0082:  ldloc.0
   IL_0083:  ldloc.2
   IL_0084:  ldelem.ref
-  IL_0085:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+  IL_0085:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
   IL_008a:  br         IL_006f
 
   IL_008f: 	call	    class [mscorlib]System.IO.TextWriter [System.Console]System.Console::get_Out()
diff --git a/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj b/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj
index c7f754962f..fdf5789f8e 100644
--- a/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj
+++ b/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/tls/test-tls.ilproj b/tests/src/JIT/Directed/tls/test-tls.ilproj
index 12e1ed81bd..08087f4ad2 100644
--- a/tests/src/JIT/Directed/tls/test-tls.ilproj
+++ b/tests/src/JIT/Directed/tls/test-tls.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/zeroinit/Dev10_863995.ilproj b/tests/src/JIT/Directed/zeroinit/Dev10_863995.ilproj
index 0fc41a74aa..f0e5c8a8cb 100644
--- a/tests/src/JIT/Directed/zeroinit/Dev10_863995.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/Dev10_863995.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Dev10_863995.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/zeroinit/init_byte.ilproj b/tests/src/JIT/Directed/zeroinit/init_byte.ilproj
index 5be99554b6..39487f37e3 100644
--- a/tests/src/JIT/Directed/zeroinit/init_byte.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_byte.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="init_byte.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/zeroinit/init_int32.ilproj b/tests/src/JIT/Directed/zeroinit/init_int32.ilproj
index 315a42c9d8..6baf30d805 100644
--- a/tests/src/JIT/Directed/zeroinit/init_int32.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_int32.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="init_int32.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/zeroinit/init_int64.ilproj b/tests/src/JIT/Directed/zeroinit/init_int64.ilproj
index f64bfe2d05..5a538c953f 100644
--- a/tests/src/JIT/Directed/zeroinit/init_int64.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_int64.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="init_int64.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/zeroinit/init_struct.ilproj b/tests/src/JIT/Directed/zeroinit/init_struct.ilproj
index d36674f48f..a2638c8f75 100644
--- a/tests/src/JIT/Directed/zeroinit/init_struct.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_struct.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="init_struct.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/zeroinit/init_uint32.ilproj b/tests/src/JIT/Directed/zeroinit/init_uint32.ilproj
index e9f58a1639..80ccf29b20 100644
--- a/tests/src/JIT/Directed/zeroinit/init_uint32.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_uint32.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="init_uint32.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/zeroinit/init_uint64.ilproj b/tests/src/JIT/Directed/zeroinit/init_uint64.ilproj
index 9b6e3d0e95..967c018acf 100644
--- a/tests/src/JIT/Directed/zeroinit/init_uint64.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/init_uint64.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="init_uint64.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Directed/zeroinit/tail.ilproj b/tests/src/JIT/Directed/zeroinit/tail.ilproj
index 04796a4715..65268f324c 100644
--- a/tests/src/JIT/Directed/zeroinit/tail.ilproj
+++ b/tests/src/JIT/Directed/zeroinit/tail.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="tail.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj
index 12e71d9e3e..5a477f48d0 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{205D9EA5-99D9-42A3-8670-C2F4E8E95DB4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj
index 1dbddbd0e6..ccaae50dc6 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9F7BB3E7-27FD-44EB-B8C9-5E4B8596146A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj
index 8371bf28d7..b87d5f8f28 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A8BFCD41-6773-4700-8092-70369FDE6125}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj
index 0d4392a8ca..7e7b659640 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1CF36D39-C343-4842-BBD6-8A170BBEABAC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj
index fae142d0de..34098e1881 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7FDE4C23-E5E9-4891-9B21-4E3C94206E61}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj
index 57e6f64a04..3e377be499 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{568DC68E-8321-4B98-AE6C-F4877B2C6E21}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj
index bc66a5a1ba..bdff06ec05 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6531BCBB-6286-4989-ADF0-8C24C6D3490C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj
index 466d9fa7aa..c97169a6eb 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BB6F5D3B-AAD3-45CD-B2E8-DA9B64BB40EA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj
index 3ad9cd0c6b..b910de8e72 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{84AC84B6-357C-4D39-8C62-E9B78C3D8198}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj
index 1d65175c7f..96bb56a5b2 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EB58BEAA-3872-4F62-A0BF-596B18C4B4C7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj
index b89d7df5a4..940594ef72 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BE711884-16DD-41D3-8EE8-07DE371D3DD2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj
index 5a913ab088..e178eed985 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BF20FD4B-45EE-4614-B121-9B8A1D856D0A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj
index 206a27c427..3d2e84c0b0 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A6EE6750-296C-4545-8484-7BE877285357}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj
index 944202459a..4d7b2e1e5a 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1041EDB6-3F75-4892-9306-C0BF9C9D0584}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj
index 99a24d0578..3202ae571f 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ED1E29DC-FD20-4457-AC2B-4DF94248D0B6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj
index eb15ece2e4..ebb26c9a00 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C10068FD-69FE-4DC7-B9EF-8973C193B354}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj
index 6b7d3a2be7..eb8f58981c 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{900795A5-A96E-4E6B-9C09-87617F444F05}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj
index 55c15a7f46..4f1c658e84 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{630CD41D-B922-4064-B5CD-B77FF2C09B4C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj
index 54513a4553..6b803864c4 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{98EDD8DC-A478-49A5-89A5-78ADDBF4BD07}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj
index 84127fe622..99cf165889 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B2C7B915-DC44-4C68-AD3D-E94061A3CE79}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj
index 7d6a94a8c4..b26530451c 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2646F7D3-291C-4892-AEF1-6B14840F0E05}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj
index 40e348f219..274ef900ac 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{88289879-FE00-45B2-A561-783022B8BDEA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj
index a5d746e8a1..3eaacf3822 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{80F8F357-E85D-49BA-9065-AE13D7A79839}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj
index feadea8006..081649c594 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{551CDF76-46AD-435B-851E-12C74ACC72A6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj
index 5cc4d88edf..c0ce544fae 100644
--- a/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj
+++ b/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{15426961-0948-487F-ABE5-08BE8E6C7607}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj b/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj
index 55a3ca743d..990121636b 100644
--- a/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj
+++ b/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B9C2A1E8-B95E-4765-B27D-F127A8E9D6C6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj b/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj
index bb8f547a76..ce1dfe3f7a 100644
--- a/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj
+++ b/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{15184247-1A78-454F-A645-0ED2CE0DD16B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj b/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj
index d1c9e2f204..3c02e13d41 100644
--- a/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj
+++ b/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3E16855F-8CAE-4985-9C6E-B988472145E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj b/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj
index 9368793586..e2f4780a77 100644
--- a/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj
+++ b/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{132DC9D4-E6D6-4DD4-9483-EB887E8D6F3F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj
index e3e3b5947a..e734422078 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C6D44EEA-D087-4F1A-9894-C4D84AA62CE5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj
index 475c026443..5d795df7c9 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{87CA352D-1673-403F-BDC9-5B833E21F424}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj
index f3307f3ebd..6671f01238 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0EFA0FB8-380C-4789-84CF-4B7E4870E119}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj
index 6b77d578b0..ebe627feb6 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{62885220-F137-4C74-83D2-42AFA04C9B13}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class1_il_d.ilproj b/tests/src/JIT/Generics/ConstrainedCall/class1_il_d.ilproj
index dfb06b13dc..f2d2ec104e 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class1_il_d.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class1_il_r.ilproj b/tests/src/JIT/Generics/ConstrainedCall/class1_il_r.ilproj
index fcee0e2d2e..64b458b986 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class1_il_r.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class1_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj
index 8acab8f848..2e572efac4 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{89779DFA-1BFA-4512-B0C2-349405F82973}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj
index aeb74973c6..5e47db2e36 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D5610C53-ED8A-45D0-84D9-936BA74BE001}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj
index c24bbc83cf..0a4a31193c 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6ED8EED5-B95D-42B2-8446-6DCAACD65EF7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj
index f48821a94d..161affd073 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CF9EA97C-71A5-4602-BD58-5B451494A9B7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class2_il_d.ilproj b/tests/src/JIT/Generics/ConstrainedCall/class2_il_d.ilproj
index 6c114c60e5..5113b2edb8 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class2_il_d.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class2_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Generics/ConstrainedCall/class2_il_r.ilproj b/tests/src/JIT/Generics/ConstrainedCall/class2_il_r.ilproj
index a9e0e7b532..576dcc3a6f 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/class2_il_r.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/class2_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj
index 26940032e0..0cf220e291 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CD33B8A1-CC6F-4243-AC25-AFF8120A9CD0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj
index a751deec60..8e56665e41 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FF301ADA-2E2B-4A9F-A40C-AC343B501EFE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj
index f3679d05d2..9ddb8c0fd6 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{492BDD0F-092E-41DD-99C4-618D350EBDB4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj
index ee40f3caed..cd64f3b2fc 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1CD6EB8-7883-4FF1-ADB5-C150421EE838}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_il_d.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_il_d.ilproj
index ac935408e6..dae714193e 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_il_d.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt1_il_r.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt1_il_r.ilproj
index 70180f1b33..12948dd0db 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt1_il_r.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt1_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="vt1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj
index 5e1224a170..d3bfa112b2 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6A95068C-44EE-4FAF-B190-80E013E626EC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj
index cf40b61ad2..c474d6e486 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F9DCB5F5-79B2-4FA9-BD4E-8B0EBD091D7C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj
index bc938243f8..6fe4f3aca7 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{31025AD5-FCB4-4AB9-9595-6C93051FA3C0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj
index 80eef3090b..1ebbfcbb7d 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{634D2580-8121-454C-B00D-6E9DCB6FA047}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_il_d.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_il_d.ilproj
index 6aaa197d29..cdad01ca3c 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_il_d.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt2_il_r.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt2_il_r.ilproj
index f57e1ffeef..40ee93326c 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt2_il_r.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt2_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="vt2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj
index c4c275cc4c..ba5158440d 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CD1A954E-2F95-4DF5-893B-809A81DDCDE3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj
index 7cb09422e3..7be4beb0a5 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{97DA5467-6E6C-40FD-ABFE-34B0791B439B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj
index fe22cd207a..f26ba231fa 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{834EFA27-AB3B-4F23-8782-4A8F7DCD56BD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj
index 65eb6f0d66..1ce57b4c19 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{125363CD-1DE5-4FEF-BA2A-6301EACA1FD2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_il_d.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_il_d.ilproj
index 93ae5e9ba5..bdf620e16e 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_il_d.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt3_il_r.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt3_il_r.ilproj
index 6609b21d09..22a4753158 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt3_il_r.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt3_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="vt3.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj
index 7901160465..725e1063a0 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AA90CACB-C386-4419-804A-B6A1A7AC1255}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj
index d1aa7f4c96..31ce180fd9 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4E3D1199-2D0F-41CB-8FB9-66F039DA5493}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj
index 9d612d0005..7c6ddaabe7 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{116602E5-7873-4F65-8829-F32E8A705EDE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj
index 51a19090c7..7e4ad088a4 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BAFE9AF0-E836-4F28-871F-C08294A69522}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt4_il_d.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt4_il_d.ilproj
index 721d156773..b77bf309e8 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt4_il_d.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt4_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Generics/ConstrainedCall/vt4_il_r.ilproj b/tests/src/JIT/Generics/ConstrainedCall/vt4_il_r.ilproj
index bfb0bf4823..aac1fa8b1b 100644
--- a/tests/src/JIT/Generics/ConstrainedCall/vt4_il_r.ilproj
+++ b/tests/src/JIT/Generics/ConstrainedCall/vt4_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj b/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj
index 914b5f457c..5d1f5adbc9 100644
--- a/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj
+++ b/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C834B32F-C575-491D-9EB9-574A6DB9FF95}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
-    <Optimize>
-    </Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Call_instance01.cs" />
@@ -37,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj b/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj
index 0103a75fb6..696a582243 100644
--- a/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj
+++ b/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{671883C2-8AC6-447D-B213-A378D6A81A91}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj b/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj
index 340613327c..29ef3aa3ac 100644
--- a/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj
+++ b/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0422E973-CD19-492C-ABA8-5A5C3C482503}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj b/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj
index 83e209ee48..1ffa1c8511 100644
--- a/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj
+++ b/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{90A26425-4848-4F9F-945F-1204722317AC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Constraints/call_instance01.csproj b/tests/src/JIT/Generics/Constraints/call_instance01.csproj
index 7a8d91dd26..abe2510494 100644
--- a/tests/src/JIT/Generics/Constraints/call_instance01.csproj
+++ b/tests/src/JIT/Generics/Constraints/call_instance01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{87405971-B126-4000-977F-9AD22B6FF9A6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Constraints/call_static01.csproj b/tests/src/JIT/Generics/Constraints/call_static01.csproj
index ae6754e4a1..19c688ac01 100644
--- a/tests/src/JIT/Generics/Constraints/call_static01.csproj
+++ b/tests/src/JIT/Generics/Constraints/call_static01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8ED41591-8FDF-419B-8FAA-24631C103BBB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Constraints/convert_instance01.csproj b/tests/src/JIT/Generics/Constraints/convert_instance01.csproj
index dbbc0d351c..cc11d492fa 100644
--- a/tests/src/JIT/Generics/Constraints/convert_instance01.csproj
+++ b/tests/src/JIT/Generics/Constraints/convert_instance01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{65964B68-E893-4C78-B7FB-590452343116}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Constraints/convert_static01.csproj b/tests/src/JIT/Generics/Constraints/convert_static01.csproj
index d176a39613..2d2e8268d7 100644
--- a/tests/src/JIT/Generics/Constraints/convert_static01.csproj
+++ b/tests/src/JIT/Generics/Constraints/convert_static01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4B539B1F-AC08-4D3A-AF02-E3C44FF172FD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj b/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj
index c0cbf59d80..c43bbb62e9 100644
--- a/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj
+++ b/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{78363C03-BB50-47E6-80C0-119F5D56AF21}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Constraints/transitive_static01.csproj b/tests/src/JIT/Generics/Constraints/transitive_static01.csproj
index e989cf992f..f18d3d7843 100644
--- a/tests/src/JIT/Generics/Constraints/transitive_static01.csproj
+++ b/tests/src/JIT/Generics/Constraints/transitive_static01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D36A6FEC-097F-4209-845C-5B247BDE96F6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj b/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj
index 54257f0d23..cb53c8c530 100644
--- a/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj
+++ b/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6B9DA00A-8C8A-4349-9E8E-D400292B541C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj
index 5a82531067..1328f1730f 100644
--- a/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{80A667A7-90BD-4406-8EC6-CCE1BD19487B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj
index adfa356548..ab111ecfe0 100644
--- a/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B67D36A4-F3EB-4978-91F8-55D9B7944694}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj
index 412b3d740c..9dc08ae2d0 100644
--- a/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AAC0CF58-6577-4EF0-907D-8B5B891BDDAA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj
index d8560ec5f9..ff52da3dd3 100644
--- a/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6A6EE264-2A23-4A18-87B9-06671E767CFD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj
index 1324d2a20c..8e5aab31f7 100644
--- a/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2C13C549-98C0-43D9-8158-C1AC58502BE3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj b/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj
index d94e43ffd8..c799fb6a74 100644
--- a/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{61661F6A-1746-41E6-B1D7-90AE1401F425}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj b/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj
index 3599de7780..bfb7dfaf18 100644
--- a/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4697A402-5137-4CA5-8CAA-6C4FD39D66CD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj b/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj
index de1a079714..28d9eb51d9 100644
--- a/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A2BFAB56-28C9-43CB-97A0-D696237C1DEA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj b/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj
index f74a5265b2..d532b850b3 100644
--- a/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj
+++ b/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{50331B28-2970-44B1-A6F9-C8624121F3D8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj b/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj
index c19ed3c2e4..f09bd0e069 100644
--- a/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9E76E186-AB38-476B-8327-CB879B7E2C1D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj b/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj
index b8eb8d8919..f632ab91bb 100644
--- a/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{29259C4C-5480-4F10-B220-978491F86B3A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj b/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj
index b86c2f9744..a1575fcfe3 100644
--- a/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8FA646F7-470B-4549-A701-AA6EB28DFDBE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj b/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj
index 3a1cc4235e..7fb5bf8590 100644
--- a/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D40EF20F-4FAF-440D-BDC8-8F3C5B7E5560}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj b/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
index 2ec6423fbd..9cd1843162 100644
--- a/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6EAD1037-4170-4F97-8705-84872FB6BECB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj b/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
index 5bdbb2e3d2..c5f459d9aa 100644
--- a/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
+++ b/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ECC7983D-6775-4E8A-820B-83A2837B4ABD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj b/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj
index cfd2a47e2c..710b31d3b8 100644
--- a/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FA37EF21-043D-418E-A302-7A661B69B376}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj b/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj
index f17654e581..754f2b0f39 100644
--- a/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C10FB01B-9979-44D5-891C-20B8BFD8E697}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj b/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj
index a3059291c6..2cbbc6889e 100644
--- a/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C31FA060-E800-4659-AB66-FE0E905D725B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj b/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj
index 3f1b6ee350..8792b05dc3 100644
--- a/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0E052551-4819-46F0-9E6E-9C825465DA99}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj b/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj
index fccbe7800e..a427514d21 100644
--- a/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{69DC5D6B-6361-494D-9829-4911027EF14E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj b/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj
index 8601a8a6fb..dea773a26a 100644
--- a/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{124ED100-82F1-4DA1-8B9E-F31C7489A5DA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj b/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj
index 843f0b2a35..282dfc98e1 100644
--- a/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1A04BBA4-BFD1-4B77-AB81-F05FBD7C5FA1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj b/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj
index 6b781a6c10..1333fe36f8 100644
--- a/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{273CE762-D3A2-4241-8548-CEB666C4C3A7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj b/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj
index 05ae25816e..026692a981 100644
--- a/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E6F2DFBF-45E0-4437-B8A7-F6D8C29AB0E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj b/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj
index 12049bf54c..8ceff53e32 100644
--- a/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8C27FFEF-8C5F-4381-A667-E278C0F38967}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj b/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj
index 9677e73667..a09552d9fb 100644
--- a/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FEBC1332-1FBB-4A00-A0CF-F1FDA44EFD1A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj b/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj
index 6f71d05581..84defcc63a 100644
--- a/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj
+++ b/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AF75F01F-0296-4071-83F1-63F2164557E7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj b/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
index 0da59260f3..d4855de300 100644
--- a/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
+++ b/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{96FA8C13-55B6-4B71-A7A1-93AC7A4D8B87}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj b/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj
index a986f57fce..d2a84f9a8e 100644
--- a/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0C050436-7B93-427D-AD59-CDEE94BA5D24}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj b/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj
index b0cf155c53..3389b76873 100644
--- a/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5A6AD2D2-8381-452D-AA59-3E33CEFE3DC9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj b/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj
index e18d522713..c02e03cbad 100644
--- a/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{43B411FE-E26C-4D00-88A8-A98ADA16F601}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj b/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj
index 9418367c1f..fffcdad5da 100644
--- a/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F816AF23-8AAE-442C-A396-4F22F49CA0C1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj b/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj
index aeb71ebda4..4d078c7b64 100644
--- a/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B3DA4CBF-613D-4792-B4A6-B7E4BC126495}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj b/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj
index 4c9382936a..8918247d88 100644
--- a/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{04DFA156-2A8C-44F7-9C60-17F8526D0C22}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj b/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj
index d040723670..6c68863b50 100644
--- a/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{57320B45-E97C-4175-BED3-44F846FEF3C7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj b/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj
index 1e614a8ea9..edc249dec6 100644
--- a/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{64DBC670-FAC2-481D-A0E0-3B4D775B409A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj b/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj
index d956c88ff6..cf67bb9f9d 100644
--- a/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0C798FB6-34BF-4197-AA0E-0800181B8E45}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj b/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj
index 79dcad373b..2fc810919c 100644
--- a/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{45272C6A-7DEF-422A-B3B7-52C4746D5B1D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/static_passing_class01.csproj b/tests/src/JIT/Generics/Fields/static_passing_class01.csproj
index 05afe2e8a7..29c9faefd9 100644
--- a/tests/src/JIT/Generics/Fields/static_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_passing_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9A49CAAC-5E28-4475-BC1F-8BA1B9E999FC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj b/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj
index 2395c32ad4..97c95bf483 100644
--- a/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A6C49C29-BD23-4564-91B7-968BE5E34265}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj b/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj
index 8427c2c529..1e0368cbbc 100644
--- a/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4B38908A-FCC8-4F1C-853E-AB21F9AA1360}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj b/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj
index 4135271320..ebc047868c 100644
--- a/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2CC272A3-8730-4FF8-91B6-A73D6AA7978D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj b/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj
index beab0c40ca..e5fdec9417 100644
--- a/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2637E314-B16C-440D-9604-93E240720049}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj b/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj
index 8ab97f87ba..ef3cbdec61 100644
--- a/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{080C313F-7B4A-4258-AC75-EE444F9E2FCA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj b/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj
index b8e61aa704..bc7010e501 100644
--- a/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3E24A354-39F8-45EB-AD75-2A5550E11C3E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj b/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj
index 40eefd7b2a..eb5a465e87 100644
--- a/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{544383DE-F284-4664-9E08-40D5B3597B12}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj b/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj
index 1245f1218b..ee0a50bf87 100644
--- a/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{38E45B61-90A6-470E-AAA8-A0FDA13D6E7E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj b/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj
index 306ec2aa7a..e1f579d59e 100644
--- a/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F3C60ECA-A5E7-478E-9CA7-6C71DB965B82}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj
index bd9bb1c3f1..46b533d07d 100644
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FAC860EF-3CCD-44C9-B1C3-C0578F8C71F4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj
index 6147c07b7c..a6fdb47b67 100644
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FF8C611B-C071-4576-B41D-687D62B14530}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj
index e195d91e6e..bccd0468eb 100644
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{06A83189-481B-4203-9EC5-57188005EF54}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj
index affb98f170..032e5d686c 100644
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6449AF25-EE12-4317-A4A6-0678FE363346}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj
index af87e2871f..cc2f06f401 100644
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7211B39F-6B28-4929-9BE1-A151E52F9531}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj
index df8b352e76..4e25866038 100644
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{099D2BD1-0891-4F9A-82F6-2D92FEEF2E72}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj
index 0f321946e5..5ef66fbae3 100644
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1066B4D7-163A-4FF7-BE27-A2E3E689D5F4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj
index a702c289fa..430fdb0307 100644
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{69461DB0-1462-4AEB-A891-B03E7F1E0EAF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj
index 519ec6b863..92aad2be59 100644
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{14DB2210-9F88-4341-8A84-824049CE04C6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj b/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj
index a0cd096043..d65340409f 100644
--- a/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8B10F37F-3AD1-4158-A7D5-4DA2086DC12C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj b/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj
index 9281f4e3c0..f351c3edce 100644
--- a/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{320804D0-53D4-4799-95CF-AE10C670C032}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj b/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj
index c9ca9948fb..53fedea191 100644
--- a/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{644FEF8A-38C9-40A6-8067-6746B1FD9309}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj b/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj
index 2d82a3a096..e97c3117bb 100644
--- a/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj
+++ b/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4ED2C098-36DB-41CE-AA04-EDF02F1D63B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate001.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate001.csproj
index 5b16f0725a..8d4efcfd18 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate001.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate002.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate002.csproj
index a9536d1121..6cbab1eeea 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate002.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate003.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate003.csproj
index 4d10881098..61f0c9a01d 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate003.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate004.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate004.csproj
index 4b16378c4d..5c43a36a6d 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate004.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate004.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate005.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate005.csproj
index e5b2ef5bf3..8246056779 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate005.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate005.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate006.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate006.csproj
index 09b4b24bab..3f52b65834 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate006.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate006.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate007.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate007.csproj
index 087bd505e9..778140e87a 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate007.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate007.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate008.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate008.csproj
index f2d5436afa..d29bcb1c93 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate008.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate008.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate009.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate009.csproj
index 29f2d8ee5d..c15b0e3ae1 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate009.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate009.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate010.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate010.csproj
index 107e0dff5b..32c9c191b6 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate010.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate010.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate011.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate011.csproj
index e6b9efceb3..cb789fec62 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate011.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate011.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate012.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate012.csproj
index b881fef5dd..0d6b51c056 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate012.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate012.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate013.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate013.csproj
index 45c326a3d6..8bd9284fa3 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate013.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate013.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate014.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate014.csproj
index ca01d8f919..c49019640c 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate014.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate014.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate015.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate015.csproj
index 0398ff0c6f..9f3b037add 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate015.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate015.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate016.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate016.csproj
index 74bcbf6325..692fcd893e 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate016.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate016.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate017.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate017.csproj
index 1639d9ef7a..588e565a56 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate017.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate017.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate018.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate018.csproj
index dce9bd98c1..4e5d1557eb 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate018.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate018.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate019.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate019.csproj
index 3f161f5763..14bfc08d1f 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate019.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate019.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate020.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate020.csproj
index f1f5808b9f..c5811de516 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate020.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate020.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate021.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate021.csproj
index 6844377755..3acc670d51 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate021.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate021.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate022.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate022.csproj
index 6cf09ae7d9..6eeaa7ba7a 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate022.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate022.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate023.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate023.csproj
index 53d10acf95..79ef3e6705 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate023.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate023.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate024.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate024.csproj
index b6146cb63d..711a551699 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate024.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate024.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate025.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate025.csproj
index a7e85bfbe4..57b7c5bf63 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate025.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate025.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate026.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate026.csproj
index 186d53e9ab..5e9ecefe86 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate026.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate026.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate027.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate027.csproj
index 348597b16a..2b7714d6f5 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate027.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate027.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate028.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate028.csproj
index 8f0e503340..b5fa4ceaef 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate028.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate028.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate029.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate029.csproj
index 11afce7509..43a237c571 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate029.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate029.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate030.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate030.csproj
index 5c44f718b6..6328338e45 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate030.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate030.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate031.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate031.csproj
index 1806d4db62..497b9b4cac 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate031.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate031.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Instantiation/delegates/Delegate032.csproj b/tests/src/JIT/Generics/Instantiation/delegates/Delegate032.csproj
index f13e60363c..8781e99a61 100644
--- a/tests/src/JIT/Generics/Instantiation/delegates/Delegate032.csproj
+++ b/tests/src/JIT/Generics/Instantiation/delegates/Delegate032.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj b/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj
index c9570b9af7..5cdd0e7740 100644
--- a/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{80F3A588-555A-4075-8360-9203E5F99AC9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj b/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj
index 4fe8096245..afffaeead8 100644
--- a/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C6F29CCA-DE86-40C5-885D-3914F5D5751E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj b/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj
index d065d27ea9..cdbda0dc5d 100644
--- a/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2E883F72-1D4F-4636-84BE-3BBDD60B592D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj b/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj
index 0392c19b2b..babf7140ea 100644
--- a/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{016189CD-6895-44C3-8441-DA074A996004}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj b/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj
index fd0b2193ee..f104ecce3e 100644
--- a/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6449D13D-837E-4072-95F8-54227372136D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj b/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj
index ea556ffa92..36f3420f3a 100644
--- a/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6632E517-7D60-492F-A9AA-64ABA4120E1B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj b/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj
index bbdc5cdadf..04ea21cb07 100644
--- a/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{62A6CD3D-7157-47A6-88D0-42C3C57879F6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj b/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj
index 6f4777327b..b64f918d20 100644
--- a/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{56EF1248-EA5E-4F16-AD09-D48CDE467CC1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj b/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj
index b747f1b177..8de67ab0b8 100644
--- a/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{43AB92CB-19B3-4D71-837E-49A2300C5F11}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj b/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj
index 3b857becde..cf7f4e0c74 100644
--- a/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{35A22E14-307A-4221-AADB-06F74A77FB42}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Locals/static_passing_class01.csproj b/tests/src/JIT/Generics/Locals/static_passing_class01.csproj
index 25bcadea11..d67c04aef3 100644
--- a/tests/src/JIT/Generics/Locals/static_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_passing_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8767FA06-4489-404B-AB3C-C45C50EC5D25}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj b/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj
index 0970de7e23..298737a9c6 100644
--- a/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CE813D5E-3B67-4077-9014-BAD9D5757D57}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj b/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj
index 5c89e71f22..81ef195edc 100644
--- a/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B2F82E87-534F-417A-8709-B0B6EDF67E40}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/MemberAccess/class_static01.csproj b/tests/src/JIT/Generics/MemberAccess/class_static01.csproj
index 0291ff626c..882e5f857f 100644
--- a/tests/src/JIT/Generics/MemberAccess/class_static01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/class_static01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{363A0211-B3EB-4E66-B939-B1742AF9B9D8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj b/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj
index a40bf0f515..640a3debc8 100644
--- a/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6CCCACCF-B1F4-4B6D-9593-F4FB8765FCF7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj b/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj
index 9697b4f4aa..3d1123e4ba 100644
--- a/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9291DC28-F3E6-42C4-B2ED-924385BF29DD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj b/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj
index d8cd39f3ed..0978445c0d 100644
--- a/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7A73F51B-46FA-437C-956D-4B493763B0F1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj b/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj
index c3f669d37e..611acff3a0 100644
--- a/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{06FEE6BC-4C9E-466F-B7AD-E001F307EACE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj b/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj
index 8104bace29..2149fe458b 100644
--- a/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{22E3B002-7E30-4262-98DE-88544DD5DFBA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj b/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj
index a3d7cba1e5..555495e33f 100644
--- a/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj
+++ b/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{28EB62C0-5DA9-4C86-BB8D-AC3C03F49CF4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj b/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj
index 933efd4263..6e3e79123e 100644
--- a/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0C67E548-6B13-4924-A623-41991D858EC8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj b/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj
index 96f104f340..1e215892a2 100644
--- a/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DDB15059-8EA0-4B82-B1BF-CACBC0F701A4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj b/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj
index caa0d23a05..fb2e4bac8c 100644
--- a/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9E953E11-B967-4E15-ACF3-8DB5F0822D8A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj b/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj
index ec0a70230a..2a2bbb9c2a 100644
--- a/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A4EE7FAD-4E8B-4EB7-83F3-08A81C35A561}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj b/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj
index 6d1d8949ba..159e7073ff 100644
--- a/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{548A85F7-5474-483F-A5F8-57E8B4238642}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj b/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj
index b888a17d1b..9ceccadabe 100644
--- a/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1B079F4-6571-4462-861C-3600D5A324CD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj b/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj
index fc5b9fe6a3..4abeaacaad 100644
--- a/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FFC760C1-42D8-45F4-A2EC-025DEDE7D681}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj b/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj
index 9ccf425150..eb1f4ace14 100644
--- a/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C1076745-44FF-46F8-A6C6-E469BFE9E409}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj b/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj
index c0f5318afc..c2a121b4a3 100644
--- a/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8A767943-C04E-4E9B-81E6-F41A49E027B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj b/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj
index 938b425d0e..9f3eea06fc 100644
--- a/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A42F4CA1-C37A-4D2F-A2DD-DF2CDFB12F14}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj b/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj
index bf13d4cbfa..bcc0b8d90c 100644
--- a/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4E84BE82-9496-4CE1-8DE6-0646E93A65BB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj b/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj
index 418cd31d25..58fc997c1c 100644
--- a/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj
+++ b/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DC245710-E244-4AAD-840A-4F19DEBDBC98}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/TypeParameters/default_class01.csproj b/tests/src/JIT/Generics/TypeParameters/default_class01.csproj
index 85175fd209..5f015b5862 100644
--- a/tests/src/JIT/Generics/TypeParameters/default_class01.csproj
+++ b/tests/src/JIT/Generics/TypeParameters/default_class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{366CFD9E-E7FE-4A50-B6A0-1345D1BD061C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj b/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj
index cc8b9fd4b3..a425880abb 100644
--- a/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj
+++ b/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F907FD44-6193-4A3D-8452-92CEAF46B919}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Typeof/class01.csproj b/tests/src/JIT/Generics/Typeof/class01.csproj
index 6d04da6501..5edf08a9f3 100644
--- a/tests/src/JIT/Generics/Typeof/class01.csproj
+++ b/tests/src/JIT/Generics/Typeof/class01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9C7255CB-FAF3-4B44-B731-FF2F69ACD90E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Typeof/class02.csproj b/tests/src/JIT/Generics/Typeof/class02.csproj
index d6076733a0..2e96ef5cf0 100644
--- a/tests/src/JIT/Generics/Typeof/class02.csproj
+++ b/tests/src/JIT/Generics/Typeof/class02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6D9B4FCD-99DB-4E67-B499-BEE99CD4CA24}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Typeof/class03.csproj b/tests/src/JIT/Generics/Typeof/class03.csproj
index 18631037c2..c2994db594 100644
--- a/tests/src/JIT/Generics/Typeof/class03.csproj
+++ b/tests/src/JIT/Generics/Typeof/class03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FF49C039-4515-478E-A148-6A28A1AC38D9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj b/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj
index 0fd8a5a74a..142ef513f5 100644
--- a/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj
+++ b/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9AEB6984-FCD8-4E39-BC16-805B1C8BD43A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Typeof/objectBoxing.csproj b/tests/src/JIT/Generics/Typeof/objectBoxing.csproj
index 34d3ab4759..cbc6ada20e 100644
--- a/tests/src/JIT/Generics/Typeof/objectBoxing.csproj
+++ b/tests/src/JIT/Generics/Typeof/objectBoxing.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1A9C53C6-CEA3-49D6-9345-4F6016899183}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj b/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj
index 20b1e41745..efeb86462d 100644
--- a/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj
+++ b/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B09ED5F8-CCC7-4612-9041-0D10B8132ECB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Typeof/struct01.csproj b/tests/src/JIT/Generics/Typeof/struct01.csproj
index 44e2ef6652..1db8a624cd 100644
--- a/tests/src/JIT/Generics/Typeof/struct01.csproj
+++ b/tests/src/JIT/Generics/Typeof/struct01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{42630210-72E2-463F-8507-49F4D78E60C9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Typeof/struct02.csproj b/tests/src/JIT/Generics/Typeof/struct02.csproj
index 4e42e4d5eb..1c5d73894f 100644
--- a/tests/src/JIT/Generics/Typeof/struct02.csproj
+++ b/tests/src/JIT/Generics/Typeof/struct02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D4059AFB-8FD9-48C0-AFA8-8532933DA9B3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Typeof/struct03.csproj b/tests/src/JIT/Generics/Typeof/struct03.csproj
index 64074ecf40..9093233d0c 100644
--- a/tests/src/JIT/Generics/Typeof/struct03.csproj
+++ b/tests/src/JIT/Generics/Typeof/struct03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FF308555-4509-40A5-B990-66378FC9BE3F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj b/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj
index db5429b982..5c8a7609d9 100644
--- a/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj
+++ b/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DA444D4F-EB7F-48C1-8F9F-8E69B5D7A7EE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Generics/pinvoke/instance01.csproj b/tests/src/JIT/Generics/pinvoke/instance01.csproj
index 03cef53bbc..a23fc2eee9 100644
--- a/tests/src/JIT/Generics/pinvoke/instance01.csproj
+++ b/tests/src/JIT/Generics/pinvoke/instance01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/pinvoke/instance02.csproj b/tests/src/JIT/Generics/pinvoke/instance02.csproj
index 086b067949..8d85ff80d7 100644
--- a/tests/src/JIT/Generics/pinvoke/instance02.csproj
+++ b/tests/src/JIT/Generics/pinvoke/instance02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/pinvoke/instance03.csproj b/tests/src/JIT/Generics/pinvoke/instance03.csproj
index 94ec0fb4db..fa3e24d315 100644
--- a/tests/src/JIT/Generics/pinvoke/instance03.csproj
+++ b/tests/src/JIT/Generics/pinvoke/instance03.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/pinvoke/static01.csproj b/tests/src/JIT/Generics/pinvoke/static01.csproj
index f25591a950..6ead6981d5 100644
--- a/tests/src/JIT/Generics/pinvoke/static01.csproj
+++ b/tests/src/JIT/Generics/pinvoke/static01.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/pinvoke/static02.csproj b/tests/src/JIT/Generics/pinvoke/static02.csproj
index 8eb9abf450..f1c16f7ca6 100644
--- a/tests/src/JIT/Generics/pinvoke/static02.csproj
+++ b/tests/src/JIT/Generics/pinvoke/static02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Generics/regression/DDB148379/ddb148379.ilproj b/tests/src/JIT/Generics/regression/DDB148379/ddb148379.ilproj
index 378abb741e..c9191d5361 100644
--- a/tests/src/JIT/Generics/regression/DDB148379/ddb148379.ilproj
+++ b/tests/src/JIT/Generics/regression/DDB148379/ddb148379.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ddb148379.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/add.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/add.ilproj
index 6038771f5b..7dbf75a9d5 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/add.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/add.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/add_ovf.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/add_ovf.ilproj
index 127e2841c0..00268010e9 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/add_ovf.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/add_ovf.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_ovf.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/and.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/and.ilproj
index 10321413e1..9e59f6a687 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/and.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/and.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="and.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/beq.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/beq.ilproj
index e12dbf5cb1..ae79c7d5a4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/beq.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/beq.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="beq.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/beq_s.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/beq_s.ilproj
index a44c4d4533..c3a2f8b2f1 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/beq_s.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/beq_s.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="beq_s.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/bge.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/bge.ilproj
index da00b3f122..bf06e6bb8b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/bge.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/bge.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bge.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/bge_s.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/bge_s.ilproj
index e276be88ac..84d7c7dc45 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/bge_s.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/bge_s.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bge_s.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/bgt.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/bgt.ilproj
index b92fe50ff7..5db78dd13f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/bgt.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/bgt.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bgt.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/bgt_s.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/bgt_s.ilproj
index 794d4f8a21..498e419af9 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/bgt_s.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/bgt_s.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bgt_s.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ble.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ble.ilproj
index 66c7da57f3..9e9567939f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ble.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ble.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ble.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ble_s.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ble_s.ilproj
index e837ad9695..ff8ad78baf 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ble_s.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ble_s.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ble_s.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/blt.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/blt.ilproj
index d9d5fab72f..85fa9017c4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/blt.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/blt.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="blt.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/blt_s.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/blt_s.ilproj
index 22ecf647d6..96d37762fc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/blt_s.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/blt_s.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="blt_s.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/bne.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/bne.ilproj
index d01158610e..ff4e1aa493 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/bne.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/bne.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bne.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/bne_s.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/bne_s.ilproj
index c1d4658b0c..0e5c30d014 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/bne_s.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/bne_s.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bne_s.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/br.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/br.ilproj
index 8d147285c5..ac4fa6dc6f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/br.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/br.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="br.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/br_s.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/br_s.ilproj
index c9c37b7581..fd58d94797 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/br_s.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/br_s.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="br_s.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/brfalse.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/brfalse.ilproj
index 30b24cd331..309984039b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/brfalse.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/brfalse.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="brfalse.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/brfalse_s.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/brfalse_s.ilproj
index e693d22f40..ac5599985f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/brfalse_s.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/brfalse_s.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="brfalse_s.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/brtrue.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/brtrue.ilproj
index 5b40f41b2f..3b06f88331 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/brtrue.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/brtrue.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="brtrue.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/brtrue_s.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/brtrue_s.ilproj
index 1fbcff9e0e..449aa07393 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/brtrue_s.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/brtrue_s.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="brtrue_s.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/call.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/call.ilproj
index f6d5419dc4..6cd6a8b2c4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/call.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/call.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="call.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ceq.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ceq.ilproj
index 88ae94a8ae..a9f2ac3e00 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ceq.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ceq.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ceq.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/cgt.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/cgt.ilproj
index d0dd00ce3e..cee893ba42 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/cgt.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/cgt.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cgt.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ckfinite.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ckfinite.ilproj
index e54b6ffcc6..c306add20b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ckfinite.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ckfinite.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ckfinite.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/clt.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/clt.ilproj
index 0f9f61e118..05b68f8cdc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/clt.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/clt.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="clt.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/conv.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/conv.ilproj
index e7d1ccd5e8..ed77bb0fcb 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/conv.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/conv.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/conv_ovf.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/conv_ovf.ilproj
index 8504a80e10..b89fddc089 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/conv_ovf.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/conv_ovf.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/cpblk.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/cpblk.ilproj
index 9d79b702c9..a25b28af63 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/cpblk.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/cpblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cpblk.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/div.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/div.ilproj
index e685851ca8..07908cf584 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/div.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/div.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="div.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/dup.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/dup.ilproj
index 85ad1c3448..7a5e7d7088 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/dup.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/dup.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="dup.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/initblk.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/initblk.ilproj
index bc00a0df7e..8d1b459c62 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/initblk.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/initblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initblk.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/jmp.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/jmp.ilproj
index bb16f0c31e..6752ad308e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/jmp.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/jmp.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="jmp.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ldarg_n.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ldarg_n.ilproj
index 1531b109f4..ecb302a37e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ldarg_n.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ldarg_n.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_n.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ldarg_starg.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ldarg_starg.ilproj
index 7dbfc896dd..120535c07b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ldarg_starg.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ldarg_starg.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_starg.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ldargs_stargs.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ldargs_stargs.ilproj
index d01fbd2240..9fb284fa2e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ldargs_stargs.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ldargs_stargs.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldargs_stargs.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ldc.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ldc.ilproj
index aa4d45dc6e..c62d11888d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ldc.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ldc.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ldc_i4_n.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ldc_i4_n.ilproj
index 92f77bdaea..eca17c62c7 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ldc_i4_n.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ldc_i4_n.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_i4_n.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ldftn_calli.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ldftn_calli.ilproj
index 9aa3603ad4..a9a23a8da6 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ldftn_calli.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ldftn_calli.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldftn_calli.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ldind_stind.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ldind_stind.ilproj
index 7ba4a187a2..2bb8b310ca 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ldind_stind.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ldind_stind.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_stind.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ldloc_stloc.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ldloc_stloc.ilproj
index 1f02b7605a..b65032f7c4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ldloc_stloc.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ldloc_stloc.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_stloc.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ldloca.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ldloca.ilproj
index 0f340421ef..791da455c3 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ldloca.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ldloca.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloca.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ldnull.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ldnull.ilproj
index 549df20818..0d321e001e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ldnull.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ldnull.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldnull.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/mul.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/mul.ilproj
index 10d3b6e5df..130e8d77b5 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/mul.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/mul.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/mul_ovf.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/mul_ovf.ilproj
index 6bab10d40a..0851e35944 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/mul_ovf.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/mul_ovf.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_ovf.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/neg.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/neg.ilproj
index bcd2ffa74d..c12d4fd7d5 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/neg.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/neg.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="neg.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/nop.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/nop.ilproj
index 4b42578334..f1b73f00dc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/nop.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/nop.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="nop.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/not.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/not.ilproj
index 7ed324b2e8..d12e911638 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/not.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/not.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="not.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/or.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/or.ilproj
index d208772fea..535ed3ef7d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/or.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/or.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="or.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/pop.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/pop.ilproj
index f23400fc08..4e636802a2 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/pop.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/pop.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="pop.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/rem.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/rem.ilproj
index ea8b6d8ab0..6944878bef 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/rem.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/rem.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="rem.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/ret.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/ret.ilproj
index b9a3045653..df6ceb959d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/ret.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/ret.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ret.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/shl.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/shl.ilproj
index c2b1f7d92d..6ebce06ae3 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/shl.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/shl.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="shl.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/shr.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/shr.ilproj
index cb6926a513..b4754a2914 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/shr.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/shr.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="shr.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/sub.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/sub.ilproj
index e2a094e33c..7957146bd1 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/sub.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/sub.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/sub_ovf.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/sub_ovf.ilproj
index 37e5cdf620..745ef8ae6b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/sub_ovf.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/sub_ovf.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_ovf.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/switch.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/switch.ilproj
index eb2b6fc4b1..fe6f23c05c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/switch.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/switch.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="switch.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/tailcall.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/tailcall.ilproj
index 070422c461..7dde9545b0 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/tailcall.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/tailcall.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="tailcall.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/unaligned.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/unaligned.ilproj
index 17a9b01b4a..e1e8040d8a 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/unaligned.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/unaligned.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="unaligned.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/volatile.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/volatile.ilproj
index b480394424..5dd9c75f39 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/volatile.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/volatile.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="volatile.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Base/xor.ilproj b/tests/src/JIT/IL_Conformance/Old/Base/xor.ilproj
index da04e94dd2..6de116bd37 100644
--- a/tests/src/JIT/IL_Conformance/Old/Base/xor.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Base/xor.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="xor.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ConvDLL.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ConvDLL.ilproj
index 93ea811bb9..4d854b2bbd 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ConvDLL.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ConvDLL.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript>
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.ilproj
index bb65e70a6b..340f711c64 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Conv_I4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8.ilproj
index 1c40c44f66..40bfb4e3d2 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Conv_I8-64.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.ilproj
index e8e26c18ac..14539a8775 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Conv_R4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_I4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_I4.ilproj
index a896da8681..4e649c8be4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_I4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_I4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_I4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i.ilproj
index accdfcfeca..c3d0fb344c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i8.ilproj
index 883b78240b..edf94ab4ab 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.ilproj
index e3d4e99cb4..e894f929c1 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_ovf_i1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.ilproj
index e12a71ee2b..f28cb6f225 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_ovf_i2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.ilproj
index dc85ad3a89..09aeb3b8b3 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_ovf_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.ilproj
index 6bde8b5c2a..c9be3262ac 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_ovf_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.ilproj
index d170e81529..c9ec139e88 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_ovf_u1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.ilproj
index fa62b6cc16..17df7a7c0b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_ovf_u2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.ilproj
index dd57421e9f..e8c9bc5321 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_ovf_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.ilproj
index c9de6a8bc9..e6d76bebbd 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_ovf_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r4.ilproj
index 16d9f54f26..6d8a693b38 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r8.ilproj
index 40b49b94fd..6d23722f63 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="add_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u4.ilproj
index 1730d1cf96..b93b64a08c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="and_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u8.ilproj
index d465db5218..ed3ffce225 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="and_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i.ilproj
index a3c7da4431..88367c5b6f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="beq_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.ilproj
index 9d69309c11..4c3f4c2473 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="beq_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.ilproj
index bdf92bac6f..5b0ef24f7c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="beq_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.ilproj
index 41eee809bd..e2ea440865 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="beq_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.ilproj
index 7ed138a368..ace606ce85 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="beq_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.ilproj
index 41d50d42ef..0c18dfe6b9 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bge_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.ilproj
index fa02f6b467..649260d58d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bge_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.ilproj
index aa55f8ad83..4ad83561eb 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bge_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.ilproj
index 3040735827..396dbd2d74 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bge_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_u.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_u.ilproj
index d8db18c777..69119706df 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_u.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_u.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bge_u.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.ilproj
index 32f2211ecd..4b8b305558 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bge_un_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.ilproj
index bfe1333190..0e0635ec37 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bge_un_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.ilproj
index ca536df9e8..8ad51d7c11 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bge_un_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.ilproj
index eb06d61cdf..dbdb479d5d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bge_un_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.ilproj
index 2a69267bd7..e33acda597 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bgt_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.ilproj
index f04adcb646..f3bd7a2324 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bgt_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.ilproj
index 76757b5e94..c41802fa9d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bgt_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.ilproj
index 6c7895378b..48847fda7e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bgt_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.ilproj
index 23fff96ac9..10bc8bbac5 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bgt_u.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.ilproj
index 55054fb055..8b31db9ef1 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bgt_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.ilproj
index 2b8770671a..f41806801e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bgt_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.ilproj
index de6d55fc74..4fb1889231 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bgt_un_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.ilproj
index a026e1022c..65e5eac46d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bgt_un_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.ilproj
index 61d8e097d2..67f5689fd8 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ble_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.ilproj
index 23ed54bebc..fc0360554e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ble_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.ilproj
index b19ffa0f0a..dcba079f8c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ble_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.ilproj
index 54c7942afd..9376925853 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ble_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u.ilproj
index aaf179b6d2..89d255ad86 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ble_u.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.ilproj
index 077f8aec20..4eb7ae9a5b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ble_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.ilproj
index 5a6c977147..2a1f33d651 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ble_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.ilproj
index 6da734d232..682f4eefa7 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ble_un_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.ilproj
index 694abeef8a..d37be93766 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ble_un_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.ilproj
index 2b3e481aba..ec0b9c7180 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="blt_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.ilproj
index c14830da9d..acd30744a5 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="blt_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.ilproj
index f81db88548..19349a2d1d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="blt_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.ilproj
index 1ca8b8cf97..ed009ba241 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="blt_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u.ilproj
index fefcb1afe9..bb3b82fe27 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="blt_u.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.ilproj
index f3f197438a..576e252c9b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="blt_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.ilproj
index b556f81a44..c0d0b022a2 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="blt_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.ilproj
index 578feaf6d3..11f906b87b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="blt_un_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.ilproj
index 6d02015df2..8a7d413e2f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="blt_un_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u.ilproj
index f902964344..b9f0a11332 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bne_u.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.ilproj
index e30f86c72e..78dcf5893a 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bne_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.ilproj
index edbe4daab0..4165864261 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bne_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.ilproj
index 17ba234360..8db8a4a1b1 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bne_un_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.ilproj
index 826ab7f062..2d577473ab 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bne_un_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/br.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/br.ilproj
index 8d147285c5..ac4fa6dc6f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/br.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/br.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="br.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brfalse.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brfalse.ilproj
index 30b24cd331..309984039b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brfalse.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brfalse.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="brfalse.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brtrue.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brtrue.ilproj
index 5b40f41b2f..3b06f88331 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brtrue.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brtrue.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="brtrue.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_br.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_br.ilproj
index 7f39c65915..db282889dc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_br.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_br.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c_br.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.ilproj
index ffe8ab26fc..b09d841804 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c_brfalse.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.ilproj
index 58bb799bab..28779639ca 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c_brtrue.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_call.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_call.ilproj
index 7a62310caf..b805f2939e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_call.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_call.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c_call.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.ilproj
index 491852d421..64eb63780f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c_cpblk.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.ilproj
index 06d4693f79..086c739cf7 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c_initblk.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.ilproj
index 3d4210e57c..4d8370479b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c_ldvirtftn.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.ilproj
index 1582270bf7..c10c34ba89 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c_localloc.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_nop.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_nop.ilproj
index ee5f824de9..6b13a0fc69 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_nop.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_nop.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c_nop.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ret.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ret.ilproj
index d2f5dbc3ca..55cd3012f1 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ret.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ret.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c_ret.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_switch.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_switch.ilproj
index f124a52f4b..0f0ec5f2e0 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_switch.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_switch.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c_switch.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/call.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/call.ilproj
index f6d5419dc4..6cd6a8b2c4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/call.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/call.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="call.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.ilproj
index 4065b075c4..afb7a73629 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ceq_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.ilproj
index 56f19e0df6..c955b89229 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ceq_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.ilproj
index 92779e1dd6..0da4346e12 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ceq_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.ilproj
index fdae4a7814..fd4dd803f7 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ceq_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.ilproj
index 6939a6d69f..655e84890b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ceq_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.ilproj
index 293364f68e..06d7c3074f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cgt_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.ilproj
index ca1f164d06..48da5bc03a 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cgt_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.ilproj
index 7ffb6f5daf..2cb5f69df5 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cgt_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.ilproj
index 43d631c5cf..ff1d9b8887 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cgt_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.ilproj
index b2c242a500..bc0c9ef4fc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cgt_u.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.ilproj
index 7225700dcb..343554ef00 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cgt_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.ilproj
index 0ada8d3e3a..be54d7e602 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cgt_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.ilproj
index 9506b83067..fb5cc9c386 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cgt_un_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.ilproj
index d8cbc8b288..589b3c763d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cgt_un_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.ilproj
index 21d7e8135f..1631c2e39e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ckfinite_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.ilproj
index 976cadc3ec..2ec3d8833d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ckfinite_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.ilproj
index 726fb31692..bb306ce40d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="clt_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.ilproj
index 22abbe11be..1f862b36d4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="clt_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.ilproj
index efa6476b64..e26af50144 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="clt_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.ilproj
index ceb69ad42a..87b9cfdddc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="clt_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u.ilproj
index 634572cebb..d44be7fd62 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="clt_u.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.ilproj
index 1a596afc5f..1eb020077d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="clt_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.ilproj
index f0873bd0e8..af695cfff1 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="clt_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.ilproj
index 65128ff41d..53ce39f8b6 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="clt_un_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.ilproj
index 116042691d..f8743322d4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="clt_un_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.ilproj
index ef3d3d6ea1..3f96642a96 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i1_un.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_i1_un.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.ilproj
index 7e88bccc6c..3b3b9bd36c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_i4_i1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.ilproj
index a7a7c49527..da401a0a85 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_i4_i2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.ilproj
index af44135c62..a0c35f65d0 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_i4_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj
index c8a6e154fc..bc5bdfbaae 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj
@@ -8,19 +8,17 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DisableProjectBuild Condition="'$(Platform)' == 'x64'">true</DisableProjectBuild>
     <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -34,6 +32,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.ilproj
index c6e329ec6a..ead86de759 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_i8_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.ilproj
index 364e76c501..4f9aa4b4ea 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_i8_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.ilproj
index 0e523dd48a..ab162f236b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_r8_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.ilproj
index 7d1b273af4..f4efa4523d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_r8_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.ilproj
index cf607f263a..9f01eedd5e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_r8_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.ilproj
index 19da7eb77d..8155af8dfc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_u4_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.ilproj
index 46c2558941..5445804772 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_u4_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.ilproj
index 2f79ddb20a..7037c7bacb 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_u4_u1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.ilproj
index a49438f9cb..e14b07fd79 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_u4_u2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.ilproj
index 8f4702668d..89558873e4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_u8_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.ilproj
index feecfea782..e1126d2a39 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="conv_ovf_u8_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cpblk.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cpblk.ilproj
index 9d79b702c9..a25b28af63 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cpblk.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cpblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cpblk.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i4.ilproj
index 31a4926f13..49bafed154 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="div_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i8.ilproj
index 829ee8e1d9..5b61304a88 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="div_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r4.ilproj
index 855bc2e7bd..be7765f35c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="div_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r8.ilproj
index a98a835d5d..efdd449b23 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="div_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u4.ilproj
index cdfc8d310a..8f702ae91f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="div_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u8.ilproj
index 4d1b684a7b..907dfe968b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="div_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup4.ilproj
index 33fcaf7ce1..191ec79695 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="dup4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup8.ilproj
index 052011ce2a..cf728dd9ca 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="dup8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dupi.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dupi.ilproj
index 20fc6acf66..815e80db29 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dupi.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dupi.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="dupi.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/initblk.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/initblk.ilproj
index bc00a0df7e..8d1b459c62 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/initblk.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/initblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initblk.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.ilproj
index 6d9e72dac5..4f787cea56 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.ilproj
index 51dff42a4d..611606edbd 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.ilproj
index 0c265fdddd..2e5c5b6884 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.ilproj
index e3131da9ed..f146d314c7 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.ilproj
index 9bc172c6b8..3313e3d694 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.ilproj
index 0d008123f9..5ebff5f742 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_ref.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.ilproj
index 96242e78a1..e9d4294f6e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarga_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.ilproj
index 6c11e0d167..7b67d2b2b4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarga_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.ilproj
index 66e285a093..c06d3830ab 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarga_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.ilproj
index a92b697c17..f4f6fa2448 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarga_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.ilproj
index d5d97d0352..53f41ec884 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarga_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.ilproj
index 6d7216b486..1139ec0c90 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarga_ref.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.ilproj
index a9c12ab63d..04d4d7dc7b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_add_ovf_i1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.ilproj
index ced88ae4f0..ae98b357a7 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_add_ovf_i2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.ilproj
index fb674e1fe2..5b7a95108c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_add_ovf_i4.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.ilproj
index cd1bd965c4..f9e3557e4f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_add_ovf_i8.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.ilproj
index 2ae8ad336a..97142f6e03 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_add_ovf_u1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.ilproj
index 2ee1560218..3c532f7cf1 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_add_ovf_u2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.ilproj
index a7c2a0473e..3bab5db530 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_add_ovf_u4.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.ilproj
index 6338d59904..837d1abb43 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_add_ovf_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_add_ovf_u8.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.ilproj
index 37b87272a7..d73fe70328 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_cpblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_c_cpblk.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.ilproj
index 217cf413c1..ebd3b60e80 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_initblk.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_c_initblk.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.ilproj
index 837c166bdf..9102d3ed00 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_nop.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_c_nop.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.ilproj
index 731da59448..2cfed0e33b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_ret.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_c_ret.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.ilproj
index cd222ba66b..8a4f8a65fa 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_c_switch.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_c_switch.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.ilproj
index 17f2550986..beee8f8dec 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_ckfinite_r4.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.ilproj
index 54303887d2..046144c7fa 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ckfinite_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_ckfinite_r8.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.ilproj
index 205be65775..cea2f08997 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.ilproj
index c40882d041..c503940d1a 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_i2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.ilproj
index 353912676a..67c6087195 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i4_u4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.ilproj
index 1bf9cdc61c..b371f75a72 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.ilproj
index bd9312f8a5..57e46437ca 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_i8_u8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.ilproj
index 3cf6647570..adb9dbeb27 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.ilproj
index 69a3bb2b38..0e00ba3bb6 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.ilproj
index 65927bd259..c043d899f1 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_r8_i8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.ilproj
index 894c313de4..ba21e50bba 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.ilproj
index 431aa54e02..94f8daf52d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.ilproj
index e82d0a50ae..a6caf4571c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.ilproj
index c0fe870922..d6d4ff81a6 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u4_u2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.ilproj
index f42aba5df7..0d56cb12da 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_i8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.ilproj
index e6ee7de68a..9dd6ee8b49 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_conv_ovf_u8_u4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.ilproj
index 5f34bec83a..2eb139822c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.ilproj
index 5b65c94991..3ff1bf8589 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.ilproj
index bb12193313..49feabb1d0 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_mul_ovf_i1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.ilproj
index 979322c3a5..a9e4f427d4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_mul_ovf_i2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.ilproj
index 792bcfe332..75aec95b72 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_mul_ovf_i4.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.ilproj
index e29d2d7ae7..75f5144a53 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_mul_ovf_i8.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.ilproj
index 8dec9a8ef5..4e4556c396 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_mul_ovf_u1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.ilproj
index aacd6cdccb..5376cb269d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_mul_ovf_u2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.ilproj
index 4ae51d8b5a..f24b134f8e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_mul_ovf_u4.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.ilproj
index f8becf4dcf..753cade5c1 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_mul_ovf_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_mul_ovf_u8.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.ilproj
index ab6938a99d..0a243aef03 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.ilproj
index 189ee138df..4223ee9367 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_neg_i8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.ilproj
index 4c07ec91ad..153cf5991c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.ilproj
index bf0fdd5de0..5a5155a4b0 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldc_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.ilproj
index 889743e78d..1b197134b4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.ilproj
index 6382f2a3c9..47c80bafb4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.ilproj
index 03d4d36757..5d94d79fd4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_i8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.ilproj
index 25729a2317..76a1bc7ad8 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.ilproj
index faec28ab6d..0b3c05c2ca 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_r8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.ilproj
index 6745a838ac..abc05104a6 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_ret_ref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.ilproj
index 6e79e898f5..113fd44be9 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.ilproj
index 1162ba8bf1..9bfee26d88 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.ilproj
index 8aec542663..b03337d954 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.ilproj
index 2880539634..df11390fb8 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.ilproj
index dc3196a778..d35c08ed6f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_i8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.ilproj
index 71c6e2034a..9762a0039d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.ilproj
index dfa9bf46c6..ce060a0a17 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.ilproj
index 91ec63f3a7..2b600ac0b2 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.ilproj
index b539f6efd4..6f10be2b6f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_sub_ovf_u8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldftn.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldftn.ilproj
index d5cda548d1..2d1266b56a 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldftn.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldftn.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldftn.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.ilproj
index 71d9573c3e..0c0109ae57 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.ilproj
index e229851a34..ba680ebfcd 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_i1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.ilproj
index 43a0a16d60..35b7ca4054 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_i2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.ilproj
index 9f883355c1..2672342360 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.ilproj
index 9024055b2c..b76f5ea260 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.ilproj
index 237ad006b0..47ede0a2fd 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.ilproj
index 548779fdd1..ff29d168c7 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.ilproj
index cb925cd762..1a4250b6d8 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_ref.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.ilproj
index 59289cedbb..e65227bb72 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_u1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.ilproj
index c683952972..e356538dc8 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_u2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.ilproj
index 25f1df6867..97dc77f9fc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldind_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.ilproj
index 391f235f55..f5a7f028d3 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.ilproj
index 82a25c59fe..8ecedd7869 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.ilproj
index 4fa9251c8b..6fa85b0910 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.ilproj
index 48bb98e496..a585d3cc37 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.ilproj
index 258be3539a..76ee4dc184 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.ilproj
index a450edca8a..dce4eadca4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_ref.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.ilproj
index e794f3a551..07cf6eff41 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldnull_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.ilproj
index 7e0e838cb7..b379c672a8 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldnull_ref.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.ilproj
index b3ba2c0fc0..9d216293cc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldvirtftn.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/localloc.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/localloc.ilproj
index b249d83731..265ca1feca 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/localloc.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/localloc.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="localloc.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.ilproj
index 73fa22952c..94fef9ad3b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.ilproj
index 1412887c72..dcd2d00818 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.ilproj
index bd0bf435be..5497b42017 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_ovf_i1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.ilproj
index 6b793cf72f..5f3d73db14 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_ovf_i2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.ilproj
index f49ad825c1..343a4509db 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_ovf_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.ilproj
index 1ebd0a98a8..367ee8d12c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_ovf_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.ilproj
index a00d32872b..d52a1fca3b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_ovf_u1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.ilproj
index cb98f67ae9..31f42ffa82 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_ovf_u2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.ilproj
index dcc23abc64..28f2349600 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_ovf_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.ilproj
index 898c87af8d..6c10be6a3f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_ovf_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.ilproj
index 3f8c974dee..79b50b05f7 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.ilproj
index a9961c9a8d..7da09dad39 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="mul_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.ilproj
index c718acdaed..c225e93a46 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="neg_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.ilproj
index 6e37197fd2..6fd6529203 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="neg_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r4.ilproj
index b101d2bfd8..9c5f2b2b03 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="neg_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r8.ilproj
index 68d196846d..ff11b99f86 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="neg_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/nop.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/nop.ilproj
index 4b42578334..f1b73f00dc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/nop.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/nop.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="nop.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u4.ilproj
index 1a65be3b2d..938f70aefc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="not_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u8.ilproj
index aa04149907..5a61531904 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="not_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u4.ilproj
index c1fed57338..ba48c0fcf4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="or_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u8.ilproj
index 35f49c901f..7690a4aaaa 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="or_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop4.ilproj
index 8590da2b19..f8c95c420b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="pop4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop8.ilproj
index 8180ac83ba..23ab776991 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="pop8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/popi.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/popi.ilproj
index 28a7194100..cb4e94723d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/popi.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/popi.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="popi.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/refs.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/refs.ilproj
index d9c23eab05..238785fc59 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/refs.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/refs.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="refs.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.ilproj
index e9f07a0820..6843aff8ed 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="rem_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.ilproj
index d69fe6c2d2..d6f6b06bfc 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="rem_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.ilproj
index df9e5bba6e..693021a6f5 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.ilproj
index 2abfc95f9c..df63c916b7 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="rem_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.ilproj
index ed01578b47..b8b6f829fd 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="rem_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.ilproj
index 0e13424052..589774ca81 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="rem_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret.ilproj
index b9a3045653..df6ceb959d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ret.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i.ilproj
index a88598e007..682fa06be4 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ret_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.ilproj
index 7925c935bd..0bb553e8ad 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ret_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.ilproj
index 936f3c024f..cc3206006b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ret_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.ilproj
index 23c15e241e..b1df5ed916 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ret_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.ilproj
index 685aac535d..8853e06e95 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ret_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.ilproj
index 351795a9da..f5839ff3f8 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ret_ref.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.ilproj
index 4462444bfe..63c20554b9 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="shl_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.ilproj
index c81160e232..c5f1ab45fa 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="shl_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.ilproj
index 770aea53fc..176f39aa3e 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="shr_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.ilproj
index 1fba1765f3..ed38e54cd8 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="shr_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.ilproj
index 4716fc6fee..b21265b9f3 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="shr_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.ilproj
index e7cf12a21b..4f06e6466c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="shr_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sizeof.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sizeof.ilproj
index 4759772545..42e9075709 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sizeof.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sizeof.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sizeof.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i.ilproj
index aa06463a28..f04b21fe65 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="starg_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.ilproj
index cef93e38b4..843d8f2366 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="starg_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.ilproj
index dc80ab1a97..960d7c8898 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="starg_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.ilproj
index 5029bc4069..aea4614a7a 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="starg_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.ilproj
index 3d3d961332..530d4bc0de 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="starg_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.ilproj
index 9203b72bac..b348503c20 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="starg_ref.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.ilproj
index 4a9683e7f3..c84640e2c8 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stind_i1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.ilproj
index edfb9b9267..e19c42c6d0 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stind_i2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.ilproj
index 66571d8dd5..d7c4f3656f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stind_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.ilproj
index 0a35dfd7db..a7cbaa1ed3 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stind_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.ilproj
index 8fc017d5f2..06709379ea 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stind_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.ilproj
index cdd25a12b0..82b998f9b8 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stind_ref.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.ilproj
index 8ecb91a94a..8e8d81942d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stloc_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.ilproj
index ba00badcd7..a698dc0317 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stloc_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.ilproj
index 4c305d51b6..1df25d9e96 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stloc_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.ilproj
index 98635df5ea..8338c5bc8a 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stloc_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.ilproj
index 926d56f156..1469e3b597 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stloc_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.ilproj
index 5d21997a15..62d5cc675d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="stloc_ref.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i.ilproj
index 4561aed665..b423a7b65a 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_i.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.ilproj
index f347d3f165..2f547d603d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.ilproj
index 0e188a365e..6b3b5e1f73 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.ilproj
index 5bb3073c6a..e58ce99d2c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_ovf_i1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.ilproj
index 2ea3ab8813..ab09c3c584 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_ovf_i2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.ilproj
index 37d9f88842..b32514981b 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_ovf_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.ilproj
index 872d137480..db4b3bbf28 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_ovf_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.ilproj
index c5eada6c5d..048d376d97 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_ovf_u1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.ilproj
index 09c3f1721b..d10545887f 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_ovf_u2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.ilproj
index 2fc4691114..b1505e3c42 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_ovf_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.ilproj
index 224dcf6276..2ee5e47f12 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_ovf_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.ilproj
index d50d0b7a57..2fbd4943d8 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.ilproj
index 65c72af777..2ce307ebfe 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="sub_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/switch.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/switch.ilproj
index eb2b6fc4b1..fe6f23c05c 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/switch.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/switch.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="switch.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.ilproj
index 62e9d7510e..d4841eeb87 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="xor_u4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.ilproj b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.ilproj
index 07095b7ea6..e235d94b2d 100644
--- a/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="xor_u8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/AutoInit.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/AutoInit.ilproj
index cb1c5b5cca..e6d058def3 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/AutoInit.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/AutoInit.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="AutoInit.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/heap_ovf.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/heap_ovf.ilproj
index 0abb53fd08..c5d78ae0c8 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/heap_ovf.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/heap_ovf.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,39 +8,30 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="heap_ovf.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i1.ilproj
index 4d9b9dff43..b6bac808bc 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_s_i1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i2.ilproj
index b7db9633a4..2918d94e49 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_s_i2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i4.ilproj
index e49c747938..b25d59374e 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_s_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i8.ilproj
index 8946960c74..a70915d352 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_s_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r4.ilproj
index f966fed3cc..5e737d2e64 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_s_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r8.ilproj
index d8c656a3a2..066de1b12a 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldarg_s_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i1.ilproj
index 1e0a5b0157..884dcfd43e 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_s_i1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i2.ilproj
index 4ec1c238e8..0cc624115f 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_s_i2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i4.ilproj
index bf9d1bc265..c03828c1dd 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_s_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i8.ilproj
index 4b8289777e..03d2c96fbd 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_s_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r4.ilproj
index 7c9c8cc329..639ff4212b 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_s_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r8.ilproj
index 7a40fe80d7..244a0a20de 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloc_s_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i1.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i1.ilproj
index 377855bfab..f305e99814 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i1.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloca_s_i1.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i2.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i2.ilproj
index 4c7e5ce77e..00eeeeb36f 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i2.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloca_s_i2.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i4.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i4.ilproj
index 1a7a0bff5a..b96a649ea7 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloca_s_i4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i8.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i8.ilproj
index 92b83bb691..bf0d4ccdac 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloca_s_i8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r4.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r4.ilproj
index acfe4b5335..917ebc6046 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r4.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r4.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloca_s_r4.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r8.ilproj b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r8.ilproj
index 0061be1ab6..c460fa94f9 100644
--- a/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r8.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r8.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldloca_s_r8.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.ilproj
index 2167aff449..7459c64c2a 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Box_Unbox.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/array_tests.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/array_tests.ilproj
index bdfa9005b7..d21ab8b236 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/array_tests.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/array_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="array_tests.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/callintf.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/callintf.ilproj
index a938ecf4f4..5b2ce27890 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/callintf.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/callintf.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="callintf.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/callnonvirt.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/callnonvirt.ilproj
index 1125a5aaf7..a39cb0e3e4 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/callnonvirt.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/callnonvirt.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="callnonvirt.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/callstatic.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/callstatic.ilproj
index 3901c91ca5..a1edb64b4b 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/callstatic.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/callstatic.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="callstatic.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/callsuper.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/callsuper.ilproj
index 5b4dfe46e5..4673af40c8 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/callsuper.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/callsuper.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="callsuper.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/callvirt.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/callvirt.ilproj
index 9c815ca948..298ca815c0 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/callvirt.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/callvirt.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="callvirt.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/castclass.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/castclass.ilproj
index 7f7d497435..396c6cfe45 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/castclass.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/castclass.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="castclass.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/cpobj.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/cpobj.ilproj
index a936ae2fb8..5a2b28ae1c 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/cpobj.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/cpobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cpobj.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/field_tests.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/field_tests.ilproj
index a72bdcef92..eacc196b3d 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/field_tests.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/field_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="field_tests.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/fielda_tests.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/fielda_tests.ilproj
index 9bfe1ec2ec..5268da905d 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/fielda_tests.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/fielda_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="fielda_tests.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/initobj.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/initobj.ilproj
index 9ee7556a70..4d23af92d5 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/initobj.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/initobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initobj.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/isinst.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/isinst.ilproj
index 4cb8830beb..43fb6769a4 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/isinst.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/isinst.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="isinst.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/ldlen.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/ldlen.ilproj
index 102a3016bf..96df13c15d 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/ldlen.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/ldlen.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldlen.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/ldobj.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/ldobj.ilproj
index d914f68568..997e74cf9c 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/ldobj.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/ldobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldobj.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/ldstr.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/ldstr.ilproj
index a267077aaf..f21e82f3a8 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/ldstr.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/ldstr.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldstr.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/ldtoken.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/ldtoken.ilproj
index ef826ea324..7833729d5c 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/ldtoken.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/ldtoken.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldtoken.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.ilproj
index b3ba2c0fc0..9d216293cc 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldvirtftn.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/localloc.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/localloc.ilproj
index b249d83731..265ca1feca 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/localloc.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/localloc.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="localloc.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/newobj.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/newobj.ilproj
index 4e7061527a..d2c6ecd406 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/newobj.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/newobj.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="newobj.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/seh_tests.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/seh_tests.ilproj
index f0c9fe5324..ada5a4ae35 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/seh_tests.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/seh_tests.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="seh_tests.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/IL_Conformance/Old/objectmodel/throw.ilproj b/tests/src/JIT/IL_Conformance/Old/objectmodel/throw.ilproj
index 1e315914ed..ac9af0a50f 100644
--- a/tests/src/JIT/IL_Conformance/Old/objectmodel/throw.ilproj
+++ b/tests/src/JIT/IL_Conformance/Old/objectmodel/throw.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="throw.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_b.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_b.ilproj
index 30c2ed95c6..4f91979395 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_b.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_b.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_i4.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_i4.ilproj
index 4ae04fa696..121d46407c 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_i4.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_i4.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_objref.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_objref.ilproj
index ad5ccdd9b8..4d048844ef 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_objref.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_objref.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r4.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r4.ilproj
index 21af4457f3..504c6d75b4 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r4.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r4.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r8.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r8.ilproj
index 7db1ce09bf..02e142e58e 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r8.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r8.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_struct.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_struct.ilproj
index 52cf804b38..28a2a4d7f1 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_struct.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_struct.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_u8.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_u8.ilproj
index b944501b90..1fefd84d56 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_u8.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_u8.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_b.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_b.ilproj
index 059101dd7a..999f9ccf39 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_b.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_b.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_i4.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_i4.ilproj
index c8e85e7c14..0fdec883c4 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_i4.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_i4.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_objref.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_objref.ilproj
index 85dfac77ef..594497cffd 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_objref.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_objref.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r4.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r4.ilproj
index 03a7cab5b0..7c063abcb0 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r4.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r4.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r8.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r8.ilproj
index abfea682e5..06d06db801 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r8.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r8.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_struct.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_struct.ilproj
index 1c4ccdb722..96b153d474 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_struct.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_struct.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_u8.ilproj b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_u8.ilproj
index 97101f90a2..7540a7330a 100644
--- a/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_u8.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_u8.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/huge_struct.ilproj b/tests/src/JIT/Methodical/Arrays/huge_struct.ilproj
index f306c9e668..5d11aa598f 100644
--- a/tests/src/JIT/Methodical/Arrays/huge_struct.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/huge_struct.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj
index 3c5ee2ffbc..0890b75fb7 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5286AA16-A28B-4619-8842-73A9D89234B1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj
index 64967dacff..e49867da8c 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C6E13C6A-929B-413F-8D38-80F3E5E94A0E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj
index c9f1d98459..adee3ffa19 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1242903-9B22-4575-BEB9-D0300420705F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj
index a6442e8c93..4707625d52 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7F5BAD59-A81B-4154-BD8F-3F78F97D8255}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj
index d5ac3323c2..b991d11fdd 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2FF2EEFB-5E2B-47DB-A4A8-E52EB641DC49}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj
index ceb4029eda..85f57224ca 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D70C99ED-C081-4812-9B65-9B32B12ADC2C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj
index f1c2c45ad8..888a428900 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{229C7705-C14C-455D-9D7B-BED5F44DA541}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj
index ca1e43251c..c482bcbf86 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8F624618-F2BC-4CF6-A29C-F55B62508180}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_il_dbglcs_ldlen.ilproj b/tests/src/JIT/Methodical/Arrays/lcs/_il_dbglcs_ldlen.ilproj
index 4fe4700d2d..a9eb734253 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_il_dbglcs_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_il_dbglcs_ldlen.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_il_rellcs_ldlen.ilproj b/tests/src/JIT/Methodical/Arrays/lcs/_il_rellcs_ldlen.ilproj
index 9b75f5ca0b..adb15b020f 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_il_rellcs_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_il_rellcs_ldlen.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj
index 79dff94d50..3924cea95b 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6030F53-7EA9-4F85-93EE-583C70D4E382}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj
index 5f09bd2eed..8df4a9a3f7 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9E5B5249-574A-4DF1-8FEC-CEB6BBEC7F44}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj
index b17dc05997..030cfde4e8 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{383D2C5A-0D0D-461F-AC9E-16AC87A1EE41}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj
index 1fc8be68ce..6dbdbe89c2 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EB3126F9-9BAD-4402-B05C-D4911647914D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj
index a4ef3057de..7b4b7a36a5 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0DE45EAD-6D45-4C9B-95D7-7B42478D3271}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj
index 4e0fe629b0..0513a1fca7 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{04507495-DE8E-4FDE-98BF-323CE49114CC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj
index 82ecc4a7f6..7adbe3d2d3 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DBFA497E-DB71-4362-8A35-9F0A8A5B99B1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj
index 5512b8eab5..8088f888af 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6D59C069-4635-4971-9C44-C0FD0AB478FE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj
index 8cfb726791..c10f0fec24 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7F2BE09E-FB70-4867-8510-92CB72423557}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj
index 498e537653..9e084b709f 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CFCB5240-B25C-4731-B438-901AA0A46CA3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj
index e921edd39e..a724a4c93c 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{08D7A761-C3C5-41DA-8EDD-73FDDA2141E0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj
index a9cadef131..8f095dde57 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2047CED4-FC91-4429-9FA3-B1AA18B92617}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj
index af97fd2334..3393219b3b 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6113EE4E-E070-4A64-B6DA-9C0D81D5FF67}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj
index fcacd25bd9..ef5b8a1f97 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7FA818E6-43F9-4064-8D14-7A3ECF71EC4D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj
index 3b06c384ae..abbc42e99a 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{72BE06E8-0A10-4BC4-A79C-1D09D825AC7D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj
index 58b7990043..d81e01f891 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1A8C3540-503A-4515-9D4A-174F2E7D970B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj
index 3680b29165..c9a80d624e 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D81C1BBD-C6DC-4C88-B0CF-1F4AFA212D15}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj
index 2e18d967e2..0b01e846fa 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BA2B856D-9A08-423B-A166-43DF59F3C357}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj
index 84596658e6..597add1908 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D8DDFB16-E394-4CF8-9C7D-60EDA36C0DD6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj
index 8c3a5e4456..9a0cead0b3 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9CE7B008-52BD-4C42-A786-0319CD610C78}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj
index c4cd77195b..55e190fadb 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0950132C-BFC2-4F19-8125-07CE50FA340F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj
index a864be18c3..ff427fbb64 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{44AD9943-B0B1-4DD8-877E-CC3CB6A0D735}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj
index e8dfc1dde3..1c36bf7cbb 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3170D5EE-2113-4606-ABAB-B3B2B95D0395}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj
index 85729d3694..3a546866ac 100644
--- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj
+++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F5D42974-3541-42FB-9C75-3770270E5D94}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_dbgarrres.csproj b/tests/src/JIT/Methodical/Arrays/misc/_dbgarrres.csproj
index c506312146..4644a76ae5 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_dbgarrres.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_dbgarrres.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EEC386C8-76E2-4D97-8D5F-11413554DA38}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj b/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj
index 2e816fb921..7c61bd6262 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BA6C694F-CA16-4648-A162-19928FEA4AB7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj b/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj
index 515f834077..7b686ff8a7 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2A8C2287-CDC7-429C-8AD6-5076A13E7AB8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_dbgaddress.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_dbgaddress.ilproj
index 4554aa2a32..6816ea5ce4 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_dbgaddress.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_dbgaddress.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_dbggcarr.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_dbggcarr.ilproj
index fd478565a9..00447a81d3 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_dbggcarr.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_dbggcarr.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray.ilproj
index e1383c7ed8..eff5f7437e 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray.ilproj
@@ -8,9 +8,7 @@
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DebugType>Full</DebugType>
     <Optimize>false</Optimize>
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray_enum.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray_enum.ilproj
index edb9a2c5ab..eb30a65309 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray_enum.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_dbginitializearray_enum.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_dbgldelem_get.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_dbgldelem_get.ilproj
index af954f857a..a681cd348c 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_dbgldelem_get.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_dbgldelem_get.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_dbglength0.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_dbglength0.ilproj
index 03252ed665..d68177db42 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_dbglength0.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_dbglength0.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_dbglengthm2.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_dbglengthm2.ilproj
index 8146da4de2..3329579944 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_dbglengthm2.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_dbglengthm2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_dbgselfref.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_dbgselfref.ilproj
index ca42afcddc..c0e9b50282 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_dbgselfref.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_dbgselfref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_reladdress.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_reladdress.ilproj
index 31d8471b1e..774b66ddc2 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_reladdress.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_reladdress.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_relarrres.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_relarrres.ilproj
index 3fd62d650b..126257c461 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_relarrres.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_relarrres.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_relgcarr.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_relgcarr.ilproj
index 6256a1c3b0..3fb2beb939 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_relgcarr.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_relgcarr.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray.ilproj
index 28aedb65f7..42861a0a5c 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,11 +8,13 @@
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <Optimize>true</Optimize>
   </PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="initializearray.il" />
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray_enum.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray_enum.ilproj
index 985aa37fe0..f2f0747bc7 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray_enum.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_relinitializearray_enum.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_relldelem_get.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_relldelem_get.ilproj
index e89796865a..0809947688 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_relldelem_get.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_relldelem_get.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_rellength0.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_rellength0.ilproj
index d2d03af450..871288234a 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_rellength0.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_rellength0.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_rellengthm2.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_rellengthm2.ilproj
index 0efadc065a..fd5851a1b1 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_rellengthm2.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_rellengthm2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_il_relselfref.ilproj b/tests/src/JIT/Methodical/Arrays/misc/_il_relselfref.ilproj
index a177ee8021..d632d374f1 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_il_relselfref.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_il_relselfref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_relarrres.csproj b/tests/src/JIT/Methodical/Arrays/misc/_relarrres.csproj
index 66234ccf82..e2619f7360 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_relarrres.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_relarrres.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{376F7141-6564-4FCA-8B5B-1FAF03C0FBB6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj b/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj
index 9a3fefe0ec..63cf92cb49 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{52B653E7-69BC-4FD4-B124-A673C88BB72E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj b/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj
index badaf9d8e4..e3cf56213b 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{859EDDFE-5EDE-4772-888F-27000A56AA11}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgarrres.csproj b/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgarrres.csproj
index 545e6b6344..056271c086 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgarrres.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgarrres.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B5006B72-624F-496F-A429-4AE7E50AEB82}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj b/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj
index 5d567eef75..c23969c8f6 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F92F1679-95B9-488E-A378-7ADF531B2D01}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj b/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj
index 457ebd75bd..161d4235c7 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C8051056-1A85-4BEF-9408-3EAB51DCF52E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_speed_relarrres.csproj b/tests/src/JIT/Methodical/Arrays/misc/_speed_relarrres.csproj
index 362b192355..533f532c9e 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_speed_relarrres.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_speed_relarrres.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E07778FA-E591-4470-BD28-FBA0B45C880F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj b/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj
index 00eadac417..ee59fbb7a7 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5A836F00-9458-403C-A88F-D974F2B39F61}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj b/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj
index 14024ef9e8..5a82c2c18a 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj
+++ b/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B04EBCD4-E07A-461A-9ACF-922288EF3917}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Arrays/misc/arrres.cs b/tests/src/JIT/Methodical/Arrays/misc/arrres.cs
index 7956cc6103..e021a59d8c 100644
--- a/tests/src/JIT/Methodical/Arrays/misc/arrres.cs
+++ b/tests/src/JIT/Methodical/Arrays/misc/arrres.cs
@@ -45,15 +45,20 @@ namespace GCTest
             return 100;
         }
         [System.Runtime.CompilerServices.MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
-        private static void Test1()
+        private static void CollectAndFinalize()
         {
-            for (int i = 0; i < 50; i++)
-                s_arr[i] = new Test(i);
             GC.Collect();
             GC.WaitForPendingFinalizers();
             GC.Collect();
         }
         [System.Runtime.CompilerServices.MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
+        private static void Test1()
+        {
+            for (int i = 0; i < 50; i++)
+                s_arr[i] = new Test(i);
+            CollectAndFinalize();
+        }
+        [System.Runtime.CompilerServices.MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
         private static void Test2()
         {
             for (int i = 0; i < 50; i++)
@@ -62,52 +67,44 @@ namespace GCTest
                 s_arr[i].CheckValid();
                 s_arr[i] = null;
             }
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-            GC.Collect();
         }
         [System.Runtime.CompilerServices.MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
         private static void Test3()
         {
+            CollectAndFinalize();
             for (int i = 0; i < 50; i++)
             {
                 if (s_arr[i] == null) throw new Exception();
                 s_arr[i].CheckValid();
                 s_arr[i] = null;
             }
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-            GC.Collect();
         }
         [System.Runtime.CompilerServices.MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
         private static void Test4()
         {
+            CollectAndFinalize();
             for (int i = 0; i < 50; i++)
             {
                 if (s_arr[i] == null) throw new Exception();
                 s_arr[i].CheckValid();
                 s_arr[i] = null;
             }
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-            GC.Collect();
         }
         [System.Runtime.CompilerServices.MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
         private static void Test5()
         {
+            CollectAndFinalize();
             for (int i = 0; i < 50; i++)
             {
                 if (s_arr[i] == null) throw new Exception();
                 s_arr[i].CheckValid();
                 s_arr[i] = null;
             }
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-            GC.Collect();
         }
         [System.Runtime.CompilerServices.MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
         private static void Test6()
         {
+            CollectAndFinalize();
             for (int i = 0; i < 50; i++)
             {
                 if (s_arr[i] == null) throw new Exception();
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range1.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range1.ilproj
index 72bc23acd1..490b10a9c9 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range1.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range2.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range2.ilproj
index 5e2e833a9b..6e559fb5c9 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range2.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range2.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0.ilproj
index b0ab92e422..0ac691a64e 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5a.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5a.ilproj
index b4b93eae3c..b3c6cc350e 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5a.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5a.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5b.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5b.ilproj
index 8d5de8ec20..664f08766f 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5b.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5b.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_1.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_1.ilproj
index 516699033a..6deb0cd90f 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_1.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_m1.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_m1.ilproj
index 04e99f3e8f..0ab9bcae9a 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_m1.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_m1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_neg_range.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_neg_range.ilproj
index e9c4226459..04a893de72 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_neg_range.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_neg_range.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range1.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range1.ilproj
index d51b85a9d4..2f98ce8106 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range1.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range2.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range2.ilproj
index e99541698a..5d3e20153b 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range2.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range2.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range1.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range1.ilproj
index 82239c6a15..79afd6adc5 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range1.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range2.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range2.ilproj
index 8aa3f3dba9..bb5666106e 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range2.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range2.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0.ilproj
index db18a1eb28..3050cc6fa0 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5a.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5a.ilproj
index f9e598c603..05f4b5427b 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5a.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5a.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5b.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5b.ilproj
index bc971ee16d..40befd89df 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5b.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5b.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_1.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_1.ilproj
index b5f477ba8d..98774493d4 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_1.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_m1.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_m1.ilproj
index b0433e17d5..404c5fe5b1 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_m1.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_m1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_neg_range.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_neg_range.ilproj
index de7c2eb7ea..e33206cc1d 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_neg_range.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_neg_range.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range1.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range1.ilproj
index 8c5431e634..12bb7944d8 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range1.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range2.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range2.ilproj
index 5978081c98..3cfbc20f93 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range2.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range2.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Arrays/range/_il_relnegIndexRngChkElim.ilproj b/tests/src/JIT/Methodical/Arrays/range/_il_relnegIndexRngChkElim.ilproj
index b1f9f31c55..e0dd970625 100644
--- a/tests/src/JIT/Methodical/Arrays/range/_il_relnegIndexRngChkElim.ilproj
+++ b/tests/src/JIT/Methodical/Arrays/range/_il_relnegIndexRngChkElim.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
index 54adc03b70..c12f77a6b7 100644
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6EAF444E-55CF-473C-99E0-38176828C2D6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
index 94f1115463..53e32beb72 100644
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{10E5D6DB-A089-4539-8A17-6216BD6F98B8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
index 88b9c9488a..2a8a7f94af 100644
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4FAD1625-EF71-4917-9F1F-ED9ABFFB934C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
index 02d5e78dd1..f32a18b9d3 100644
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C84C8426-642F-4DFD-BF02-7A6E9F708756}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
index 861e2b346f..a893ec9242 100644
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{14163169-6FB4-4A2B-8A4A-A021D006D717}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
index b6792775bf..d116b6a841 100644
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7D321758-1C83-4DB3-B51D-27F6FA57AE64}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
index 73b8e720a5..e08ef5eb10 100644
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{16967885-D7D0-4D58-AF6B-00F5FC54EC1B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
index 9896f6c1e5..ebcd935b4b 100644
--- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7B540E45-BDAB-46BC-8657-D6CBCBE61831}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
index 5c83997834..da0bf3ac46 100644
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{293FE611-8ECE-473A-913C-7CF09977A544}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
index 7349233bed..7e43326111 100644
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A6038A0C-F7A9-4511-A080-22E10146CFF4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
index 5fc11d1572..1508919680 100644
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F482BF92-E9C2-4B1D-9E42-EADBAAC53B30}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
index 9da5c7b516..7f64ac90f9 100644
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F743004C-99B4-4580-80AE-33EA97834AB9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
index c9e1f65c35..d80d87eb09 100644
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{364B851D-D4FF-4F6A-AF3B-96D8CDD71360}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
index eb11c86221..f7062387dc 100644
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{12E16CD9-7ECB-44CE-ADEB-93783A7FCE13}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
index 03872f3fb0..3a1acd2a6b 100644
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{21007222-B4B1-49D7-9AE6-D9A4C915A20A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
index 795385fa0a..c9b953ef07 100644
--- a/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A01D75F2-4784-4CF8-BA88-23BC63F3CB0A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
index e65190d50b..6cc763ee82 100644
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{83C230E5-DE57-4F98-90A2-5E434A64071E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
index e10295daf5..8bf26d46ff 100644
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{019B6706-6421-4BFA-BC71-9CF043491C3B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
index c21ddc4ed3..3e98ba190e 100644
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{70351EE6-B46D-45D4-81BB-E48E359D49A8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
index e6d99dd54b..4a9f696279 100644
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FA9A66F5-886D-46E8-AC9B-0CA8E67D6CBD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
index d8cb2a93aa..741dad768d 100644
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1F45941-0CB1-4C86-A9C0-22B751B4EC4D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
index 073eec68cd..5c5acfe529 100644
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B9707CEE-08FE-4DA8-9ED1-0CD2326A6390}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
index bb58e599e7..8ff1f07188 100644
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BFAEC7EF-E209-4F9B-BB90-FFA58678A253}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
index 5018d65fdc..4eae3cbe3f 100644
--- a/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{11C1B849-E442-4D5E-A0A7-AA0B30F2247B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
index 0aa5da05b2..e9eb1013c2 100644
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{149D8B69-2B5C-4F25-8853-991A4BF08DB4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
index fd383e7844..e022e39966 100644
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5269AD90-8679-4AEA-8C2A-906CDA9F056F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
index 580516bf5a..d5a3e25447 100644
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2C65FE18-0E3B-44B0-9BB7-E8254C06A3C9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
index 05305b1044..a7f9068ef0 100644
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9B133BDC-48C6-4E11-906C-FDEAF818309F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
index 20606a1815..28acfd869e 100644
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{38B47509-08E5-4BEE-B112-14528D0C48F3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
index ce95b7f38f..85db11af00 100644
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A30B47AA-3D05-47ED-86E6-836946DBE693}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
index 1cfaff7ac5..bf2ab3eb1a 100644
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1CDEC76B-6206-4094-85C9-6447D3DFDFDA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
index 4452da6baa..d2b45f3f9c 100644
--- a/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{089F5E49-9BEF-4F72-852F-E13C1A8E91F4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgarray.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgarray.ilproj
index 2490bb121d..f656f8b11e 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgarray.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgarray.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgchain.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgchain.ilproj
index e6a93dbbb3..b85f82b5cc 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgchain.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgchain.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgfinally.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgfinally.ilproj
index 12799e64f1..3880432098 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgfinally.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgfinally.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbghuge_filter.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbghuge_filter.ilproj
index f1ed54a3bd..3a21db4355 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbghuge_filter.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbghuge_filter.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgjump.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgjump.ilproj
index 584a68af67..14b43a15cc 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgjump.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgjump.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocal.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocal.ilproj
index baee334681..2a552f67e5 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocal.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocal.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocalloc.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocalloc.ilproj
index fa10e59585..5e76400964 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocalloc.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocalloc.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgsimple.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgsimple.ilproj
index 9bd5462a1a..e58591ead6 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgsimple.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgsimple.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtailcall.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtailcall.ilproj
index 253c1f74b1..58bbcb89f7 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtailcall.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtailcall.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtry.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtry.ilproj
index 76176677ed..0c55bcc320 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtry.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtry.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relarray.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relarray.ilproj
index 6194b70995..cebfc957d4 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relarray.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relarray.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relchain.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relchain.ilproj
index fba37578df..f8f35eea73 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relchain.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relchain.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relfinally.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relfinally.ilproj
index c08aec48fe..bd844852e7 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relfinally.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relfinally.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relhuge_filter.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relhuge_filter.ilproj
index b9c193e821..5cdcd99d4f 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relhuge_filter.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relhuge_filter.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reljump.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reljump.ilproj
index c7a88937cf..b10ac53d4e 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reljump.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reljump.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocal.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocal.ilproj
index 716ccb838d..145996632c 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocal.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocal.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocalloc.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocalloc.ilproj
index c8d8517343..ef1e2304f9 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocalloc.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocalloc.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relsimple.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relsimple.ilproj
index 5ceae3c5e1..ac4e169e4b 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relsimple.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relsimple.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltailcall.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltailcall.ilproj
index c2a3631bb7..bd7e9db0db 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltailcall.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltailcall.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltry.ilproj b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltry.ilproj
index 7b0ecd5820..4d50c293b7 100644
--- a/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltry.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltry.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.csproj b/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.csproj
index 1c954fb540..894fa723a5 100644
--- a/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_il.ilproj b/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_il.ilproj
index d441125ee9..5d7b8017e1 100644
--- a/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_il.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.csproj b/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.csproj
index e2062b47d7..703d92e2e0 100644
--- a/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.csproj b/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.csproj
index dc03b3b956..80fcc8b269 100644
--- a/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.csproj b/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.csproj
index 56add9ecbb..ee396cfaa3 100644
--- a/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_il.ilproj b/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_il.ilproj
index f45276c7b8..8394f062aa 100644
--- a/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_il.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.csproj b/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.csproj
index f9931602e4..2336dee6f7 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_il.ilproj b/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_il.ilproj
index 9d008306c6..416c4be104 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_il.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.csproj b/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.csproj
index 4f47fd363f..75968f3bae 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_il.ilproj b/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_il.ilproj
index 1596bd21e3..7040a5b9d7 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_il.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.csproj b/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.csproj
index c095a79229..5ec049f7de 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.csproj b/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.csproj
index cbdf4a3f12..1f5998ff8a 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.csproj b/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.csproj
index 15559fba61..b100f86c75 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.csproj b/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.csproj
index 35a69c7fa5..5a200178d3 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.csproj b/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.csproj
index b8aeecd635..306483697b 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_relfibo_il.ilproj b/tests/src/JIT/Methodical/Boxing/functional/_relfibo_il.ilproj
index ce95d516b1..e570bdd65f 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_relfibo_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_relfibo_il.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.csproj b/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.csproj
index b60aa07cd0..c1e8e3ac6f 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/functional/_relsin_il.ilproj b/tests/src/JIT/Methodical/Boxing/functional/_relsin_il.ilproj
index 0c48b9b239..5d3bf50c9a 100644
--- a/tests/src/JIT/Methodical/Boxing/functional/_relsin_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/functional/_relsin_il.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgconcurgc_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgconcurgc_il.ilproj
index b9984b051b..69112d0048 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgconcurgc_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgconcurgc_il.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj
index 25ec5f245e..c516e6f39a 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1078159A-0ADF-4196-8910-17C460B6B9C4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_il.ilproj
index 00bf3a7181..c747cc5819 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_il.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj
index 4c463ff9fc..a28fa93bee 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{32EFE30D-5B7F-4660-8F73-F1D533004FCD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_il.ilproj
index d160121ba0..7027d90be9 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_il.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj
index 5b53d864e1..fad6120ae5 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BB4C7E4F-77AB-4E77-97D0-3195E414DF66}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_il.ilproj
index 3bc973e59a..04415837d3 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_il.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_dbgtypedref.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_dbgtypedref.ilproj
index b22980f7a3..7618c3561d 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_dbgtypedref.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_dbgtypedref.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj
index af323b49c7..5b7941f53f 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E1EFF632-5803-4922-8556-047D321ACDD6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj
index 8baf3e11b9..bb1e2f7d6f 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DD3CD0A1-DF96-4AD5-B363-94E216361C80}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj
index 1eff1dc2b4..2503096fac 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B3A065CE-BEAE-4A30-AEF3-83E45D4C8569}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj
index 603312e83f..8545a97671 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{61121819-B7F9-474B-85EB-040490EF3D0A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj
index 85077408cf..cb1e682d02 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D3F0D5C2-219B-4E50-9C1C-BEAE2E2A9587}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj
index f95651774d..c599f15f05 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B3E6268C-05E7-4BEC-8D4C-B471DC6946E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_relconcurgc_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_relconcurgc_il.ilproj
index fe55035275..54e7d9c004 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_relconcurgc_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_relconcurgc_il.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj
index 3c9002b270..a6ca409936 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7BD9A24F-20E4-4515-9514-0029E4A485C0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_relenum_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_relenum_il.ilproj
index b97370ca8e..29d59bf934 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_relenum_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_relenum_il.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj
index a10628f2f8..a38a9466fa 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E6A3B5BF-331D-4B40-8993-CDCFB9E8F181}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_relnestval_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_relnestval_il.ilproj
index 06646b460e..6f72c98cf2 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_relnestval_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_relnestval_il.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj b/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj
index 8533053efe..18b1e023d1 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{50E37C5A-A812-4C7B-8299-C5A973E99C91}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_il.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_il.ilproj
index 290d39a3db..d45796a90d 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_il.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/misc/_reltypedref.ilproj b/tests/src/JIT/Methodical/Boxing/misc/_reltypedref.ilproj
index 079a49f4b3..e3fadd3d70 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/_reltypedref.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/misc/_reltypedref.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/misc/concurgc.il b/tests/src/JIT/Methodical/Boxing/misc/concurgc.il
index ad0abb190e..5d8d5be386 100644
--- a/tests/src/JIT/Methodical/Boxing/misc/concurgc.il
+++ b/tests/src/JIT/Methodical/Boxing/misc/concurgc.il
@@ -26,7 +26,8 @@
       .maxstack  8
       IL_0002:  call       void [mscorlib]System.GC::Collect()
                 ldc.i4 100
-                call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+                call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
+                volatile.
                 ldsfld     bool Test.App::signal
                 brfalse.s  IL_0002
                 ret
@@ -38,8 +39,8 @@
       .entrypoint
       .maxstack  3
       .locals ([0] class Test.App app,
-               [1] class [mscorlib]System.Threading.ThreadStart ts,
-               [2] class [mscorlib]System.Threading.Thread th,
+               [1] class [System.Threading.Thread]System.Threading.ThreadStart ts,
+               [2] class [System.Threading.Thread]System.Threading.Thread th,
                [3] class System.Object obj,
                [4] class System.Object I,
                [5] float64 V_5,
@@ -48,15 +49,16 @@
       IL_0005:  stloc.0
       IL_0006:  ldloc.0
       IL_0007:  ldftn      instance void Test.App::Func()
-      IL_000d:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(class System.Object,native int)
+      IL_000d:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(class System.Object,native int)
       IL_0012:  stloc.1
       IL_0013:  ldloc.1
-      IL_0014:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+      IL_0014:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
       IL_0019:  stloc.2
                 ldc.i4.0
+                volatile.
                 stsfld     bool  Test.App::signal
       IL_001a:  ldloc.2     
-      IL_001b:  call       instance void [mscorlib]System.Threading.Thread::Start()
+      IL_001b:  call       instance void [System.Threading.Thread]System.Threading.Thread::Start()
       IL_0020:  ldc.r8     11.
       IL_0029:  stloc.s    V_5
       IL_002b:  ldloc.s   V_5
@@ -137,6 +139,7 @@
       IL_00bf:  blt      IL_0041
 
       IL_00c1:  ldc.i4.1
+                volatile.
       IL_00c2:  stsfld     bool  Test.App::signal
       IL_00c7:  ldstr      "**** PASSED ****"
       IL_00cc:  call       void [System.Console]System.Console::WriteLine(class System.String)
diff --git a/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.csproj b/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.csproj
index 4f47fd363f..75968f3bae 100644
--- a/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.csproj b/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.csproj
index cbdf4a3f12..1f5998ff8a 100644
--- a/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.csproj b/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.csproj
index 35a69c7fa5..5a200178d3 100644
--- a/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.csproj b/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.csproj
index b60aa07cd0..c1e8e3ac6f 100644
--- a/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/morph/sin3double.il b/tests/src/JIT/Methodical/Boxing/morph/sin3double.il
new file mode 100644
index 0000000000..65cc41d81e
--- /dev/null
+++ b/tests/src/JIT/Methodical/Boxing/morph/sin3double.il
@@ -0,0 +1,436 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+.assembly extern mscorlib
+{
+}
+
+.assembly extern System.Console as console
+{
+}
+
+.assembly sin3double
+{
+}
+
+.class private sequential ansi sealed beforefieldinit VV extends [mscorlib]System.ValueType
+{
+  .pack 0
+  .size 40
+}
+
+.class public auto ansi beforefieldinit Z extends [mscorlib] System.Object
+{
+
+.method static float64 mySin(float64 Angle) cil managed
+{
+  .locals (int32 V_0,
+           float64 V_1,
+           float64 V_2,
+           float64 V_3,
+           float64 V_4,
+           object V_5,
+           object V_6,
+           object V_7,
+           object V_8,
+           object V_9,
+           object V_10,
+           object V_11,
+           object V_12,
+           object V_13,
+           object V_14,
+           float64 V_15,
+           float64 V_16)
+  IL_0000:  ldnull
+  IL_0001:  stloc.s    V_14
+  IL_0003:  ldnull
+  IL_0004:  stloc.s    V_13
+  IL_0006:  ldnull
+  IL_0007:  stloc.s    V_12
+  IL_0009:  ldnull
+  IL_000a:  stloc.s    V_11
+  IL_000c:  ldnull
+  IL_000d:  stloc.s    V_10
+  IL_000f:  ldc.r8     0.0
+  IL_0018:  box        [mscorlib]System.Double
+  IL_001d:  stloc.s    V_14
+  IL_001f:  ldc.r8     0.0
+  IL_0028:  box        [mscorlib]System.Double
+  IL_002d:  stloc.s    V_13
+  IL_002f:  ldc.r8     0.0
+  IL_0038:  box        [mscorlib]System.Double
+  IL_003d:  stloc.s    V_12
+  IL_003f:  ldc.r8     0.0
+  IL_0048:  box        [mscorlib]System.Double
+  IL_004d:  stloc.s    V_11
+  IL_004f:  ldc.r8     1.
+  IL_0058:  box        [mscorlib]System.Double
+  IL_005d:  stloc.s    V_10
+  IL_005f:  ldloc.s    V_14
+  IL_0061:  stloc.s    V_9
+  IL_0063:  ldloc.s    V_9
+  IL_0065:  isinst     [mscorlib]System.Double
+  IL_006a:  brfalse.s  IL_0075
+
+  IL_006c:  ldloc.s    V_9
+  IL_006e:  unbox      [mscorlib]System.Double
+  IL_0073:  br.s       IL_0077
+
+  IL_0075:  ldc.i4.0
+  IL_0076:  conv.i
+  IL_0077:  ldind.r8
+  IL_0078:  stloc.s    V_4
+  IL_007a:  ldloc.s    V_13
+  IL_007c:  stloc.s    V_8
+  IL_007e:  ldloc.s    V_8
+  IL_0080:  isinst     [mscorlib]System.Double
+  IL_0085:  brfalse.s  IL_0090
+
+  IL_0087:  ldloc.s    V_8
+  IL_0089:  unbox      [mscorlib]System.Double
+  IL_008e:  br.s       IL_0092
+
+  IL_0090:  ldc.i4.0
+  IL_0091:  conv.i
+  IL_0092:  ldind.r8
+  IL_0093:  stloc.3
+  IL_0094:  ldloc.s    V_12
+  IL_0096:  stloc.s    V_7
+  IL_0098:  ldloc.s    V_7
+  IL_009a:  isinst     [mscorlib]System.Double
+  IL_009f:  brfalse.s  IL_00aa
+
+  IL_00a1:  ldloc.s    V_7
+  IL_00a3:  unbox      [mscorlib]System.Double
+  IL_00a8:  br.s       IL_00ac
+
+  IL_00aa:  ldc.i4.0
+  IL_00ab:  conv.i
+  IL_00ac:  ldind.r8
+  IL_00ad:  stloc.2
+  IL_00ae:  ldloc.s    V_11
+  IL_00b0:  stloc.s    V_6
+  IL_00b2:  ldloc.s    V_6
+  IL_00b4:  isinst     [mscorlib]System.Double
+  IL_00b9:  brfalse.s  IL_00c4
+
+  IL_00bb:  ldloc.s    V_6
+  IL_00bd:  unbox      [mscorlib]System.Double
+  IL_00c2:  br.s       IL_00c6
+
+  IL_00c4:  ldc.i4.0
+  IL_00c5:  conv.i
+  IL_00c6:  ldind.r8
+  IL_00c7:  stloc.s    V_16
+  IL_00c9:  ldloc.s    V_10
+  IL_00cb:  stloc.s    V_5
+  IL_00cd:  ldloc.s    V_5
+  IL_00cf:  isinst     [mscorlib]System.Double
+  IL_00d4:  brfalse.s  IL_00df
+
+  IL_00d6:  ldloc.s    V_5
+  IL_00d8:  unbox      [mscorlib]System.Double
+  IL_00dd:  br.s       IL_00e1
+
+  IL_00df:  ldc.i4.0
+  IL_00e0:  conv.i
+  IL_00e1:  ldind.r8
+  IL_00e2:  stloc.1
+  IL_00e3:  ldarg.0
+  IL_00e4:  stloc.2
+  IL_00e5:  ldloc.2
+  IL_00e6:  stloc.s    V_4
+  IL_00e8:  ldc.r8     0.0
+  IL_00f1:  stloc.3
+  IL_00f2:  ldc.i4.1
+  IL_00f3:  stloc.0
+  IL_00f4:  br.s       IL_00fa
+
+  IL_00f6:  ldloc.0
+  IL_00f7:  ldc.i4.2
+  IL_00f8:  add
+  IL_00f9:  stloc.0
+  IL_00fa:  ldloc.0
+  IL_00fb:  ldc.i4     0xc8
+  IL_0100:  bgt.s      IL_012b
+
+  IL_0102:  ldloc.3
+  IL_0103:  ldloc.2
+  IL_0104:  add
+  IL_0105:  stloc.3
+  IL_0106:  ldloc.s    V_4
+  IL_0108:  ldarg.0
+  IL_0109:  neg
+  IL_010a:  ldarg.0
+  IL_010b:  mul
+  IL_010c:  mul
+  IL_010d:  stloc.s    V_4
+  IL_010f:  ldloc.1
+  IL_0110:  ldloc.0
+  IL_0111:  ldc.i4.1
+  IL_0112:  add
+  IL_0113:  ldloc.0
+  IL_0114:  ldc.i4.2
+  IL_0115:  add
+  IL_0116:  mul
+  IL_0117:  conv.r8
+  IL_0118:  mul
+  IL_0119:  stloc.1
+  IL_011a:  ldloc.1
+  IL_011b:  call       bool [mscorlib]System.Double::IsInfinity(float64)
+  IL_0120:  brfalse.s  IL_0124
+
+  IL_0122:  br.s       IL_012b
+
+  IL_0124:  ldloc.s    V_4
+  IL_0126:  ldloc.1
+  IL_0127:  div
+  IL_0128:  stloc.2
+  IL_0129:  br.s       IL_00f6
+
+  IL_012b:  ldloc.3
+  IL_012c:  stloc.s    V_15
+  IL_012e:  ldloc.s    V_15
+  IL_0130:  ret
+}
+
+.method static int32 Main() cil managed
+{
+  .entrypoint
+  .locals (int32 V_0,
+           float64 V_1,
+           float64 V_2,
+           float64 V_3,
+           int32 V_4,
+           object V_5,
+           object V_6,
+           object V_7,
+           object V_8,
+           object V_9,
+           object V_10,
+           valuetype VV V_11)
+  IL_0000:  ldc.i4.0
+  IL_0001:  stloc.s    V_4
+  IL_0003:  ldnull
+  IL_0004:  stloc.s    V_10
+  IL_0006:  ldnull
+  IL_0007:  stloc.s    V_9
+  IL_0009:  ldnull
+  IL_000a:  stloc.s    V_8
+  IL_000c:  ldc.r8     0.0
+  IL_0015:  box        [mscorlib]System.Double
+  IL_001a:  stloc.s    V_10
+  IL_001c:  ldc.r8     0.0
+  IL_0025:  box        [mscorlib]System.Double
+  IL_002a:  stloc.s    V_9
+  IL_002c:  ldc.r8     0.0
+  IL_0035:  box        [mscorlib]System.Double
+  IL_003a:  stloc.s    V_8
+  IL_003c:  ldloc.s    V_10
+  IL_003e:  stloc.s    V_7
+  IL_0040:  ldloc.s    V_7
+  IL_0042:  isinst     [mscorlib]System.Double
+  IL_0047:  brfalse.s  IL_0052
+
+  IL_0049:  ldloc.s    V_7
+  IL_004b:  unbox      [mscorlib]System.Double
+  IL_0050:  br.s       IL_0054
+
+  IL_0052:  ldc.i4.0
+  IL_0053:  conv.i
+  IL_0054:  ldind.r8
+  IL_0055:  stloc.3
+  IL_0056:  ldloc.s    V_9
+  IL_0058:  stloc.s    V_6
+  IL_005a:  ldloc.s    V_6
+  IL_005c:  isinst     [mscorlib]System.Double
+  IL_0061:  brfalse.s  IL_006c
+
+  IL_0063:  ldloc.s    V_6
+  IL_0065:  unbox      [mscorlib]System.Double
+  IL_006a:  br.s       IL_006e
+
+  IL_006c:  ldc.i4.0
+  IL_006d:  conv.i
+  IL_006e:  ldind.r8
+  IL_006f:  stloc.2
+  IL_0070:  ldloc.s    V_8
+  IL_0072:  stloc.s    V_5
+  IL_0074:  ldloc.s    V_5
+  IL_0076:  isinst     [mscorlib]System.Double
+  IL_007b:  brfalse.s  IL_0086
+
+  IL_007d:  ldloc.s    V_5
+  IL_007f:  unbox      [mscorlib]System.Double
+  IL_0084:  br.s       IL_0088
+
+  IL_0086:  ldc.i4.0
+  IL_0087:  conv.i
+  IL_0088:  ldind.r8
+  IL_0089:  stloc.1
+  IL_008a:  ldloca.s   V_11
+  IL_008c:  ldc.r4     0.0
+  IL_0091:  stind.r4
+  IL_0092:  ldloca.s   V_11
+  IL_0094:  ldc.i4.4
+  IL_0095:  add
+  IL_0096:  ldc.r4     0.309017
+  IL_009b:  stind.r4
+  IL_009c:  ldloca.s   V_11
+  IL_009e:  ldc.i4.8
+  IL_009f:  add
+  IL_00a0:  ldc.r4     0.58778524
+  IL_00a5:  stind.r4
+  IL_00a6:  ldloca.s   V_11
+  IL_00a8:  ldc.i4.s   12
+  IL_00aa:  add
+  IL_00ab:  ldc.r4     0.809017
+  IL_00b0:  stind.r4
+  IL_00b1:  ldloca.s   V_11
+  IL_00b3:  ldc.i4.s   16
+  IL_00b5:  add
+  IL_00b6:  ldc.r4     0.95105654
+  IL_00bb:  stind.r4
+  IL_00bc:  ldloca.s   V_11
+  IL_00be:  ldc.i4.s   20
+  IL_00c0:  add
+  IL_00c1:  ldc.r4     1.
+  IL_00c6:  stind.r4
+  IL_00c7:  ldloca.s   V_11
+  IL_00c9:  ldc.i4.s   24
+  IL_00cb:  add
+  IL_00cc:  ldc.r4     0.95105654
+  IL_00d1:  stind.r4
+  IL_00d2:  ldloca.s   V_11
+  IL_00d4:  ldc.i4.s   28
+  IL_00d6:  add
+  IL_00d7:  ldc.r4     0.809017
+  IL_00dc:  stind.r4
+  IL_00dd:  ldloca.s   V_11
+  IL_00df:  ldc.i4.s   32
+  IL_00e1:  add
+  IL_00e2:  ldc.r4     0.58778524
+  IL_00e7:  stind.r4
+  IL_00e8:  ldloca.s   V_11
+  IL_00ea:  ldc.i4.s   36
+  IL_00ec:  add
+  IL_00ed:  ldc.r4     0.309017
+  IL_00f2:  stind.r4
+  IL_00f3:  ldc.i4.0
+  IL_00f4:  stloc.0
+  IL_00f5:  br.s       IL_00fb
+
+  IL_00f7:  ldloc.0
+  IL_00f8:  ldc.i4.1
+  IL_00f9:  add
+  IL_00fa:  stloc.0
+  IL_00fb:  ldloc.0
+  IL_00fc:  ldc.i4.s   10
+  IL_00fe:  bge        IL_0227
+
+  IL_0103:  ldc.r8     3.1415926535897931
+  IL_010c:  ldloc.0
+  IL_010d:  conv.r8
+  IL_010e:  ldc.r8     10.
+  IL_0117:  div
+  IL_0118:  mul
+  IL_0119:  stloc.3
+  IL_011a:  ldstr      "Classlib Sin("
+  IL_0124:  call       void [console]System.Console::Write(string)
+  IL_0129:  ldloc.3
+  IL_012a:  call       void [console]System.Console::Write(float64)
+  IL_012f:  ldstr      ")="
+  IL_0139:  call       void [console]System.Console::Write(string)
+  IL_013e:  ldloc.3
+  IL_013f:  call       float64 [mscorlib]System.Math::Sin(float64)
+  IL_0144:  stloc.2
+  IL_0145:  ldloc.2
+  IL_0146:  call       void [console]System.Console::WriteLine(float64)
+  IL_014b:  ldstr      "This Version("
+  IL_0155:  call       void [console]System.Console::Write(string)
+  IL_015a:  ldloc.3
+  IL_015b:  call       void [console]System.Console::Write(float64)
+  IL_0160:  ldstr      ")="
+  IL_016a:  call       void [console]System.Console::Write(string)
+  IL_016f:  ldloc.3
+  IL_0170:  call       float64 Z::mySin(float64)
+  IL_0175:  stloc.1
+  IL_0176:  ldloc.1
+  IL_0177:  call       void [console]System.Console::WriteLine(float64)
+  IL_017c:  ldstr      "Error is:"
+  IL_0186:  call       void [console]System.Console::Write(string)
+  IL_018b:  ldloc.2
+  IL_018c:  ldloc.1
+  IL_018d:  sub
+  IL_018e:  call       void [console]System.Console::WriteLine(float64)
+  IL_0193:  call       void [console]System.Console::WriteLine()
+  IL_0198:  ldloc.2
+  IL_0199:  ldloc.1
+  IL_019a:  sub
+  IL_019b:  call       float64 [mscorlib]System.Math::Abs(float64)
+  IL_01a0:  ldc.r8     1.0000000000000001e-005
+  IL_01a9:  ble.un.s   IL_01c2
+
+  IL_01ab:  ldstr      "ERROR, Versions too far apart!"
+  IL_01b5:  call       void [console]System.Console::WriteLine(string)
+  IL_01ba:  ldc.i4.1
+  IL_01bb:  stloc.s    V_4
+  IL_01bd:  br         IL_023a
+
+  IL_01c2:  ldloca.s   V_11
+  IL_01c4:  ldloc.0
+  IL_01c5:  conv.i8
+  IL_01c6:  ldc.i4.4
+  IL_01c7:  conv.i8
+  IL_01c8:  mul
+  IL_01c9:  add
+            conv.i
+  IL_01ca:  ldind.r4
+  IL_01cb:  conv.r8
+  IL_01cc:  ldloc.2
+  IL_01cd:  sub
+  IL_01ce:  call       float64 [mscorlib]System.Math::Abs(float64)
+  IL_01d3:  ldc.r8     1.0000000000000001e-005
+  IL_01dc:  ble.un.s   IL_01f2
+
+  IL_01de:  ldstr      "ERROR, ClassLib version isn't right!"
+  IL_01e8:  call       void [console]System.Console::WriteLine(string)
+  IL_01ed:  ldc.i4.1
+  IL_01ee:  stloc.s    V_4
+  IL_01f0:  br.s       IL_023a
+
+  IL_01f2:  ldloca.s   V_11
+  IL_01f4:  ldloc.0
+  IL_01f5:  conv.i8
+  IL_01f6:  ldc.i4.4
+  IL_01f7:  conv.i8
+  IL_01f8:  mul
+  IL_01f9:  add
+            conv.i
+  IL_01fa:  ldind.r4
+  IL_01fb:  conv.r8
+  IL_01fc:  ldloc.1
+  IL_01fd:  sub
+  IL_01fe:  call       float64 [mscorlib]System.Math::Abs(float64)
+  IL_0203:  ldc.r8     1.0000000000000001e-005
+  IL_020c:  ble.un.s   IL_0222
+
+  IL_020e:  ldstr      "ERROR, our version isn't right!"
+  IL_0218:  call       void [console]System.Console::WriteLine(string)
+  IL_021d:  ldc.i4.1
+  IL_021e:  stloc.s    V_4
+  IL_0220:  br.s       IL_023a
+
+  IL_0222:  br         IL_00f7
+
+  IL_0227:  ldstr      "Yippee, all correct"
+  IL_0231:  call       void [console]System.Console::WriteLine(string)
+  IL_0236:  ldc.i4.s   100
+  IL_0238:  stloc.s    V_4
+  IL_023a:  ldloc.s    V_4
+  IL_023c:  ret
+}
+
+}
+
diff --git a/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj
new file mode 100644
index 0000000000..d8ec34de75
--- /dev/null
+++ b/tests/src/JIT/Methodical/Boxing/morph/sin3double.ilproj
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
+ </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+     <DebugType>None</DebugType>
+     <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="sin3double.il" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Boxing/seh/_dbgfault.ilproj b/tests/src/JIT/Methodical/Boxing/seh/_dbgfault.ilproj
index cb3f863fb1..3097fbd2a5 100644
--- a/tests/src/JIT/Methodical/Boxing/seh/_dbgfault.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/seh/_dbgfault.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/seh/_dbgfilter.ilproj b/tests/src/JIT/Methodical/Boxing/seh/_dbgfilter.ilproj
index 2784b1a71a..5b03c77728 100644
--- a/tests/src/JIT/Methodical/Boxing/seh/_dbgfilter.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/seh/_dbgfilter.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.csproj b/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.csproj
index 222fa26638..6bb3b8753f 100644
--- a/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_il.ilproj b/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_il.ilproj
index 76176677ed..0c55bcc320 100644
--- a/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_il.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.csproj b/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.csproj
index 9c9772aa81..e3ff2b8b5f 100644
--- a/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.csproj b/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.csproj
index 3ef597cefb..2cbc7285f6 100644
--- a/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/seh/_relfault.ilproj b/tests/src/JIT/Methodical/Boxing/seh/_relfault.ilproj
index 61d2d266e4..3bdcabfc32 100644
--- a/tests/src/JIT/Methodical/Boxing/seh/_relfault.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/seh/_relfault.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="fault.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Boxing/seh/_relfilter.ilproj b/tests/src/JIT/Methodical/Boxing/seh/_relfilter.ilproj
index fd8c5cea9d..7db101032e 100644
--- a/tests/src/JIT/Methodical/Boxing/seh/_relfilter.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/seh/_relfilter.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="filter.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.csproj b/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.csproj
index 42dd63ecd4..0daa127daa 100644
--- a/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/seh/_reltry_il.ilproj b/tests/src/JIT/Methodical/Boxing/seh/_reltry_il.ilproj
index dfbb305ec1..cdd2688128 100644
--- a/tests/src/JIT/Methodical/Boxing/seh/_reltry_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/seh/_reltry_il.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="try.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj
index ad7a510210..35ef960e63 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="sinlib_cs.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj
index 7317a71980..9d669983f2 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -42,10 +38,6 @@
   <ItemGroup>
     <ProjectReference Include="sinlib_il.ilproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj
index 4e135fb7d4..d374868b83 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj
index c98f28284c..7638fae4b3 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj
index 8a04e0feb0..0293498c07 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="sinlib_cs.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj
index fd7c1ea615..53495494cd 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -42,10 +38,6 @@
   <ItemGroup>
     <ProjectReference Include="sinlib_il.ilproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj
index 4e135fb7d4..d374868b83 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj
index c98f28284c..7638fae4b3 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj
index 55338559e8..ad551adcb8 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="sinlib_cs.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj
index 0acb30b78a..d9ec87cc73 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -42,10 +38,6 @@
   <ItemGroup>
     <ProjectReference Include="sinlib_il.ilproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj
index 4af670c992..d946ce5520 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="sinlib_cs.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj
index 13b9c34ae3..f54a8fe8f9 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="sinlib_il.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj
index 48c4e023c7..8affc673ac 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="sinlib_cs.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj
index 298abcc7f4..9d6f58cb45 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -42,10 +38,6 @@
   <ItemGroup>
     <ProjectReference Include="sinlib_il.ilproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj
index 4af670c992..d946ce5520 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="sinlib_cs.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj
index 13b9c34ae3..f54a8fe8f9 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="sinlib_il.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/sinlib_cs.csproj b/tests/src/JIT/Methodical/Boxing/xlang/sinlib_cs.csproj
index b466a75df7..4c19a9e7c5 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/sinlib_cs.csproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/sinlib_cs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Boxing/xlang/sinlib_il.ilproj b/tests/src/JIT/Methodical/Boxing/xlang/sinlib_il.ilproj
index 8548e8bb44..28047bd7a2 100644
--- a/tests/src/JIT/Methodical/Boxing/xlang/sinlib_il.ilproj
+++ b/tests/src/JIT/Methodical/Boxing/xlang/sinlib_il.ilproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Coverage/arglist_pos.ilproj b/tests/src/JIT/Methodical/Coverage/arglist_pos.ilproj
index caca59806f..3e02647ab5 100644
--- a/tests/src/JIT/Methodical/Coverage/arglist_pos.ilproj
+++ b/tests/src/JIT/Methodical/Coverage/arglist_pos.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Coverage/b39946.ilproj b/tests/src/JIT/Methodical/Coverage/b39946.ilproj
index 8c86270f19..23cc107bd8 100644
--- a/tests/src/JIT/Methodical/Coverage/b39946.ilproj
+++ b/tests/src/JIT/Methodical/Coverage/b39946.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Coverage/b433189.csproj b/tests/src/JIT/Methodical/Coverage/b433189.csproj
index 73bf441ddb..cd7df5c737 100644
--- a/tests/src/JIT/Methodical/Coverage/b433189.csproj
+++ b/tests/src/JIT/Methodical/Coverage/b433189.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B15721F4-238B-4A65-9C72-57FB609402A1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Coverage/b518440.ilproj b/tests/src/JIT/Methodical/Coverage/b518440.ilproj
index b7a6aa7b44..ac7bb44890 100644
--- a/tests/src/JIT/Methodical/Coverage/b518440.ilproj
+++ b/tests/src/JIT/Methodical/Coverage/b518440.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Coverage/hole.ilproj b/tests/src/JIT/Methodical/Coverage/hole.ilproj
index 4d55ee33d9..f787300ab9 100644
--- a/tests/src/JIT/Methodical/Coverage/hole.ilproj
+++ b/tests/src/JIT/Methodical/Coverage/hole.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_i.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_i.ilproj
index 798f999dc4..f8507a8b59 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_i.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_u.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_u.ilproj
index 8fcd27b026..d96b4b02cb 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_u.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconv_i8_u.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_i.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_i.ilproj
index 168660ee44..a371a58c31 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_i.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_u.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_u.ilproj
index 85e0bd9114..17f55d67aa 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_u.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgconvovf_i8_u.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
index b57b24630a..0248ae2d86 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_box.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_box.ilproj
index 290890be25..0791478084 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_box.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_box.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_conv.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_conv.ilproj
index b71eac4386..8fa775323a 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_conv.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_conv.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_fld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_fld.ilproj
index 6742a5a300..1f95d2c988 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_fld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_fld.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flood.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flood.ilproj
index 48e27320f9..6ab83d653d 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flood.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flood.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flow.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flow.ilproj
index 9686bc94f7..dfc8d95a42 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flow.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_flow.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_prop.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_prop.ilproj
index 80ff790760..6a30cc64ba 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_prop.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_prop.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort1.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort1.ilproj
index e742ed9ca9..993a0ba1b0 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort1.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort2.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort2.ilproj
index e7d7f74784..f7104c747d 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort2.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_qsort2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_ref.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_ref.ilproj
index c1ecc03e15..8e9fdde15c 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_ref.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_ref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_seq.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_seq.ilproj
index 376d830fbf..c3fbffbb37 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_seq.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_seq.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_vfld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_vfld.ilproj
index c20de406a1..5a6f4d3949 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_vfld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_vfld.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgptr.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgptr.ilproj
index 299d2cf24e..d641c8a545 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgptr.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgptr.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgqperm.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgqperm.ilproj
index a2c774de83..c094e4d961 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgqperm.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgqperm.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
index c2b6ba4225..ca8073178c 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
index 2a0ff9f5bb..40deb2b188 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_box.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_box.ilproj
index 340936b74d..70e6ef8680 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_box.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_box.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_conv.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_conv.ilproj
index f3e96555c4..48e5e7c771 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_conv.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_conv.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_fld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_fld.ilproj
index 6d76050189..7fa5f8dbc9 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_fld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_fld.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flood.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flood.ilproj
index 30a49971ed..ea41ab4722 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flood.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flood.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flow.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flow.ilproj
index e2e09b94ae..feba79109e 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flow.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_flow.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_prop.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_prop.ilproj
index 2ae3777094..29b32990c4 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_prop.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_prop.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort1.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort1.ilproj
index 419855821d..c4a0561011 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort1.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort2.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort2.ilproj
index 4ac10b2c88..606b840623 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort2.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_qsort2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_ref.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_ref.ilproj
index 12b87223f1..7b683d9486 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_ref.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_ref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_seq.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_seq.ilproj
index 882ebdf3ba..836c303933 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_seq.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_seq.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_vfld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_vfld.ilproj
index bfcf11ae04..3065537a06 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_vfld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_vfld.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_i.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_i.ilproj
index a5019a4844..5154ba6b46 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_i.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_u.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_u.ilproj
index 12d16a2642..d33dc2ccb8 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_u.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconv_i8_u.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_i.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_i.ilproj
index 47ae291283..73152db28a 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_i.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_u.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_u.ilproj
index 6f389b36ff..fec0915b30 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_u.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relconvovf_i8_u.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
index bf6a61d557..ba9ac58e29 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_box.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_box.ilproj
index b2d53bad2c..e607c2c766 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_box.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_box.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_conv.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_conv.ilproj
index 10b5da1283..7179c5573b 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_conv.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_conv.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_fld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_fld.ilproj
index 64ce2030b9..58e4a037de 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_fld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_fld.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flood.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flood.ilproj
index bb00cf2f94..0267da721c 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flood.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flood.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flow.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flow.ilproj
index 1a602b0dfb..4feafd568e 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flow.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_flow.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_prop.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_prop.ilproj
index 83ae048346..97e43ad537 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_prop.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_prop.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort1.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort1.ilproj
index deccfee479..603a0ec0d6 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort1.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort2.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort2.ilproj
index a53778c9a4..84ae2c9022 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort2.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_qsort2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_ref.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_ref.ilproj
index b670ffc4e4..cd2664fc49 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_ref.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_ref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_seq.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_seq.ilproj
index 9f8136d7a5..b63829f2eb 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_seq.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_seq.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_vfld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_vfld.ilproj
index 8a140d2a65..31a4718b81 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_vfld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_vfld.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relptr.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relptr.ilproj
index 1f55bb31f5..306ec9dd44 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relptr.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relptr.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relqperm.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relqperm.ilproj
index 512f09eb72..43aecc0ab7 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relqperm.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relqperm.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
index c0f79d7e8e..530b2519d2 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
index dfcf078157..f009a69443 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_box.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_box.ilproj
index a89d4dca68..d5f43ada77 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_box.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_box.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_conv.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_conv.ilproj
index 67240ee5e9..032563aa9c 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_conv.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_conv.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_fld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_fld.ilproj
index 89c85abf4a..266aaf5246 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_fld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_fld.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flood.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flood.ilproj
index 7b58a73cf2..6a3af5f96a 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flood.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flood.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flow.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flow.ilproj
index f3ea0e119c..9eaa95d393 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flow.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_flow.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_prop.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_prop.ilproj
index 2299f6e70c..4e465717c8 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_prop.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_prop.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort1.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort1.ilproj
index de622249d9..cb4f5ad96d 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort1.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort2.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort2.ilproj
index 2bfb9fcccf..4dc2549735 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort2.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_qsort2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_ref.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_ref.ilproj
index 60c1f6fe88..61b1b6a75e 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_ref.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_ref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_seq.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_seq.ilproj
index e55fdb4c84..cb44a44daf 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_seq.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_seq.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_vfld.ilproj b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_vfld.ilproj
index df7f3c4978..cec25b1d79 100644
--- a/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_vfld.ilproj
+++ b/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_vfld.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
index b3b99be02d..5c53dc2fea 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BD5B9A20-29E1-4CBA-8933-7E3C79A5529D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
index 36f3666da3..c1c906e644 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73C9B4AC-39C5-4DED-BC68-AA03CD41072A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
index c4e4d3efe3..027f308dcb 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BD949E3E-C280-48EE-8184-87DAC8A703DC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
index fa8c99726c..005bcb32a1 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{20B43D32-9F6E-4CBF-AAD7-81DC2CC8A4A7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj b/tests/src/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj
index 6e525f0128..6318485848 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4d_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj b/tests/src/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj
index 703bbca322..5a7af8ff45 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr4d_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="convr4d.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
index b834c78a22..abdd192182 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7E653F52-E821-4AD7-84B9-FBD13E0C1308}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
index c2707ba109..e6837f9302 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B414C4D2-2F6A-4CEF-814E-BA9DC7DB7C8F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
index 6e14e23602..67267c11b4 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A57CD20C-BC08-49F1-88CD-AB3609C76C68}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
index d8b6a1090d..d256519ed4 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{387A2A16-9BD0-4E49-B934-9F725CEB810E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj b/tests/src/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj
index 9c4134a5fd..3a08822ac5 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8d_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj b/tests/src/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj
index 9dc6f46ea5..aff40c234c 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convr8d_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="convr8d.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/FPtrunc/convx_il_d.ilproj b/tests/src/JIT/Methodical/FPtrunc/convx_il_d.ilproj
index 795bba2ee0..bdf64b17d8 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convx_il_d.ilproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convx_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/FPtrunc/convx_il_r.ilproj b/tests/src/JIT/Methodical/FPtrunc/convx_il_r.ilproj
index b40279a4a0..3070dfdaf8 100644
--- a/tests/src/JIT/Methodical/FPtrunc/convx_il_r.ilproj
+++ b/tests/src/JIT/Methodical/FPtrunc/convx_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
index 110417290e..50978eb193 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F4BF21B1-69E1-48F6-9AC8-0465F3B5798B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
index acfad19270..3b6f922afe 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8AA2DDC3-5BB2-4F35-A020-8106C20CF8FA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
index a72eba4ae6..4568c2f1ef 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{765B8DAE-C0A8-4247-B89C-A945693622D6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
index 22c2626b52..91b4d68f7c 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AF9518E2-1C16-44D2-AD0D-6D72786BCD06}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj
index ef9f896f03..02c33cf7e3 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj
index 81b25d8ff4..0a3c916627 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1b_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="25param1b.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj
index 8b287d8e55..92803dd0c6 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj
index a944ed673f..bf0d834723 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param1c_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="25param1c.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
index 4e9391604f..611b38e001 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0A6812BB-B1ED-4946-985A-59D6BA337C02}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
index ad70fee358..f560c57782 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C75CD0A5-EC50-4758-934C-6556DB3ABB56}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
index d3adbf8f61..8ccb48384e 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7522C319-7E9C-4FF6-BA8B-4AFD82505F11}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
index afd86aaf4d..000be6ecd5 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5D3D87C1-CFFE-4C30-B840-166734802351}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj
index 1d9e93aca7..00974991f4 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj
index f17a7c0e95..b97d22fd96 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj
index e7de997a82..b3f7d18901 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj
index 518000f6ea..fb1b6661ff 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
index 764483ab81..a7891c8ec2 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{066648D8-5CC3-4237-B749-6EEF50933525}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
index 6bf48327dd..9c6ca65404 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{55B6A522-0226-4155-8C65-07876D6A9860}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
index f1bbc7f70b..6ff0946165 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2D5ECCEC-4287-4CDA-BC4C-7232A0F61449}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
index 606de87bf4..55f7ce1698 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0AAAF581-8DA8-43B4-AEF0-66F55292813E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj
index be7179127c..bc54bbc9a5 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj
index e96debebf2..eab0c3aab7 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3b_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="25param3b.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj
index 598a4d4cd0..7015fe465b 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj
index 839ebbf50b..4434176745 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25param3c_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="25param3c.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj
index b93fad5926..c97b58f522 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj b/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj
index 74bcdfac7f..920e96a47a 100644
--- a/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/25params/25paramMixed_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="25paramMixed.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj
index f132b33156..844015d5ff 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0DA8CCC7-53D6-4F33-B6DE-D56A54B57B37}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj
index 4549b17131..0ceaf90918 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CDB2B955-A5B9-4C92-A9CD-66421A10C575}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault.ilproj
index 4fef145364..80d3025e6b 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_jmp.ilproj
index f83f97b74e..9f3d9bd84a 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_jmp.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_tail.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_tail.ilproj
index e0760b323c..81b6702f4c 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_tail.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfault_tail.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_ind.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_ind.ilproj
index 8fb212c039..d187945242 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_ind.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_ind.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmp.ilproj
index 24fda631a1..ef11707849 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmp.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmpind.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmpind.ilproj
index 12ee4bc327..13515484c6 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmpind.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_jmpind.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_tail.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_tail.ilproj
index 6bea6b7e8a..665e68af49 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_tail.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_dbgcatchfinally_tail.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault.ilproj
index f126626df8..993e4be53d 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_jmp.ilproj
index b86596e55f..899a1d649b 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_jmp.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_tail.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_tail.ilproj
index 52745dcef1..2facc18c0d 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_tail.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfault_tail.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_ind.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_ind.ilproj
index a0b9e93505..de63a7ae3d 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_ind.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_ind.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmp.ilproj
index 920eedc0d6..9e025c9e94 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmp.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmpind.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmpind.ilproj
index 025430be3e..4a34346c23 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmpind.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_jmpind.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_tail.ilproj b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_tail.ilproj
index fe9c1adc10..30f9f04a20 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_tail.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_il_relcatchfinally_tail.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj
index 5b35fc5127..f00f79f3ee 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D4A7F6E3-10FB-4289-9889-559C58A9CE82}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj
index eadc553760..331b951456 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{85F10744-5D68-401F-95B0-11D9434FF153}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj
index bd2fc1d842..f399f81868 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C34ABC48-FC7E-478E-B148-06E3BF70B638}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj
index 6accb57bb1..5da5dc3cfc 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{65CC7212-A80C-4176-A942-2F9747772F31}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj
index 27db20bdb8..699e19603c 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F8CCECEF-F7D4-4E88-9CBB-3FF27E856D5A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj b/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj
index e2a1cf4a37..4051d426a5 100644
--- a/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj
+++ b/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{951998CF-8BF0-4660-B2E1-F5E7B9CAE775}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj b/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj
index fd9341200e..2c9678f91a 100644
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8B3226D1-019E-4374-9D7A-984AFF660832}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest1.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest1.ilproj
index c6b4b9a442..1b810e75c2 100644
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest2.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest2.ilproj
index 1f75b0f831..6a5db07a21 100644
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest3.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest3.ilproj
index f96e15490a..365374c4da 100644
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest3.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_dbgtest3.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest1.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest1.ilproj
index b65402db90..0f02c42bbf 100644
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest2.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest2.ilproj
index 6dbf024b31..68281ca172 100644
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest3.ilproj b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest3.ilproj
index 5c9978961e..af020fbfd7 100644
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest3.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_il_reltest3.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj b/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj
index f91a20bdd8..01866e9846 100644
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8F545EB4-16C4-4561-A7FA-30D9A9504E2D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj b/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj
index a522fb7f0a..ffe8db95ff 100644
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6423E198-6E4C-4FE3-87D3-A14586D1E7E1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj b/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj
index 3b06580b75..64c7c5dc78 100644
--- a/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj
+++ b/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{612EEF55-B933-4F56-9203-6387DB3755F5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj b/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj
index ad6a945e37..61a1d325f9 100644
--- a/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{04DCE5F5-545D-4326-AAE7-8B3311248AA3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_cctor.ilproj b/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_cctor.ilproj
index 6fa615d758..85acd790d8 100644
--- a/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_cctor.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_cctor.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_ctor_newobj.ilproj b/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_ctor_newobj.ilproj
index 79489cb60d..77896a77f8 100644
--- a/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_ctor_newobj.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_il_dbgval_ctor_newobj.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_cctor.ilproj b/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_cctor.ilproj
index 867cea0f7f..37ce8b5b06 100644
--- a/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_cctor.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_cctor.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_ctor_newobj.ilproj b/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_ctor_newobj.ilproj
index 511536d3e5..5fa69ae95e 100644
--- a/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_ctor_newobj.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_il_relval_ctor_newobj.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj b/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj
index d5dde75ba5..718a602612 100644
--- a/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E73AE81F-2BB2-4BA4-A99F-6E9AEEBAFB19}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj b/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj
index 8021c6347a..2ee20d25fa 100644
--- a/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{20860BEB-89DA-4119-B82E-C7DD5994E92F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj b/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj
index 57f9216133..32b21cefda 100644
--- a/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj
+++ b/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9050A814-D15D-4F3E-9259-54803F85FE63}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj b/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj
index 0da69a18c8..52bd6eaadd 100644
--- a/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{098FBD79-0E99-4E2D-B67B-1C0C977A3EAA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep1.ilproj b/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep1.ilproj
index d38ea74f4f..ee22da152a 100644
--- a/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep2.ilproj b/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep2.ilproj
index 84dda96bef..fee288b772 100644
--- a/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_il_dbgdeep2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep1.ilproj b/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep1.ilproj
index ae8152e431..3093e3d2c4 100644
--- a/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep2.ilproj b/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep2.ilproj
index c813bca9ce..89421ea5e2 100644
--- a/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_il_reldeep2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj b/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj
index ba8e3b8b2f..2722e5bfbd 100644
--- a/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CA007CA9-CD94-4D2A-B45E-B4FFB36C56DE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj b/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj
index 27660893c6..98aa572724 100644
--- a/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2896F75C-65F5-489C-99ED-C651B1CF438B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj b/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj
index 0daf66d4e7..dd38c094c5 100644
--- a/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj
+++ b/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2755A058-AF1D-4DDA-85A0-D69E5A96D298}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj b/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj
index 535db94190..37a6a25f86 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95B46689-1DF6-4292-93C6-783B238750CD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgftn_t.ilproj
index 87d1d72da6..261b6a130f 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgftn_t.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn.ilproj
index 6def5a3b1e..11e35d7dd9 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn_t.ilproj
index d3d0063393..57ba4970c2 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbginstftn_t.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_calli.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_calli.ilproj
index 4880eefce3..2d509855f8 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_calli.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_calli.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmp.ilproj
index ac699b2c32..dc05af41ad 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmp.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmpi.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmpi.ilproj
index 45094ec12e..e0cdcfb9a6 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmpi.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_jmpi.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_call.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_call.ilproj
index d3742b4f0c..f59438c3f2 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_call.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_call.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_calli.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_calli.ilproj
index 4dcad36ce5..b0e64bf23b 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_calli.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgrecurse_tail_calli.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn.ilproj
index 668331ed2e..71891496a0 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn_t.ilproj
index 1470320b91..963eb60068 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvalftn_t.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn.ilproj
index ae2d8c4d55..de3cd556bd 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn_t.ilproj
index 80285751e4..f41b611578 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_dbgvirtftn_t.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relftn_t.ilproj
index 5a21c16f7b..4b1f010c65 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relftn_t.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn.ilproj
index 54f926e060..1dbab3b7ba 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn_t.ilproj
index 0058635304..ee95630f31 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relinstftn_t.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_calli.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_calli.ilproj
index b3b8e1f9f7..6131be6261 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_calli.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_calli.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmp.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmp.ilproj
index 7799c9c537..c6e338c9df 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmp.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmp.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmpi.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmpi.ilproj
index a269b6070f..8f3e922b84 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmpi.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_jmpi.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_call.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_call.ilproj
index 58411f3a83..4e1e343e7d 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_call.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_call.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_calli.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_calli.ilproj
index 96ca6dfa28..c1f175c1ae 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_calli.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relrecurse_tail_calli.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn.ilproj
index 64de873322..b9b5e805cc 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn_t.ilproj
index 1caf1e87d7..fc6d33326b 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvalftn_t.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn.ilproj
index ac9646f412..187115def9 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn_t.ilproj b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn_t.ilproj
index 9755d198b1..54e5a01053 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn_t.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_il_relvirtftn_t.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj b/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj
index 9f3d4c8e5a..c3a0234d2c 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D4376443-7B4E-4592-BA55-2C95E2313BB5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj b/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj
index f5ee2b63de..c3f0777ab5 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3D1C981E-82C6-4479-BA4A-9E498F8968F2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj b/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj
index 7e9eece8b7..5fbb86d126 100644
--- a/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj
+++ b/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{52239498-7DBD-47B6-8C86-33D3928D305E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj b/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj
index 89eb81adb2..19880b0bc4 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D579DF0E-44A5-4B01-B354-2F6C269EFEC5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr4.ilproj
index 51f0674968..7f264294b1 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr8.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr8.ilproj
index 68a45021fc..415b7c70c7 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr8.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgfr8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i1.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i1.ilproj
index 701d13ba68..f55c54dd64 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i2.ilproj
index d0e3ec448d..b39ffe37cc 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i2.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u1.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u1.ilproj
index 6043d97220..973faedf20 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u2.ilproj
index 747fff0068..44a564ecb0 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u4.ilproj
index e73fc543a7..14cc954f5f 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi8u8.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi8u8.ilproj
index b92d793b89..1b57acfeac 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi8u8.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi8u8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii1.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii1.ilproj
index 96620cc278..508be5c9f2 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii2.ilproj
index cf49b24c6e..84d26c7d18 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii4.ilproj
index a5d6f846ba..988fa81e7c 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgii4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu1.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu1.ilproj
index 8bf427b8ed..6ef608f92b 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu2.ilproj
index 702968f2a4..f27a645ead 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu4.ilproj
index effdd5b053..50cb8f1cdd 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgobjref.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgobjref.ilproj
index fe8b0fa479..24235f86c3 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgobjref.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgobjref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr4.ilproj
index 6a320a11fe..d32dfd6b83 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr8.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr8.ilproj
index 8781bb69a6..9cb69a5ae9 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr8.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relfr8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i1.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i1.ilproj
index 0a38d93141..f5bfd96d84 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i2.ilproj
index 5ff95488ef..f101455a94 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i2.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u1.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u1.ilproj
index 36d8184e0f..c9b5f4431a 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u2.ilproj
index f2af489b22..cd0fc38ca0 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u4.ilproj
index 57617367cb..1f750186b0 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli8u8.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli8u8.ilproj
index 50dcabc2e8..988f6d541e 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reli8u8.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reli8u8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii1.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii1.ilproj
index e01d81d3bb..39aed6b008 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii2.ilproj
index a8eb21e5f2..2eafec2dff 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii4.ilproj
index 0e081ffe32..4c7c3b6f85 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relii4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relii4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu1.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu1.ilproj
index dbe2a0f697..3c9d9a7ab5 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu1.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu2.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu2.ilproj
index 3501f920cd..24b16cf884 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu2.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu4.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu4.ilproj
index 3be23755ce..a68851fafa 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu4.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_il_relobjref.ilproj b/tests/src/JIT/Methodical/Invoke/implicit/_il_relobjref.ilproj
index 766f845de7..1be49a7bc6 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_il_relobjref.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_il_relobjref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj b/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj
index b323b5a4dc..80a4de7c16 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{281E6D84-DD28-44CF-9007-218767F38CEA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj b/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj
index f945cf79e4..a09a06d22a 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CF2FB203-4A66-40D3-B3DE-4563FA349CF6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj b/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj
index b1305ef073..9485793a43 100644
--- a/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj
+++ b/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{67E8AF36-6FD6-461E-96BD-A539C62B21CA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Invoke/thiscall/_dbgthisnull.ilproj b/tests/src/JIT/Methodical/Invoke/thiscall/_dbgthisnull.ilproj
index 40b9d610c0..0e59c8ddb8 100644
--- a/tests/src/JIT/Methodical/Invoke/thiscall/_dbgthisnull.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/thiscall/_dbgthisnull.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/thiscall/_relthisnull.ilproj b/tests/src/JIT/Methodical/Invoke/thiscall/_relthisnull.ilproj
index b1eae9ac63..8b3c843427 100644
--- a/tests/src/JIT/Methodical/Invoke/thiscall/_relthisnull.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/thiscall/_relthisnull.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/thiscall/_speed_dbgthisnull.ilproj b/tests/src/JIT/Methodical/Invoke/thiscall/_speed_dbgthisnull.ilproj
index 40b9d610c0..0e59c8ddb8 100644
--- a/tests/src/JIT/Methodical/Invoke/thiscall/_speed_dbgthisnull.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/thiscall/_speed_dbgthisnull.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/Invoke/thiscall/_speed_relthisnull.ilproj b/tests/src/JIT/Methodical/Invoke/thiscall/_speed_relthisnull.ilproj
index b1eae9ac63..8b3c843427 100644
--- a/tests/src/JIT/Methodical/Invoke/thiscall/_speed_relthisnull.ilproj
+++ b/tests/src/JIT/Methodical/Invoke/thiscall/_speed_relthisnull.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
index cd4887bf04..6046cfbcbe 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3FF8F7D5-8EA6-4BE7-AD41-02F2D123CA86}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
index 1f6349c218..d5ff6318dd 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CF43C188-347D-48F9-A579-DA44539A0FF9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
index 775585b6e7..f0749cf78c 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C5003221-20FB-4B11-ADFF-9B74AB85E644}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
index c056778347..5d8797db30 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{48D2ADCC-1F30-4048-9D7D-DB2EAE996DC0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
index 8007621593..4a3fafaebd 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{27EF2574-85F6-4344-A8FB-53FF676B2B35}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
index e698895fc0..a99afe7d1a 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1CDEFA2A-BEAF-446E-9A37-9831CA8B98EE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
index f10c6fbe2d..e3d9002715 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5A1A4F68-E0EF-4C86-A2DD-B4B51D2AE5B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
index 6c62d5e454..748a6253eb 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B1777F72-B4F9-4163-934D-01C5FE94C3A0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
index 9ad41999f7..dc749d0e4f 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{85C3782E-2BC8-47F1-A8FC-A281D38E2E2E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
index 1bbf9402aa..61d86b4ec2 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5E080301-62C6-473A-A81E-B6CA4660D910}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
index 9bacc4edc2..c8f15644c1 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4C6B201D-B3CB-4532-90CC-BD168C55245B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
index a2c98d0aa3..86b08a4e6b 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E3B35BC3-48A5-49CF-A7AF-6482668C7925}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
index 67cf25542a..ea48e7b732 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{616C74B4-061C-4397-B353-55EFA946A066}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
index 8589d0bba9..28c2ccbed9 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{43052CE7-B86C-4348-A8DF-F36649824AF2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
index 5d41939d19..eb7c91712b 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{208C8119-B194-4496-B8CE-10792F48127B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
index 19a7f80d05..ae210d7e24 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{83836C23-C48E-43D3-B4FE-D6B87038B4F3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
index 9a7f457df9..b757d43023 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E5A4BD61-B9C8-4C55-9255-6C4034266B8A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
index 66986afc8b..eb7d6336a0 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DA85578A-95B0-46E2-9B6A-9CC632F47468}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
index 5945b516c4..f983b45e2f 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EB1A58D0-1CDF-4E38-A034-E8E5E8BBE6CC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
index a17f09b6af..9623319775 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1AAF5C25-41EC-4C6C-B284-D5DAA8717974}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
index 9457294bfc..eb4f327e4a 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EC6BB7AB-E35B-49FB-833B-25C2E06EE333}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
index ce49ace641..fdc2c4c50f 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5E0080D5-E089-4F8D-A052-AFA19F3FEB95}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
index 88a83f0aba..ac613d6989 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2FDB1ADC-FBFF-43D4-927C-DA5349A245A2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
index e1a1f3df04..3a51c8e3f0 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{59FAFAB9-B2D5-4357-92F2-07529D10D29E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
index 2407480023..3617878888 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B32B89B4-2FA0-4AB6-B8F6-088B6158262E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
index 28069375f0..3b4cd0fa15 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0CB356F0-5EEB-46EA-BA75-E44007B6A527}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
index 924cc4f2f8..b3fdb96c07 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{10344C2D-626F-4D00-81AE-600152A08826}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
index 254b2e483b..7616be652f 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C6695D0A-0449-45C2-9410-0FA0467594FE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
index 0b3a125934..8089330a1d 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0B8DD1B0-EB2A-413A-A338-E77E7A9F0DFB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
index 046532aad4..56be40145f 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4DDE0784-48C0-43D0-9104-A3819391E088}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
index e2785fbc62..b91e945a8f 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{00A82ED2-1BB9-4D92-BB6A-59D4C0516345}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
index 2ad68d9d85..87547690f3 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4551976E-9FCA-4CEA-BEC7-A6932A2AB122}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
index 9cc3caaad8..a7c9badd7e 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{56492795-B082-4C4D-9754-DA229027FA72}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
index 10aff67c8d..1d408b9387 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E850C367-E4F9-45CF-AD86-003E3147B8B7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
index 679860a1c5..9d9fafcf0b 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{525ADEB5-7FAF-48B4-B400-65FD55F513A8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
index c99cf2f19c..c85a112fba 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7600B247-46FE-42D8-B836-802F3D554EA6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
index e8059cde8c..68426986b5 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{29866FDB-13E5-4263-8C83-C1281A60CFC8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
index 9b5e242766..c77d003904 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A2046A98-4DCF-41E9-8C9A-3255762568BB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
index f351ad75ba..1a91defb44 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9C47B01D-2DFC-4AA7-A048-F9F330D758E7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
index a2a460ac81..234441438f 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0B668A23-0B4D-40CD-A1DC-4790A3C9F66D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
index 4539a194f5..ea720ec584 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6761286C-C56B-4249-BB07-12F71A3560E6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
index bfb92712cf..5bad8dd976 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A14EB7B1-D53D-413B-A605-308B16365797}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
index 54874c4176..8104f0741c 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{483F68B7-0346-4C1D-BFD8-2438CDA4E216}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
index 6b4c663bcc..deb0f242f7 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AC13ED14-FCED-40A6-A689-87B847A71A44}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
index e86d76a872..cfd919e1d3 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8144FE5F-7A00-43F6-8F40-C33951625630}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
index 1735c30241..e9092ce1ac 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DC15F043-3742-4CFB-9DC7-4FF57E75A8F8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
index fb1473f337..a2b8a35cd5 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{273951C4-81A9-4326-BF46-31D56CA3B416}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
index 9a23f9b6b0..ef9246d9c4 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0D30946A-1C07-4347-9C85-E62D017B6F58}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
index f50463b5b1..40ab592649 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1F808F80-1B46-476A-8129-60B93DAE2301}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
index 4a2b9e5372..9f250c1ce6 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4473117B-E775-4328-8F5D-B6AB38774AB2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
index ad6fc7e7aa..ae54e985df 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FF309582-6138-4A73-B058-C5DD57C5E796}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
index f00bccbe0f..609c85c0cc 100644
--- a/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AB9A667E-75FC-41E7-B521-CE80A3340C39}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj
index 87cb57953a..ae2255a719 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8E846AE6-E1DF-4F5B-8A53-7B706BB27A2B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj
index ec279121bd..639abda577 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{299750E6-91B0-4E77-BEEB-1AB96761D860}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj
index 5eda964abd..7331809426 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{76CBC4E9-4702-4709-B739-FC928AEE879B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj
index 2ea8b99b07..d21c2df132 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3AB92143-46C6-4678-83CA-08998544B96A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj
index e13de42cec..63c87fa00b 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6F9533F8-AD41-4AB2-91FB-3C8EEC2BB301}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj
index 06c3f3e284..20b94bf988 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BFB05742-010A-43FC-999C-6BBE0E195108}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj
index a85fa9996c..b3172fd6df 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C5E60D76-6428-472C-A893-234B58ABC3A7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj
index fbbc482b96..138cda7e9a 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2FEDB07F-3F15-458C-BDE8-A0AC979F0F12}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
index 158fbf043d..7de12b426b 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DB357669-6C23-4F7E-933F-677B2B83023D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
index b028276ca6..45d0850dcd 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B346CE86-77B4-46BB-9D1E-0206B64F2210}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
index 2953df8643..c6de66fc43 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4A4C968D-35A0-4577-A68F-BD0122B53C68}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
index d992734e2c..f51316e85b 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F625B760-9258-4469-BB48-D9458E67612D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj
index 66f22157e2..1faf8a2c6c 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{878B4003-5746-4FD8-AB71-576EB6747746}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj
index 257feb292c..ece65464c8 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{798CDBA4-CC8E-494D-AC4A-B892A10FFD70}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj
index c2d7903c31..d958219ed9 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D1795849-657A-4479-B5A3-F20431C63A72}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj
index 9efeebc7be..1792072b83 100644
--- a/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D657916B-CBC0-4D16-B28D-C01E9A5AA79E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj
index 57e8deb8d8..3a591b4cd2 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7E2D7EC3-19A1-4214-8B3C-F018D3F98183}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj
index e093946e27..601d19befc 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6BA02F9B-6421-4C6A-BB95-66BFD09CE3DB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj
index 25832f13e9..0274081e7f 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7BC300A1-FD27-4485-9E8E-E065E82F6393}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj
index ea419bd524..c510d81c44 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{83885718-D3DC-4E70-AC83-6D0A83891D35}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj
index 62560fd009..c932c95a74 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{07A629B8-C886-4581-BBDD-E02F27834E7D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj
index 34985c384d..077e973229 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0B6A35C1-A609-4C38-BF28-8B91393FFD96}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj
index 66aba5cf70..931e4800f4 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{290E6251-A87B-4D85-A45D-8036E1B2499F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj
index d25b267dbc..0f39e747aa 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DBA3CBE0-5201-4FA5-B75E-641110A8667C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
index facd2ef59d..f4feedec71 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5AA71946-DB07-4B6A-9BAE-596BED827F8D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
index e99fa1053b..fed365c1ce 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B423676C-EB2B-491A-B464-BD7DA461079A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
index 6a0f5416ee..71f5ae2645 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7B091221-8500-461F-8AB8-0C446D4BB605}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
index f05adefb89..74ca8cf206 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A6FF0C69-0661-48FA-A17F-C874A0F1EA05}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj
index 83382f479f..35bfca2114 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{391BE933-E506-48E6-AD43-866852E16602}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj
index a77079f006..1b03306262 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{708E31E2-7DDD-42D7-8DC9-8E32514A006B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj
index e9095574f4..b722409c3a 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{28F14B2C-CEC1-42D8-8D57-55F97AEDB1FF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj
index 763cff9cfa..b152d7ef45 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{32B9796D-5D11-4642-8DE0-45C149041059}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj
index 6baca6db3b..f800997112 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5539D57F-8648-4E7A-91A2-2A2A06C538AA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj
index ceb9e5e03e..e53f5b1e60 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5845BCDB-8A8F-43C2-B67F-2B272709F6DB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj
index 7c934290ca..1ecd7495ac 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{507762C5-DC51-47AB-AADB-5B44ABE0B01B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj
index e049a0daeb..c4a82a2799 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BD7E4344-FEE5-43C9-A9BD-43F75583C030}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj
index fb15fd3bda..99cf6969b9 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8D6BD55F-B624-4C3B-8A46-5C4E8509B7F2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj
index 3ff9d28612..4e3a39c913 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4D7B3353-6E2F-4B1F-9C71-C67109413257}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj
index 03e669b74a..2fb4c931bf 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BB32D37C-444E-4D1A-8F78-D3A8A05BE042}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj
index 1f1e5f19db..c120d288bf 100644
--- a/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E847FF15-94E0-46F8-AC9B-9337D5433F82}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj
index 50c845cc39..0511890483 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{151EC427-404B-4583-950C-10DCB25FFB8B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj
index 2127b6444a..6df0b172e4 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{666A1E0A-7B7E-4FEA-A709-89B8106126B7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj
index 284fd18a4c..2f59a99bea 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{949C72E3-78EF-4A5F-A435-B6A9178FC764}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj
index fad359d403..91b2f54b44 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C6ED996E-FDC0-4019-A4F5-6B6E464CBF29}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj
index 10914b9374..b8e21abc69 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{11D2FD2E-5CAD-4EAF-9D73-BD6A52705FF0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj
index 44a831e36e..0734385ea1 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{65F673F3-86E3-4876-A411-A51B45D54F85}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj
index 06b576b131..2f188747ae 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{23702DA7-B13D-41CD-B371-C85937BF8120}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj
index 5a6bc87e43..ac5d114bb1 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FD0D2C89-B029-4737-B625-93523ADBA96E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj
index 81c0ff8621..8ede464b32 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A356404D-40C5-4839-843B-B3D23B38F4F6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj
index 24752bc357..e035c8d49e 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{91860B28-9EE4-48DA-94F5-E4A82FF8FDD3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj
index 3085bb4e3b..b10eefc08c 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7513BC5A-BB00-4FF2-8F92-2AD6B9FDDE71}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj
index 69671a48ea..073e3df143 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1A799F59-EED6-41DA-9952-B2999E4548C9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj
index afbad69291..77e54433f9 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F68BF4F7-67E8-402E-9818-C2B7F4CE9DA8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj
index cbd6945cf2..cf2926f943 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E712666D-E63C-4FB8-99A6-B690ECEC64E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj
index e393a55601..eb1e4da4a6 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C69F3959-C027-439B-B851-253BBCF71E0C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj
index d7a800b1b8..97576271ba 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{20DD6027-635F-409C-8313-6A6E89AE71C6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj
index 2d27bec5a6..e08b62a3c8 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D54ADABB-D3D3-4A05-BCF0-20ADC9417D75}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj
index 59d736100d..7afc5e4d88 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{211C7C2F-8474-4BA6-B46E-DA820B1992B5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj
index a69dc6cb65..e4a7bfa332 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2798FCA2-258E-4E32-BB71-95518A239579}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj
index 612beb93f2..e5d833c68f 100644
--- a/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{37B10A10-D699-4CB0-A5C0-B5A949AC2304}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj b/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj
index 7bf727f78b..7fe67f925b 100644
--- a/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8AAC1E98-E824-4F45-9976-B6C45573EA79}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj b/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj
index 175eac6145..efdd90020c 100644
--- a/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8D757677-B479-4E9E-9FCC-9FE05FBC6093}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj b/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj
index 349c900991..9ab6303314 100644
--- a/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C00BD68E-BF60-4A02-9386-C0D811E1098A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj
index f574dd6e7c..60796089dd 100644
--- a/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A0A700E5-A48E-4F89-B247-C2150472B1FD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm32_d.csproj b/tests/src/JIT/Methodical/NaN/arithm32_d.csproj
index b0b5634c2a..c55291b5b4 100644
--- a/tests/src/JIT/Methodical/NaN/arithm32_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{842BD77D-3500-409C-B61C-B48C4203CD79}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
-    <Optimize>
-    </Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="arithm32.cs" />
@@ -37,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/NaN/arithm32_do.csproj b/tests/src/JIT/Methodical/NaN/arithm32_do.csproj
index 4176029aa9..444bdf28f1 100644
--- a/tests/src/JIT/Methodical/NaN/arithm32_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_do.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9790CB17-0DF1-4405-BBC0-3FCB6F3EACEA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/NaN/arithm32_r.csproj b/tests/src/JIT/Methodical/NaN/arithm32_r.csproj
index 04839b6083..b8985c4c99 100644
--- a/tests/src/JIT/Methodical/NaN/arithm32_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6FB5F31D-7D7E-4708-8454-4BDA558499B6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj b/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj
index da484719d3..e586e46403 100644
--- a/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{51B02585-4E58-47F9-A0AC-1A71E48B8D40}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj b/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj
index 9f5024e9bd..6427e96a73 100644
--- a/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{746ED3A3-E1C1-4815-961F-217A95876E08}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj b/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj
index ec742aea4c..5999594488 100644
--- a/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1BBBFC8D-B37F-4E7B-A93F-AA2834EFBA69}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj b/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj
index 528a7745fc..ad7715f0e1 100644
--- a/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{055505F2-8161-4968-82CF-BB5DAC090C81}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj
index b7f8609b79..307085385a 100644
--- a/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{03FC92DA-B0B0-4211-AFF9-77CEF912942E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm64_d.csproj b/tests/src/JIT/Methodical/NaN/arithm64_d.csproj
index 636959ea19..a4e41fc751 100644
--- a/tests/src/JIT/Methodical/NaN/arithm64_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9FF725EF-6847-445D-AB69-343E35543CAB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
-    <Optimize>
-    </Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="arithm64.cs" />
@@ -37,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/NaN/arithm64_do.csproj b/tests/src/JIT/Methodical/NaN/arithm64_do.csproj
index 49407974bf..5d935ffefe 100644
--- a/tests/src/JIT/Methodical/NaN/arithm64_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_do.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4C61F1D5-4F0A-44F5-80F5-322E39CAB963}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>
-    </DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/NaN/arithm64_r.csproj b/tests/src/JIT/Methodical/NaN/arithm64_r.csproj
index 505e5094f4..f70eb1a079 100644
--- a/tests/src/JIT/Methodical/NaN/arithm64_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BF401ADD-7FF7-4218-B172-2AA4CB11B05B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj b/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj
index de1b5314bc..4019fdc6f1 100644
--- a/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{500FBE98-A9F7-4958-948D-D161E96796B4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/comp32_il_d.ilproj b/tests/src/JIT/Methodical/NaN/comp32_il_d.ilproj
index 5e7ac6c70f..8cfaf94f22 100644
--- a/tests/src/JIT/Methodical/NaN/comp32_il_d.ilproj
+++ b/tests/src/JIT/Methodical/NaN/comp32_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/NaN/comp32_il_r.ilproj b/tests/src/JIT/Methodical/NaN/comp32_il_r.ilproj
index f75e390131..c7d4cb5079 100644
--- a/tests/src/JIT/Methodical/NaN/comp32_il_r.ilproj
+++ b/tests/src/JIT/Methodical/NaN/comp32_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="comp32.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/NaN/comp64_il_d.ilproj b/tests/src/JIT/Methodical/NaN/comp64_il_d.ilproj
index 25bfdc003b..afa20f4cfa 100644
--- a/tests/src/JIT/Methodical/NaN/comp64_il_d.ilproj
+++ b/tests/src/JIT/Methodical/NaN/comp64_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/NaN/comp64_il_r.ilproj b/tests/src/JIT/Methodical/NaN/comp64_il_r.ilproj
index 4a4aa6eac0..760c264363 100644
--- a/tests/src/JIT/Methodical/NaN/comp64_il_r.ilproj
+++ b/tests/src/JIT/Methodical/NaN/comp64_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="comp64.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/NaN/cond32_il_d.ilproj b/tests/src/JIT/Methodical/NaN/cond32_il_d.ilproj
index 5d7ae4d072..a14e642cc5 100644
--- a/tests/src/JIT/Methodical/NaN/cond32_il_d.ilproj
+++ b/tests/src/JIT/Methodical/NaN/cond32_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/NaN/cond32_il_r.ilproj b/tests/src/JIT/Methodical/NaN/cond32_il_r.ilproj
index 3238239ed5..3c25912f9a 100644
--- a/tests/src/JIT/Methodical/NaN/cond32_il_r.ilproj
+++ b/tests/src/JIT/Methodical/NaN/cond32_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cond32.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/NaN/cond64_il_d.ilproj b/tests/src/JIT/Methodical/NaN/cond64_il_d.ilproj
index da976d859d..a2dfb7dc96 100644
--- a/tests/src/JIT/Methodical/NaN/cond64_il_d.ilproj
+++ b/tests/src/JIT/Methodical/NaN/cond64_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/NaN/cond64_il_r.ilproj b/tests/src/JIT/Methodical/NaN/cond64_il_r.ilproj
index 7c464f6e62..07c216a00e 100644
--- a/tests/src/JIT/Methodical/NaN/cond64_il_r.ilproj
+++ b/tests/src/JIT/Methodical/NaN/cond64_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cond64.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/NaN/intrinsic.cs b/tests/src/JIT/Methodical/NaN/intrinsic.cs
index 86020d8988..f6a97e5b93 100644
--- a/tests/src/JIT/Methodical/NaN/intrinsic.cs
+++ b/tests/src/JIT/Methodical/NaN/intrinsic.cs
@@ -582,11 +582,11 @@ namespace JitTest
                 TestAtan2(Double.NaN, Double.PositiveInfinity, Double.NaN);
                 TestAtan2(Double.NaN, Double.NegativeInfinity, Double.NaN);
                 TestAtan2(Double.PositiveInfinity, Double.NaN, Double.NaN);
-                TestAtan2(Double.PositiveInfinity, Double.PositiveInfinity, Double.NaN);
-                TestAtan2(Double.PositiveInfinity, Double.NegativeInfinity, Double.NaN);
+                TestAtan2(Double.PositiveInfinity, Double.PositiveInfinity, Math.PI / 4);
+                TestAtan2(Double.PositiveInfinity, Double.NegativeInfinity, 3 * Math.PI / 4);
                 TestAtan2(Double.NegativeInfinity, Double.NaN, Double.NaN);
-                TestAtan2(Double.NegativeInfinity, Double.PositiveInfinity, Double.NaN);
-                TestAtan2(Double.NegativeInfinity, Double.NegativeInfinity, Double.NaN);
+                TestAtan2(Double.NegativeInfinity, Double.PositiveInfinity, -Math.PI / 4);
+                TestAtan2(Double.NegativeInfinity, Double.NegativeInfinity, -3 * Math.PI / 4);
             }
             catch (Exception ex)
             {
diff --git a/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj b/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj
index c2c98b6c0c..55c498e90b 100644
--- a/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BDBE2A19-B492-4181-8CAA-A4CEA53AD4EC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj b/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj
index 456ed23fbe..b7287bdcaa 100644
--- a/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{60BD58AE-B377-4AA5-82F3-49484A8A995A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj b/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj
index f870819777..31ac4a7bf8 100644
--- a/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{068F2B0A-443C-491D-87E0-89A4D9F12923}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
index d7a581cf98..b71805cf67 100644
--- a/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4574F673-D343-4EA2-A466-6B9424620B3E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/intrinsic_nonf.il b/tests/src/JIT/Methodical/NaN/intrinsic_nonf.il
index ef9bc0af31..9c9faa76dd 100644
--- a/tests/src/JIT/Methodical/NaN/intrinsic_nonf.il
+++ b/tests/src/JIT/Methodical/NaN/intrinsic_nonf.il
@@ -2846,13 +2846,13 @@
                                                           float64)
         IL_0783:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_078c:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_0795:  ldc.r8     (FF FF FF FF FF FF FF 7F)
+        IL_0795:  ldc.r8     0.78539816339744828
         IL_079e:  call       void JitTest.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
         IL_07a3:  ldc.r8     (00 00 00 00 00 00 F0 7F)
         IL_07ac:  ldc.r8     (00 00 00 00 00 00 F0 FF)
-        IL_07b5:  ldc.r8     (FF FF FF FF FF FF FF 7F)
+        IL_07b5:  ldc.r8     2.3561944901923448
         IL_07be:  call       void JitTest.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
@@ -2864,13 +2864,13 @@
                                                           float64)
         IL_07e3:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_07ec:  ldc.r8     (00 00 00 00 00 00 F0 7F)
-        IL_07f5:  ldc.r8     (FF FF FF FF FF FF FF 7F)
+        IL_07f5:  ldc.r8     -0.78539816339744828
         IL_07fe:  call       void JitTest.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
         IL_0803:  ldc.r8     (00 00 00 00 00 00 F0 FF)
         IL_080c:  ldc.r8     (00 00 00 00 00 00 F0 FF)
-        IL_0815:  ldc.r8     (FF FF FF FF FF FF FF 7F)
+        IL_0815:  ldc.r8     -2.3561944901923448
         IL_081e:  call       void JitTest.Test::TestAtan2(float64,
                                                           float64,
                                                           float64)
diff --git a/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj b/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj
index b7ab0ee946..6d91bb32fa 100644
--- a/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj
+++ b/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj b/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj
index 5349f95a67..0f44ddbdd5 100644
--- a/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj
+++ b/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="intrinsic_nonf.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
index 567089fa0d..ada9c4b20e 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A22C5171-CE93-4AD1-A614-53ECB5AB6F99}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
index 6963c24c99..e42fbac712 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8F6D34BF-B0BC-4A54-884E-46BAD7906979}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
index 8c1e8638c8..653b29e8f3 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{37B4859A-768F-49D4-992B-74F745A1B76F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
index 27595ba65b..2499957a89 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FF25E2F8-8DA6-4FEC-8DFB-A907C8C09894}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
index 2e07e4ada2..bf3811ec49 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{93353512-05DF-470D-9E61-EC736AED7CBB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
index 3ef8a77d1a..300803b320 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D43FA9C7-1EAA-4A51-9527-0497780EE28C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
index 18cd8dd28d..0b2f22e232 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{14556421-C88D-4570-BE8F-9BF7AA9C3EAA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
index 36ad613f7c..ae442fdc28 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6FAAAEF7-86D7-4A66-9BBE-172C84D4C06F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
index 5991eca271..499cccd047 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C16861BF-4E41-4938-B299-23ACACC9BD4D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
index 862d560cb4..e5029539eb 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5B8C8DB2-163F-4BD0-85BD-D6828FFAB94B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
index 4fbe33f37e..26cdcb26b4 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B4C7EC4E-86E7-4971-936A-E026CD1030FA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
index 1561ca3ebb..7e2e6106be 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ABD48F8F-3E3B-4338-B0A8-D99474BA2115}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
index 76a1c61f08..e915ae0e59 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D01798FD-2762-4684-B994-5A9E62401B09}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
index b5a776fe78..7dde6175cb 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1614BCF8-1A48-4FD5-AB31-66025E4C87C0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
index a5ccf103fd..84941a4a0c 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{47409D5E-6F2A-4B6D-8E81-DBAB8D43EF1F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
index 4c177a42b6..b8898ca21e 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3E236884-A6EF-4B33-9FFC-D42E4B012405}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
index 7a0c046e31..91d4471683 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{494A94F6-1F88-4F43-BCB9-98C1EDD78E4A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
index e3abff0691..0b2e6ff763 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FDBE563E-D93F-4AB0-9437-DCB690A9DAAF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
index 23d8049d1f..82d68e726f 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AC25B4EE-B099-488B-9A81-CCC51080D5C7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
index a3ceae1142..0c8413cbfc 100644
--- a/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E33CA01E-20FC-48A3-817C-1B199F30D03B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r4nanconv_il_d.ilproj b/tests/src/JIT/Methodical/NaN/r4nanconv_il_d.ilproj
index c605d5af09..a82ddb76fb 100644
--- a/tests/src/JIT/Methodical/NaN/r4nanconv_il_d.ilproj
+++ b/tests/src/JIT/Methodical/NaN/r4nanconv_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/NaN/r4nanconv_il_r.ilproj b/tests/src/JIT/Methodical/NaN/r4nanconv_il_r.ilproj
index 1d80137bc9..e11cbd2f3d 100644
--- a/tests/src/JIT/Methodical/NaN/r4nanconv_il_r.ilproj
+++ b/tests/src/JIT/Methodical/NaN/r4nanconv_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
index 4328bba076..14af1dc023 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{00E7B256-7EE2-439D-B96E-0C294CC1B3FD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
index 9269e771a7..36f9dbb862 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CFAAAF11-8C97-4ED2-A398-08444A50486A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
index 018241aa67..430301690a 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1DB4EE50-5094-47D6-9D94-061E10DF69D5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
index ad6631fd7b..ace5f877e7 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E9CCED78-232F-4EB5-90A1-023A41274B58}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
index 75ba17e285..28d5f703e1 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1E5221ED-2048-4FC9-BA16-00F38544CC72}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
index 0865a530ad..f8693836f2 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{50A016ED-8DE8-4C0D-B25D-2100B4914DEE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
index 223af30764..9fcbfcfa44 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FB579738-9498-4881-A32C-694CF37A697C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
index 4ea8f137eb..e1e47691b0 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4FF01844-7091-4256-8188-DDD701C6F87E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
index 5cffd73051..4b32a5f368 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3756C837-8E90-43EA-B4F3-E075AF783EB0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
index f3d67abc10..331fdf89f5 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{954ADAD4-8861-47A3-A106-510F631315DB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
index 1e5240c2e5..f1a71f4b24 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F8FB7B02-E03F-4AD9-8EEC-25203B57A827}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
index 91f1b387c8..75840311df 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{20171FF8-DDE1-4FF1-90A8-F8EC281EC68D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
index 97adf16671..90b7e834ca 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{06D2A7DD-028F-458A-8D54-C3D3B3F638C0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
index 50f109a95e..e885cf6159 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1B4E9C42-7E89-4763-B701-AC4BBE830565}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
index 66c16fbed0..0ba27ea5f0 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3002F383-353A-4535-A7F6-A175A4CEF8DC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
index a65453188e..4b2983e4ef 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C7EABAB6-FB6B-4F66-A55D-98CB9E47BEC8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
index 9f3043afc2..a653013234 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C08249C3-EB5D-4BB2-B5AF-58C16A215FC9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
index 99c337606b..d13a470c50 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{29929866-FBAF-4C45-8B0F-AF635A9AC1EA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
index 334ab80a3d..90fa94a924 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{03A68991-465F-4E1A-8DBF-3D61A31122BD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
index 6d7424e029..86ceff9b85 100644
--- a/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{20435EF0-4C67-4BE5-9B88-DF1E227D67E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/NaN/r8nanconv_il_d.ilproj b/tests/src/JIT/Methodical/NaN/r8nanconv_il_d.ilproj
index cf1c99bcad..c75e5b0bb8 100644
--- a/tests/src/JIT/Methodical/NaN/r8nanconv_il_d.ilproj
+++ b/tests/src/JIT/Methodical/NaN/r8nanconv_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/NaN/r8nanconv_il_r.ilproj b/tests/src/JIT/Methodical/NaN/r8nanconv_il_r.ilproj
index 81f1d2b08d..d3b7b1fa9b 100644
--- a/tests/src/JIT/Methodical/NaN/r8nanconv_il_r.ilproj
+++ b/tests/src/JIT/Methodical/NaN/r8nanconv_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
index ba1ee5d873..6f901d7c82 100644
--- a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C846EFEF-EE6C-4946-9DBA-6756578415B4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
index 05eff815fa..b73a51936e 100644
--- a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{75D77419-B86B-47F0-A331-9A760698C35E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
index 953427a37f..3f62cd8d04 100644
--- a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{390610BA-E35C-4473-9D6C-990DDCBDE4F7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
index 5de8eb7103..3f5eba19ba 100644
--- a/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CDA2AA0A-A390-4A54-BD6B-1981FB8A87D8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
index 1041f4bcf7..0c0a14f7f1 100644
--- a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{422EF5C6-E6D3-4025-BF58-BAD9F965D51F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
index 8e64604dfd..35f46c529a 100644
--- a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{581F9C7A-C9E9-479B-A17F-51C578150103}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
index 826344cf15..6d10aee624 100644
--- a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ED117AC3-B0A9-4BEA-9D54-10E0E61CE4B4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
index 25b345c941..d9d9def93d 100644
--- a/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
+++ b/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C6BAFF05-7D71-4AD0-967A-6B4FAC410969}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj
index 8bda9a5108..9745eb65b3 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BB8AAFEE-9654-4F6B-A96E-734766D317D2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj
index 9f1f7cd26f..ef5f38834c 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A26D4F08-414D-4444-BD5B-A786D1E1BB65}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj
index 00e6e65eb2..73cc281e90 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1F9F89B9-793D-45F8-B231-560CE321E8C3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj
index 1af37db364..3c183379ff 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{54FAA905-87B2-434F-890B-E78091C1DE6C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgaa.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgaa.ilproj
index cd6a766b73..e9bd39b5ff 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgaa.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgaa.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgcalli.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgcalli.ilproj
index 9eef221a34..57bc2755e6 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgcalli.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgcalli.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgdd.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgdd.ilproj
index 812262b1af..fd685a8a55 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgdd.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgdd.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgee.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgee.ilproj
index d406b7fe15..376126d73e 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgee.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgee.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper1.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper1.ilproj
index 270544e2d2..94a0004b57 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper1.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper2.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper2.ilproj
index 76d69e6cc2..39d4628796 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper2.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper3.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper3.ilproj
index b84106716a..3029d46796 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper3.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper3.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper4.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper4.ilproj
index 17db1e4b91..d0f526318b 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper4.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper5.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper5.ilproj
index 84b13e48a0..306110682c 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper5.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumper5.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps1.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps1.ilproj
index 6672f17908..341c88c658 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps1.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps2.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps2.ilproj
index 7708525729..14377758df 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps2.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps2.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps3.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps3.ilproj
index 0092ee0f31..9d8dcf61e1 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps3.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps3.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps4.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps4.ilproj
index 7aad665e88..aec73136e4 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps4.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps4.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps5.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps5.ilproj
index 2aae027ef5..f76575d28c 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps5.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps5.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret.ilproj
index b1ab4ce505..4ff856ab50 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret2.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret2.ilproj
index 0bae87d0a8..e0b8f0fe14 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret2.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_dbgvtret2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_relaa.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_relaa.ilproj
index 6b33c891c8..bf6d86a03b 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_relaa.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_relaa.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_relcalli.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_relcalli.ilproj
index a7d1c02a86..19aa798e6e 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_relcalli.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_relcalli.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reldd.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reldd.ilproj
index 3bb69b9ff1..69ceeb4079 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reldd.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reldd.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_relee.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_relee.ilproj
index 8b7cb8f9f1..6b4e706e56 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_relee.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_relee.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper1.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper1.ilproj
index 6ae5a69a24..c708eff45b 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper1.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper2.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper2.ilproj
index 637829625e..833b5b3bad 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper2.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper3.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper3.ilproj
index 0d81c74b32..63417cc7c9 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper3.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper3.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper4.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper4.ilproj
index 41ef1f4de2..c564c1fd7a 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper4.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper5.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper5.ilproj
index edc790c04d..bde57b0b8f 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumper5.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumper5.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumps1.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumps1.ilproj
index d2e606ed49..7c9519f190 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumps1.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumps1.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumps2.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumps2.ilproj
index 0b61f86542..bb0b2587f3 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumps2.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumps2.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumps3.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumps3.ilproj
index c7def37a3c..8f23dae4f8 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumps3.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumps3.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumps4.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumps4.ilproj
index 2d8bf72ee0..d366a27d60 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumps4.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumps4.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_reljumps5.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_reljumps5.ilproj
index aeecfbc7e0..74effe9f95 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_reljumps5.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_reljumps5.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_relvtret.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_relvtret.ilproj
index aa408725aa..9b84082adf 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_relvtret.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_relvtret.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_il_relvtret2.ilproj b/tests/src/JIT/Methodical/VT/callconv/_il_relvtret2.ilproj
index 7b5754efe1..c59c23f905 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_il_relvtret2.ilproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_il_relvtret2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj
index 4dc71a0a86..52616556f8 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0210D570-2CBA-4A6A-A0BB-60391314F05F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj
index 355b842092..0816797aec 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FC774CEF-FA61-4FEF-969D-7FB656BAD931}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj
index f66e823de7..59b8e4fa5a 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A04473DD-EF02-4686-831E-054DF9F91F86}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj
index fe06dbeb0d..d6d00f7e72 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3DB52B16-4BC3-4024-BD75-4A1AD2D35A24}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj
index 7032a6fdb7..1b8d06e09f 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A6802642-229E-47CC-B42F-CB135E4A38DF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj
index 7c948b728a..339ed8844e 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2D5CB3E4-495B-423D-9367-58E2D85CB165}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj
index e3c22ee10c..d5f18c8da8 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E19A0C27-4003-4051-8641-053AFA2AE532}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj
index 0dbb89f6c4..1299a1b054 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{39B71F50-20FB-4615-990A-E9B5E7F7DCEF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj
index f48041ca2a..5d5f832345 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F399B587-ED92-4DD3-8588-F5FDD3931FFD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj
index 17ef08783c..ab6a72ea46 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2E9D0279-8DA5-4A78-897E-5BF16E421F17}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj
index 78f8a922d0..9a41cdeaa2 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2B10E9B2-A2B8-4662-AED1-C4353AE14C05}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj
index 8f274e0fd7..c2abcf733d 100644
--- a/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj
+++ b/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DCF0DE1B-E454-4D9F-99B2-DEC173E0D33A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj
index dcbd668fb9..20da7922dd 100644
--- a/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{22F86E3D-039E-47B9-A0CB-401AE8E5DBC8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj
index 12d1188440..afe15bbe2d 100644
--- a/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0CF8DB4B-6F3B-48FA-8CAB-443E456CE5C3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj
index 756b23b2e9..fd37515600 100644
--- a/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C1CC2BDD-95C8-4068-A276-B2DB9C8D5546}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj
index b1d4800012..63a27bae45 100644
--- a/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CD132095-6E35-4B16-8F9B-5FB76FCBE6B6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj
index 304b7b2679..0e7cb653b1 100644
--- a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{05A739C9-5067-4BF8-926E-C257FBAA633D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj
index 43ec42f9e4..bbe9c869c3 100644
--- a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FD5ADA5A-418C-4FD2-AEFE-E3D39370656D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj
index 78492944ad..63516f79b5 100644
--- a/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E07BAD61-4DCB-47AB-BD0D-34D7D6611349}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj b/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj
index 87b67651ab..2e9d997892 100644
--- a/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{45D704E0-EC36-4EF7-B5D9-39CE0C8F1B4A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj b/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj
index 86708822e7..33039679f7 100644
--- a/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D5A83968-CF00-4ED6-A999-2602996AA234}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_dbghan3.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_dbghan3.ilproj
index 8c0428db1c..b1cf0fe794 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_dbghan3.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_dbghan3.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ctor.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ctor.ilproj
index 8f33f0090d..71be78344a 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ctor.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ctor.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ref.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ref.ilproj
index 4b3865f400..fb248696b8 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ref.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ref.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi.ilproj
index d86623a9da..3a6ba7eada 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi2.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi2.ilproj
index 073fde00d0..8047002942 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi2.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi2.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_dbgknight.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_dbgknight.ilproj
index e86a11408c..ce917e339c 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_dbgknight.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_dbgknight.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_dbgnested.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_dbgnested.ilproj
index 65a62d050f..87ba981862 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_dbgnested.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_dbgnested.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_relhan3.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_relhan3.ilproj
index 12b56c0530..d116b6bcfe 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_relhan3.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_relhan3.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ctor.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ctor.ilproj
index ff3b3d117c..5ff629bcab 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ctor.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ctor.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ref.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ref.ilproj
index a067ea5345..847d8ffa4e 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ref.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ref.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_relhanoi.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_relhanoi.ilproj
index 571106b1ca..1cd1cd72a3 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_relhanoi.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_relhanoi.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_relhanoi2.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_relhanoi2.ilproj
index 8ffdceba12..2bf9eb2e99 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_relhanoi2.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_relhanoi2.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_relknight.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_relknight.ilproj
index b0b5d6f4bc..a8ae388c4b 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_relknight.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_relknight.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_il_relnested.ilproj b/tests/src/JIT/Methodical/VT/etc/_il_relnested.ilproj
index 666d61a16e..090ac543fa 100644
--- a/tests/src/JIT/Methodical/VT/etc/_il_relnested.ilproj
+++ b/tests/src/JIT/Methodical/VT/etc/_il_relnested.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj
index b63fd8d056..84a5ee5545 100644
--- a/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B77D7828-B6CF-4A16-8551-066928F5E80D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj
index cc47166cab..7ec8612274 100644
--- a/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8336D84D-D521-4061-A011-0D4D9982CAC4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj
index 48ffa36604..662320f565 100644
--- a/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{41ACB02B-620E-43B1-99A5-FC49DE6EFCCF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj
index 6b663476b2..2e8e61890d 100644
--- a/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C458785F-D6EB-4E20-960E-96E0F1495CB2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj
index c42c937c89..58612b1b56 100644
--- a/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{13744560-2695-4724-B54C-82FA972B0BC6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj
index 6a442ce9eb..d6791c4081 100644
--- a/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A93771DA-825C-4897-A8B5-D643BCFACE90}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj
index 1e4924beaf..4952eae88f 100644
--- a/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D9E1DF21-AD46-4D01-9623-34894A90943F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_relknight.csproj b/tests/src/JIT/Methodical/VT/etc/_relknight.csproj
index 569b546ca4..01094920b9 100644
--- a/tests/src/JIT/Methodical/VT/etc/_relknight.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relknight.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FD02985C-E4C5-430A-8714-E4B1A6EC9789}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_relnested.csproj b/tests/src/JIT/Methodical/VT/etc/_relnested.csproj
index c298dc4cd2..b0b398de80 100644
--- a/tests/src/JIT/Methodical/VT/etc/_relnested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_relnested.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{923A6EA0-9F8F-456A-871A-E46039B1B678}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj
index 00606abc15..ecff1332d9 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{76655B3D-67E1-41D3-A2B0-E03E77D36656}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj
index c0c77b15be..2b1acc4a5c 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CFB1BFEE-DDB0-432F-9023-C887120AEF26}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj
index 8924d48b75..8668285af0 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CEF603D3-5C1A-47CC-B808-A31C0687209B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj
index 7301a07700..258c6c0eed 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{028A8292-C8D2-4B63-8304-A8E36F244279}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj
index 1042b3dcb6..a142369200 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{94028362-0517-43DA-B3E8-ED474B0A9A59}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj
index 280b8578d2..39edcdb404 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DA55CD67-0F1C-4D32-8C12-183B8371D7CC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj
index b4eb884c96..d6aae16067 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D362D233-C560-4023-B68A-93162C984D17}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj
index ad059415b9..d3f8ac8183 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FD64267A-0AF0-4A6C-926D-65FAAA94834E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj
index 924ac26531..97be5fecbd 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C47FB2CB-75F2-492A-A994-72F4AAD2445B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj
index 592a9297c8..cb1698ed04 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{84F2A622-1F52-4BE8-9607-C52BF18222E8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj
index eac1db5476..592c20a7b8 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{48CA2642-7AD4-42FE-BB59-535B0FE8CF02}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj
index 6090bb8e53..419b7a3e27 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{76E37BB2-870B-45D1-81D5-B1248EC522F3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj
index 9f5a3b82d8..0b6506d26b 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C1D19880-4EA9-4D47-ADB2-F3020BB36614}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj
index b372cc89ad..a72f05a37a 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B6648448-C527-4F11-8B86-F419064B576F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj
index 78022df5df..e5a676799a 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DB1F1802-281D-434E-ADF2-F7DA2708BB23}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj
index eeed2fbbc9..1c003d2c34 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1703781B-A132-48C1-8D83-9418150E5EC3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj
index 7a35c0af9a..392bf77e10 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{21433341-8435-4758-8874-8B69D3197855}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj
index 7c14d2d545..817c22f9c3 100644
--- a/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1165E77-B017-43EF-BAD6-B694420E2DF9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj
index a4c0cde14a..f858d0f6bd 100644
--- a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4818E0D2-FDE7-4760-B73A-D6771454AFFE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/etc/nested.csproj b/tests/src/JIT/Methodical/VT/etc/nested.csproj
index 086cae693c..11babc3182 100644
--- a/tests/src/JIT/Methodical/VT/etc/nested.csproj
+++ b/tests/src/JIT/Methodical/VT/etc/nested.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5AD68D22-B586-4782-8C8D-18733CEBE41F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj
index 6832454a6c..a03e664ce4 100644
--- a/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C7A9C579-E424-44E2-9A2F-29B4D4DEE717}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj
index ba9889147c..0cffb1f83c 100644
--- a/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F956F618-3908-4B72-90A2-E5C95A568BE5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/identity/_il_dbgaccum.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_dbgaccum.ilproj
index 52f0723fbe..3951bc3e43 100644
--- a/tests/src/JIT/Methodical/VT/identity/_il_dbgaccum.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_dbgaccum.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/identity/_il_dbglivecall.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_dbglivecall.ilproj
index c0c904a29c..ce6c8323d6 100644
--- a/tests/src/JIT/Methodical/VT/identity/_il_dbglivecall.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_dbglivecall.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/identity/_il_dbgvolatile.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_dbgvolatile.ilproj
index 3e637ee754..257adf75e9 100644
--- a/tests/src/JIT/Methodical/VT/identity/_il_dbgvolatile.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_dbgvolatile.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/identity/_il_relaccum.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_relaccum.ilproj
index 24dbb19ddd..0316517ebf 100644
--- a/tests/src/JIT/Methodical/VT/identity/_il_relaccum.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_relaccum.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/identity/_il_rellivecall.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_rellivecall.ilproj
index d9108aca95..ef7667a18a 100644
--- a/tests/src/JIT/Methodical/VT/identity/_il_rellivecall.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_rellivecall.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/identity/_il_relvolatile.ilproj b/tests/src/JIT/Methodical/VT/identity/_il_relvolatile.ilproj
index fc92ad9697..6abff9530a 100644
--- a/tests/src/JIT/Methodical/VT/identity/_il_relvolatile.ilproj
+++ b/tests/src/JIT/Methodical/VT/identity/_il_relvolatile.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj
index 5f7daa7a0a..b01fcbecae 100644
--- a/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0EDD9DAA-5C28-416B-93D6-649F5F53F3BA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj
index 1d0c923493..f1bfc1fe99 100644
--- a/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2804A906-6AE0-475A-BCD0-B4431927593F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj
index 93813716c8..2ab6734390 100644
--- a/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7A5F6CF8-A8B2-450C-BC84-1DC24CEE9112}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj
index 9705e9adf6..08acf32579 100644
--- a/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8B475B38-3649-4F42-851C-0CD105D39443}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj
index 14d147be3c..256da98e06 100644
--- a/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{271F3C97-79B6-4540-B7A5-206695AF763E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj
index 308bd90892..c4305cf099 100644
--- a/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj
+++ b/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9AC8C788-6AA5-46E2-B55B-0F933D9DE13F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj b/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj
index b72158aeea..20b4edbe56 100644
--- a/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4832AD20-C18B-4DA6-BA24-1BBC091A9EDF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj
index 05bdec78c6..3d3bdaec42 100644
--- a/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{88478773-3195-4E44-827C-70217D768587}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/port/_il_dbghuge_gcref.ilproj b/tests/src/JIT/Methodical/VT/port/_il_dbghuge_gcref.ilproj
index 6c8e803028..6032cf9af8 100644
--- a/tests/src/JIT/Methodical/VT/port/_il_dbghuge_gcref.ilproj
+++ b/tests/src/JIT/Methodical/VT/port/_il_dbghuge_gcref.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/port/_il_relhuge_gcref.ilproj b/tests/src/JIT/Methodical/VT/port/_il_relhuge_gcref.ilproj
index b66a8c00f6..a3c6bc0d2a 100644
--- a/tests/src/JIT/Methodical/VT/port/_il_relhuge_gcref.ilproj
+++ b/tests/src/JIT/Methodical/VT/port/_il_relhuge_gcref.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/VT/port/_rellcs.csproj b/tests/src/JIT/Methodical/VT/port/_rellcs.csproj
index b46a5c4719..7862013e3b 100644
--- a/tests/src/JIT/Methodical/VT/port/_rellcs.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_rellcs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{48C681B9-8B9F-4192-85B7-5D355AB3BA22}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj
index 4e5f7c66a3..3d3a35934e 100644
--- a/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D6144DFE-A510-468B-AF81-5DFCDB51A82F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj
index c87b46f29b..89cf834222 100644
--- a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A655F286-8C9E-4C53-943C-A1917175368C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj
index 3a8f457000..2647d49920 100644
--- a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{722FBB70-33CC-4C7F-ABD0-7BEABA4998C6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj b/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj
index 9f034745d2..08d71c05a3 100644
--- a/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{365C9C3D-367B-4905-82DD-4424A041F001}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj
index 8aa93beccf..ea5912300b 100644
--- a/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj
+++ b/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{71429F1A-06E7-4830-AD79-B13611080D3F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.il b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.il
new file mode 100644
index 0000000000..2e1fc4a4c4
--- /dev/null
+++ b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.il
@@ -0,0 +1,437 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+.assembly extern mscorlib
+{
+}
+
+.assembly extern System.Console as console
+{
+}
+
+.assembly boxing001 
+{
+}
+
+.class private sequential ansi sealed beforefieldinit V extends [mscorlib] System.ValueType
+{
+  .field public int32 m_i
+}
+
+.class public auto ansi beforefieldinit Z extends [mscorlib] System.Object
+{
+
+.field static int32 nFailures
+
+.method static int32 Assert(int32 line, string f) cil managed
+{
+  .locals (int32 V_0)
+   ldstr      "ASSERTION FAILED AT LINE"
+   call       void [console]System.Console::Write(string)
+   ldarg.0
+   call       void [console]System.Console::Write(int32)
+   ldstr      ": '"
+   call       void [console]System.Console::Write(string)
+   ldarg.1
+   call       void [console]System.Console::Write(string)
+   ldstr      "'"
+   call       void [console]System.Console::WriteLine(string)
+   ldsfld     int32 Z::nFailures
+   ldc.i4.1
+   add
+   stsfld     int32 Z::nFailures
+   ldsfld     int32 Z::nFailures
+   stloc.0
+   ldloc.0
+   ret
+}
+
+.method public static int32 Main() cil managed
+{
+  .entrypoint
+  .locals (int32 V_0,
+           object V1,
+           valuetype V V_2,
+           valuetype V& V_3,
+           object V_4,
+           object V_5,
+           object V_6,
+           int32 V_7,
+           int32 V_8,
+           object V_9,
+           object V_10,
+           object V_11,
+           object V_12,
+           string V_13,
+           string V_14,
+           valuetype V& V_15,
+           valuetype V V_16,
+           valuetype V V_17)
+  ldc.i4.0
+  stloc.s    V_7
+  ldnull
+  stloc.1
+  ldnull
+  stloc.s    V_4
+  ldnull
+  stloc.s    V_14
+  ldnull
+  stloc.s    V_13
+  ldnull
+  stloc.s    V_6
+  ldnull
+  stloc.s    V_5
+  ldnull
+  stloc.s    V_12
+  ldnull
+  stloc.s    V_11
+  ldloca.s   V_2
+  initobj    V
+  ldloca.s   V_2
+  ldc.i4.5
+  stfld      int32 V::m_i
+  ldloc.2
+  box        V
+  stloc.1
+  ldloc.1
+  unbox      V
+  ldfld      int32 V::m_i
+  stloc.0
+  ldloc.0
+  ldc.i4.5
+  beq.s      T1
+
+  ldc.i4.s   50
+  ldstr      "i == 5"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T1:
+
+  ldloc.1
+  unbox      V
+  stloc.3
+  ldloc.3
+  ldfld      int32 V::m_i
+  ldc.i4.5
+  beq.s      T2
+
+  ldc.i4.s   53
+  ldstr      "pv->m_i == 5"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T2:
+
+  ldloc.3
+  ldfld      int32 V::m_i
+  ldc.i4.5
+  beq.s      T3
+
+  ldc.i4.s   55
+  ldstr      "(*pv).m_i == 5"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T3:
+
+  ldloc.3
+  ldobj      V
+  stloc.s    V_17
+  ldloca.s   V_17
+  ldc.i4.s   10
+  stfld      int32 V::m_i
+  ldloca.s   V_17
+  ldfld      int32 V::m_i
+  ldc.i4.s   10
+  beq.s      T4
+
+  ldc.i4.s   60
+  ldstr      "v3.m_i == 10"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T4:
+
+  ldloc.3
+  ldfld      int32 V::m_i
+  ldc.i4.5
+  beq.s      T5
+
+  ldc.i4.s   61
+  ldstr      "(*pv).m_i == 5"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T5:
+
+  ldloca.s   V_17
+  stloc.3
+  ldloc.3
+  ldfld      int32 V::m_i
+  ldc.i4.s   10
+  beq.s      T6
+
+  ldc.i4.s   64
+  ldstr      "(*pv).m_i == 10"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T6:
+
+  ldloc.1
+  unbox      V
+  ldobj      V
+  stloc.s    V_16
+  ldloca.s   V_16
+  ldfld      int32 V::m_i
+  ldc.i4.5
+  beq.s      T7
+
+  ldc.i4.s   68
+  ldstr      "v2.m_i == 5"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T7:
+
+  ldloc.1
+  unbox      V
+  ldc.i4.s   10
+  stfld      int32 V::m_i
+  ldloc.1
+  unbox      V
+  ldfld      int32 V::m_i
+  stloc.0
+  ldloc.0
+  ldc.i4.s   10
+  beq.s      T8
+
+  ldc.i4.s   72
+  ldstr      "i == 10"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T8:
+
+  ldloc.1
+  unbox      V
+  ldc.i4.s   123
+  stfld      int32 V::m_i
+  ldloc.1
+  unbox      V
+  ldobj      V
+  stloc.2
+  ldloca.s   V_2
+  ldfld      int32 V::m_i
+  ldc.i4.s   123
+  beq.s      T9
+
+  ldc.i4.s   76
+  ldstr      "v.m_i == 123"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T9:
+
+  ldloc.2
+  box        V
+  stloc.s    V_4
+  ldloc.s    V_4
+  stloc.1
+  ldloc.1
+  unbox      V
+  ldfld      int32 V::m_i
+  stloc.0
+  ldloc.0
+  ldc.i4.s   123
+  beq.s      T10
+
+  ldc.i4.s   82
+  ldstr      "i == 123"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T10:
+
+  ldstr      "V"
+  stloc.s    V_14
+  ldloc.1
+  callvirt   instance string [mscorlib]System.ValueType::ToString()
+  stloc.s    V_13
+  ldloc.s    V_14
+  ldloc.s    V_13
+  callvirt   instance bool [mscorlib]System.String::Equals(string)
+  brtrue.s   T11
+
+  ldc.i4.s   86
+  ldstr      "str1->Equals( str2 )"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T11:
+
+  ldloc.2
+  box        V
+  stloc.s    V_4
+  ldloc.s    V_4
+  stloc.s    V_10
+  ldloc.s    V_10
+  isinst     V
+  brfalse.s  X0
+
+  ldloc.s    V_10
+  unbox      V
+  br.s       X1
+
+X0:
+
+  ldc.i4.0
+  conv.i
+
+X1:
+
+  stloc.s    V_15
+  ldloc.s    V_15
+  ldobj      V
+  stloc.2
+  ldloc.s    V_4
+  stloc.s    V_9
+  ldloc.s    V_9
+  isinst     V
+  brfalse.s  X2
+
+  ldloc.s    V_9
+  unbox      V
+  br.s       X3
+
+X2:
+
+  ldc.i4.0
+  conv.i
+
+X3:
+
+  ldobj      V
+  stloc.2
+  ldloc.1
+  unbox      V
+  ldobj      V
+  box        V
+  unbox      V
+  ldobj      V
+  box        V
+  unbox      V
+  ldobj      V
+  stloc.2
+  ldloca.s   V_2
+  ldfld      int32 V::m_i
+  stloc.0
+  ldloc.1
+  unbox      V
+  ldobj      V
+  box        V
+  unbox      V
+  ldobj      V
+  box        V
+  unbox      V
+  ldobj      V
+  box        V
+  unbox      V
+  ldobj      V
+  box        V
+  stloc.1
+  ldloc.0
+  ldloc.1
+  unbox      V
+  ldfld      int32 V::m_i
+  sub
+  stloc.0
+  ldloc.0
+  brfalse.s  T12
+
+  ldc.i4.s   101
+  ldstr      "i == 0"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T12:
+ 
+  ldc.i4.5
+  stloc.s    V_8
+  ldc.i4.0
+  stloc.0
+  ldc.i4.5
+  box        [mscorlib]System.Int32
+  stloc.s    V_6
+  ldloc.0
+  ldloc.s    V_6
+  unbox      [mscorlib]System.Int32
+  ldind.i4
+  add
+  stloc.0
+  ldc.i4.5
+  box        [mscorlib]System.Int32
+  stloc.s    V_5
+  ldloc.0
+  ldloc.s    V_5
+  unbox      [mscorlib]System.Int32
+  ldind.i4
+  add
+  stloc.0
+  ldloc.s    V_8
+  box        [mscorlib]System.Int32
+  stloc.s    V_12
+  ldloc.0
+  ldloc.s    V_12
+  unbox      [mscorlib]System.Int32
+  ldind.i4
+  add
+  stloc.0
+  ldloc.s    V_8
+  box        [mscorlib]System.Int32
+  stloc.s    V_11
+  ldloc.0
+  ldloc.s    V_11
+  unbox      [mscorlib]System.Int32
+  ldind.i4
+  add
+  stloc.0
+  ldloc.0
+  ldc.i4.s   20
+  beq.s      T13
+
+  ldc.i4.s   114
+  ldstr      "i == 5+5+5+5"
+  call       int32 Z::Assert(int32, string)
+  pop
+
+T13:
+
+  ldloc.s    V_5
+  stloc.s    V_6
+  ldsfld     int32 Z::nFailures
+  brtrue.s   Fail
+
+  ldstr      "PASSED"
+  call       void [console]System.Console::WriteLine(string)
+  ldc.i4.s   100
+  stloc.s    V_7
+  br.s       Done
+
+Fail:
+
+  ldstr      "FAILED"
+  call       void [console]System.Console::WriteLine(string)
+  ldsfld     int32 Z::nFailures
+  stloc.s    V_7
+
+Done:
+
+  ldloc.s    V_7
+  ret
+}
+
+}
+
diff --git a/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj
new file mode 100644
index 0000000000..3d7729f5e7
--- /dev/null
+++ b/tests/src/JIT/Methodical/acceptance/Boxing/boxing001.ilproj
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
+ </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+     <DebugType>None</DebugType>
+     <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="boxing001.il" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj b/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj
index d29f1d92a5..a7e3454195 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{45913162-0814-48BD-BB47-A3FC01EB66A1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj b/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj
index bd6b4abcca..d3223e5869 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{53999106-094B-4E18-BA77-D8498D398376}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch.ilproj
index 7a87341f0a..f190bfeba6 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch_neg.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch_neg.ilproj
index c8558cdfff..aecec76b22 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch_neg.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_dbgcastclass_catch_neg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_dbgfilter.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_dbgfilter.ilproj
index f934990413..0e846bb100 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_il_dbgfilter.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_dbgfilter.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch.ilproj
index b825b25a8b..fa7618c6f7 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch_neg.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch_neg.ilproj
index 9419d9e06e..b02b5a97fd 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch_neg.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_dbgisinst_catch_neg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch.ilproj
index 35b475aec6..f865bf59a6 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch_neg.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch_neg.ilproj
index 10ef407023..5e85a0d1d9 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch_neg.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_relcastclass_catch_neg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_relfilter.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_relfilter.ilproj
index 5ea788636a..8d8b1b99b2 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_il_relfilter.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_relfilter.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch.ilproj
index 3cefd45ae8..87642f24d4 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch_neg.ilproj b/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch_neg.ilproj
index 59838a2fc4..bf13f3adcc 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch_neg.ilproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_il_relisinst_catch_neg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj b/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj
index df004fa126..4b5a269076 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AAEADD3D-8607-40C0-B852-FE268A309DC8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj b/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj
index 229ca70db3..d07dabecb7 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{87F222B0-EE89-41DB-A9ED-0123DDF67749}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj b/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj
index 27433a9091..df974a9633 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{57F6C5A7-D8BF-4FBC-BB97-1677B71445B7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj b/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj
index dee51c974e..ec115dbb76 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C189A69F-0DDC-4415-8733-7BCC228293F5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj b/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj
index f5da8fd306..eae225616f 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{21FC3929-FA6C-4DF7-90A7-637A45E3ADC9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj b/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj
index 048fbf80a6..694513207a 100644
--- a/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj
+++ b/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4179CA63-8CD0-445C-83E1-64E534A0E471}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/array/_il_dbgarrays.ilproj b/tests/src/JIT/Methodical/casts/array/_il_dbgarrays.ilproj
index 43227b7343..42784c605c 100644
--- a/tests/src/JIT/Methodical/casts/array/_il_dbgarrays.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_dbgarrays.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/array/_il_dbgcastclass_ldlen.ilproj b/tests/src/JIT/Methodical/casts/array/_il_dbgcastclass_ldlen.ilproj
index 09a2b56843..f73215d9b7 100644
--- a/tests/src/JIT/Methodical/casts/array/_il_dbgcastclass_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_dbgcastclass_ldlen.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/array/_il_dbgisinst_ldlen.ilproj b/tests/src/JIT/Methodical/casts/array/_il_dbgisinst_ldlen.ilproj
index 8a3c11cd7f..2ec1cd43ae 100644
--- a/tests/src/JIT/Methodical/casts/array/_il_dbgisinst_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_dbgisinst_ldlen.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/array/_il_relarrays.ilproj b/tests/src/JIT/Methodical/casts/array/_il_relarrays.ilproj
index 648bcfd600..8cc78b6dd2 100644
--- a/tests/src/JIT/Methodical/casts/array/_il_relarrays.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_relarrays.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/array/_il_relcastclass_ldlen.ilproj b/tests/src/JIT/Methodical/casts/array/_il_relcastclass_ldlen.ilproj
index 6c82449d0c..1a1c34cfe9 100644
--- a/tests/src/JIT/Methodical/casts/array/_il_relcastclass_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_relcastclass_ldlen.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/array/_il_relisinst_ldlen.ilproj b/tests/src/JIT/Methodical/casts/array/_il_relisinst_ldlen.ilproj
index 7df12b465f..e575588113 100644
--- a/tests/src/JIT/Methodical/casts/array/_il_relisinst_ldlen.ilproj
+++ b/tests/src/JIT/Methodical/casts/array/_il_relisinst_ldlen.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj
index fd67d2a92d..18299291ba 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EC462D6D-429B-4032-9C16-8124B636F52E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj
index d27bd56b6d..99a69d81e5 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{47DB4011-8390-4971-A4B0-614D877753E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj
index c262d4d864..3ace65a9b6 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CFD0A615-8DFB-4BE7-9447-8B40B669F358}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj
index d7cc894747..ebea6006a3 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2EB2B920-3D17-4DEA-9C7F-5619728AC09F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj
index b03213eec8..424199d905 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A72CD380-2512-44A5-8B6D-A3B3E293C6CD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj
index 6b546d620c..f6c510ba4a 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{96B72BE7-8B3F-44F5-B80C-F57BE0B395DB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj
index 9b7c84dd71..30c1146179 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{57B8E571-4E72-4C73-B538-8AADCAB3C0DC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj
index 9a2df2bd56..b26d70520b 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{87F99B82-CC31-4C2B-B516-E4FF5B14850B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_call.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_call.ilproj
index 87bfa6f7ce..36e5e2291b 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_call.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_call.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_calli.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_calli.ilproj
index 63a3f72d7e..2061aeaf18 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_calli.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_calli.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldarg.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldarg.ilproj
index 39a3a52964..6ea269da3b 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldarg.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldarg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldloc.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldloc.ilproj
index 3669c1abf9..6e5867ce18 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldloc.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgcastclass_ldloc.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_call.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_call.ilproj
index e269c7452a..7650c93354 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_call.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_call.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_calli.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_calli.ilproj
index 41d4ed91a1..f4f72ff2e9 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_calli.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_calli.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldarg.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldarg.ilproj
index 199a3c0d88..b4eeae3b50 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldarg.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldarg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldloc.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldloc.ilproj
index 766319b57b..9cf0c19bfb 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldloc.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgisinst_ldloc.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_dbgldnull.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_dbgldnull.ilproj
index 285ca2f9e2..632a4fc31e 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_dbgldnull.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_dbgldnull.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_call.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_call.ilproj
index 39b9524767..91137d625c 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_call.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_call.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_calli.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_calli.ilproj
index 95565916eb..e0903e0246 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_calli.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_calli.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldarg.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldarg.ilproj
index 4517210e93..8e4ec8ab53 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldarg.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldarg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldloc.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldloc.ilproj
index c44157cd98..8e9f139721 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldloc.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relcastclass_ldloc.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_call.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_call.ilproj
index ccd1bb17f6..0b92fd69f4 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_call.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_call.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_calli.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_calli.ilproj
index b0205d97ac..05151919c4 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_calli.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_calli.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldarg.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldarg.ilproj
index 40f31f3089..57489c8366 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldarg.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldarg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldloc.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldloc.ilproj
index 3a8d42865d..1eace0863c 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldloc.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relisinst_ldloc.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_il_relldnull.ilproj b/tests/src/JIT/Methodical/casts/coverage/_il_relldnull.ilproj
index e91a1247e0..1d8fc84009 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_il_relldnull.ilproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_il_relldnull.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj
index 606286174e..f0c71bceab 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EBF644A9-39CC-438A-BA2C-C5442D126964}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj
index 66ee2f5998..54ccde76da 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2C09812A-1591-447F-94C5-F33FB0346B4B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj
index 130806c5d4..17b5f20dc1 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5A8FDFCD-343D-481D-8488-0143733DD0C7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj
index b5e7085378..bab0b1f8ec 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D5CFB37E-ECFE-444A-B190-F51ABA65B445}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj
index c22bf08bad..67978a836c 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B0FF97B0-F7C0-426E-9824-9DC7E3DD80D9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj
index dfd2bf4a74..a0103db20b 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2384630F-557C-4F9E-8E89-0BFB6C3C2FAD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj
index a026a8e5d8..88d2a6d0ac 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7A51F8A9-E6EE-4DDE-BAF6-B7C1B3D9540D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj
index 7c3080a1ed..816a0745f5 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AC027E46-2C6D-4A35-970C-89AEC7BDAB30}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj
index ad6943b8ba..e2c767f014 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D7CD98E8-0C64-461C-8F01-65AA36A6C96C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj
index bd8026ab80..0c9efb190b 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{610C682C-0742-4385-AB31-C5ECD325FE18}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj
index 04ce1dcad5..fcb32225a1 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4F03B20F-FF85-47CC-98D0-9FA1019DD791}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj
index a2e333f926..07ab3883b4 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8BD76585-0793-42D2-8C56-44BD7FAEA618}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj
index 756001ec5e..7ae1b752d7 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4AFCCDF9-E134-47CE-BC3D-5D6F87887FE5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj
index 1ac78458a6..985d030df6 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E013FA53-3402-4527-A67C-BCAF01906006}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj
index 97c7eaf4c0..51a94d6f2c 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{96242A32-C8B7-443A-8CA7-2834487DDD4D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj
index ea32ab15c7..b516ce544a 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BC757971-447D-476E-A471-FB7AD31F05D5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj
index 3d181043a8..bb9451bf0e 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0A6D1692-4BB7-4AE0-8201-69789E8DCF71}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj
index 86245b1d46..ac4a068f34 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1E5382F-1EFE-425F-AE94-EE6E3ECF170F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj
index b8f0cc9c5f..747ef07c82 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2549CAA4-4472-4788-A01E-ADF8AC8E50DD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj
index c5fa457db9..6ef08fad0b 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8D3F8332-7C3A-4539-8D78-D908D9715214}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj
index 377a9feda4..f8627aaa05 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9A448D03-472D-4B82-BBFF-A9067F38DDC0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj
index 814de04ee6..495a1b8f3b 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{17062F31-5AA0-44BE-A095-F70ACDA913EE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj
index 8571ff0276..686f010701 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CD5A8A91-8FDE-4446-9EE5-59AD78F28E1E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj
index e21714ac4c..c2f8cd21cf 100644
--- a/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj
+++ b/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A6275C7C-33EE-4265-B0A0-79A03D5C9160}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj b/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj
index 718fae21f1..20e931d56a 100644
--- a/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj
+++ b/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CF86105B-1DC7-44E0-87EE-76F509A7423D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/iface/_il_dbgiface2.ilproj b/tests/src/JIT/Methodical/casts/iface/_il_dbgiface2.ilproj
index 40dc4be3d9..0e06ff8670 100644
--- a/tests/src/JIT/Methodical/casts/iface/_il_dbgiface2.ilproj
+++ b/tests/src/JIT/Methodical/casts/iface/_il_dbgiface2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/iface/_il_reliface2.ilproj b/tests/src/JIT/Methodical/casts/iface/_il_reliface2.ilproj
index 3719e0a3f1..1df035705c 100644
--- a/tests/src/JIT/Methodical/casts/iface/_il_reliface2.ilproj
+++ b/tests/src/JIT/Methodical/casts/iface/_il_reliface2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj b/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj
index 05b7dde803..e2943f2cc7 100644
--- a/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj
+++ b/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73978DEA-5BFF-4F42-A98B-53C49110A405}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj b/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj
index b3af45f839..9587acbd80 100644
--- a/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj
+++ b/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9A8E4763-D08B-4C38-B529-3051062FF267}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj b/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj
index 9d9bcba330..9d3959f6b8 100644
--- a/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj
+++ b/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C2DB220F-1880-43CB-92D2-F6D5EAD79F4E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj b/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj
index ee39ad7803..e0c4d90ff4 100644
--- a/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj
+++ b/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73592109-1E40-4998-ABD4-B067DC8743C5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_d.csproj b/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_d.csproj
index 874bbe54b5..13be096354 100644
--- a/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_do.csproj b/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_do.csproj
index 1eec5d1582..6b7efe8504 100644
--- a/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_r.csproj b/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_r.csproj
index ae9cc8905d..2f43f9b2ec 100644
--- a/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_ro.csproj
index d99acec974..7b1d759a3f 100644
--- a/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj b/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
index ae740afd9e..4909ff372f 100644
--- a/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj b/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
index 368fe3fa9a..247e1e60bd 100644
--- a/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj b/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
index e5004881b2..63b7a23ef9 100644
--- a/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
index d4e30b2603..cd65fb82db 100644
--- a/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj b/tests/src/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj
index dfe8938746..7cfc5e15b3 100644
--- a/tests/src/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj
+++ b/tests/src/JIT/Methodical/cctor/misc/deadlock_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj b/tests/src/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj
index e963003b37..1a0c04961b 100644
--- a/tests/src/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/misc/deadlock_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="deadlock.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj b/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj
index 60b9d6510b..b47be6a187 100644
--- a/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj
+++ b/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj b/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj
index be43af7681..45b6ad76a7 100644
--- a/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/cctor/misc/testlib.csproj b/tests/src/JIT/Methodical/cctor/misc/testlib.csproj
index df563387a7..ec0f6f9912 100644
--- a/tests/src/JIT/Methodical/cctor/misc/testlib.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/testlib.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj b/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
index d67a456a7d..1fd96b03f0 100644
--- a/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj b/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
index 6f4ba43b1b..3f3910329e 100644
--- a/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj b/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
index 9644edc25a..a4ba17056e 100644
--- a/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
index d1ed7d5e53..2b154e434c 100644
--- a/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj b/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
index 1c0b700f84..898735c40d 100644
--- a/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj b/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
index e7b2b279a0..ce85361fc9 100644
--- a/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj b/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
index 64fa439b5a..53dd943412 100644
--- a/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
index ca797df508..5d3ec23a4b 100644
--- a/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.csproj b/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.csproj
index 55da5db638..c5ed9a11f8 100644
--- a/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,8 +21,8 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType></DebugType>
-    <Optimize></Optimize>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
     <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
     <Noconfig>True</Noconfig>
@@ -40,11 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.csproj b/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.csproj
index c3d94cc3d7..46a6915579 100644
--- a/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,7 +21,7 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType></DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
     <NoLogo>True</NoLogo>
     <NoStandardLib>True</NoStandardLib>
@@ -40,11 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.csproj b/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.csproj
index 55da5db638..52b499ddc5 100644
--- a/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.csproj
index c3d94cc3d7..f9f464ecc5 100644
--- a/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj b/tests/src/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj
index cc4a47124b..0800c8cbda 100644
--- a/tests/src/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/Desktop/prefldinit3_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="prefldinit3.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
index f6c826d247..bd502ce9a4 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8C128213-9AA8-4025-8EE7-6FDF47DD544A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
index d199fd6d98..d00ec7b38a 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4DFBCA5D-68C7-4512-A880-079C2C6074E1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
index a804e40590..bca9c9388d 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C696F969-2AA1-4289-8576-CAAB8748F4C3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
index 3a5fc46636..9fcbb15b35 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CDEE2A91-3E85-4BD8-8E66-63C827EBED8D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
index 5a6cfaece8..9aa74d30b3 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{47AF9833-5788-4D1A-BF71-1902E8B9BE59}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
index 7a624fdbcc..6c5fa66104 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0FF10F1C-0C7D-4CD8-8A14-21C6E488B8E7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
index 884328b3b9..e49f71240f 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{89AE94AA-DF13-41D6-9673-1FBCA7727162}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
index fe09d42a32..e0aa79f144 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{41992141-0B64-4EB2-B3D2-35CCB92CEB8A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
index f2bbabbd8b..fb839b4ded 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{54A922D9-D2B1-4969-A811-1EBE820FB5BF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
index c89dd3f6ef..d6bceca622 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F9740EEE-763B-4CDE-AE92-5876DF3E9468}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
index 4f34e1890d..d9526d03b7 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1847231C-A265-425B-B58B-9B8FDA2B0783}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
index c93b3a5c26..a610bef765 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3E123581-790A-4E86-A7AC-0A09F790B058}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
index 2e55a5bb8f..a6f7fa63d1 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{821703F9-4217-4040-B5BB-F1002E4949B3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
index 48ba182e33..f5ff7f3e82 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E4D96FB0-C02E-4475-A719-FA7B65195C81}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
index f28bf5b38b..0fc2142476 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{09F506EA-4CBB-40BF-8A7E-68F9870996BA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
index a548ea2a93..2cb8c050e0 100644
--- a/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{96D54F48-B900-4CA4-AA41-D6195774E529}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj
index 160e875458..cfb4ec7cf3 100644
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj
index 5e08445022..df32de79fd 100644
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit1_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="prefldinit1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj
index cafeba3f65..ceaf0ed221 100644
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj
index 0a6393bd06..7075c8a66f 100644
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit2_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="prefldinit2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj
index 0209692d21..2a67fac1f5 100644
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj b/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj
index b57adaa59b..4e89cc28b0 100644
--- a/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj
+++ b/tests/src/JIT/Methodical/cctor/simple/prefldinit4_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="prefldinit4.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/cctor/xassem/testlib.csproj b/tests/src/JIT/Methodical/cctor/xassem/testlib.csproj
index 34c856bc3e..69f0224bc1 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/testlib.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/testlib.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript>
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj
index 91ec868257..7fe3db7e49 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj
index 7c9d515f31..252f4939cc 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj
index 908dc3fae9..5e027d4e04 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj
index d122b1e115..3061d0c39c 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj
index dcce689fc5..88f5d3f9cb 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj
index 56c10f1c18..bf962ccfdb 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj
index 37eee3e59c..78e776a5e4 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj
index 84da82e78c..a145fa2e95 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj
index 8a14ba06f2..675b475214 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj
index 87ac59d771..914b3765a3 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj
index 0db84e6399..a96e53535c 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj
index d7861ce3b8..147f1b06dc 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj
index 03a9711b94..f1503d4c2f 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj
index f3943dfac8..7e39668f38 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj
index dacc3f8014..3fe213b224 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj b/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj
index 190d46e605..8bedd64e65 100644
--- a/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj b/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj
index 744ce687ef..abfa1ce747 100644
--- a/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj
+++ b/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj b/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj
index da4299cd27..e91c1e3852 100644
--- a/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj
+++ b/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
index 4c257aa004..f7058b39de 100644
--- a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8074FD34-7426-4CCC-B82F-98FFC649E91B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
index 3f4110187e..33f9863d45 100644
--- a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C2414151-E272-4E72-B8F8-E735C686BEFA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
index 611d671066..ead5675ab4 100644
--- a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4533D06F-382E-49F3-9486-B41E12EA2378}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
index 8eb5e32423..553c654143 100644
--- a/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8687A72B-5DF2-498C-8A8C-CD5A7856D42D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj
index 9ed1a31afa..ce1ecdecfb 100644
--- a/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{05D8DDDA-6741-4FFC-BB91-629E45A29E46}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj
index cf3aef2a6a..bf4a3ec1a3 100644
--- a/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0EA524F7-EB60-4BA2-8FA3-D3E474EC8D07}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj
index 402806759d..92fce0741d 100644
--- a/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DD2256C6-B7D6-4239-98A9-A63E694E93E2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
index 698495ab02..5e3777d936 100644
--- a/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0F5F1532-DDC8-4803-A39F-102F65ACD806}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj
index ecb0fdedc0..e14d524b5f 100644
--- a/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2731E7B8-7BF4-4BA1-9B33-0CCEAB9D6F57}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj
index fb90ce413e..e75f0f2626 100644
--- a/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8CE48E50-0F9E-4DA2-87C3-2645659C8379}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj
index 3f50c2c0c7..746c61cbc8 100644
--- a/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D212F6AA-8309-4C7D-BAFC-E52A3CF1C9AD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
index 47a3655e65..808634edfb 100644
--- a/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B25A0F5B-8C27-42BE-AA4A-F124D958A6D4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj b/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj
index 3c17074b61..5ac4d74d98 100644
--- a/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1B2250BC-AB60-4AD2-97D3-BD9BD5782F80}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
index 92b8e4234f..b088860bd0 100644
--- a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{76A2BDAD-760E-45AE-A7A9-9778753092B9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
index 37e2a91415..ebc7cf08b2 100644
--- a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FA9512A5-92B8-4508-8579-2B0568155602}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
index 12a2ec8b54..4926a427ac 100644
--- a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AD35C91C-EC29-4560-AC15-60CAFFC639D7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
index acac1c9def..61c3cd2084 100644
--- a/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1C0ECCFA-6538-4E2A-8111-BA9F110B5B7C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj
index 06a202b944..40c70ffff8 100644
--- a/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{22C1826A-A04D-4669-983E-6679BDEBC5E7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj
index 8824638698..564831eb2d 100644
--- a/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{363331BD-4648-4BC9-99C2-D63044C13C83}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj
index de06b8eef0..0af8847226 100644
--- a/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4A81DA45-79DE-4101-96F1-8FF12227DFDC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
index 6c9580e430..71cbdba99f 100644
--- a/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C28A4049-C64B-48EC-A7C8-0823F4167308}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj
index 9b4966d048..b3b34f624b 100644
--- a/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5354026F-2CCB-4547-A33E-D80FA0615FF2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj
index 5c2c8a31e7..67fc72b898 100644
--- a/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{50C047DC-A854-4B09-9D8C-61121ADF7B81}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj
index c5dafb255f..9887e34780 100644
--- a/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9E197F07-4741-4FE5-B984-AD5D866B5B39}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
index 7cc665ea95..00075b60ba 100644
--- a/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BE12D59E-CEEE-4697-98E1-119F292F7894}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj
index 78432024bb..fcce3214ca 100644
--- a/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BA9F8921-34FF-4A6C-85BD-8E448730BF9E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj
index 614bef02c3..d93a3e2359 100644
--- a/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2EC60DDE-4C5D-47BD-BE04-07092EC947F5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj
index e848e4ff38..536c40d386 100644
--- a/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D44E25B4-A4BD-438A-B8F4-3DAC4EB0E636}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
index 92699b1f99..62716e7fc0 100644
--- a/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B756347C-04AE-45B1-A646-9E0BB01F23E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj b/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj
index 3a454dfa40..e1f04bfde8 100644
--- a/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ED48DE69-3A2B-4BF4-85DE-B02E168D331F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj b/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj
index 6a17c38e42..7ced749ebf 100644
--- a/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CD6EA305-5025-431B-910D-93512B81AA30}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj b/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj
index cd4d0130ef..79ba57b6eb 100644
--- a/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D48A27DA-5609-4218-A5D9-87C9E7B621FE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
index a97a107f4f..0a5b9a430e 100644
--- a/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9E44E821-9E0A-4024-8700-474B370765D7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
index c6ef57bd21..f3d8e0c785 100644
--- a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{47398E20-1072-4B0C-8FA1-C81F53620699}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
index d47f1e7565..d934091f44 100644
--- a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2FE13806-29EA-496E-AB35-6880A97D04C5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
index 85036e6466..d0caf8d716 100644
--- a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4CBA35C7-C345-43A4-BF80-F8C7B5147330}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
index 33fc93d0da..9ae9b0d825 100644
--- a/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{638BCF07-6BC4-488A-AC49-B7DD3BDF3691}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
index bc73340ea1..52538c532c 100644
--- a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E838E359-9791-4399-B90D-08BCF7B6759A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
index 7ba0926659..831998f2be 100644
--- a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{29A6979F-FF0F-4E64-B484-39512815C58A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
index 81ea6a5f18..26354bfd52 100644
--- a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3480389B-CAEC-4077-843B-A915E8DE6CCF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
index 5a92c6ab9f..e184efc895 100644
--- a/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6CD3C00E-D38B-4884-B16E-99C0DB0D0832}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
index c74d7138bb..dd90d2503b 100644
--- a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{071C86E8-527E-4DEF-9547-C71212A776DE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
index acc8c0468d..39bbb6612f 100644
--- a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95E53FE5-6FEC-46D2-A05F-3740B5096693}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
index 151120f979..dc3e6313ef 100644
--- a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AB8065FD-01A2-4791-9044-E26FF8C97DD3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
index a70fc22f33..2282d47d86 100644
--- a/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{019C42A8-9635-40FC-BC6A-EE2C41996E83}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
index 5406739b32..8f528fbdb1 100644
--- a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{56FF3771-7CDF-4828-AEB0-9EEDACA09346}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
index 40cebd66ef..cb885fd2cc 100644
--- a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{78774AFC-E717-4828-BB45-B910295200A4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
index 51550369a3..9603b9cc2f 100644
--- a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9FA1B6E9-A5E1-4E52-9390-954820DCDC72}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
index f54ad966d2..f3355412dd 100644
--- a/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1B4BDABC-C8D4-4FAE-814F-1B67E39B5156}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
index 3dc1ec261d..083979edca 100644
--- a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{85CEC9BA-18F4-42C0-B3A8-BCDF2E68858B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
index 48d43c3b24..d8b45e1857 100644
--- a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{599FE2AC-4FD2-464A-8CBF-D26B0746D73F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
index 7ffd367b79..b70bdc88ad 100644
--- a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3312A13F-DED5-47B2-8166-160B156E0E39}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
index a4f1718a39..ce78296791 100644
--- a/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6B94184B-A46A-4121-BD93-C653CEC64E88}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
index 49688700f3..81e256e033 100644
--- a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7D41599D-2F6B-4127-B75B-CAB27E34BB9F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
index e83710d0f2..7e01629468 100644
--- a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EF75F79F-9FC5-4366-A962-D4CC5797E9FC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
index ac60559f05..e0c2d5330b 100644
--- a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8D598B51-ED43-4661-BC93-E5FE26557F53}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
index c0ec3e9b89..9a548ef8d3 100644
--- a/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BB17B9FB-D73C-415F-86F6-E07093C6EAFA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
index 50581bb0ec..897367935f 100644
--- a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{191A3D78-6BF7-4244-8000-F9444CBD9323}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
index 3222131b18..c0b98092b5 100644
--- a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E3A3179F-0DC9-4D61-B1E0-5EA062EDCFF7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
index 62abfcdd2b..c323544e5e 100644
--- a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B798D96F-A8DA-42F8-A91F-5CF606557041}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
index ec2ccef022..ef57fe7d65 100644
--- a/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D9ECFCBB-D8B0-4D14-8059-9D105BE2AF6B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
index 73916ad5f5..fec801524e 100644
--- a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{50EF1878-1A99-4A7D-AB2A-48253984442C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
index 791debb2be..0e44715b4c 100644
--- a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{935AC2CD-FBCF-4261-BA6F-4E61FA59F610}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
index 8016f0d6e0..3d60f5a7fb 100644
--- a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{919C114C-F977-45F0-9877-BFA66D3EA063}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
index 7b29739995..370027f976 100644
--- a/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AC48EED6-19D5-475D-BEB9-2E884F027A7A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray1_cs_d.csproj b/tests/src/JIT/Methodical/doublearray/dblarray1_cs_d.csproj
index df1ca240a4..cd9f4f40d2 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray1_cs_d.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray1_cs_do.csproj b/tests/src/JIT/Methodical/doublearray/dblarray1_cs_do.csproj
index f41f06379e..b7b35faee2 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray1_cs_do.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray1_cs_r.csproj b/tests/src/JIT/Methodical/doublearray/dblarray1_cs_r.csproj
index 8c125f3983..6cbdc467e7 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray1_cs_r.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj b/tests/src/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj
index 1719e4ad08..bde50fe961 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray2_cs_d.csproj b/tests/src/JIT/Methodical/doublearray/dblarray2_cs_d.csproj
index c2958a6ad6..e80451608f 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray2_cs_d.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray2_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray2_cs_do.csproj b/tests/src/JIT/Methodical/doublearray/dblarray2_cs_do.csproj
index 1b13e5c902..322a16a2a0 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray2_cs_do.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray2_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray2_cs_r.csproj b/tests/src/JIT/Methodical/doublearray/dblarray2_cs_r.csproj
index 142a7e3ba1..f75fce8e43 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray2_cs_r.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray2_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj b/tests/src/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj
index 8376c8e73d..5dc7966ab2 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray3_cs_d.csproj b/tests/src/JIT/Methodical/doublearray/dblarray3_cs_d.csproj
index 069ee7cc53..a6e0db5e42 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray3_cs_d.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray3_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray3_cs_do.csproj b/tests/src/JIT/Methodical/doublearray/dblarray3_cs_do.csproj
index 77f71d753e..41c46fa24b 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray3_cs_do.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray3_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray3_cs_r.csproj b/tests/src/JIT/Methodical/doublearray/dblarray3_cs_r.csproj
index 9644928159..0b063f8749 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray3_cs_r.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray3_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj b/tests/src/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj
index 34e6da0a18..c3a906b40e 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray4_cs_d.csproj b/tests/src/JIT/Methodical/doublearray/dblarray4_cs_d.csproj
index 34fd19b006..5441e605a5 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray4_cs_d.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray4_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -46,10 +42,6 @@ export COMPlus_DoubleArrayToLargeObjectHeap=0x64
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray4_cs_do.csproj b/tests/src/JIT/Methodical/doublearray/dblarray4_cs_do.csproj
index f76c5d701d..c1248f1584 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray4_cs_do.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray4_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -46,10 +42,6 @@ export COMPlus_DoubleArrayToLargeObjectHeap=0x64
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray4_cs_r.csproj b/tests/src/JIT/Methodical/doublearray/dblarray4_cs_r.csproj
index 8e73eba9cb..0c154cb491 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray4_cs_r.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray4_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -46,10 +42,6 @@ export COMPlus_DoubleArrayToLargeObjectHeap=0x64
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj b/tests/src/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj
index 868b326de7..95ef6068a8 100644
--- a/tests/src/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -46,10 +42,6 @@ export COMPlus_DoubleArrayToLargeObjectHeap=0x64
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/dynamic_methods/bug_445388.csproj b/tests/src/JIT/Methodical/dynamic_methods/bug_445388.csproj
index 92f5d36078..4d8bce742a 100644
--- a/tests/src/JIT/Methodical/dynamic_methods/bug_445388.csproj
+++ b/tests/src/JIT/Methodical/dynamic_methods/bug_445388.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/emptyfinally_d.ilproj b/tests/src/JIT/Methodical/eh/basics/emptyfinally_d.ilproj
index 48b0a75cf0..7560cdd94c 100644
--- a/tests/src/JIT/Methodical/eh/basics/emptyfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/emptyfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/emptyfinally_r.ilproj b/tests/src/JIT/Methodical/eh/basics/emptyfinally_r.ilproj
index 8b73c9d22f..96c9db3e65 100644
--- a/tests/src/JIT/Methodical/eh/basics/emptyfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/emptyfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/multihandler_d.csproj b/tests/src/JIT/Methodical/eh/basics/multihandler_d.csproj
index 926f827cf6..a273dea104 100644
--- a/tests/src/JIT/Methodical/eh/basics/multihandler_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/multihandler_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/multihandler_do.csproj b/tests/src/JIT/Methodical/eh/basics/multihandler_do.csproj
index c175f2fe3e..e311d99152 100644
--- a/tests/src/JIT/Methodical/eh/basics/multihandler_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/multihandler_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/multihandler_r.csproj b/tests/src/JIT/Methodical/eh/basics/multihandler_r.csproj
index 846e6f11cc..8b5d40d4b9 100644
--- a/tests/src/JIT/Methodical/eh/basics/multihandler_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/multihandler_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/multihandler_ro.csproj b/tests/src/JIT/Methodical/eh/basics/multihandler_ro.csproj
index 3fb6552126..5c78ab2d73 100644
--- a/tests/src/JIT/Methodical/eh/basics/multihandler_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/multihandler_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwincatch_d.csproj b/tests/src/JIT/Methodical/eh/basics/throwincatch_d.csproj
index 0bcd174e21..46ef135494 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwincatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwincatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwincatch_do.csproj b/tests/src/JIT/Methodical/eh/basics/throwincatch_do.csproj
index 85326e081c..dd220b71d4 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwincatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwincatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwincatch_r.csproj b/tests/src/JIT/Methodical/eh/basics/throwincatch_r.csproj
index cc8917dc97..af10ad41f5 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwincatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwincatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwincatch_ro.csproj b/tests/src/JIT/Methodical/eh/basics/throwincatch_ro.csproj
index 6ebb5ca209..65a80c7684 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwincatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwincatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj b/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj
index 622bf0016b..472d03bdab 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj b/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj
index e844f103ee..9d6378edeb 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj b/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj
index f11b0f917d..07be6eda95 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj b/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj
index a649d1a8ea..81878325da 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinexcept_d.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinexcept_d.ilproj
index 4939f7956e..5b317143dd 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinexcept_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinexcept_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinexcept_r.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinexcept_r.ilproj
index 42fb06dcaf..6019771b1b 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinexcept_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinexcept_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfault_d.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinfault_d.ilproj
index 569b59bbeb..ac63770127 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfault_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfault_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfault_r.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinfault_r.ilproj
index c1a695888f..fb00274a20 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfault_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfault_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfilter_d.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinfilter_d.ilproj
index cc45d42e9f..3c75e2ee2e 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfilter_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfilter_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfilter_r.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinfilter_r.ilproj
index db329a72ae..c253e23371 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfilter_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfilter_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinally_d.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinally_d.csproj
index 242531f965..2590816179 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinally_do.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinally_do.csproj
index d379dc3075..602095648a 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinally_r.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinally_r.csproj
index a24240c6eb..dcf9113bcc 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinally_ro.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinally_ro.csproj
index 054590cf43..4f9e56825c 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj
index 370f148053..02d3e51a89 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj
index a235dc038b..bdeaaa2a3c 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj
index ba12ad5dee..1781f14be5 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj
index 2a64d9756f..ac49173880 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj
index 4935afdcec..68ce992173 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj
index 8f614a0e6c..c4fba10a57 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj
index 7235f1136c..2e820ccc29 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj
index 8d888f2a71..7b1873e1d7 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj
index c98bfe33aa..a34d02d64d 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj
index 219b194947..bb78b11a72 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj
index 92bd066c65..2efecfc0b2 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj
index 9efaccdfc4..d1179be8d1 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj
index afe398caf5..32e9dbd424 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj
index c5393cca29..50a24eb25f 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj b/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj
index 2cfb9fba64..e1fd35d2f2 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj b/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj
index b2e3696121..a2a31c66f7 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/throwoutside_d.csproj b/tests/src/JIT/Methodical/eh/basics/throwoutside_d.csproj
index 149836a04b..55f59bcaf6 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwoutside_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwoutside_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwoutside_do.csproj b/tests/src/JIT/Methodical/eh/basics/throwoutside_do.csproj
index ccdc0934a8..7750dd8291 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwoutside_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwoutside_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwoutside_r.csproj b/tests/src/JIT/Methodical/eh/basics/throwoutside_r.csproj
index 644a65d6d9..f8dedce1b2 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwoutside_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwoutside_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/throwoutside_ro.csproj b/tests/src/JIT/Methodical/eh/basics/throwoutside_ro.csproj
index 068290033c..ced9af5e8c 100644
--- a/tests/src/JIT/Methodical/eh/basics/throwoutside_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/throwoutside_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trycatch_d.csproj b/tests/src/JIT/Methodical/eh/basics/trycatch_d.csproj
index 26f0fe7321..bbc7609252 100644
--- a/tests/src/JIT/Methodical/eh/basics/trycatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trycatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trycatch_do.csproj b/tests/src/JIT/Methodical/eh/basics/trycatch_do.csproj
index 9543b3bb12..43ab4c4c1d 100644
--- a/tests/src/JIT/Methodical/eh/basics/trycatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trycatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trycatch_r.csproj b/tests/src/JIT/Methodical/eh/basics/trycatch_r.csproj
index 0139aad401..dabb0ba48a 100644
--- a/tests/src/JIT/Methodical/eh/basics/trycatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trycatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trycatch_ro.csproj b/tests/src/JIT/Methodical/eh/basics/trycatch_ro.csproj
index 9cfc7bbb3c..c49dfeeb54 100644
--- a/tests/src/JIT/Methodical/eh/basics/trycatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trycatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj b/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj
index 5bf4fd138a..09c8819650 100644
--- a/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj b/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj
index d9054035c2..2ccbe43faa 100644
--- a/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj b/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj
index 6cee58f236..7248d52a51 100644
--- a/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj b/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj
index 8bfa3b1ed4..ec18398662 100644
--- a/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryexcept_d.ilproj b/tests/src/JIT/Methodical/eh/basics/tryexcept_d.ilproj
index 4eb43522c6..41a4548f6d 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryexcept_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryexcept_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/tryexcept_r.ilproj b/tests/src/JIT/Methodical/eh/basics/tryexcept_r.ilproj
index 4d4b27bf84..a81c69f3d9 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryexcept_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryexcept_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfault_d.ilproj b/tests/src/JIT/Methodical/eh/basics/tryfault_d.ilproj
index 2cc0809623..4e1ea56eee 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfault_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfault_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfault_r.ilproj b/tests/src/JIT/Methodical/eh/basics/tryfault_r.ilproj
index 565627ceed..943742ec7d 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfault_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfault_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj b/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj
index c8e346e201..d480e4c298 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj b/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj
index 688884a7d0..3d3c38427d 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj b/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj
index a0db0f8188..d398127f7d 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj b/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj
index b436dba1dd..5af7c7f05c 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinally_d.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinally_d.csproj
index 4c5b0c2f24..7495323279 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinally_do.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinally_do.csproj
index a27bbe69a1..acb63e605a 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinally_r.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinally_r.csproj
index 4b6f401d9e..68e3174224 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinally_ro.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinally_ro.csproj
index 1c37d09fbb..bbec6b42fc 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj
index ff706c6f6f..16a0555677 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj
index 56a222c307..f0c38ea898 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj
index c241970315..a543fc98e8 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj
index 2183b3cbd0..c29293900e 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj
index 7c20293a57..7fb0c117d4 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj
index 6c0ddf862c..057399ec9c 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj
index 8f432f4e66..356254da40 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj b/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj
index ee4b679b55..4e3f0c278e 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj b/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj
index ef5e3c5a25..0093580460 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj b/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj
index 77015cbb6d..a071384903 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj b/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj
index caebeb7648..0d3d5d9837 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj b/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj
index dadcbaffb6..cce13bd2ac 100644
--- a/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/basics/trythrowcatch_d.csproj b/tests/src/JIT/Methodical/eh/basics/trythrowcatch_d.csproj
index 63a88bff52..5445dcbce5 100644
--- a/tests/src/JIT/Methodical/eh/basics/trythrowcatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trythrowcatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trythrowcatch_do.csproj b/tests/src/JIT/Methodical/eh/basics/trythrowcatch_do.csproj
index baaa69f0bf..a37b9d1c62 100644
--- a/tests/src/JIT/Methodical/eh/basics/trythrowcatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trythrowcatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trythrowcatch_r.csproj b/tests/src/JIT/Methodical/eh/basics/trythrowcatch_r.csproj
index 6163c15b9b..7beb7c903f 100644
--- a/tests/src/JIT/Methodical/eh/basics/trythrowcatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trythrowcatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj b/tests/src/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj
index 150efcf64d..27d8664685 100644
--- a/tests/src/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj b/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj
index 82246cbdc4..8953741221 100644
--- a/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj b/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj
index cbfb838650..69e1a21a98 100644
--- a/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj b/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj
index 31319a232f..b356f92f83 100644
--- a/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj b/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj
index 0c13b1993c..07fd3b4133 100644
--- a/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj b/tests/src/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj
index e9bba4173b..fd875d5b65 100644
--- a/tests/src/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj b/tests/src/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj
index 1012666661..6f07ae597d 100644
--- a/tests/src/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/common/common.csproj b/tests/src/JIT/Methodical/eh/common/common.csproj
index f736178e0f..8864f5d5fe 100644
--- a/tests/src/JIT/Methodical/eh/common/common.csproj
+++ b/tests/src/JIT/Methodical/eh/common/common.csproj
@@ -8,15 +8,10 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/eh/cs/unsafe_d.csproj b/tests/src/JIT/Methodical/eh/cs/unsafe_d.csproj
index 5da782475e..751c585e09 100644
--- a/tests/src/JIT/Methodical/eh/cs/unsafe_d.csproj
+++ b/tests/src/JIT/Methodical/eh/cs/unsafe_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/cs/unsafe_do.csproj b/tests/src/JIT/Methodical/eh/cs/unsafe_do.csproj
index f4b04f4e5e..8e2749d3e4 100644
--- a/tests/src/JIT/Methodical/eh/cs/unsafe_do.csproj
+++ b/tests/src/JIT/Methodical/eh/cs/unsafe_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/cs/unsafe_r.csproj b/tests/src/JIT/Methodical/eh/cs/unsafe_r.csproj
index ceb5a37b57..2da788195c 100644
--- a/tests/src/JIT/Methodical/eh/cs/unsafe_r.csproj
+++ b/tests/src/JIT/Methodical/eh/cs/unsafe_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/cs/unsafe_ro.csproj b/tests/src/JIT/Methodical/eh/cs/unsafe_ro.csproj
index ecde13e918..c850e74d50 100644
--- a/tests/src/JIT/Methodical/eh/cs/unsafe_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/cs/unsafe_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj
index 59ac75ceba..019d9cb6f7 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj
index 906ac950f3..fe94381a4f 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj
index 597e8b10f5..47b827ed98 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj
index b2952a24ae..1483d2a5ac 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj
index 0a015dbec3..c60df8f95f 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj
index ca86431134..4b1a399ee9 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj
index 9083da65c1..be53b78134 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj
index 90bf8efd40..362f9e100a 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj
index 4925bdc25f..075c511c3c 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj
index d739d5eab9..53f775051a 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj
index a7e31f811d..b08340c766 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj
index 201dc7f4fa..00a8e93b55 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj
index 5bf7cc378f..6028bedf86 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj
index 6be4240905..5750cef440 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj
index 59b5882c63..aa4bd5d3d2 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj
index 34ec5b04f4..85c9c464bc 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="deadEHregionacrossBB.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj
index a1bc0229ab..ee6ba6a3f8 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj
index 6fff83ec68..f3c60962e9 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="deadcodeincatch.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj
index 62421a6fe2..3c602f3170 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj
index 87e7fb0e7a..9ef4ff4812 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj
index ee4e7dfc23..e17122eace 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj
index a13ee58fe4..2569ce9934 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="deadoponerror.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj
index dc349b6f46..cf7e74b940 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj
index 79d9e3051f..de4f669273 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj
index b8b1703ffe..bc09732683 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj
index 89af351f70..d0e41c930c 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj
index a3c18fb736..a5b766ced4 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj
index bba14ce4eb..f781296744 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj
index cf3c0decd6..2018a2fd55 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj
index 9122e3cc59..4068ff1b84 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj
index bfaec39cf5..c629958033 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj
index c382f311e6..6caf3271d6 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj
index 7d510719f8..17691f4887 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj
index 6076e610c2..16e42aaa8f 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj b/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
index 2b0481f270..868b1b6946 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj b/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
index 68b0b912dd..dfc4073aa3 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj b/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
index 5d22e97613..2b97bc2369 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj b/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
index cc604cc6ef..50663bf5a8 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj
index 318503dd6c..b6aa2c54e3 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj
index 1c2638e6db..d4fd7a2052 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj
index c5e3dc93fa..9d21ec245c 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj
index 8fb2e8f33b..f7c9c3e4f0 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj b/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj
index 3a65095706..ca6a38659b 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj b/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj
index d6397e4ba9..e63267eedf 100644
--- a/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj
index 7a324354da..912026c210 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj
index dbf0e3978a..528ff71f69 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj
index a58327a713..ebe10d29af 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj
index 6bb51d7625..db8d153e54 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj
index 351cb2faa9..d0b7d8399b 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj
index 937a903287..c84f8db602 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj
index f14aa050ad..3e759d28c8 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj
index 3ee54f6377..8b17ab28a6 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj
index 44eb3079da..1fd46a95ba 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj
index a843579a7f..bdf097c29c 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj
index ef3d996dd6..655e765764 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj
index 9af58c4d05..42d3706ab9 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj
index cb372cde5b..72abec470f 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj
index 90df3e0774..00c481f324 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj
index 43834dab04..6c6459e49f 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj
index afc27418b6..69409d0a63 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj
index 2030a5183b..eeefe71c19 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj
index bc459f05b0..f7d226dfc1 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/testeit_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/testeit_d.ilproj
index c8dd5935fd..3a089caddd 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/testeit_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/testeit_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/testeit_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/testeit_r.ilproj
index 92433dd30e..112982c784 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/testeit_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/testeit_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj
index 5ac5594fc6..4a2776febd 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj
index c45bd8eec0..82e3a306ee 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj b/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj
index 59f21efefa..6355756f17 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj b/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj
index 67bbd9482b..958a1843b0 100644
--- a/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj
@@ -8,18 +8,17 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
   </PropertyGroup>
+  <PropertyGroup>
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj
index d8a7f96942..8806b57868 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj
index 5345e26429..8652ede432 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj
index 526a76d8b5..6d3e6ae588 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj
index cb07f27ce5..8142867a01 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj
index 11087a14bf..1649f86a24 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj
index 0277486b7e..46b1c8a5a5 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj
index 66e396a97f..8aa50dd999 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj
index f31eb9431c..30c50bd486 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj
index abf76cfda9..6a4a8545ef 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj
index 750200d989..72fb2bbfe5 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj
index 03b58e65a3..1ff35e08ae 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj
index 16cc616470..f3b38748cc 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj
index c7167a98e6..4d07071d3c 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj
index 3ef2da6ffd..910cee5d58 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj b/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj
index a2edbdd659..04b90e89f6 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj b/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj
index fd56cc4be1..4d1f73528a 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj
index 07a76f12f2..3f7c870bf9 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj
index 7829b05d6f..4c46b61a31 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj
index 27e91983b6..11701e2eeb 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj
index d73de45d97..3b7a1bf754 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj
index d95eb6d4aa..1e5760aa56 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj
index fd881cf66d..448d2800a7 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj
index 867f22bc2e..84d7035a53 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj
index 2ff8c3dd7d..2e78383fac 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj
index 1a2b9c43a9..56cceb5e73 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj
index 592814f78c..ee61946e86 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj
index 8729eb18c3..b77b00919c 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj
index ae2bd0d0bb..415aa727ae 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj
index 1e82a5c96e..615cc8875a 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj
index 382c6ac81f..29ca27d775 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj
index 96163b60cd..56143b1507 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj
index d6c870fb4d..c79687656b 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj
index 83055d4047..0ba7f69d8c 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj
index 197a27ca3a..8e02815a6c 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj
index a7a0e17250..09c600ee77 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj
index 2babc8282d..8d7a660d1d 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj
index 4bb8f71b9e..bf7e7ad1ac 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj
index 42414abd92..890be088e1 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj
index 44283df5c1..be80decede 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj
index dbe4e242a0..de70dab1a2 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj
index abd286109c..bf48b6911a 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj
index 46bb440aac..44d789828c 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj
index c52d66a258..de857a2deb 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj
index d0edd67fd1..745a5c1c83 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj
index 723c732b4d..c0e91b7912 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj
index fa960a153e..7b6309e0c0 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj
index df847c5a7a..12d5c32246 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj
index 8517ebe37c..d8bae286d1 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj
index 2bbce32c29..5b2810d446 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj
index 30142acf2e..36b1c51702 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj
index 64aa11672a..bbfdec2028 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj
index 29ae443b0f..6cabb8ecdc 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj
index 19e7e0b213..28a07157bb 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj
index 9a8eefed88..80bb79f647 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj
index 94792c2a3a..d1dce2856f 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj
index 5523479d87..c976aae7dc 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj
index a2712229a8..1a86e5d2d4 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj b/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj
index eda2d3acd6..6f69c0d534 100644
--- a/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/throwincatch_d.csproj b/tests/src/JIT/Methodical/eh/generics/throwincatch_d.csproj
index e28b2fca76..c3e73e0cff 100644
--- a/tests/src/JIT/Methodical/eh/generics/throwincatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/throwincatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/throwincatch_do.csproj b/tests/src/JIT/Methodical/eh/generics/throwincatch_do.csproj
index 822443dd41..3b9b5195e6 100644
--- a/tests/src/JIT/Methodical/eh/generics/throwincatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/throwincatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/throwincatch_r.csproj b/tests/src/JIT/Methodical/eh/generics/throwincatch_r.csproj
index 8027721ddd..0ddf787226 100644
--- a/tests/src/JIT/Methodical/eh/generics/throwincatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/throwincatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/throwincatch_ro.csproj b/tests/src/JIT/Methodical/eh/generics/throwincatch_ro.csproj
index 78699bea3d..4c62fcc92b 100644
--- a/tests/src/JIT/Methodical/eh/generics/throwincatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/throwincatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj b/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj
index 9fa2472bf5..a366e89614 100644
--- a/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj b/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj
index 5bc31c0a12..387a34bd0a 100644
--- a/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj b/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj
index e939f74792..42c733a59b 100644
--- a/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj b/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj
index e54b318802..4d61a28302 100644
--- a/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj b/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj
index 7d3178a8df..262167a7f6 100644
--- a/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj b/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj
index 660587a48f..434dfe2da8 100644
--- a/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj b/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj
index b60a1bfa77..57deae3b28 100644
--- a/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj b/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj
index 0edc3ed7bb..84c9832ae6 100644
--- a/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/ehso.csproj b/tests/src/JIT/Methodical/eh/interactions/ehso.csproj
index 7120c59918..819c424457 100644
--- a/tests/src/JIT/Methodical/eh/interactions/ehso.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/ehso.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0FC11856-26BE-4361-B267-28CAA7BE5CAC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/gcincatch_d.csproj b/tests/src/JIT/Methodical/eh/interactions/gcincatch_d.csproj
index baff214427..610739311a 100644
--- a/tests/src/JIT/Methodical/eh/interactions/gcincatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/gcincatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B22ABFEA-9859-4C97-A166-52C420C39FEF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/gcincatch_do.csproj b/tests/src/JIT/Methodical/eh/interactions/gcincatch_do.csproj
index 449e66a2da..ac711dd951 100644
--- a/tests/src/JIT/Methodical/eh/interactions/gcincatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/gcincatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{19C43397-A7B7-4E2D-B2F2-D302C13A0715}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/gcincatch_r.csproj b/tests/src/JIT/Methodical/eh/interactions/gcincatch_r.csproj
index 5f764b35e2..9d7b763c28 100644
--- a/tests/src/JIT/Methodical/eh/interactions/gcincatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/gcincatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CC5EAFC7-EA27-485B-AD9E-D7ED67F808F0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/gcincatch_ro.csproj b/tests/src/JIT/Methodical/eh/interactions/gcincatch_ro.csproj
index 6853642e44..cd22882a03 100644
--- a/tests/src/JIT/Methodical/eh/interactions/gcincatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/gcincatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9426D669-315D-4940-BB26-EE3709A7802A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj b/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj
index 816fb0a4cf..8f5852c917 100644
--- a/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0F547F76-8657-44EF-9AC0-FE81153E4B22}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj b/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj
index 7e0549dea8..054a0fb655 100644
--- a/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{43996CEE-7608-49CD-A31F-68F3DD5B0C61}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj b/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj
index 1173f041c3..d67c435a5d 100644
--- a/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{740B75E4-4B74-4735-98E3-679E181869BB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj b/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj
index 432cb04d42..727a0f5651 100644
--- a/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{315270DE-3D17-4865-8217-2F4C3A3553E2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj b/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
index 2a3bc61adb..3cf5d88255 100644
--- a/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A1FA3C71-3005-413C-8874-2D944567215B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj b/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
index d94cd6bae3..5aa24998ea 100644
--- a/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D84625F2-F0FF-42B9-BE7F-6C3322B92970}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj b/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
index af8eba0102..3323d43410 100644
--- a/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9103B277-05CF-4063-8C10-9106474A2FD5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj b/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
index 8734a1479e..138f1b36be 100644
--- a/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F8B0F993-E1A5-42AE-AF3E-F15ABEE8EC33}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/switchinfinally_d.csproj b/tests/src/JIT/Methodical/eh/interactions/switchinfinally_d.csproj
index b85cf227a9..26adb498a5 100644
--- a/tests/src/JIT/Methodical/eh/interactions/switchinfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/switchinfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{46F9E6BB-7EC8-402A-9D81-AD9CF6CFFA27}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/switchinfinally_do.csproj b/tests/src/JIT/Methodical/eh/interactions/switchinfinally_do.csproj
index caf99b9694..1d89875253 100644
--- a/tests/src/JIT/Methodical/eh/interactions/switchinfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/switchinfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6E0304C7-64F1-4099-8C16-CE91AEC08A5C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/switchinfinally_r.csproj b/tests/src/JIT/Methodical/eh/interactions/switchinfinally_r.csproj
index 484fdd15d8..4f0509e33e 100644
--- a/tests/src/JIT/Methodical/eh/interactions/switchinfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/switchinfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5EB85BED-9B18-486F-980C-1E16A15D4F35}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj b/tests/src/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj
index 3f5bea6c67..570a66c15f 100644
--- a/tests/src/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{29B438CE-3CF8-4BCC-817C-7BC806BA235C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj b/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj
index 1d83303f8e..22362d46a8 100644
--- a/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj b/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj
index 9e885d8b67..0f92fd15d4 100644
--- a/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj b/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj
index 5a6877c544..c237312cb4 100644
--- a/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj b/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj
index 6fc6eb995d..d6443bb9da 100644
--- a/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj b/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
index f951e6ba69..ba26618633 100644
--- a/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
+++ b/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{40C4B8EF-FF73-43D2-A6B6-C1591A8C83A9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj
index 568334e8d8..f81d81d39d 100644
--- a/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj
index 1bfd8beb91..024e5366ea 100644
--- a/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj
index 729ec684b8..0eeda11772 100644
--- a/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj
index 95597054bf..6d74a36585 100644
--- a/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj
index 02bd45afd0..e09d12175c 100644
--- a/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj
index d37c93f1ab..2825de2e06 100644
--- a/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj
index 51c2611162..93182610d5 100644
--- a/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj
index 7b0e7f4312..2df3c21e64 100644
--- a/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj
index 3d4f234781..d536512f7b 100644
--- a/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj
index be3d539913..34ab13fc0b 100644
--- a/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj
index 6e56011168..d51cfb0706 100644
--- a/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj
index 86d77dc967..c75fb6a8e8 100644
--- a/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj b/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj
index 885695263c..fbc30bec5a 100644
--- a/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj b/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj
index 5c3e1cff08..9a16454fab 100644
--- a/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj b/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj
index 0048f8fceb..bf0b8454d3 100644
--- a/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj b/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj
index 927fe1fdfe..c74789af69 100644
--- a/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj
index 83eb805a9e..2cc2ef6d3b 100644
--- a/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj
index 486e0d1c22..a56f8daa16 100644
--- a/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj
index 9fc6eca6a0..28436f2135 100644
--- a/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj
index ff7128f798..b385132597 100644
--- a/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj
index fbde21e6ac..841379707b 100644
--- a/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj
index b60a657d60..8d560bb8b5 100644
--- a/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj
index 4e948ff7f2..23ddc6c2c9 100644
--- a/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj
index fdab756636..3dc25d63bd 100644
--- a/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj
index dd12873485..fd9a8d7730 100644
--- a/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj
index dc0dfb7341..94fc513da2 100644
--- a/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj b/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj
index cea98534e5..f7b3a43bbc 100644
--- a/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj b/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj
index bf438b5ae1..69e16adff0 100644
--- a/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj b/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj
index 20538c343f..2ac3b12c52 100644
--- a/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj b/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj
index 1d37d3a693..885ce63e82 100644
--- a/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/oponerror_d.csproj b/tests/src/JIT/Methodical/eh/leaves/oponerror_d.csproj
index 1d01cfa01a..f65e675903 100644
--- a/tests/src/JIT/Methodical/eh/leaves/oponerror_d.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/oponerror_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/oponerror_do.csproj b/tests/src/JIT/Methodical/eh/leaves/oponerror_do.csproj
index 0e45a4785b..f7fe6efcd1 100644
--- a/tests/src/JIT/Methodical/eh/leaves/oponerror_do.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/oponerror_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/oponerror_r.csproj b/tests/src/JIT/Methodical/eh/leaves/oponerror_r.csproj
index 453d9394e9..b5233f5222 100644
--- a/tests/src/JIT/Methodical/eh/leaves/oponerror_r.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/oponerror_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/oponerror_ro.csproj b/tests/src/JIT/Methodical/eh/leaves/oponerror_ro.csproj
index 5f51019be6..524fec3396 100644
--- a/tests/src/JIT/Methodical/eh/leaves/oponerror_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/oponerror_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj b/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj
index a147843af1..16a0997924 100644
--- a/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj b/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj
index 43efc954c5..cd39df9029 100644
--- a/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj b/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj
index 01ea7c2409..3c298bab93 100644
--- a/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj b/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj
index da57ea5372..f35529aedc 100644
--- a/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj b/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj
index 33b1408bd5..aec74fe4fd 100644
--- a/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj b/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj
index 06c45b0058..dc9027d481 100644
--- a/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj b/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj
index d292b27c24..5e6a77967a 100644
--- a/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj b/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj
index 0197fe54fc..d2819506a0 100644
--- a/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj b/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj
index 30e2126d27..7fffb44b82 100644
--- a/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj b/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj
index 7d8f3ab43a..cafc42dbb9 100644
--- a/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.ilproj
index 06046ed7ee..92164ce055 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.ilproj
index fb866d5d6d..6d2c70c109 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj
index 264b0de07a..bb98b2d6e1 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj
index 53e8ae9130..ea496d6896 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj
index a738439441..30b1d4e93d 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj
index 6535f78544..655c930b87 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj
index 671607c2d1..25dd883ad9 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj
index 27f6f0b3d5..93c36efa1b 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj
index c630a40c76..1d9cb26cb2 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj
index 10250aa156..a9322b641e 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj
index 1d1894a45f..1a7ff12399 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj
index 6ba7f5437f..9e0e861e3f 100644
--- a/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj b/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj
index 1456424651..a89c4ac04e 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj b/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj
index ad2c19e39f..dfbc286855 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj b/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj
index 98d15bf2b8..dd60a1da82 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj b/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj
index f38547685b..3ea82416b5 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj b/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj
index efe44a899b..87ed4ff871 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj b/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj
index cbe9d6548c..3adf406a20 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj b/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj
index 7a261f2a8f..af2792c956 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj b/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj
index 6c3fa2f8d7..7e062d56ae 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj b/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj
index 61568eb7fc..9e69b8695e 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj b/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj
index ed91139ef1..869f633f0c 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj b/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj
index b954b273a5..ea6446e6a7 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj b/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj
index 8589e17ba6..f7486cff2c 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj b/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj
index f9f4583dfb..2daf078604 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj b/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj
index 84913dbdde..49f3a7c0ec 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_d.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_d.csproj
index 148a89d02c..e66e53d58f 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_do.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_do.csproj
index 16e3415463..347880c024 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_r.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_r.csproj
index 48b6dd5dba..cf0b15d9d5 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_ro.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_ro.csproj
index 7ca9424895..2f945fe5cc 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj
index 209b773dd8..8f4026fbb4 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj
index 6036595feb..aac9367ea1 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj
index 2601c4548f..dba0485a2d 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj
index 26c68e594c..6d5ec883ee 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj
index edc50fed98..86d5116376 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj
index 4365b3c493..591942f394 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj
index 838d578e87..75cbd19c0c 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj
index fd0a6ad77d..5f19c397b1 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj
index beeaeca08c..e5d6769cd2 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj
index c65fd145fd..e0657c0453 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj b/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj
index daf8db62e3..521c8f905b 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj b/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj
index b7d0348d04..36ba2da691 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj b/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj
index 7349e7cc8e..ec5b25dc10 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj b/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj
index ba7baf2980..dc91b07e08 100644
--- a/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj
index aa08eba978..0672c8b73a 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj
index bca0558179..ac1b7fb6fa 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj
index 4e6e866f2f..88e3f60003 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj
index 1d421eb03a..5e25c5f521 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj
index 4734ad561e..babf3c370d 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj
index 157aabb856..c45fdbdbf2 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj
index c72d11e114..84ec7742e4 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj
index 311a789a57..2d1502cfcf 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj
index bf0e9b48a5..1de74cfa3c 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj
index fb0b0d853d..6bfea5e3b2 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj
index a1531ceb33..6751d7e3e3 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj
index eb1149fbf3..e1944b9e5b 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj
index 0ac17c254e..1f844d8979 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj
index 9057879443..aadcb95e1f 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj
index 2cf222b4c4..ab27ee25a0 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj
index e5129ee912..f7d75cafbb 100644
--- a/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj
index c730c31f5e..f06e649d2f 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj
index 15fa393ea0..eef1e13848 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj
index a40d9359fb..b44a59b843 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj
index 4baf4d6606..0c4e41639e 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj
index 25d3ce53c5..f2f5e5df47 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj
index 1bdcd2f655..8e0a5b6e81 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj
index 193d24b5f8..b674e37911 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj
index a9bbbe43a5..6be68b4093 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj
index 606b7eb89d..99954fbe97 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj
index f258fb7407..f9c2b09d48 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj
index d656af173f..54f12d7348 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj
index 0e9eb69a47..1730d6cac9 100644
--- a/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj b/tests/src/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj
index 18cfa5b9ec..2b6372ce6e 100644
--- a/tests/src/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj
+++ b/tests/src/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj b/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj
index aa84748877..382b88b8c3 100644
--- a/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj
+++ b/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj b/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj
index d3c3af4c37..00b496c2d0 100644
--- a/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj
+++ b/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj b/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj
index cc26068c4f..b593658c2c 100644
--- a/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj
+++ b/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj b/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj
index 2cfec2c127..5c70e4259f 100644
--- a/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj b/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj
index 2d54acac9e..1b45f36b53 100644
--- a/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj
+++ b/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj b/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj
index d8129dfeaa..1ed903073d 100644
--- a/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj
+++ b/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj b/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj
index ac4d261d44..8c81b4e421 100644
--- a/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj
+++ b/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj b/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj
index 232fd8727f..ff25394ba2 100644
--- a/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj b/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj
index 690d43d097..97a3106eab 100644
--- a/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj
+++ b/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj b/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj
index fdf84f557d..e57a56c592 100644
--- a/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj
+++ b/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj
index ea2ffb5158..652b252323 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj
index 3753b34764..11ded02965 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj
index 2fa1428931..f87e16e534 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj
index a71a2a2184..0e56ad2bdf 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj
index 1eb3d02c6d..72558f21ef 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj
index bfa252ff56..77159a93a3 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_d.csproj b/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_d.csproj
index 8e3a2ed9bb..48f52f4b8a 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_d.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_do.csproj b/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_do.csproj
index b9c63c65bb..62fcc7ba40 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_do.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_r.csproj b/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_r.csproj
index 5af044a7ce..a96f127432 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_r.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_ro.csproj b/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_ro.csproj
index cd091bd0c8..979561fbef 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/rethrowwithhandlerscatchingbase_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj b/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj
index 09c348d0d6..17c8a5c713 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj b/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj
index cd41840ba4..5c98bea014 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj b/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj
index d6e85df665..6b61d377b1 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj b/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj
index 627dd8ad0c..4842ff5b9f 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj b/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj
index 1bb95fa1a4..bf9e627964 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj b/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj
index 8e3de6bf61..e7ce0a8446 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj b/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj
index dedd716fd8..bcbd69c567 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj b/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj
index 6e90fb3167..e2b95d8108 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj b/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj
index c387a63660..3645de9b33 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj b/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj
index 7993eb2ece..a6db2a369c 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj b/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj
index 22a2d735f5..c7b5ed4208 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj b/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj
index 4e3aa3c37c..c086f91ccc 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_d.csproj b/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_d.csproj
index 8b00e82cbc..5f880140f6 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_d.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_do.csproj b/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_do.csproj
index 2b6a2a6247..1cdd086429 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_do.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
    </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_r.csproj b/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_r.csproj
index 4a5b05ac0e..3413a63b18 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_r.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_ro.csproj b/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_ro.csproj
index e6d4242987..dee58d0d32 100644
--- a/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_ro.csproj
+++ b/tests/src/JIT/Methodical/eh/rethrow/throwwithhandlerscatchingbase_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>    
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_c.csproj b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_c.csproj
index 4f3c5198d9..1057cecdc1 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_c.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_c.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{08B1F637-A1C8-49FA-88D8-FB37C4A9D9BC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f4.csproj b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f4.csproj
index 21c5ad35fa..9a1c09f30e 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f4.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AD96E098-C723-4D1F-A3CD-54A7EA2A8DB7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f8.csproj b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f8.csproj
index 9851ea770b..3e9713783d 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f8.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f8.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A5D8EA2C-CF59-472D-BB3B-4DD8A7DEF87E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i1.csproj b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i1.csproj
index 25a54b6b60..6fcba18d98 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i1.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{48CBCF4D-D50D-4D56-9851-F01B935F9FA7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i2.csproj b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i2.csproj
index 14d98a3f55..a232fd378b 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i2.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B7BF440F-34EC-4FE0-A3AC-440995B4E0E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i4.csproj b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i4.csproj
index 3bbef8d878..6a366ac7fb 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i4.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0EF9D522-85FC-47E7-B073-6CF7EF35D887}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_o.csproj b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_o.csproj
index 1ecb570300..9eb5dad4d0 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_o.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8603865F-ED03-4B83-88F4-13960697AC22}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_s.csproj b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_s.csproj
index f031d48947..80edc7334c 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_s.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_s.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{16CB4750-BA9A-4883-8C2D-A8B8D135FA2A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_c.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_c.ilproj
index 1245d4829f..73c659a6d5 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_c.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_c.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f4.ilproj
index 4df0566b19..766fd61f3d 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f8.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f8.ilproj
index fab7d671d8..eb297e5424 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f8.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_f8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i1.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i1.ilproj
index 6201e57570..d364dc3c42 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i1.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i2.ilproj
index 3bcd406995..34115ec2d6 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i4.ilproj
index 71ea465253..4bc479064c 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_o.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_o.ilproj
index 4531fd1577..38e2896d7d 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_o.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_o.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_s.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_s.ilproj
index 56067e213c..ae6af64472 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_s.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefarg_s.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_c.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_c.ilproj
index 8634617c2f..04ebf13bea 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_c.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_c.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i1.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i1.ilproj
index 93096b0e21..72c4e8cfc5 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i1.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i2.ilproj
index 6b7a0f1403..6b0cfc8c4e 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i4.ilproj
index c258a0275d..324a8f198e 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o.ilproj
index fb2bea6dd9..f013fed58c 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o2.ilproj
index 70fefb4ed0..81542af86d 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_o2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r4.ilproj
index fe5d46c323..5266c01508 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r8.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r8.ilproj
index c1341fdb51..bdb3e805a3 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r8.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_r8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_u2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_u2.ilproj
index 5c3f3ef087..305500075a 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_u2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_dbgrefloc_u2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_c.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_c.ilproj
index 2824d3941a..8872a5e1b8 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_c.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_c.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f4.ilproj
index 6687c72366..39890b2757 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f8.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f8.ilproj
index f4562f698c..304d7b8659 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f8.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_f8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i1.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i1.ilproj
index fb8e5375e0..ed30ba9c27 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i1.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i2.ilproj
index 223e12293f..17304d92cc 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i4.ilproj
index 75926f7879..01496fcdcb 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_o.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_o.ilproj
index 575d509568..4af13a5dd4 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_o.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_o.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_s.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_s.ilproj
index 0f098ba9be..5fd7d77c6a 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_s.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefarg_s.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_c.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_c.ilproj
index 4ca1eeb036..64f43c638c 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_c.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_c.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i1.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i1.ilproj
index 07d208a4b5..e95d9ec25f 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i1.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i2.ilproj
index 905933bd8c..cae8bfb203 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i4.ilproj
index 0adbe68b29..208c4d56f6 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o.ilproj
index ec1f50d1e9..a889ce4058 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o2.ilproj
index 1ab17a5506..7a436e4978 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_o2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r4.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r4.ilproj
index 0cfc8fee63..d58968c444 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r8.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r8.ilproj
index a030bce261..0889d94991 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r8.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_r8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_u2.ilproj b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_u2.ilproj
index e688f4015a..d4592b864e 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_u2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_il_relrefloc_u2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_c.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_c.csproj
index 326fcf255e..789923a9e2 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_c.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_c.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{979D89AA-7B08-4A81-A210-A78152FCFEC9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f4.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f4.csproj
index 6ae86610d7..b8ee9323e5 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f4.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DABA4519-FAA5-4920-ADA9-14C97643F9E9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f8.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f8.csproj
index 0b3bd4d55c..247e91ec4c 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f8.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f8.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E754D107-EFF0-484B-92CA-4A1813E74CF7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i1.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i1.csproj
index 1c6200aa22..eb8cd4f270 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i1.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B442D811-8360-4821-A993-F3370E1A4706}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i2.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i2.csproj
index c8a54c1769..ede0ef8534 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i2.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{62F221E1-FAE2-47CE-BC47-D5E70DF062C6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i4.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i4.csproj
index 87b1c4a5fd..b4b1f71699 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i4.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B67EDCB0-EFB7-4D75-ABEE-B52D4E3D26F0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_o.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_o.csproj
index b3452fc291..97fd47f650 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_o.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1FC52C10-A9A7-47D7-8AB2-B381FD8EF3BC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_s.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_s.csproj
index f2fe870dd4..45de96289a 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_s.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_s.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C1097342-3E8F-41E5-BF2F-27632CFEB916}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_c.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_c.csproj
index 4aa56ac3bd..a996834c0d 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_c.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_c.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A1182F90-D24D-41E5-A8B1-401CEB96EDE7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f4.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f4.csproj
index 2a74cc9410..7260540f02 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f4.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AF1DA2B8-1207-41EC-B450-CBDC4159B38A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f8.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f8.csproj
index 44565acc9f..8da7d14f73 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f8.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f8.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9B56074F-2439-4551-A6FD-1FE930CAAEB2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i1.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i1.csproj
index 2d86fa2a82..047f344e31 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i1.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8A43CA3A-D78B-42F0-801B-2C9BA15BCD87}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i2.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i2.csproj
index 57bcbd1c80..b7c611d620 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i2.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BC70BE71-FCC1-43E7-B0D4-6FA08ADA48F5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i4.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i4.csproj
index 037ef3ca04..26b3c7a985 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i4.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{60E2DAC3-00D4-468D-A9E8-756F7F07E792}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_o.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_o.csproj
index 4edde6a6ef..badf14f12d 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_o.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A0191131-99CA-4D0A-BBED-0C348E5AAC98}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_s.csproj b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_s.csproj
index a811fa0057..d42595fe27 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_s.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_s.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{970BD1E0-DB96-45B0-8482-B04D83198210}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_c.csproj b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_c.csproj
index c3855a46a2..1f0c199878 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_c.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_c.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{68B564EC-9CB2-4937-B1B3-DF59EB44AEA7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f4.csproj b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f4.csproj
index 865b036bdd..20554af243 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f4.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B31A4B6A-8EEF-41E5-AAAD-157BE431B6A4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f8.csproj b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f8.csproj
index 91f5344ee8..69524e0b6a 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f8.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f8.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CD736B39-3BCC-4328-A022-1958860C747C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i1.csproj b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i1.csproj
index 072e9d688d..b3d2bb3398 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i1.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4ABB8EED-D61E-41CC-8A74-1A8E35B0DB44}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i2.csproj b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i2.csproj
index 5e17a7b0e8..492a16fa5d 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i2.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{360AD8A0-E8A0-4627-86F5-2405ACE6B6F0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i4.csproj b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i4.csproj
index 6ad196b9f9..201e71c6cf 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i4.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BB807CC1-C13E-496F-9427-760F9D24E4A5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_o.csproj b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_o.csproj
index fa209a0cda..f204fc09c1 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_o.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D152BC64-BF23-43D2-8599-A1B150EF901F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_s.csproj b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_s.csproj
index c0f36d06d7..a1f71c8bde 100644
--- a/tests/src/JIT/Methodical/explicit/basic/_relrefarg_s.csproj
+++ b/tests/src/JIT/Methodical/explicit/basic/_relrefarg_s.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{606BF6D4-1A30-40FF-96DE-3ED738C9F17C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_d.csproj
index b5bbc45b6d..57e09e18e7 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_r.csproj
index 94542ecf8b..95b48e3877 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_byte_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_d.csproj
index d5c38bb0e0..4d564f890d 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_r.csproj
index d17f69d3d0..86533b4094 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_double_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_d.csproj
index d4d4e8b9ac..92c34e4b68 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_r.csproj
index bb9bf8e3b4..5318d20599 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_float_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_d.csproj
index 62ba863cd6..1237990e23 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_r.csproj
index 5fe0a35e5e..9beec0ce9d 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_byte_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_d.csproj
index 118a2ceafc..876c37fffb 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_r.csproj
index 2c123483b5..6edf4b673c 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_double_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_d.csproj
index 1c22583d6b..7ad061b2cc 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_r.csproj
index 07e139dbdf..796da30532 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_float_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_d.csproj
index b40d47939d..4d324b5c12 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_r.csproj
index 2305708215..26a2b83dfa 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_int_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_d.csproj
index 1db15050c6..5666e35c01 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_r.csproj
index bf15bc4488..ba40918c1e 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_long_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_d.csproj
index 73da151e95..ab778c9c75 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_r.csproj
index 3abb81436a..1ae75e79fb 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_obj_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_d.csproj
index d1e37e9841..6dae13ae06 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_r.csproj
index ab806ef61d..51f556e68e 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_short_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_d.csproj
index 72b8193c97..f7a2345543 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_r.csproj
index d0d55f412b..d48296f8e1 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_gc_val_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_d.csproj
index 0dedd42236..643f250c82 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_r.csproj
index fc2251947a..0176b16292 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_int_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_d.csproj
index 5cfd1a3ade..d8e448929e 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_r.csproj
index 14d46293a4..633b8b4961 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_long_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_d.csproj
index 30aade9d95..e68bab8455 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_r.csproj
index 556ac7ca9e..ab062d2aad 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_obj_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_d.csproj
index 160bc2013d..93bb796d71 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_r.csproj
index f3a6ff7f08..3c15b7436a 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_short_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_d.csproj
index 7ee6c7697e..378a05b351 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_r.csproj
index ef56f23ed4..484608a6f3 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/expl_val_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_d.csproj
index fcc4e06aa4..887797e3a7 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_r.csproj
index d39acb8963..f48e0a3b9e 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_byte_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_d.csproj
index 2f58043043..dbcc699bfb 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_r.csproj
index c25081c154..d934c77bb5 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_double_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_d.csproj
index ebee5956c2..9ffe533324 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_r.csproj
index 1f88ca451d..5214f09631 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_float_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_d.csproj
index 543f370390..036e0608e9 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_r.csproj
index 7ff0503ed6..75f2b4166f 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_byte_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_d.csproj
index 98145a4d44..21817bf161 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_r.csproj
index f103e26c30..6608bf74f9 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_double_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_d.csproj
index 2d8f69b241..8688f2df87 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_r.csproj
index 075b48ff7e..6079025f79 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_float_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_d.csproj
index 168d90cab3..fed4f44b0f 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_r.csproj
index 4bf12ddddd..06433d9ccb 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_int_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_d.csproj
index 379ec5313a..8b0edfef49 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_r.csproj
index df114a9193..80a82e1528 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_long_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_d.csproj
index aba41c7868..d02fe03e20 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_r.csproj
index f6a9a43318..26690daaab 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_obj_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_d.csproj
index 6a85fe944a..6837902c12 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_r.csproj
index 3208856bcf..1022bcbdcb 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_short_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_d.csproj
index d9eff260bd..d2219ad16a 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_r.csproj
index d6b1974be0..ceb66a13af 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_gc_val_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_d.csproj
index 15818b1b83..9a2097fbf9 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_r.csproj
index 5a3240a388..3b25bbcdd4 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_int_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_d.csproj
index 3ae9c3d4d4..ed38ff6bbb 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_r.csproj
index be12491167..e4f40adeb0 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_long_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_d.csproj
index d981ea1e6b..a4e5d35a0c 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_r.csproj
index 03bc94ccd7..8b89748226 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_obj_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_d.csproj
index e3025edbea..2799cd806e 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_r.csproj
index eddc85be0d..736ab03fbc 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_short_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_d.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_d.csproj
index 0d599d9b21..4ccdd9dde0 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_d.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_d.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_r.csproj b/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_r.csproj
index e3cf69aa3f..a38437ba97 100644
--- a/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_r.csproj
+++ b/tests/src/JIT/Methodical/explicit/coverage/seq_val_1_r.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>false</RestorePackages>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj
index b918cdbe0f..04c359a95c 100644
--- a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj
index b844cc75c1..58348aee64 100644
--- a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_gc_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="expl_funcptr_gc.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj
index 807673c396..9490c22576 100644
--- a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj
index 17c58dc7bf..6189a179d9 100644
--- a/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/expl_funcptr_val_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="expl_funcptr_val.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj
index 8ee37df5a2..6f461818f0 100644
--- a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj
index 4c6a8e3a9a..0eeaf28065 100644
--- a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_gc_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="seq_funcptr_gc.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj
index 177c61fcdb..76de06fa3d 100644
--- a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj
index 81182c64e9..046aaa4080 100644
--- a/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj
+++ b/tests/src/JIT/Methodical/explicit/funcptr/seq_funcptr_val_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="seq_funcptr_val.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj
index acaee30c51..34632787e5 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F9BF6F07-4FA2-4617-8B85-C1AF8ADE7852}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj
index 2475f34fa1..8639d7e554 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CA25FE8B-ED22-4717-BCF1-9038C1025531}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj
index 5e59c15c86..11a9b8c530 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E04B4FE7-3294-4E7E-A58E-3F72A2E46012}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj
index f365b6765a..c05fedae36 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{50915858-F3A0-4A59-A472-19DD972E12BD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj
index 4be4e50f58..96e7ce78cd 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{55A905BA-153E-470E-B43E-83B83F2A4076}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj
index 9341d7f4d6..aa3a3e8033 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{25C5CB08-72E4-410B-9668-55EC29A3F014}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj
index 094c3638a0..8e5d371373 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{86D05636-6F57-464F-BA67-58052EB5D261}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj
index cf12b5633c..5a08193e89 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9DCD37F3-0AC9-4B60-A149-C319029AB84C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_f8.ilproj b/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_f8.ilproj
index 6ce3c57bf4..9fe5061769 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_f8.ilproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_f8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_val.ilproj b/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_val.ilproj
index c21bb8ee10..c291e62d7c 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_val.ilproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_val.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_f8.ilproj b/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_f8.ilproj
index 51cc8568be..c428a57632 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_f8.ilproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_f8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_val.ilproj b/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_val.ilproj
index 8989522ae2..39879102ea 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_val.ilproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_val.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj
index 6692b94bf2..8cb0504d5a 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8FF63B36-14E7-4C4B-B099-594D645323FC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj
index 1d27647791..652a7f26a8 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9D46012C-E0C5-42DB-875E-D629CDDA6FD0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj
index ed566b24c0..5d63dda728 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{11C8526B-518D-4138-9B36-779D7BC58EAB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj
index d5691b421a..6019399a12 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8EDB1CA5-1F39-40B8-B6E0-6540D31CA266}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj
index 635b20eda4..441c38a705 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C0DC33BE-4E18-4920-85AD-2FDF6ABBD7A8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj
index 6fce56f207..25c38eacb5 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E152E1B5-574E-438A-B04B-A58CB8DAB8BA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj
index 83a965d181..01ab2d2585 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0A0A16D6-628F-4768-BB81-DD16FEB98B7F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj
index 4574362b5d..d8745ee0da 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4ABC5E77-9279-413B-9BEC-D6513A782256}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj
index ae4e5e80c2..84bd57e889 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D71F6CCC-0D67-401C-916C-0529571FC431}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj
index b440fdcf2d..7b889a459c 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{88B9A0E6-0ADB-4EB5-85A1-652233306A79}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj
index 99fb9e545c..96c978b783 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{68DAD312-A648-424D-A134-922AEFA15413}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj
index 5f32aa8eb8..eb30192774 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FDBD6454-A0A1-4671-8E70-FF152BD1DE77}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj
index 0b059be3f0..fba20a5c1a 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DBC6F9F2-7364-46FE-8694-1D135DF355A0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj
index 107c5e860d..9a0c1a0fbd 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{45333B47-E509-41CF-9627-4EF137D9B249}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj
index 4444856728..419628704e 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{22B4CD80-3644-4D24-A67D-645FE3844927}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj
index 1b36d9a2f1..da1447e402 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0BB2EF5F-8151-46D8-BBE0-7E2A2CA1F10B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj
index 2492bef417..84c955c287 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D699CFA0-477E-4107-8C40-FF40583040C9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj
index bc16317bd5..ef9444f251 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E8FD1A9F-3ABB-4A39-86E2-FCF0B1ACF637}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj
index 6f00a1b6a9..d1c3e3df78 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{867151F8-7CC6-42A8-AA43-56FAA17C5765}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj
index 3180325771..191eb379d9 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{227AAE83-0144-4EFA-8578-1F9AA3EF12B3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj
index f4fe25c7ba..4627c49af9 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B85BA308-7EBB-4926-8ED1-9F2120FC8F71}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj
index ae8c7324aa..e0bb19ebdb 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D7CA7EF2-F816-47AA-8590-1AC0920E2C3E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj
index 20d95f10e8..d78e5bb5ea 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0D793897-35AF-4F89-AE80-764E25987B68}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj b/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj
index 322e19700e..437b31e4c2 100644
--- a/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj
+++ b/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B2022BE8-2907-44A4-B3F1-9608DD31E1AE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_double.csproj b/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_double.csproj
index e063d6316b..d2bf2648c4 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_double.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_double.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{533A348E-8B43-4135-9C11-ADC4D0A9A99B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_float.csproj b/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_float.csproj
index 63207a81cd..cd764e16a0 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_float.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_float.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CA713167-3F0D-4B7B-896C-8AF75F707D7E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_objref.csproj b/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_objref.csproj
index 4cbab0dada..023c3b11ee 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_objref.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_objref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{27B2EA55-C6A3-48B8-9FC8-BB8C418BA3FB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_valref.csproj b/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_valref.csproj
index 305264c6f0..1be5de1fd2 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_valref.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_valref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2CF0B708-C4D5-46A9-A1D7-3201A8F1D489}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_double.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_double.ilproj
index 8496b2bee7..19b1ba6a84 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_double.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_double.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_float.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_float.ilproj
index a2c85f0315..628f0361c5 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_float.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_float.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_objref.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_objref.ilproj
index 64d27c3f05..0b885b128a 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_objref.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_objref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_valref.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_valref.ilproj
index faeb1acca2..8f72146c43 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_valref.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotarg_valref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_i4.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_i4.ilproj
index e46c651279..5478bc47f5 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_u2.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_u2.ilproj
index 4a40156eb7..7040fa5e0e 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_u2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_dbgrotate_u2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_double.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_double.ilproj
index c19d943b28..4881cea906 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_double.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_double.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_float.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_float.ilproj
index 37525b7bff..56b84fe517 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_float.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_float.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_objref.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_objref.ilproj
index a99768e9d3..167ce9ff1f 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_objref.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_objref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_valref.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_valref.ilproj
index 30fd94afd2..7af2107fdf 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_valref.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotarg_valref.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_i4.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_i4.ilproj
index 3b789f5be5..93d80c0ea0 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_i4.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_u2.ilproj b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_u2.ilproj
index f145279971..8d41758232 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_u2.ilproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_il_relrotate_u2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_double.csproj b/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_double.csproj
index 543e690646..d5d2ba1460 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_double.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_double.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9D7C6C0B-67C9-4EBA-812C-427B2747786C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_float.csproj b/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_float.csproj
index e30320d446..c881560c71 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_float.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_float.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{06D52326-FE15-410B-83CA-E9296A80664A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_objref.csproj b/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_objref.csproj
index 7625193836..feb60b5299 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_objref.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_objref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{50E1DFB4-FB0E-49E0-A77B-F97D4CF44ED5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_valref.csproj b/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_valref.csproj
index 652720ac09..54fecf2393 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_valref.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_valref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E44CE525-A845-4B61-95C3-4DDDCC3D1C44}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_double.csproj b/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_double.csproj
index 74bf84ad1d..c217d30c63 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_double.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_double.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B201911C-100F-4BBF-AC74-37A7A6E29240}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_float.csproj b/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_float.csproj
index f0519e1449..3ec461bc8a 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_float.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_float.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ADE6100D-1E8E-4E38-AC33-DEA0614EA7A0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_objref.csproj b/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_objref.csproj
index eda26ce4b5..a44bc84cb3 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_objref.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_objref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9E38776B-AA0D-4B79-AD1B-8B49628748B4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_valref.csproj b/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_valref.csproj
index 40d4863300..ba65f38b7c 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_valref.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_valref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E72EAA3F-8428-4A2E-A079-26519312086A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_double.csproj b/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_double.csproj
index 7f194e07f7..41353bab98 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_double.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_double.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4A8F7FB2-CD5C-4FD9-A8C4-9C8195A4C871}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_float.csproj b/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_float.csproj
index dae35a2c89..e71cdc1be7 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_float.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_float.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D480AED3-2286-4034-A5E2-42C7A0014DC6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_objref.csproj b/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_objref.csproj
index 8cc4c11182..649cd89478 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_objref.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_objref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{23D00E82-5CE3-4C54-AE96-7A2D53811791}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_valref.csproj b/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_valref.csproj
index 1d59773823..c0a454bcaa 100644
--- a/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_valref.csproj
+++ b/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_valref.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E17FE022-D37B-4739-BAE4-BED63DE3837F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj b/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
index 7d86f869e8..ab5496c701 100644
--- a/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{38E931AD-E0F1-4BA9-B9DA-851D242EFC37}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj b/tests/src/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj
index deb14ef432..373451026e 100644
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/ILStackAllocRepro.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj b/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
index 695b82ba7e..aee0682a2e 100644
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C0AF51C0-3FCE-4328-8121-6592E9E8AC18}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj b/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
index d5734d6d97..fec62f096b 100644
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0252FB51-FEFA-4CF1-9EF3-5EB35C554372}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj b/tests/src/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj
index 173cb8dda9..ef14f4a39b 100644
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9B5AD16F-BD22-4238-B2D6-4257177929A5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="moduleLibrary.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/moduleLibrary.csproj b/tests/src/JIT/Methodical/flowgraph/bug619534/moduleLibrary.csproj
index 7fee87c670..b6b9036bd3 100644
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/moduleLibrary.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/moduleLibrary.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{57A93F23-5D4F-4B04-B0BD-78C0470733B6}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript>
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj b/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
index b771d10b06..5126f07754 100644
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E5264C5D-3734-459D-B50E-AAC29135C045}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il.ilproj b/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il.ilproj
index fecd93a0e7..a2a626c90d 100644
--- a/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys_il.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="twoEndFinallys.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj b/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
index 9ae243f408..768a44944d 100644
--- a/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E6160387-CF75-4ED6-8E20-53C1033E20B8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj b/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
index 0c9a021b76..5e6c3f6a91 100644
--- a/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{01FE6087-00D7-4CD1-B8D7-49D3AB55BC64}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj
index cb82556e90..ef2224124d 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug642944/GCMaskForGSCookie.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
index 140382567e..532bba3c89 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7C847559-14F1-43D2-BD8D-8F9680655C31}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj
index a60993dd4a..8922cc4251 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
index aee96c13e2..eabb471cf9 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8A4CA30B-F404-439B-AFE9-056BCD22E27E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
index 97232bfaca..8526f4f96d 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{518617C6-D2B3-4845-8EFB-D3FC7B86FCCC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
index c1e706c481..3772e16474 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{14A880B9-CBA0-4AB2-A366-C0A481D4D2C4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
index 6453c497fc..f866eb7fc7 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5080B3C4-69B5-41BF-9283-E081CBAF94D5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/dependentlifetimes.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/dependentlifetimes.ilproj
index 0cb145443f..7fd07263c5 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/dependentlifetimes.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/dependentlifetimes.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj
index 01da435750..0e577d2f73 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj
index c694e263fa..718b116eb7 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj
index 38f034fd5e..d457dfb374 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/helper.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/helper.ilproj
index 71f156cfc5..fa7e692717 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/helper.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/helper.ilproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
index 519a943376..47f9031ecc 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DE8466D8-73FC-4F24-BACA-F501645D7F24}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
index 1016a36638..7476ff1743 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{70EDE717-BFCD-4BDE-923C-DDC57BB36A78}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
index 44a85f4b22..74990598ae 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{68C7D908-CA1E-4E4C-9FB2-708CDDDCE784}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj
index 96d18b7fb4..07596ce038 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/cpblkInt32.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj
index fec5202e6e..85c9e6d425 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/flowgraph.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj
index b2f65b2421..f6a2332e66 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj
index 10af1cfe1a..38b64195cb 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/indexMinusOne.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj
index e865782e4e..f5a6571b76 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj
index 431d2cdcd8..a7c3b30973 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug679955/volatileLocal2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj b/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
index 3eeb58397f..8ffa410446 100644
--- a/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
+++ b/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C8C6FE1B-24C6-4339-B659-0CF7C14A20E4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj b/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj
index bda4e6a21b..882d3067c7 100644
--- a/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj b/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj
index bc8b918091..7975463a63 100644
--- a/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj b/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj
index f640e548a1..bb3c91d823 100644
--- a/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj b/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj
index cb9aab6099..6314b65e98 100644
--- a/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj
index d99daae552..b145daf3d6 100644
--- a/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj
index 22a11605c8..73e7cf5a01 100644
--- a/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj
index 0a1000c6f3..32a9c2c9b5 100644
--- a/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj
index db68739b9c..38e693f6b1 100644
--- a/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj
index 6eec2fa515..ea6631c16f 100644
--- a/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj
index 1908eccebc..94fec00bfd 100644
--- a/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj
index 8c2073a9f9..0770853486 100644
--- a/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj
index bcf604a61e..77506e133d 100644
--- a/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
index a694797c3c..3f3747b93b 100644
--- a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
     <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
     <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj
index 08ab78eea5..6bb65b3031 100644
--- a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
index 4b75ff430d..777074735c 100644
--- a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
     <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
     <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj
index 095a469483..4aa948928e 100644
--- a/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj
index 56fb603a32..fd87717f4c 100644
--- a/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj
index 0a68e170bf..3b3fd405a3 100644
--- a/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj
index 615254b690..36d4030547 100644
--- a/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj
index 07f2138154..da78ebdb33 100644
--- a/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj
index 433baabd9e..30909f3a72 100644
--- a/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj
index e6c8e6e6c8..2fcce44052 100644
--- a/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj
index ce49d905c0..73749d97cd 100644
--- a/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj
index f02ce4e017..603da8fd44 100644
--- a/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj
index 3c5cf6ec95..75c50c3c1f 100644
--- a/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj
index 861073e177..45c7893d5a 100644
--- a/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj
index 3faa5fd1d9..5fc0f75a1c 100644
--- a/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj
index bd31b3e186..578c865f58 100644
--- a/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj
index 7f1b1be80a..dd885c7411 100644
--- a/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj
index 6edff23289..698ff6fffd 100644
--- a/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj
index 3a7508b770..18c2b3e41f 100644
--- a/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj
index 41a224035a..0bad417f05 100644
--- a/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj
index 110d620750..ca61cbd9a7 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj
index 22ffa7078a..c9b561c1b5 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj
index 323ea17df7..3f1c1b0663 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj
index 2516c8c526..e449044fb9 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj
index 56feba1e0d..05ca757875 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj
index f4581a31d9..dd86cde62c 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj
index 8237249d4f..729b56c742 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj
index e637c376ba..f608aabc1a 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj
index 50c8be2fbf..e46d638d32 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj
index ac96e82e8f..f2b8b73cf7 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj
index 06bac15097..eb0bc8a1f8 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj
index 348154dc34..43962c576c 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj
index da5e201509..333bd50e5f 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj
index 1e82686472..86231186ae 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj
index c514c48f58..c68547f1a8 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj
index ec3f3d6d05..b02ca7abbd 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj
index 5488886df7..3a40dadc3d 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj
index 9e8ad79f54..4a023791f4 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj
index beae351938..a31931c1e8 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj
index 2c799c40c9..e3cd634974 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj
index dc0e2d21d1..df8260b2c5 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj
index 350f019b3a..8ff2e92677 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj
index 0aa6c1bbc1..8ecab8b1c7 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj b/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj
index fa2df31ae0..15945e23d5 100644
--- a/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj
+++ b/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/inlining/boolean/test.csproj b/tests/src/JIT/Methodical/inlining/boolean/test.csproj
index 2dc8109674..210f3bd170 100644
--- a/tests/src/JIT/Methodical/inlining/boolean/test.csproj
+++ b/tests/src/JIT/Methodical/inlining/boolean/test.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/inlining/bug505642/test.csproj b/tests/src/JIT/Methodical/inlining/bug505642/test.csproj
index 1c6f443526..e1705c7c6d 100644
--- a/tests/src/JIT/Methodical/inlining/bug505642/test.csproj
+++ b/tests/src/JIT/Methodical/inlining/bug505642/test.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E0103068-EB46-4656-87E3-CF19AE878B11}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj b/tests/src/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj
index ae4636c5d4..1dfcca22d9 100644
--- a/tests/src/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj
+++ b/tests/src/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj
index ca52d6a3b7..b62692a15b 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F93B7BB2-940E-431E-8839-27BA4B19A37D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj
index 3b15053b1a..666cc4a017 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8690FDA6-ED8B-476B-B425-11B537AD3D1F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_dbghugedim.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_dbghugedim.ilproj
index 22e3483a87..2c686061fb 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_il_dbghugedim.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_dbghugedim.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.ilproj
index 003bdd08f3..2278a314f7 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.ilproj
index 9de0dbb9a4..164c6b3c60 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.ilproj
index 8d17baff6a..b3aa212468 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.ilproj
index be6addd8b2..581cad4348 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.ilproj
index 322abecaf7..914626e3a1 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.ilproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj
index 3ef7a1608c..d0cbec1914 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3E45A5A3-2EFB-4EA8-B4FD-48B18614D4BE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj
index 7bb12c0cb8..4589ebe2db 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B37628B7-CE24-421E-ADD9-8891841089F4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj
index ecbf298429..2775a2bea7 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AE280DF4-49BC-4E3F-9448-DF01AE2A79D6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj
index 414e7655ca..a0115ce3c8 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3E50722A-00C5-4325-9725-B3ED27E7C68B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj
index cf11ef64aa..7753e6227e 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{27089AED-EA60-4CCE-B935-6DE8E6B1A493}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj
index 9b10b161fe..e42971bcc1 100644
--- a/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj
+++ b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{10E43853-92BC-4942-87E4-552668E7D79A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj
index 5c466262f7..685e337e4a 100644
--- a/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{580FEFE3-992A-42C2-BB1C-8CEF9C685C94}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj b/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj
index 9868c4f89b..3805959bef 100644
--- a/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DBFE118D-00F9-482C-9805-F1A2B41F4A28}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/misc/_il_dbgbinop.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_dbgbinop.ilproj
index 00ab1f7cff..267b3328a4 100644
--- a/tests/src/JIT/Methodical/int64/misc/_il_dbgbinop.ilproj
+++ b/tests/src/JIT/Methodical/int64/misc/_il_dbgbinop.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.ilproj
index eeacede115..26ffe88bf4 100644
--- a/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.ilproj
+++ b/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/misc/_il_relbinop.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_relbinop.ilproj
index a6ba31640b..95d2498c0a 100644
--- a/tests/src/JIT/Methodical/int64/misc/_il_relbinop.ilproj
+++ b/tests/src/JIT/Methodical/int64/misc/_il_relbinop.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/misc/_il_relbox.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_relbox.ilproj
index 3b0df66ee7..1d17049f6a 100644
--- a/tests/src/JIT/Methodical/int64/misc/_il_relbox.ilproj
+++ b/tests/src/JIT/Methodical/int64/misc/_il_relbox.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj
index 4209aa6c1f..029ef67561 100644
--- a/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1A5C747A-F17C-4AB3-823F-48066B124D66}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/misc/_relbox.csproj b/tests/src/JIT/Methodical/int64/misc/_relbox.csproj
index 32e90550d9..b00abf00ba 100644
--- a/tests/src/JIT/Methodical/int64/misc/_relbox.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_relbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{02B9E9A9-A095-453D-BE57-77322656E398}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj
index a805c717c2..76cab15ead 100644
--- a/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C15DE2D2-D511-4E8B-99EC-310AB048ED78}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj
index 5d58eb11d5..59a1032360 100644
--- a/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FDCA396E-8F47-4D7B-A217-9A58C89906D4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj
index 295fdf0b8c..a8faa818ab 100644
--- a/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F429DB17-B746-49A5-867D-E1B01743506B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj
index 4f233f2262..d79934b288 100644
--- a/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj
+++ b/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CFDEEC08-B326-447C-87AA-DBDC8C162A0C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj
index 94cfec3758..9f9c0ea7a1 100644
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A9202F62-6B02-46A0-A746-3AB1642FAA32}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj
index 3de9be5b6e..c6e2922846 100644
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5D4B0BB7-BFBC-4E3B-A034-A495C0B9FF1C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj
index f4015c8a4d..12fdaab582 100644
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D4659BB2-3194-4E72-8F96-90D1D4C376E6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj
index 205d3acace..ca626350f7 100644
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{99A9FC6E-8554-442E-A563-79C591CD6080}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj
index 62303b6af0..c97feb18d7 100644
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F252D0B3-0048-42F4-BBEB-D383F580C8A1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj
index 626dfd4aa5..4bd26363eb 100644
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3668BBD3-D327-454E-993C-A21C14CF0681}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj
index 14f62f128c..9fc62fc876 100644
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{60D4A110-1B71-4533-B2B0-ADBA05183FCA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj
index e8dd83d13d..b59d7bbbe2 100644
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DAEE7438-D02A-4C30-BFFA-CADB1FA6EB80}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj
index 580ef43f39..c8f3064b55 100644
--- a/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{019C9789-1053-4D7E-9E50-9B0EEE6A185C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_addsub.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_addsub.ilproj
index 33f03435bc..16c8c467b4 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_addsub.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_addsub.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.ilproj
index 3800547f3d..aad770f90c 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.ilproj
index d123489264..d004c7ed6b 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.ilproj
index 4e01421de1..e1a831541a 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.ilproj
index 7be9524e8c..b83efadb23 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.ilproj
index f3d9167cbd..66eb126ecd 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.ilproj
index 7da2946829..cab4c0eb7c 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.ilproj
index d37a80f981..499beec4c7 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.ilproj
index c296507467..a2b1d96a2f 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.ilproj
index 402890f012..fb65ac060e 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.ilproj
index 5e410b86f5..c251a0988b 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.ilproj
index b10a757303..38634caddd 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.ilproj
index 005fa4c010..5ceacbac85 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.ilproj
index ab2659c0c4..8c171ad616 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.ilproj
index 6b9a84fc41..87edc7437e 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.ilproj
index f49f478339..78dd4dc750 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.ilproj
index ca1f565c95..e3b347a3fa 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.ilproj
index 9934d6e183..806873296e 100644
--- a/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.ilproj
+++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj
index 404a4bedbb..1253fe2b3b 100644
--- a/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E50F842A-A1FC-4EA6-8B34-4D158A7E072C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj
index 0c8a8c5152..3d26841b3e 100644
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D5770801-F36C-4DA4-8A58-69AE5CC4E888}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj
index 9a1d937313..17a497128f 100644
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1996DA9-E707-4E7A-81FC-03DEB87378BD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj
index 385f2664c6..c80e658a4d 100644
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2533F191-FA8A-4FA9-873F-79B6804AD2C8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj
index 79b55b2a3f..50795d737c 100644
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{465A464D-47FB-4CB9-8C90-ADF96BD3E89F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj
index e7f6f4fd12..a476185e40 100644
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{691593C3-E183-48E0-8D91-65E0201D7C0C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj
index 8379c26b32..3c2db375a1 100644
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D84D3EEE-222D-4927-A323-D0C224F3E573}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj
index 833ee112d8..02452b7249 100644
--- a/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CA30F7A0-9F57-4432-86D1-1A4F57B26BB5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj
index cc03d62aa9..5a6c24182e 100644
--- a/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DD08ED5A-41B2-456C-ACBA-DC402B3659C4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj
index 888612ccee..18dcbe7397 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{20A55E8F-A15F-498E-9C96-A21D548CFF5B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj
index 5dcba16b96..e1574cdd10 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E213A0BC-966E-4FBA-BFE1-DF4D8403E903}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj
index ed962ebadb..ca6a3a543f 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3F998112-300D-4E91-A63C-629716549E08}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj
index 0102722818..56de75e239 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{057C217E-A1F3-47E7-90EF-1381FA776873}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj
index 64b1f07ef7..05c03877c0 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DFF5F310-3B12-4EBA-9238-62676EB60880}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj
index 671de9101d..87806c2ef1 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0785FDAB-4D31-4685-B367-761E05C9D0EC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj
index 1cc15fab0a..c090727b88 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5ECA9427-7B2D-4152-A1CB-CC9B52EACF4C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj
index 9475659958..094f199827 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{739A4E16-C0EE-441D-94F4-ABCE480099D6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj
index f75761dcf9..7e3452a233 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B83094A3-CB33-4B53-8EC4-86D621B94969}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj
index 3e8890dbe2..04674f69a9 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7A66B167-954F-4759-9AD4-DF4646BD0FD1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj
index 54b1803cca..e290acfeb6 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3D92D0C7-EB79-442A-8FAE-2062967BB071}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj
index 92f5e29a01..63fe75ea1f 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{51B00A68-AA1A-4D5F-A5AD-4BCF699A972B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj
index b35b1e5caf..a2512a013c 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6B683E72-60F5-4FDA-81E4-E28AA2BA8793}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj
index e31c86614e..94ae71ffd1 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0A4F1EDE-F87C-4565-954F-9BB4463A3FD8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj
index d947b2b7ed..e84c3cbc1f 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0B633E06-28C1-4B74-9689-A8FBA27B8E16}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj
index 10b168cf2b..bf24cb42d8 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{79415AB2-2446-4237-B3C4-A7FFD441771A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj
index 2b2b2a4c84..eb4de0f4e2 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FEAB9B3A-BE50-4A52-A53E-058C80080DE8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj
index 8cdb4a0043..5406f3bbf6 100644
--- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9FF4BA69-374C-45A9-A086-454D7F0A1C3D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj
index 1326fe4b70..a0d334d3b6 100644
--- a/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4C56766C-B273-40B9-83A3-864587B27DCF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/superlong/_il_dbgsuperlong.ilproj b/tests/src/JIT/Methodical/int64/superlong/_il_dbgsuperlong.ilproj
index d63a37bd3e..ab5a35c34e 100644
--- a/tests/src/JIT/Methodical/int64/superlong/_il_dbgsuperlong.ilproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_il_dbgsuperlong.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.ilproj b/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.ilproj
index a56e16926f..ff3c291ea7 100644
--- a/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.ilproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj
index 8301ac7431..b412a218bf 100644
--- a/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9B09D580-688C-453E-8117-D3DE0CAA0C1C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj
index e508792b80..beb95b0f95 100644
--- a/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A6C400C1-33DA-4336-9D9C-1A61E96E82D3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj
index 457ad4c950..f255465f5a 100644
--- a/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj
+++ b/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3BE8DEA6-834C-4C98-8E6E-8FAF407EF7FB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj
index 430e376180..8a32039dfb 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9EE0D0A5-3C95-494B-9D8B-9B55D571A8DE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj
index dfa37b4947..02b03c1e08 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{108844DD-995F-48F3-AF3F-F97FEECF9EF3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj
index d6f49db343..4762913e5e 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{11D3DC9A-3154-4968-8D52-FE25D4A460E5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj
index 5716fcedbc..8659b75473 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2F5EE036-F784-49AE-B95C-5615AB7F47D3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj
index 239d4f9b44..35122bc31c 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F07227A9-C305-42FE-969D-D1461D6BEF6F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj
index 7f642e96a3..b9d12ee27b 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{85F114AE-6238-4E30-B579-7BB0D658922E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj
index 4603961d84..d118a64ed4 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{18DCAA00-850D-41AF-9B12-DD8E99B150BA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj
index 6ae83cc6bd..135d9490fd 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EA901A35-ECE3-4F4D-9587-F4100BCACA4D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgaddsub.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgaddsub.ilproj
index 348f2b5b9a..3b0188b3fc 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgaddsub.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgaddsub.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.ilproj
index 0597355d9a..e2abaed22d 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.ilproj
index 56ec8de259..f507adc2c8 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.ilproj
index 99f6f5eb13..2b5ae24334 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.ilproj
index ded8ec24b7..7454473c9d 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.ilproj
index 5c4842282e..01388855ba 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.ilproj
index 064a81a0b0..97c99f09a7 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.ilproj
index b717060af0..c7b3252d35 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.ilproj
index 15c27d9cdc..cc76824828 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.ilproj
index 9e822480d9..a37a58ebda 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.ilproj
index 59c08c9aac..afd4236005 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.ilproj
index e41bc94fb3..16b3747b86 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.ilproj
index b06cd3fef9..fef6269773 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.ilproj
index 807e1d7904..d7d2f62e7c 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.ilproj
index c6c348f5f3..c05b8cea4e 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.ilproj
index 7dfbb61b66..a533b93807 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.ilproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj
index 6d4caf9ab9..3feeb3595f 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FDC30F95-BA55-472A-A295-D483565435C4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj
index ccb7bc51a1..1fec6038a4 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{36E5B901-463B-47BB-A693-AFE10FC21395}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj
index afd0e678c0..e2df58fc07 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{268C28E6-0F65-45A5-978A-C7BC947E2C2A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj
index e18e1e4320..e75d03481e 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AB1CB3C1-40D2-4DF2-9926-DB5A4EA9F85C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj
index c1cb95303a..c90d6cf108 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0A1B6C17-EFE6-4A07-A87D-C5CC66D6D854}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj
index 275b571865..431ddd896e 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{96AD2682-4F41-4067-BCB4-F1B164154159}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj
index 872763c5a5..7c3b7b606f 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7D0A89E9-BDA0-4421-BA34-BDCAADEEB30B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj
index 98b0ae726a..d95daa0ba0 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FE92C687-9D99-4CAA-8991-122492761722}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj
index 39d425e9a7..0697adfd94 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CE34B2B0-D684-4106-B425-8E0EAC8DF40A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj
index d3115b2689..2b0008ea86 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DFD73D77-5D12-4440-A1B1-FD336F74B1B4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj
index c4a23832f6..adb936f7f9 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1420E1E7-EF7E-4E9A-8FB2-9C35B5E3C7DB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj
index cdf326cc2f..4abc9e664e 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{41E8FEFF-4FF9-4575-9B36-24EC5AD6354F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj
index 3e534cc756..5a5c055ccd 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ACAC8A61-3E34-4984-90C8-50FD78D19DE3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj
index abd71a97b2..33bc038bdb 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DCD83293-D516-40DF-B9F0-3C6A06E027F9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj
index cbbae39729..e93aa5a94f 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AAFFFBCE-FAA9-42C1-8D35-8F866B5FD84C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj
index f94b8238fc..a9d88c7c5f 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1FB7C14C-8E8E-4F8F-AD95-BBB313F9D484}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj
index 4b76447dc1..5fbf38fece 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0A98D022-18A7-45C3-85D6-CD563D7FB748}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj
index daf72daba1..e7e5305964 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5AD565C4-D90A-4F4C-961F-852208988029}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj
index 6fc1c8ab88..c6e4d27803 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{14ABED61-9399-49A8-8E7E-F3C7A53AA097}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj
index c27b6a2564..af47a357cf 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0068F78B-8F43-4CB4-A5DF-5FCD781FEF98}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj
index 1ed05eb42b..0e96b5761d 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4281C0B9-B4D5-473D-A790-310FBBB40A65}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj
index 8a85f024af..493681e75f 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DA6F49B6-6B54-4259-A1F7-2E7915DD5421}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj
index 740e7eb63f..a47c3cf027 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A1E821F6-07CF-46C5-AF96-3454B80436D2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj
index 465b4e3a66..22d3a0c80f 100644
--- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj
+++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{077010A8-4A52-4E5C-9392-C21B684A8375}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/jitinterface/bug603649.csproj b/tests/src/JIT/Methodical/jitinterface/bug603649.csproj
index 47239cea82..310f080e17 100644
--- a/tests/src/JIT/Methodical/jitinterface/bug603649.csproj
+++ b/tests/src/JIT/Methodical/jitinterface/bug603649.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/ldtoken/_il_dbgldtoken.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_dbgldtoken.ilproj
index 6eec84b5a1..1b2edd9b1a 100644
--- a/tests/src/JIT/Methodical/ldtoken/_il_dbgldtoken.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_dbgldtoken.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ldtoken/_il_dbgldtokena.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_dbgldtokena.ilproj
index 81944a4a44..cac0cbb70b 100644
--- a/tests/src/JIT/Methodical/ldtoken/_il_dbgldtokena.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_dbgldtokena.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ldtoken/_il_dbgptr_types.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_dbgptr_types.ilproj
index d19d42356e..6a90a1ac11 100644
--- a/tests/src/JIT/Methodical/ldtoken/_il_dbgptr_types.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_dbgptr_types.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ldtoken/_il_dbgtypes.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_dbgtypes.ilproj
index 5193f3c8fe..19a75861da 100644
--- a/tests/src/JIT/Methodical/ldtoken/_il_dbgtypes.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_dbgtypes.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ldtoken/_il_relldtoken.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_relldtoken.ilproj
index 11f79be5fb..91ebe2de7c 100644
--- a/tests/src/JIT/Methodical/ldtoken/_il_relldtoken.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_relldtoken.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ldtoken/_il_relldtokena.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_relldtokena.ilproj
index 2c29448f27..76cc8a326f 100644
--- a/tests/src/JIT/Methodical/ldtoken/_il_relldtokena.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_relldtokena.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ldtoken/_il_relptr_types.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_relptr_types.ilproj
index b625176301..e13558514d 100644
--- a/tests/src/JIT/Methodical/ldtoken/_il_relptr_types.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_relptr_types.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ldtoken/_il_reltypes.ilproj b/tests/src/JIT/Methodical/ldtoken/_il_reltypes.ilproj
index d5c95ec46a..04efeec196 100644
--- a/tests/src/JIT/Methodical/ldtoken/_il_reltypes.ilproj
+++ b/tests/src/JIT/Methodical/ldtoken/_il_reltypes.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/ldtoken/types.il b/tests/src/JIT/Methodical/ldtoken/types.il
index 4756fc6241..4df5e24340 100644
--- a/tests/src/JIT/Methodical/ldtoken/types.il
+++ b/tests/src/JIT/Methodical/ldtoken/types.il
@@ -34,7 +34,7 @@
       call       string [mscorlib]System.String::Concat(string, string)
       call       void [System.Console]System.Console::WriteLine(string)
       ldc.i4.s   101
-      call       void [mscorlib]System.Environment::Exit(int32)
+      call       void [system.runtime.extensions]System.Environment::Exit(int32)
       IL_EXIT:
       ret
     }
diff --git a/tests/src/JIT/Methodical/localloc/call/call01_small.csproj b/tests/src/JIT/Methodical/localloc/call/call01_small.csproj
index dbebea51e4..63426586a1 100644
--- a/tests/src/JIT/Methodical/localloc/call/call01_small.csproj
+++ b/tests/src/JIT/Methodical/localloc/call/call01_small.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj b/tests/src/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj
index b859538b39..c1d855c4f0 100644
--- a/tests/src/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj
+++ b/tests/src/JIT/Methodical/localloc/verify/verify01_dynamic.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/localloc/verify/verify01_large.ilproj b/tests/src/JIT/Methodical/localloc/verify/verify01_large.ilproj
index dfd9907bdd..e186c4920f 100644
--- a/tests/src/JIT/Methodical/localloc/verify/verify01_large.ilproj
+++ b/tests/src/JIT/Methodical/localloc/verify/verify01_large.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/localloc/verify/verify01_small.ilproj b/tests/src/JIT/Methodical/localloc/verify/verify01_small.ilproj
index 6f549ea95e..aaa808ff07 100644
--- a/tests/src/JIT/Methodical/localloc/verify/verify01_small.ilproj
+++ b/tests/src/JIT/Methodical/localloc/verify/verify01_small.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj b/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj
index 25d4343326..6e3f86137c 100644
--- a/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj
+++ b/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="zeroInit01_large.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj b/tests/src/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj
index c48353e726..1e01c878e8 100644
--- a/tests/src/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj
+++ b/tests/src/JIT/Methodical/localloc/zeroinit/zeroinit01_small.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj b/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj
index edc4aaf851..64835f41a0 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B880BAD3-0997-4C56-8C6A-B68CA9557EF3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/classic_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/classic_d.ilproj
index d53a4e73d4..b4a30483e5 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/classic_d.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/classic_d.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/classic_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/classic_r.ilproj
index 79ea0181ff..a9525190f5 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/classic_r.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/classic_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,18 +8,16 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -27,7 +25,6 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj b/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj
index 4629bfe86d..1476ab459b 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0A5E38FD-4E07-44A7-BF26-BDCDEEDC698C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/delegate_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/delegate_d.ilproj
index 0a440b2c1e..d9bb332ff4 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/delegate_d.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/delegate_d.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/delegate_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/delegate_r.ilproj
index 05d7bfc59b..1c3bc13951 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/delegate_r.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/delegate_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,18 +8,16 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -27,7 +25,6 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj b/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj
index d591f4ad12..d13a1a3d0e 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ED0E7884-4ED9-4F38-B410-8D9CBA8D9390}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj b/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj
index dd980a7216..afc5fb4a00 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2091A1AE-6728-4431-8DE6-DA9C48FD65D7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/generics2_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/generics2_d.ilproj
index c5307e7428..2098bf643d 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/generics2_d.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/generics2_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.ilproj
index 754baec093..3fa68c8923 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -26,7 +24,6 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,6 +33,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/generics_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/generics_d.ilproj
index 3cc6e304d0..985eef0323 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/generics_d.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/generics_d.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/generics_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/generics_r.ilproj
index 2a35df72e0..f8f44b0659 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/generics_r.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/generics_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,18 +8,16 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -27,7 +25,6 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,11 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj b/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj
index ea35539a70..ac90ebff62 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{027E2FF8-91B0-43EE-9FB5-D465143AA146}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj
index 68d7005dbd..3d383f9362 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj
index 58e9109f59..cb5dd9ea28 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -26,7 +24,6 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,6 +33,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj b/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj
index 0fc0e02dd5..6b4c2dcd90 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{93CE4675-F874-40C2-AFEA-401A247E70BB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj
index 2ef37b1c12..2406d6d7a6 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj
index c0e27614bf..3c0b6ed4f2 100644
--- a/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj
+++ b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -26,7 +24,6 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -36,6 +33,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/refany/_dbggcreport.csproj b/tests/src/JIT/Methodical/refany/_dbggcreport.csproj
index 99ecf7df37..c8dd1da34c 100644
--- a/tests/src/JIT/Methodical/refany/_dbggcreport.csproj
+++ b/tests/src/JIT/Methodical/refany/_dbggcreport.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1BAA34B6-4EAB-43D2-BAAB-4B9E719B92C6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_dbgnative.csproj b/tests/src/JIT/Methodical/refany/_dbgnative.csproj
index 6ae6bb2bf9..1ffea88844 100644
--- a/tests/src/JIT/Methodical/refany/_dbgnative.csproj
+++ b/tests/src/JIT/Methodical/refany/_dbgnative.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A1B2CCBC-1919-40E3-9C8D-8082BFC58493}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_dbgstress1.csproj b/tests/src/JIT/Methodical/refany/_dbgstress1.csproj
index 5bdcef7b86..eb5c6626f3 100644
--- a/tests/src/JIT/Methodical/refany/_dbgstress1.csproj
+++ b/tests/src/JIT/Methodical/refany/_dbgstress1.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C544C2F9-F5F5-41E3-AD28-E71649EE9CB0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -40,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_dbgstress3.csproj b/tests/src/JIT/Methodical/refany/_dbgstress3.csproj
index e644c2d443..c41462c110 100644
--- a/tests/src/JIT/Methodical/refany/_dbgstress3.csproj
+++ b/tests/src/JIT/Methodical/refany/_dbgstress3.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9711B502-A732-43B1-AA5B-CDF7DA92042C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj b/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj
index ca8d50eff5..f1b1b10a24 100644
--- a/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj
+++ b/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6B6C97C1-90DE-4716-BB81-38EA342BE67E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -40,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_il_dbgarray1.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgarray1.ilproj
index 2222962740..952227108a 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbgarray1.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgarray1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_dbgarray2.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgarray2.ilproj
index 8fafbfbe6b..3490fe5085 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbgarray2.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgarray2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_dbgarray3.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgarray3.ilproj
index 2485f0fd9e..e85675fe87 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbgarray3.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgarray3.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_dbgformat.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgformat.ilproj
index c9891b7083..2cab96df8e 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbgformat.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgformat.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/refany/_il_dbgindcall.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgindcall.ilproj
index ff0c08750c..9d2e93e190 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbgindcall.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgindcall.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/refany/_il_dbglcs.ilproj b/tests/src/JIT/Methodical/refany/_il_dbglcs.ilproj
index 5587762e4a..02fc2277f3 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbglcs.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbglcs.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/refany/_il_dbglongsig.ilproj b/tests/src/JIT/Methodical/refany/_il_dbglongsig.ilproj
index 7388580f38..c494675012 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbglongsig.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbglongsig.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/refany/_il_dbgnative.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgnative.ilproj
index 0b8cf8b4ba..167920d9a7 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbgnative.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgnative.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_dbgseq.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgseq.ilproj
index ca938203ad..88d7e55d8a 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbgseq.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgseq.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_dbgshortsig.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgshortsig.ilproj
index cc613b6dae..807a7e52ff 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbgshortsig.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgshortsig.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/refany/_il_dbgstress2.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgstress2.ilproj
index 3e355d521d..27d7f540ca 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbgstress2.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgstress2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_dbgu_native.ilproj b/tests/src/JIT/Methodical/refany/_il_dbgu_native.ilproj
index 12bbf8d519..a3055f9788 100644
--- a/tests/src/JIT/Methodical/refany/_il_dbgu_native.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_dbgu_native.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_relarray1.ilproj b/tests/src/JIT/Methodical/refany/_il_relarray1.ilproj
index 0cd9a16df2..755ff610fa 100644
--- a/tests/src/JIT/Methodical/refany/_il_relarray1.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relarray1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_relarray2.ilproj b/tests/src/JIT/Methodical/refany/_il_relarray2.ilproj
index 336ba3970e..a632b7bf9d 100644
--- a/tests/src/JIT/Methodical/refany/_il_relarray2.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relarray2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_relarray3.ilproj b/tests/src/JIT/Methodical/refany/_il_relarray3.ilproj
index 2193fd1a22..fcbbde8c6c 100644
--- a/tests/src/JIT/Methodical/refany/_il_relarray3.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relarray3.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_relformat.ilproj b/tests/src/JIT/Methodical/refany/_il_relformat.ilproj
index ec013093d6..c1e8ae2aa3 100644
--- a/tests/src/JIT/Methodical/refany/_il_relformat.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relformat.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/refany/_il_relindcall.ilproj b/tests/src/JIT/Methodical/refany/_il_relindcall.ilproj
index cca9949416..9f54ba3282 100644
--- a/tests/src/JIT/Methodical/refany/_il_relindcall.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relindcall.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/refany/_il_rellcs.ilproj b/tests/src/JIT/Methodical/refany/_il_rellcs.ilproj
index 18fe180d27..7e36138d11 100644
--- a/tests/src/JIT/Methodical/refany/_il_rellcs.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_rellcs.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/refany/_il_rellongsig.ilproj b/tests/src/JIT/Methodical/refany/_il_rellongsig.ilproj
index d236903173..c6517c066d 100644
--- a/tests/src/JIT/Methodical/refany/_il_rellongsig.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_rellongsig.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/refany/_il_relnative.ilproj b/tests/src/JIT/Methodical/refany/_il_relnative.ilproj
index 72a89276f1..a50978ea9d 100644
--- a/tests/src/JIT/Methodical/refany/_il_relnative.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relnative.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_relseq.ilproj b/tests/src/JIT/Methodical/refany/_il_relseq.ilproj
index fb11842542..438b7b31b9 100644
--- a/tests/src/JIT/Methodical/refany/_il_relseq.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relseq.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_relshortsig.ilproj b/tests/src/JIT/Methodical/refany/_il_relshortsig.ilproj
index 17ba69ebe7..58dac52f5d 100644
--- a/tests/src/JIT/Methodical/refany/_il_relshortsig.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relshortsig.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/refany/_il_relstress2.ilproj b/tests/src/JIT/Methodical/refany/_il_relstress2.ilproj
index 935c87e89b..aecd0e59c6 100644
--- a/tests/src/JIT/Methodical/refany/_il_relstress2.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relstress2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_il_relu_native.ilproj b/tests/src/JIT/Methodical/refany/_il_relu_native.ilproj
index 50032eb87d..aa20e00626 100644
--- a/tests/src/JIT/Methodical/refany/_il_relu_native.ilproj
+++ b/tests/src/JIT/Methodical/refany/_il_relu_native.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/refany/_relgcreport.csproj b/tests/src/JIT/Methodical/refany/_relgcreport.csproj
index 8bb276cef9..8781f33cdb 100644
--- a/tests/src/JIT/Methodical/refany/_relgcreport.csproj
+++ b/tests/src/JIT/Methodical/refany/_relgcreport.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AECC90EB-057E-4F71-B856-D761FFB409C7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_relnative.csproj b/tests/src/JIT/Methodical/refany/_relnative.csproj
index 425c1c387a..50bccd2c9d 100644
--- a/tests/src/JIT/Methodical/refany/_relnative.csproj
+++ b/tests/src/JIT/Methodical/refany/_relnative.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BC3D7C80-7A6E-425F-B161-5E1851092A2E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_relstress1.csproj b/tests/src/JIT/Methodical/refany/_relstress1.csproj
index c38c2e3eba..08cfb0238f 100644
--- a/tests/src/JIT/Methodical/refany/_relstress1.csproj
+++ b/tests/src/JIT/Methodical/refany/_relstress1.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6E345FA6-CA32-47A8-BC90-F759402D1222}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -40,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_relstress3.csproj b/tests/src/JIT/Methodical/refany/_relstress3.csproj
index 65b913b3d3..03c37ce533 100644
--- a/tests/src/JIT/Methodical/refany/_relstress3.csproj
+++ b/tests/src/JIT/Methodical/refany/_relstress3.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A2C3BA7F-EEBD-4046-9270-9D9B0F88D312}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_relvirtcall.csproj b/tests/src/JIT/Methodical/refany/_relvirtcall.csproj
index 968896118b..459da7d647 100644
--- a/tests/src/JIT/Methodical/refany/_relvirtcall.csproj
+++ b/tests/src/JIT/Methodical/refany/_relvirtcall.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{408A55FA-F02A-4EE4-A011-B00EFEB34B5B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -40,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj b/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj
index d64a580854..21e1dfb876 100644
--- a/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj
+++ b/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0C22565A-AA1E-4850-86FB-AD68B9F71DE4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj
index 6b817d4ca6..f7fde093de 100644
--- a/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj
+++ b/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E72B991C-DC2D-49E4-ADBE-0921F97924A3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj
index b3087cc71f..10d26819f4 100644
--- a/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj
+++ b/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BB49DE8D-7B90-473C-A40E-419C8264D61C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj
index c83fd05439..cfd702ecae 100644
--- a/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj
+++ b/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B1AA8C01-E8BA-4DCF-81DA-857256D23E77}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj b/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj
index 3dcb57fe25..531b47a9bc 100644
--- a/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj
+++ b/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{307CB204-B03B-41C6-A806-ACD1A0BDDC58}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -40,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj b/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj
index 0d32f3c32f..3fb0a8d27f 100644
--- a/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj
+++ b/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7FE42FB3-2FAE-42FF-976E-1F406D1A92E4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_speed_relnative.csproj b/tests/src/JIT/Methodical/refany/_speed_relnative.csproj
index 6554066376..11e2afd4be 100644
--- a/tests/src/JIT/Methodical/refany/_speed_relnative.csproj
+++ b/tests/src/JIT/Methodical/refany/_speed_relnative.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E95CED31-BA82-4462-8A89-51C3C02F8D26}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj b/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj
index c0e3399b30..f300ebc4aa 100644
--- a/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj
+++ b/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{020DB66A-2FEF-486E-ADB0-5AA68237DAB5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -40,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj b/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj
index 0d7afa890e..fd6a9aedb9 100644
--- a/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj
+++ b/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{762770DA-FA56-4A3A-A630-5270B95311B2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj b/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj
index 552cd098d2..ecae4158e9 100644
--- a/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj
+++ b/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1475D529-78CC-437E-82BC-6C6C10A5936D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/array1.csproj b/tests/src/JIT/Methodical/refany/array1.csproj
index cf3fbc898a..83c8927f2d 100644
--- a/tests/src/JIT/Methodical/refany/array1.csproj
+++ b/tests/src/JIT/Methodical/refany/array1.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73B862FC-979B-4EEC-A57A-2B04A2B46F01}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/array2.csproj b/tests/src/JIT/Methodical/refany/array2.csproj
index 5421e79d56..1890a9c9d0 100644
--- a/tests/src/JIT/Methodical/refany/array2.csproj
+++ b/tests/src/JIT/Methodical/refany/array2.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EDB14918-1731-46A5-BAD4-1B0920F2EE7B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/format.csproj b/tests/src/JIT/Methodical/refany/format.csproj
index 03e9b3a950..18b8fa8e87 100644
--- a/tests/src/JIT/Methodical/refany/format.csproj
+++ b/tests/src/JIT/Methodical/refany/format.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0B9A50E6-CF08-4A02-9342-67828BDB9F90}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/gcreport.csproj b/tests/src/JIT/Methodical/refany/gcreport.csproj
index cfe0053d62..04d0fffb01 100644
--- a/tests/src/JIT/Methodical/refany/gcreport.csproj
+++ b/tests/src/JIT/Methodical/refany/gcreport.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3BA00219-0647-4CAF-ABA7-54B66438AA1A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/lcs.csproj b/tests/src/JIT/Methodical/refany/lcs.csproj
index cb63f53204..122a161b4a 100644
--- a/tests/src/JIT/Methodical/refany/lcs.csproj
+++ b/tests/src/JIT/Methodical/refany/lcs.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6BC88FC8-AF31-4C84-8EEA-8B567B8DE61C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/native.csproj b/tests/src/JIT/Methodical/refany/native.csproj
index 23ef189c0c..db30722d05 100644
--- a/tests/src/JIT/Methodical/refany/native.csproj
+++ b/tests/src/JIT/Methodical/refany/native.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1F61DC1B-CF47-4932-9C3A-0B32D1DA6763}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/refany/virtcall.csproj b/tests/src/JIT/Methodical/refany/virtcall.csproj
index 1b1fd04b1c..fecf6cc43e 100644
--- a/tests/src/JIT/Methodical/refany/virtcall.csproj
+++ b/tests/src/JIT/Methodical/refany/virtcall.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CA7E0C28-6C9E-465E-8D00-649C39A816EE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -40,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/stringintern/_Simpleb207621.csproj b/tests/src/JIT/Methodical/stringintern/_Simpleb207621.csproj
index 705418639c..75173dfdb4 100644
--- a/tests/src/JIT/Methodical/stringintern/_Simpleb207621.csproj
+++ b/tests/src/JIT/Methodical/stringintern/_Simpleb207621.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/stringintern/_Simpletest1.csproj b/tests/src/JIT/Methodical/stringintern/_Simpletest1.csproj
index 2fd73f50b7..47866356df 100644
--- a/tests/src/JIT/Methodical/stringintern/_Simpletest1.csproj
+++ b/tests/src/JIT/Methodical/stringintern/_Simpletest1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/stringintern/_Simpletest2.csproj b/tests/src/JIT/Methodical/stringintern/_Simpletest2.csproj
index 2c8b3fe11f..44c750b34b 100644
--- a/tests/src/JIT/Methodical/stringintern/_Simpletest2.csproj
+++ b/tests/src/JIT/Methodical/stringintern/_Simpletest2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/stringintern/_Simpletest4.csproj b/tests/src/JIT/Methodical/stringintern/_Simpletest4.csproj
index b90478cf2b..4ff80cb1cf 100644
--- a/tests/src/JIT/Methodical/stringintern/_Simpletest4.csproj
+++ b/tests/src/JIT/Methodical/stringintern/_Simpletest4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj b/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj
index b83cceda93..3c96838c11 100644
--- a/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj
+++ b/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj b/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj
index 79470a22fa..b7a5d9347e 100644
--- a/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj
+++ b/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj b/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj
index 982faa0461..4f3e622653 100644
--- a/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj
+++ b/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/stringintern/_XModuletest1-xmod.csproj b/tests/src/JIT/Methodical/stringintern/_XModuletest1-xmod.csproj
index d1edd0655e..1140cbbaab 100644
--- a/tests/src/JIT/Methodical/stringintern/_XModuletest1-xmod.csproj
+++ b/tests/src/JIT/Methodical/stringintern/_XModuletest1-xmod.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/tests/src/JIT/Methodical/stringintern/_XModuletest2-xmod.csproj b/tests/src/JIT/Methodical/stringintern/_XModuletest2-xmod.csproj
index 6baa9e8e74..af311ffc06 100644
--- a/tests/src/JIT/Methodical/stringintern/_XModuletest2-xmod.csproj
+++ b/tests/src/JIT/Methodical/stringintern/_XModuletest2-xmod.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/tests/src/JIT/Methodical/stringintern/_XModuletest4-xmod.csproj b/tests/src/JIT/Methodical/stringintern/_XModuletest4-xmod.csproj
index 1631c3f493..b13ffc56b9 100644
--- a/tests/src/JIT/Methodical/stringintern/_XModuletest4-xmod.csproj
+++ b/tests/src/JIT/Methodical/stringintern/_XModuletest4-xmod.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/tests/src/JIT/Methodical/stringintern/test1-xassem.csproj b/tests/src/JIT/Methodical/stringintern/test1-xassem.csproj
index 51e2b3619a..5443191e3b 100644
--- a/tests/src/JIT/Methodical/stringintern/test1-xassem.csproj
+++ b/tests/src/JIT/Methodical/stringintern/test1-xassem.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/tests/src/JIT/Methodical/stringintern/test2-xassem.csproj b/tests/src/JIT/Methodical/stringintern/test2-xassem.csproj
index 27f0f6a13b..1c03e29034 100644
--- a/tests/src/JIT/Methodical/stringintern/test2-xassem.csproj
+++ b/tests/src/JIT/Methodical/stringintern/test2-xassem.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/tests/src/JIT/Methodical/stringintern/test4-xassem.csproj b/tests/src/JIT/Methodical/stringintern/test4-xassem.csproj
index b6e560d283..51cc08ec11 100644
--- a/tests/src/JIT/Methodical/stringintern/test4-xassem.csproj
+++ b/tests/src/JIT/Methodical/stringintern/test4-xassem.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/tests/src/JIT/Methodical/stringintern/testgenstr.csproj b/tests/src/JIT/Methodical/stringintern/testgenstr.csproj
index 52924179ef..d64f4ca7f2 100644
--- a/tests/src/JIT/Methodical/stringintern/testgenstr.csproj
+++ b/tests/src/JIT/Methodical/stringintern/testgenstr.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/stringintern/teststr.csproj b/tests/src/JIT/Methodical/stringintern/teststr.csproj
index 6132ab0aae..602637f222 100644
--- a/tests/src/JIT/Methodical/stringintern/teststr.csproj
+++ b/tests/src/JIT/Methodical/stringintern/teststr.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/structs/systemvbringup/structinregs.cpp b/tests/src/JIT/Methodical/structs/systemvbringup/structinregs.cpp
index df4a091acb..6b634cbb66 100644
--- a/tests/src/JIT/Methodical/structs/systemvbringup/structinregs.cpp
+++ b/tests/src/JIT/Methodical/structs/systemvbringup/structinregs.cpp
@@ -14,6 +14,14 @@
 #endif  // !__i386__
 #endif // !defined(_MSC_VER)
 
+#ifdef _MSC_VER
+#define CALLBACK  __stdcall
+#define NATIVEAPI __stdcall
+#else // _MSC_VER
+#define CALLBACK
+#define NATIVEAPI
+#endif // !_MSC_VER
+
 typedef unsigned char byte;
 
 struct S1
@@ -191,130 +199,130 @@ struct S30
     long long y;
 };
 
-typedef void (__stdcall *PFNACTION1)(S1 s);
-typedef void (__stdcall *PFNACTION2)(S2 s);
-typedef void (__stdcall *PFNACTION3)(S3 s);
-typedef void (__stdcall *PFNACTION4)(S4 s);
-typedef void (__stdcall *PFNACTION5)(S5 s);
-typedef void (__stdcall *PFNACTION6)(S6 s);
-typedef void (__stdcall *PFNACTION7)(S7 s);
-typedef void (__stdcall *PFNACTION8)(S8 s);
-typedef void (__stdcall *PFNACTION9)(S9 s);
-typedef void (__stdcall *PFNACTION10)(S10 s);
-typedef void (__stdcall *PFNACTION11)(S11 s);
-typedef void (__stdcall *PFNACTION12)(S12 s);
-typedef void (__stdcall *PFNACTION13)(S13 s);
-typedef void (__stdcall *PFNACTION14)(S14 s);
-typedef void (__stdcall *PFNACTION15)(S15 s);
-typedef void (__stdcall *PFNACTION16)(S16 s);
-typedef void (__stdcall *PFNACTION17)(S17 s);
-typedef void (__stdcall *PFNACTION18)(S18 s);
-typedef void (__stdcall *PFNACTION19)(S19 s);
-typedef void (__stdcall *PFNACTION20)(S20 s);
-
-typedef void (__stdcall *PFNACTION28)(S28 s);
-typedef void (__stdcall *PFNACTION29)(S29 s);
-typedef void (__stdcall *PFNACTION30)(S30 s1, S30 s2, S30 s3);
-
-EXPORT(void) __stdcall InvokeCallback1(PFNACTION1 callback, S1 s)
+typedef void (CALLBACK *PFNACTION1)(S1 s);
+typedef void (CALLBACK *PFNACTION2)(S2 s);
+typedef void (CALLBACK *PFNACTION3)(S3 s);
+typedef void (CALLBACK *PFNACTION4)(S4 s);
+typedef void (CALLBACK *PFNACTION5)(S5 s);
+typedef void (CALLBACK *PFNACTION6)(S6 s);
+typedef void (CALLBACK *PFNACTION7)(S7 s);
+typedef void (CALLBACK *PFNACTION8)(S8 s);
+typedef void (CALLBACK *PFNACTION9)(S9 s);
+typedef void (CALLBACK *PFNACTION10)(S10 s);
+typedef void (CALLBACK *PFNACTION11)(S11 s);
+typedef void (CALLBACK *PFNACTION12)(S12 s);
+typedef void (CALLBACK *PFNACTION13)(S13 s);
+typedef void (CALLBACK *PFNACTION14)(S14 s);
+typedef void (CALLBACK *PFNACTION15)(S15 s);
+typedef void (CALLBACK *PFNACTION16)(S16 s);
+typedef void (CALLBACK *PFNACTION17)(S17 s);
+typedef void (CALLBACK *PFNACTION18)(S18 s);
+typedef void (CALLBACK *PFNACTION19)(S19 s);
+typedef void (CALLBACK *PFNACTION20)(S20 s);
+
+typedef void (CALLBACK *PFNACTION28)(S28 s);
+typedef void (CALLBACK *PFNACTION29)(S29 s);
+typedef void (CALLBACK *PFNACTION30)(S30 s1, S30 s2, S30 s3);
+
+EXPORT(void) NATIVEAPI InvokeCallback1(PFNACTION1 callback, S1 s)
 {
     printf("Native S1: %d, %d, %d, %d\n", s.x, s.y, s.z, s.w);
     callback(s);
 }
 
-EXPORT(void) __stdcall InvokeCallback2(PFNACTION2 callback, S2 s)
+EXPORT(void) NATIVEAPI InvokeCallback2(PFNACTION2 callback, S2 s)
 {
     printf("Native S2: %d, %d, %f\n", s.x, s.y, s.z);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback3(PFNACTION3 callback, S3 s)
+EXPORT(void) NATIVEAPI InvokeCallback3(PFNACTION3 callback, S3 s)
 {
     printf("Native S3: %d, %d, %f\n", s.x, s.y, s.z);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback4(PFNACTION4 callback, S4 s)
+EXPORT(void) NATIVEAPI InvokeCallback4(PFNACTION4 callback, S4 s)
 {
     printf("Native S4: %d, %f\n", s.x, s.y);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback5(PFNACTION5 callback, S5 s)
+EXPORT(void) NATIVEAPI InvokeCallback5(PFNACTION5 callback, S5 s)
 {
     printf("Native S5: %d, %f\n", s.x, s.y);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback6(PFNACTION6 callback, S6 s)
+EXPORT(void) NATIVEAPI InvokeCallback6(PFNACTION6 callback, S6 s)
 {
     printf("Native S6: %hd, %hd, %d, %d\n", s.x, s.y, s.z, s.w);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback7(PFNACTION7 callback, S7 s)
+EXPORT(void) NATIVEAPI InvokeCallback7(PFNACTION7 callback, S7 s)
 {
     printf("Native S7: %f, %d, %d\n", s.x, s.y, s.z);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback8(PFNACTION8 callback, S8 s)
+EXPORT(void) NATIVEAPI InvokeCallback8(PFNACTION8 callback, S8 s)
 {
     printf("Native S8: %f, %d\n", s.x, s.y);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback9(PFNACTION9 callback, S9 s)
+EXPORT(void) NATIVEAPI InvokeCallback9(PFNACTION9 callback, S9 s)
 {
     printf("Native S9: %d, %d, %f, %f\n", s.x, s.y, s.z, s.w);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback10(PFNACTION10 callback, S10 s)
+EXPORT(void) NATIVEAPI InvokeCallback10(PFNACTION10 callback, S10 s)
 {
     printf("Native S10: %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd\n", s.a, s.b, s.c, s.d, s.e, s.f, s.g, s.h);
     callback(s);
 }
 
-EXPORT(void) __stdcall InvokeCallback11(PFNACTION11 callback, S11 s)
+EXPORT(void) NATIVEAPI InvokeCallback11(PFNACTION11 callback, S11 s)
 {
     printf("Native S11: %hhd, %hhd, %hhd, %hhd, %f\n", s.a, s.b, s.c, s.d, s.e);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback12(PFNACTION12 callback, S12 s)
+EXPORT(void) NATIVEAPI InvokeCallback12(PFNACTION12 callback, S12 s)
 {
     printf("Native S12: %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %lld\n", s.a, s.b, s.c, s.d, s.e, s.f, s.g, s.h, s.i);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback13(PFNACTION13 callback, S13 s)
+EXPORT(void) NATIVEAPI InvokeCallback13(PFNACTION13 callback, S13 s)
 {
     printf("Native S13: %hhd, %d\n", s.hasValue, s.x);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback14(PFNACTION14 callback, S14 s)
+EXPORT(void) NATIVEAPI InvokeCallback14(PFNACTION14 callback, S14 s)
 {
     printf("Native S13: %hhd, %lld\n", s.x, s.y);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback15(PFNACTION15 callback, S15 s)
+EXPORT(void) NATIVEAPI InvokeCallback15(PFNACTION15 callback, S15 s)
 {
     printf("Native S15: %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd\n", s.a, s.b, s.c, s.d, s.e, s.f, s.g, s.h, s.i);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback16(PFNACTION16 callback, S16 s)
+EXPORT(void) NATIVEAPI InvokeCallback16(PFNACTION16 callback, S16 s)
 {
     printf("Native S16: %hhd, %hd\n", s.x, s.y);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback17(PFNACTION17 callback, S17 s)
+EXPORT(void) NATIVEAPI InvokeCallback17(PFNACTION17 callback, S17 s)
 {
     printf("Native S17: %f, %f\n", s.x, s.y);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback18(PFNACTION18 callback, S18 s)
+EXPORT(void) NATIVEAPI InvokeCallback18(PFNACTION18 callback, S18 s)
 {
     printf("Native S18: %f, %d, %f\n", s.x, s.y, s.z);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback19(PFNACTION19 callback, S19 s)
+EXPORT(void) NATIVEAPI InvokeCallback19(PFNACTION19 callback, S19 s)
 {
     printf("Native S19: %d, %f, %d, %f\n", s.x, s.y, s.z, s.w);
     callback(s);
 }
 
-EXPORT(void) __stdcall InvokeCallback20(PFNACTION20 callback, S20 s)
+EXPORT(void) NATIVEAPI InvokeCallback20(PFNACTION20 callback, S20 s)
 {
 #ifdef __clang__
     printf("Native S20: %lld, %lld, %lld, %lld\n", s.x, s.y, s.z, s.w);
@@ -325,140 +333,140 @@ EXPORT(void) __stdcall InvokeCallback20(PFNACTION20 callback, S20 s)
     callback(s);
 }
 
-EXPORT(void) __stdcall InvokeCallback28(PFNACTION28 callback, S28 s)
+EXPORT(void) NATIVEAPI InvokeCallback28(PFNACTION28 callback, S28 s)
 {
     printf("Native S28: %p object, %d\n", s.x, s.y);
     callback(s);
 }
-EXPORT(void) __stdcall InvokeCallback29(PFNACTION29 callback, S29 s)
+EXPORT(void) NATIVEAPI InvokeCallback29(PFNACTION29 callback, S29 s)
 {
     printf("Native S29: %d, %p object\n", s.x, s.y);
     callback(s);
 }
 
-EXPORT(void) __stdcall InvokeCallback30(PFNACTION30 callback, S30 s1, S30 s2, S30 s3)
+EXPORT(void) NATIVEAPI InvokeCallback30(PFNACTION30 callback, S30 s1, S30 s2, S30 s3)
 {
     printf("Native S30: %lld, %lld, %lld, %lld, %lld, %lld\n", s1.x, s1.y, s2.x, s2.y, s3.x, s3.y);
     callback(s1, s2, s3);
 }
 
-EXPORT(S1) __stdcall InvokeCallback1R(PFNACTION1 callback, S1 s)
+EXPORT(S1) NATIVEAPI InvokeCallback1R(PFNACTION1 callback, S1 s)
 {
     printf("Native S1: %d, %d, %d, %d\n", s.x, s.y, s.z, s.w);
     callback(s);
     return s;
 }
 
-EXPORT(S2) __stdcall InvokeCallback2R(PFNACTION2 callback, S2 s)
+EXPORT(S2) NATIVEAPI InvokeCallback2R(PFNACTION2 callback, S2 s)
 {
     printf("Native S2: %d, %d, %f\n", s.x, s.y, s.z);
     callback(s);
     return s;
 }
-EXPORT(S3) __stdcall InvokeCallback3R(PFNACTION3 callback, S3 s)
+EXPORT(S3) NATIVEAPI InvokeCallback3R(PFNACTION3 callback, S3 s)
 {
     printf("Native S3: %d, %d, %f\n", s.x, s.y, s.z);
     callback(s);
     return s;
 }
-EXPORT(S4) __stdcall InvokeCallback4R(PFNACTION4 callback, S4 s)
+EXPORT(S4) NATIVEAPI InvokeCallback4R(PFNACTION4 callback, S4 s)
 {
     printf("Native S4: %d, %f\n", s.x, s.y);
     callback(s);
     return s;
 }
-EXPORT(S5) __stdcall InvokeCallback5R(PFNACTION5 callback, S5 s)
+EXPORT(S5) NATIVEAPI InvokeCallback5R(PFNACTION5 callback, S5 s)
 {
     printf("Native S5: %d, %f\n", s.x, s.y);
     callback(s);
     return s;
 }
-EXPORT(S6) __stdcall InvokeCallback6R(PFNACTION6 callback, S6 s)
+EXPORT(S6) NATIVEAPI InvokeCallback6R(PFNACTION6 callback, S6 s)
 {
     printf("Native S6: %hd, %hd, %d, %d\n", s.x, s.y, s.z, s.w);
     callback(s);
     return s;
 }
-EXPORT(S7) __stdcall InvokeCallback7R(PFNACTION7 callback, S7 s)
+EXPORT(S7) NATIVEAPI InvokeCallback7R(PFNACTION7 callback, S7 s)
 {
     printf("Native S7: %f, %d, %d\n", s.x, s.y, s.z);
     callback(s);
     return s;
 }
-EXPORT(S8) __stdcall InvokeCallback8R(PFNACTION8 callback, S8 s)
+EXPORT(S8) NATIVEAPI InvokeCallback8R(PFNACTION8 callback, S8 s)
 {
     printf("Native S8: %f, %d\n", s.x, s.y);
     callback(s);
     return s;
 }
-EXPORT(S9) __stdcall InvokeCallback9R(PFNACTION9 callback, S9 s)
+EXPORT(S9) NATIVEAPI InvokeCallback9R(PFNACTION9 callback, S9 s)
 {
     printf("Native S9: %d, %d, %f, %f\n", s.x, s.y, s.z, s.w);
     callback(s);
     return s;
 }
-EXPORT(S10) __stdcall InvokeCallback10R(PFNACTION10 callback, S10 s)
+EXPORT(S10) NATIVEAPI InvokeCallback10R(PFNACTION10 callback, S10 s)
 {
     printf("Native S10: %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd\n", s.a, s.b, s.c, s.d, s.e, s.f, s.g, s.h);
     callback(s);
     return s;
 }
-EXPORT(S11) __stdcall InvokeCallback11R(PFNACTION11 callback, S11 s)
+EXPORT(S11) NATIVEAPI InvokeCallback11R(PFNACTION11 callback, S11 s)
 {
     printf("Native S11: %hhd, %hhd, %hhd, %hhd, %f\n", s.a, s.b, s.c, s.d, s.e);
     callback(s);
     return s;
 }
-EXPORT(S12) __stdcall InvokeCallback12R(PFNACTION12 callback, S12 s)
+EXPORT(S12) NATIVEAPI InvokeCallback12R(PFNACTION12 callback, S12 s)
 {
     printf("Native S12: %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %lld\n", s.a, s.b, s.c, s.d, s.e, s.f, s.g, s.h, s.i);
     callback(s);
     return s;
 }
-EXPORT(S13) __stdcall InvokeCallback13R(PFNACTION13 callback, S13 s)
+EXPORT(S13) NATIVEAPI InvokeCallback13R(PFNACTION13 callback, S13 s)
 {
     printf("Native S13: %hhd, %d\n", s.hasValue, s.x);
     callback(s);
     return s;
 }
-EXPORT(S14) __stdcall InvokeCallback14R(PFNACTION14 callback, S14 s)
+EXPORT(S14) NATIVEAPI InvokeCallback14R(PFNACTION14 callback, S14 s)
 {
     printf("Native S13: %hhd, %lld\n", s.x, s.y);
     callback(s);
     return s;
 }
-EXPORT(S15) __stdcall InvokeCallback15R(PFNACTION15 callback, S15 s)
+EXPORT(S15) NATIVEAPI InvokeCallback15R(PFNACTION15 callback, S15 s)
 {
     printf("Native S15: %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd, %hhd\n", s.a, s.b, s.c, s.d, s.e, s.f, s.g, s.h, s.i);
     callback(s);
     return s;
 }
-EXPORT(S16) __stdcall InvokeCallback16R(PFNACTION16 callback, S16 s)
+EXPORT(S16) NATIVEAPI InvokeCallback16R(PFNACTION16 callback, S16 s)
 {
     printf("Native S16: %hhd, %hd\n", s.x, s.y);
     callback(s);
     return s;
 }
-EXPORT(S17) __stdcall InvokeCallback17R(PFNACTION17 callback, S17 s)
+EXPORT(S17) NATIVEAPI InvokeCallback17R(PFNACTION17 callback, S17 s)
 {
     printf("Native S17: %f, %f\n", s.x, s.y);
     callback(s);
     return s;
 }
-EXPORT(S18) __stdcall InvokeCallback18R(PFNACTION18 callback, S18 s)
+EXPORT(S18) NATIVEAPI InvokeCallback18R(PFNACTION18 callback, S18 s)
 {
     printf("Native S18: %f, %d, %f\n", s.x, s.y, s.z);
     callback(s);
     return s;
 }
-EXPORT(S19) __stdcall InvokeCallback19R(PFNACTION19 callback, S19 s)
+EXPORT(S19) NATIVEAPI InvokeCallback19R(PFNACTION19 callback, S19 s)
 {
     printf("Native S19: %d, %f, %d, %f\n", s.x, s.y, s.z, s.w);
     callback(s);
     return s;
 }
 
-EXPORT(S20) __stdcall InvokeCallback20R(PFNACTION20 callback, S20 s)
+EXPORT(S20) NATIVEAPI InvokeCallback20R(PFNACTION20 callback, S20 s)
 {
 #ifdef __clang__
     printf("Native S20: %lld, %lld, %lld, %lld\n", s.x, s.y, s.z, s.w);
@@ -469,13 +477,13 @@ EXPORT(S20) __stdcall InvokeCallback20R(PFNACTION20 callback, S20 s)
     return s;
 }
 
-EXPORT(S28) __stdcall InvokeCallback28R(PFNACTION28 callback, S28 s)
+EXPORT(S28) NATIVEAPI InvokeCallback28R(PFNACTION28 callback, S28 s)
 {
     printf("Native S28: %p object, %d\n", s.x, s.y);
     callback(s);
     return s;
 }
-EXPORT(S29) __stdcall InvokeCallback29R(PFNACTION29 callback, S29 s)
+EXPORT(S29) NATIVEAPI InvokeCallback29R(PFNACTION29 callback, S29 s)
 {
     printf("Native S29: %d, %p object\n", s.x, s.y);
     callback(s);
diff --git a/tests/src/JIT/Methodical/structs/systemvbringup/structinregs.csproj b/tests/src/JIT/Methodical/structs/systemvbringup/structinregs.csproj
index 8b58ce1719..5098259880 100644
--- a/tests/src/JIT/Methodical/structs/systemvbringup/structinregs.csproj
+++ b/tests/src/JIT/Methodical/structs/systemvbringup/structinregs.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,12 +8,13 @@
     <ProjectGuid>{649A239B-AB4B-4E20-BDCA-3BA736E8B790}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"></PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="structpasstest.cs" />
@@ -25,4 +26,4 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/structs/valuetuple.csproj b/tests/src/JIT/Methodical/structs/valuetuple.csproj
index 486744bb36..210414cd39 100644
--- a/tests/src/JIT/Methodical/structs/valuetuple.csproj
+++ b/tests/src/JIT/Methodical/structs/valuetuple.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,16 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0B8F1AF4-9355-4307-BC68-08A2947AD3B9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -31,11 +29,6 @@
   <ItemGroup>
     <Compile Include="valuetuple.cs" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/switch/switch1.il b/tests/src/JIT/Methodical/switch/switch1.il
index a3a7a53365..ed3f5e4fc3 100644
--- a/tests/src/JIT/Methodical/switch/switch1.il
+++ b/tests/src/JIT/Methodical/switch/switch1.il
@@ -30,7 +30,7 @@
     IL_0012:  br.s       IL_0033
 
     IL_0014:  ldc.i4.s   100
-    IL_0016:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0016:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_001b:  ldstr      "Test passed"
     IL_0020:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0025:  br.s       IL_003f
@@ -52,8 +52,8 @@
     .maxstack  8
     IL_0000:  ldc.i4.1
     IL_0001:  call       void Test::DoSwitch(int32)
-    IL_0006:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_0006:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
diff --git a/tests/src/JIT/Methodical/switch/switch1.ilproj b/tests/src/JIT/Methodical/switch/switch1.ilproj
index 2fa6604062..feb1a611da 100644
--- a/tests/src/JIT/Methodical/switch/switch1.ilproj
+++ b/tests/src/JIT/Methodical/switch/switch1.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/switch/switch10.il b/tests/src/JIT/Methodical/switch/switch10.il
index 964db3ebda..5827b03ab5 100644
--- a/tests/src/JIT/Methodical/switch/switch10.il
+++ b/tests/src/JIT/Methodical/switch/switch10.il
@@ -57,13 +57,13 @@
     IL_0018:  bne.un.s   IL_002d
 
     IL_001a:  ldc.i4.s   100
-    IL_001c:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_001c:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0021:  ldstr      "Test passed"
     IL_0026:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_002b:  br.s       IL_003d
 
     IL_002d:  ldc.i4.1
-    IL_002e:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_002e:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0033:  ldstr      "Test failed"
     IL_0038:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_003d:  ret
@@ -75,8 +75,8 @@
     .maxstack  8
     IL_0000:  ldc.i4.1
     IL_0001:  call       void Test::DoSwitch(int32)
-    IL_0006:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_0006:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
diff --git a/tests/src/JIT/Methodical/switch/switch10.ilproj b/tests/src/JIT/Methodical/switch/switch10.ilproj
index 6b82dc24d7..c7db610e5e 100644
--- a/tests/src/JIT/Methodical/switch/switch10.ilproj
+++ b/tests/src/JIT/Methodical/switch/switch10.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/switch/switch11.il b/tests/src/JIT/Methodical/switch/switch11.il
index 056b16e1f8..b2375b0f4f 100644
--- a/tests/src/JIT/Methodical/switch/switch11.il
+++ b/tests/src/JIT/Methodical/switch/switch11.il
@@ -25,12 +25,12 @@
     IL_0002:  br.s       IL_0004
 
     IL_0004:  ldc.i4.s   100
-    IL_0006:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0006:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_000b:  ldstr      "Test passed"
     IL_0010:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0015:  pop
-              call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+              call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
diff --git a/tests/src/JIT/Methodical/switch/switch11.ilproj b/tests/src/JIT/Methodical/switch/switch11.ilproj
index 9263134de0..4ed5de284f 100644
--- a/tests/src/JIT/Methodical/switch/switch11.ilproj
+++ b/tests/src/JIT/Methodical/switch/switch11.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/switch/switch2.il b/tests/src/JIT/Methodical/switch/switch2.il
index ef5b6a8157..f02a1f00a1 100644
--- a/tests/src/JIT/Methodical/switch/switch2.il
+++ b/tests/src/JIT/Methodical/switch/switch2.il
@@ -44,7 +44,7 @@
     IL_001e:  bne.un.s   IL_0031
 
     IL_0020:  ldc.i4.s   100
-    IL_0022:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0022:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0027:  ldstr      "Test passed"
     IL_002c:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0031:  br.s       IL_005f
@@ -58,13 +58,13 @@
     IL_0039:  bne.un.s   IL_004b
 
     IL_003b:  ldc.i4.1
-    IL_003c:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_003c:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0041:  ldstr      "Test failed"
     IL_0046:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_004b:  br.s       IL_005f
 
     IL_004d:  ldc.i4.1
-    IL_004e:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_004e:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0053:  ldstr      "Test failed"
     IL_0058:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_005d:  br.s       IL_005f
@@ -78,8 +78,8 @@
     .maxstack  8
     IL_0000:  ldc.i4.1
     IL_0001:  call       void Test::DoSwitch(int32)
-    IL_0006:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_0006:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
diff --git a/tests/src/JIT/Methodical/switch/switch2.ilproj b/tests/src/JIT/Methodical/switch/switch2.ilproj
index 79ecff30fd..c386326e9e 100644
--- a/tests/src/JIT/Methodical/switch/switch2.ilproj
+++ b/tests/src/JIT/Methodical/switch/switch2.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/switch/switch3.il b/tests/src/JIT/Methodical/switch/switch3.il
index d128ddac3a..95f233f09b 100644
--- a/tests/src/JIT/Methodical/switch/switch3.il
+++ b/tests/src/JIT/Methodical/switch/switch3.il
@@ -33,13 +33,13 @@
     IL_0014:  br.s       IL_0016
 
     IL_0016:  ldc.i4.s   100
-    IL_0018:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0018:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_001d:  ldstr      "Test passed"
     IL_0022:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0027:  br.s       IL_003b
 
     IL_0029:  ldc.i4.1
-    IL_002a:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_002a:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_002f:  ldstr      "Test failed"
     IL_0034:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0039:  br.s       IL_003b
@@ -53,8 +53,8 @@
     .maxstack  8
     IL_0000:  ldc.i4.1
     IL_0001:  call       void Test::DoSwitch(int32)
-    IL_0006:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_0006:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
diff --git a/tests/src/JIT/Methodical/switch/switch3.ilproj b/tests/src/JIT/Methodical/switch/switch3.ilproj
index 454bb9e286..c8254b4064 100644
--- a/tests/src/JIT/Methodical/switch/switch3.ilproj
+++ b/tests/src/JIT/Methodical/switch/switch3.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/switch/switch4.il b/tests/src/JIT/Methodical/switch/switch4.il
index a4d38cb71d..047be6d214 100644
--- a/tests/src/JIT/Methodical/switch/switch4.il
+++ b/tests/src/JIT/Methodical/switch/switch4.il
@@ -56,13 +56,13 @@
     IL_002e:  bne.un.s   IL_0043
 
     IL_0030:  ldc.i4.s   100
-    IL_0032:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0032:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0037:  ldstr      "Test passed"
     IL_003c:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0041:  br.s       IL_0053
 
     IL_0043:  ldc.i4.1
-    IL_0044:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0044:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0049:  ldstr      "Test failed"
     IL_004e:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0053:  ret
@@ -74,8 +74,8 @@
     .maxstack  8
     IL_0000:  ldc.i4.1
     IL_0001:  call       void Test::DoSwitch(int32)
-    IL_0006:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_0006:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
diff --git a/tests/src/JIT/Methodical/switch/switch4.ilproj b/tests/src/JIT/Methodical/switch/switch4.ilproj
index af85f65a8c..92468819a8 100644
--- a/tests/src/JIT/Methodical/switch/switch4.ilproj
+++ b/tests/src/JIT/Methodical/switch/switch4.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/switch/switch5.il b/tests/src/JIT/Methodical/switch/switch5.il
index f3f249f729..040e2da6f8 100644
--- a/tests/src/JIT/Methodical/switch/switch5.il
+++ b/tests/src/JIT/Methodical/switch/switch5.il
@@ -56,13 +56,13 @@
     IL_003c:  brtrue.s   IL_0051
 
     IL_003e:  ldc.i4.s   100
-    IL_0040:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0040:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0045:  ldstr      "Test passed"
     IL_004a:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_004f:  br.s       IL_0061
 
     IL_0051:  ldc.i4.1
-    IL_0052:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0052:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0057:  ldstr      "Test failed"
     IL_005c:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0061:  br.s       IL_0063
@@ -156,8 +156,8 @@
     IL_001b:  ldloc.0
     IL_001c:  ldc.i4.3
     IL_001d:  call       instance void TestStack::DoSwitch(int32)
-    IL_0022:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_0022:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
diff --git a/tests/src/JIT/Methodical/switch/switch5.ilproj b/tests/src/JIT/Methodical/switch/switch5.ilproj
index fa79cf698a..dceecad005 100644
--- a/tests/src/JIT/Methodical/switch/switch5.ilproj
+++ b/tests/src/JIT/Methodical/switch/switch5.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/switch/switch6.il b/tests/src/JIT/Methodical/switch/switch6.il
index 7bd8a9c94c..882d24a1d1 100644
--- a/tests/src/JIT/Methodical/switch/switch6.il
+++ b/tests/src/JIT/Methodical/switch/switch6.il
@@ -70,13 +70,13 @@
     IL_002f:  bne.un.s   IL_0044
 
     IL_0031:  ldc.i4.s   100
-    IL_0033:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0033:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0038:  ldstr      "Test passed"
     IL_003d:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0042:  br.s       IL_0054
 
     IL_0044:  ldc.i4.1
-    IL_0045:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0045:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_004a:  ldstr      "Test failed"
     IL_004f:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0054:  ret
@@ -88,8 +88,8 @@
     .maxstack  8
     IL_0000:  ldc.i4.1
     IL_0001:  call       void Test::DoSwitch(int32)
-    IL_0006:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_0006:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
diff --git a/tests/src/JIT/Methodical/switch/switch6.ilproj b/tests/src/JIT/Methodical/switch/switch6.ilproj
index 4237dcf0b3..8bee6869b6 100644
--- a/tests/src/JIT/Methodical/switch/switch6.ilproj
+++ b/tests/src/JIT/Methodical/switch/switch6.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/switch/switch7.il b/tests/src/JIT/Methodical/switch/switch7.il
index 37c33fe45c..174376050d 100644
--- a/tests/src/JIT/Methodical/switch/switch7.il
+++ b/tests/src/JIT/Methodical/switch/switch7.il
@@ -78,17 +78,17 @@
     IL_0018:  bne.un.s   IL_002d
 
     IL_001a:  ldc.i4.s   100
-    IL_001c:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_001c:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0021:  ldstr      "Test passed"
     IL_0026:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_002b:  br.s       IL_003d
 
     IL_002d:  ldc.i4.1
-    IL_002e:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_002e:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0033:  ldstr      "Test failed"
     IL_0038:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
-    IL_003d:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_003d:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
diff --git a/tests/src/JIT/Methodical/switch/switch7.ilproj b/tests/src/JIT/Methodical/switch/switch7.ilproj
index d745ebdca6..4be2149471 100644
--- a/tests/src/JIT/Methodical/switch/switch7.ilproj
+++ b/tests/src/JIT/Methodical/switch/switch7.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/switch/switch8.il b/tests/src/JIT/Methodical/switch/switch8.il
index 5b3119fea2..9b57c71b68 100644
--- a/tests/src/JIT/Methodical/switch/switch8.il
+++ b/tests/src/JIT/Methodical/switch/switch8.il
@@ -36,13 +36,13 @@
     IL_0018:  br.s       IL_002d
 
     IL_001a:  ldc.i4.s   100
-    IL_001c:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_001c:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0021:  ldstr      "Test passed"
     IL_0026:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_002b:  br.s       IL_003d
 
     IL_002d:  ldc.i4.1
-    IL_002e:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_002e:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0033:  ldstr      "Test failed"
     IL_0038:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_003d:  ret
@@ -54,8 +54,8 @@
     .maxstack  8
     IL_0000:  ldc.i4.2
     IL_0001:  call       void Test::DoSwitch(int32)
-    IL_0006:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_0006:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
diff --git a/tests/src/JIT/Methodical/switch/switch8.ilproj b/tests/src/JIT/Methodical/switch/switch8.ilproj
index 1d7cd3e5af..8089bc5c6d 100644
--- a/tests/src/JIT/Methodical/switch/switch8.ilproj
+++ b/tests/src/JIT/Methodical/switch/switch8.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/switch/switch9.il b/tests/src/JIT/Methodical/switch/switch9.il
index 9d9a0fd144..bbdb518649 100644
--- a/tests/src/JIT/Methodical/switch/switch9.il
+++ b/tests/src/JIT/Methodical/switch/switch9.il
@@ -41,19 +41,19 @@
     IL_0026:  br.s       IL_004d
 
     IL_0028:  ldc.i4.s   100
-    IL_002a:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_002a:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_002f:  ldstr      "Test passed"
     IL_0034:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0039:  br.s       IL_005f
 
     IL_003b:  ldc.i4.1
-    IL_003c:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_003c:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0041:  ldstr      "Test failed"
     IL_0046:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_004b:  br.s       IL_005f
 
     IL_004d:  ldc.i4.1
-    IL_004e:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_004e:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0053:  ldstr      "Test failed"
     IL_0058:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_005d:  br.s       IL_005f
@@ -61,13 +61,13 @@
     IL_005f:  br.s       IL_0085
 
     IL_0061:  ldc.i4.1
-    IL_0062:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0062:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0067:  ldstr      "Test failed"
     IL_006c:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0071:  br.s       IL_0085
 
     IL_0073:  ldc.i4.1
-    IL_0074:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+    IL_0074:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
     IL_0079:  ldstr      "Test failed"
     IL_007e:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
     IL_0083:  br.s       IL_0085
@@ -83,8 +83,8 @@
     IL_0001:  ldc.i4.1
     IL_0002:  call       void Test::DoSwitch(int32,
                                              int32)
-    IL_0007:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_0007:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
  
diff --git a/tests/src/JIT/Methodical/switch/switch9.ilproj b/tests/src/JIT/Methodical/switch/switch9.ilproj
index 5bbb17efd2..2dfff7a6fa 100644
--- a/tests/src/JIT/Methodical/switch/switch9.ilproj
+++ b/tests/src/JIT/Methodical/switch/switch9.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj b/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj
index d55824a331..e56fbdecad 100644
--- a/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj
+++ b/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
     <!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. -->
     <HeapVerifyIncompatible>true</HeapVerifyIncompatible>
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_enum.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_enum.ilproj
index 68dc292830..60d81ded03 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_enum.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_enum.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i2_bool.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i2_bool.ilproj
index 2fa38e12b9..816138540e 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i2_bool.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i2_bool.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_i1.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_i1.ilproj
index 93fb1ad10f..bd025f75d2 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_i1.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_i1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_u.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_u.ilproj
index 99f3c29525..c830bb1cfc 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_u.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i4_u.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i_u2.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i_u2.ilproj
index ee47aefce4..a18304d9e3 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i_u2.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_i_u2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_obj.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_obj.ilproj
index 49e843af0a..c3609d5200 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_obj.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_obj.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8.ilproj
index a220f2b30d..4fd60774b1 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8_inl.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8_inl.ilproj
index d1656f62b3..974b7126ce 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8_inl.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8_inl.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4.ilproj
index 2f7b737087..6ff75f2e97 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4_inl.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4_inl.ilproj
index f2a3ed8162..06f07ead72 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4_inl.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4_inl.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_v.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_v.ilproj
index bef9c901ba..07521bc702 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_v.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_v.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array.ilproj
index 7426687b3f..5ac518d41b 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array_nz.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array_nz.ilproj
index 68752e1085..ed404b2498 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array_nz.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_array_nz.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_gc.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_gc.ilproj
index 6a0fa9626e..cebf92c24b 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_gc.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_gc.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_inst.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_inst.ilproj
index c0669604b3..20d2ba7e31 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_inst.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_inst.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_value.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_value.ilproj
index ff4491f905..e62303bfb1 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_value.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_value.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_virt.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_virt.ilproj
index 2c8e0ce275..8660a32564 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_virt.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgdeep_virt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbggcval.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbggcval.ilproj
index 270146f74b..87aa066825 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbggcval.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbggcval.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbggcval_nested.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbggcval_nested.ilproj
index b614a2bbb1..6a879d010c 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbggcval_nested.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbggcval_nested.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbggcval_sideeffect.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbggcval_sideeffect.ilproj
index 0deb399f72..ab8b45cebc 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbggcval_sideeffect.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbggcval_sideeffect.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj
index 12e27a7059..dd95258753 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj
index ee2c646066..fd62729516 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep.ilproj
index b06472dca9..9a0920f0f7 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep_void.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep_void.ilproj
index d43acbe1ea..449bbaec57 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep_void.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep_void.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgreference_i.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgreference_i.ilproj
index 344caf665a..6e495ab74b 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgreference_i.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgreference_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2a.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2a.ilproj
index cbff15144a..6e031b6302 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2a.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2a.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2b.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2b.ilproj
index 63b079f0e2..8d1a25aeca 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2b.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2b.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2c.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2c.ilproj
index adfd57c3fb..de67198761 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2c.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_2c.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_3b.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_3b.ilproj
index d5e6be8b5b..d1afd9e430 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_3b.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_3b.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_implicit.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_implicit.ilproj
index 1d46865b18..b09a9b92b9 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_implicit.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_implicit.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_mutual_rec.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_mutual_rec.ilproj
index b8f554aa75..5a47507b8b 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_mutual_rec.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_mutual_rec.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_switch.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_switch.ilproj
index 6a3abcf942..627f4a6335 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_switch.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_switch.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_virt.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_virt.ilproj
index 2006f702d0..389ad8d670 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_virt.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_virt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_void.ilproj b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_void.ilproj
index bfb4eaf7a1..68cc4924c4 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_dbgtest_void.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_dbgtest_void.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_enum.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_enum.ilproj
index 2f75e77997..e8efe982f6 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_enum.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_enum.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i2_bool.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i2_bool.ilproj
index 7cbb1d4708..b18424da82 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i2_bool.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i2_bool.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_i1.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_i1.ilproj
index 18814ef562..f03511d4ef 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_i1.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_i1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_u.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_u.ilproj
index a939f42ffd..9154d1fd15 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_u.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i4_u.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i_u2.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i_u2.ilproj
index a42c04571f..83a7376bfa 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_i_u2.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_i_u2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_obj.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_obj.ilproj
index 359df47660..85b7a31ad5 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_obj.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_obj.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8.ilproj
index 714783b160..ecb40fd88b 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8_inl.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8_inl.ilproj
index 45e6f40e4c..4019541954 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8_inl.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8_inl.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4.ilproj
index 247de06de9..d1289b6628 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4_inl.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4_inl.ilproj
index b59244868a..963ec7f9a8 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4_inl.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4_inl.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relcompat_v.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relcompat_v.ilproj
index 57b685ead3..0c0fe81616 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relcompat_v.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relcompat_v.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_array.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_array.ilproj
index 07e6591bd6..16aba1b145 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_array.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_array.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_array_nz.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_array_nz.ilproj
index 5339178175..3c6c1744b8 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_array_nz.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_array_nz.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_gc.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_gc.ilproj
index 302d282556..6b8f42f601 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_gc.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_gc.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_inst.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_inst.ilproj
index 0906f9a045..1c431232f6 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_inst.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_inst.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_value.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_value.ilproj
index bba8ae7332..d2b9ea9ab2 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_value.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_value.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reldeep_virt.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reldeep_virt.ilproj
index a312ff68ba..292ea61124 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reldeep_virt.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reldeep_virt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relgcval.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relgcval.ilproj
index 6775c891be..0f2d0a65c2 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relgcval.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relgcval.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relgcval_nested.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relgcval_nested.ilproj
index f3fb4b39fd..0da477cf23 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relgcval_nested.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relgcval_nested.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relgcval_sideeffect.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relgcval_sideeffect.ilproj
index 93192bb0c4..478a7e56a0 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relgcval_sideeffect.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relgcval_sideeffect.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj
index 5426e4cfb6..2a7b1b078e 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj
index d3d0856aea..ef99721a0c 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep.ilproj
index ee97ad77a7..3c74dfe233 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep_void.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep_void.ilproj
index cd3d358495..96aaaf0bd8 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep_void.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep_void.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_relreference_i.ilproj b/tests/src/JIT/Methodical/tailcall/_il_relreference_i.ilproj
index 5b992873b6..d856714379 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_relreference_i.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_relreference_i.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_2a.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_2a.ilproj
index 0c08acf8e0..c8b724345b 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_2a.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_2a.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_2b.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_2b.ilproj
index 799727f78b..59bc2735a8 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_2b.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_2b.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_2c.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_2c.ilproj
index 1d143900f7..7c71c0e5aa 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_2c.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_2c.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_3b.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_3b.ilproj
index 829d7413b8..468998cbc5 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_3b.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_3b.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_implicit.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_implicit.ilproj
index fa202221e2..39279082af 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_implicit.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_implicit.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_mutual_rec.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_mutual_rec.ilproj
index 0ac8e1adbb..d06e2d739d 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_mutual_rec.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_mutual_rec.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_switch.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_switch.ilproj
index 8fc71b9d96..4895f3590d 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_switch.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_switch.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_virt.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_virt.ilproj
index 8f6f897a04..32202712b2 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_virt.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_virt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/_il_reltest_void.ilproj b/tests/src/JIT/Methodical/tailcall/_il_reltest_void.ilproj
index c6b0ea9e4e..226defdd37 100644
--- a/tests/src/JIT/Methodical/tailcall/_il_reltest_void.ilproj
+++ b/tests/src/JIT/Methodical/tailcall/_il_reltest_void.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall/recurse_ep_void.il b/tests/src/JIT/Methodical/tailcall/recurse_ep_void.il
index ec1d8b1009..34f981e38f 100644
--- a/tests/src/JIT/Methodical/tailcall/recurse_ep_void.il
+++ b/tests/src/JIT/Methodical/tailcall/recurse_ep_void.il
@@ -42,7 +42,7 @@
                                                                                class System.String)
       IL_0039:  call       void [System.Console]System.Console::WriteLine(class System.String)
       IL_003e:  ldc.i4     0x65
-      IL_0043:  call       void [mscorlib]System.Environment::Exit(int32)
+      IL_0043:  call       void [system.runtime.extensions]System.Environment::Exit(int32)
       IL_0048:  ret
 
       IL_0049:  ldsfld     int32 JitTest.Test::m
diff --git a/tests/src/JIT/Methodical/tailcall/test_2a.il b/tests/src/JIT/Methodical/tailcall/test_2a.il
index 5db6aecc9d..c4146b741d 100644
--- a/tests/src/JIT/Methodical/tailcall/test_2a.il
+++ b/tests/src/JIT/Methodical/tailcall/test_2a.il
@@ -22,7 +22,7 @@
       .maxstack  4
       .locals (int32 V_0)
       ldc.i4.1
-      call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       ldsfld     int32 JitTest.Test::n
       ldc.i4.1
       bne.un.s   IL_0047
diff --git a/tests/src/JIT/Methodical/tailcall/test_2b.il b/tests/src/JIT/Methodical/tailcall/test_2b.il
index 783ab3c7ce..c98b345192 100644
--- a/tests/src/JIT/Methodical/tailcall/test_2b.il
+++ b/tests/src/JIT/Methodical/tailcall/test_2b.il
@@ -22,7 +22,7 @@
       .maxstack  4
       .locals (int32 V_0)
       ldc.i4.1
-      call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       ldsfld     int32 JitTest.Test::n
       ldc.i4.1
       bne.un.s   IL_0047
diff --git a/tests/src/JIT/Methodical/tailcall/test_2c.il b/tests/src/JIT/Methodical/tailcall/test_2c.il
index fabec50e9e..fa1fc0fd60 100644
--- a/tests/src/JIT/Methodical/tailcall/test_2c.il
+++ b/tests/src/JIT/Methodical/tailcall/test_2c.il
@@ -22,7 +22,7 @@
       .maxstack  4
       .locals (int32 V_0)
       ldc.i4.1
-      call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       ldsfld     int32 JitTest.Test::n
       ldc.i4.1
       bne.un.s   IL_0047
diff --git a/tests/src/JIT/Methodical/tailcall/test_implicit.il b/tests/src/JIT/Methodical/tailcall/test_implicit.il
index 25575d7c08..0115c62f00 100644
--- a/tests/src/JIT/Methodical/tailcall/test_implicit.il
+++ b/tests/src/JIT/Methodical/tailcall/test_implicit.il
@@ -120,7 +120,7 @@ ret
     IL_0016:  ldc.i4.s   100
     IL_0018:  bne.un.s   IL_0053
 
-    IL_001a:  call       string [mscorlib]System.Environment::get_StackTrace()
+    IL_001a:  call       string [system.runtime.extensions]System.Environment::get_StackTrace()
     IL_001f:  stloc.0
     IL_0020:  ldloc.0
     IL_0021:  ldstr      "Main"
@@ -136,7 +136,7 @@ ret
     IL_003e:  ldstr      "Test Failed"
     IL_0043:  call       void [System.Console]System.Console::WriteLine(string)
     IL_0048:  ldc.i4.0
-    IL_0049:  call       void [mscorlib]System.Environment::Exit(int32)
+    IL_0049:  call       void [system.runtime.extensions]System.Environment::Exit(int32)
     IL_004e:  call       void [mscorlib]System.GC::Collect()
     IL_0053:  ldarg.0
     IL_0054:  dup
@@ -239,7 +239,7 @@ ret
     IL_001b:  bne.un.s   IL_0056
 
     IL_001d:  call       void [mscorlib]System.GC::Collect()
-    IL_0022:  call       string [mscorlib]System.Environment::get_StackTrace()
+    IL_0022:  call       string [system.runtime.extensions]System.Environment::get_StackTrace()
     IL_0027:  stloc.0
     IL_0028:  ldloc.0
     IL_0029:  ldstr      "Main"
@@ -255,7 +255,7 @@ ret
     IL_0046:  ldstr      "Test Failed"
     IL_004b:  call       void [System.Console]System.Console::WriteLine(string)
     IL_0050:  ldc.i4.0
-    IL_0051:  call       void [mscorlib]System.Environment::Exit(int32)
+    IL_0051:  call       void [system.runtime.extensions]System.Environment::Exit(int32)
     IL_0056:  ldarg.0
     IL_0057:  dup
     IL_0058:  ldfld      int32 Class1::'value'
diff --git a/tests/src/JIT/Methodical/tailcall/test_mutual_rec.il b/tests/src/JIT/Methodical/tailcall/test_mutual_rec.il
index 7d7284d3cb..5a291fa863 100644
--- a/tests/src/JIT/Methodical/tailcall/test_mutual_rec.il
+++ b/tests/src/JIT/Methodical/tailcall/test_mutual_rec.il
@@ -22,7 +22,7 @@
       .maxstack  4
       .locals (int32 V_0)
       ldc.i4.1
-      call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       ldsfld     int32 JitTest.Test::n
       ldc.i4.1
       bne.un.s   IL_0047
@@ -76,7 +76,7 @@ MERGE1:
       .maxstack  4
       .locals (int32 V_0)
       ldc.i4.1
-      call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       ldsfld     int32 JitTest.Test::n
       ldc.i4.1
       bne.un.s   IL_0047
@@ -130,7 +130,7 @@ MERGE1:
       .maxstack  4
       .locals (int32 V_0)
       ldc.i4.1
-      call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       ldsfld     int32 JitTest.Test::n
       ldc.i4.1
       bne.un.s   IL_0047
diff --git a/tests/src/JIT/Methodical/tailcall/test_switch.il b/tests/src/JIT/Methodical/tailcall/test_switch.il
index 3a6d4e633b..6eed26c8db 100644
--- a/tests/src/JIT/Methodical/tailcall/test_switch.il
+++ b/tests/src/JIT/Methodical/tailcall/test_switch.il
@@ -40,7 +40,7 @@
       .maxstack  4
       .locals (int32 V_0)
       ldc.i4.1
-      call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       ldsfld     int32 JitTest.Test::n
       ldc.i4.1
       bne.un.s   IL_0047
diff --git a/tests/src/JIT/Methodical/tailcall/test_virt.il b/tests/src/JIT/Methodical/tailcall/test_virt.il
index 1ec36f502d..77795e4709 100644
--- a/tests/src/JIT/Methodical/tailcall/test_virt.il
+++ b/tests/src/JIT/Methodical/tailcall/test_virt.il
@@ -20,7 +20,7 @@
       .maxstack  4
       .locals (int32 V_0)
       ldc.i4.1
-      call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       ldsfld     int32 JitTest.TestClass::n
       ldc.i4.1
       bne.un.s   IL_0047
diff --git a/tests/src/JIT/Methodical/tailcall/test_void.il b/tests/src/JIT/Methodical/tailcall/test_void.il
index 44cf3de026..2c478df1ab 100644
--- a/tests/src/JIT/Methodical/tailcall/test_void.il
+++ b/tests/src/JIT/Methodical/tailcall/test_void.il
@@ -31,7 +31,7 @@
       ldstr      "PASSED: 10! == 3628800"
       call       void [System.Console]System.Console::WriteLine(class System.String)
       ldc.i4.s   100
-      call       void [mscorlib]System.Environment::Exit(int32)
+      call       void [system.runtime.extensions]System.Environment::Exit(int32)
       ret
 
 IL_0029:
@@ -41,7 +41,7 @@ IL_0029:
       call       class System.String [mscorlib]System.String::Concat(class System.String, class System.String)
       call       void [System.Console]System.Console::WriteLine(class System.String)
       ldc.i4.s   101
-      call       void [mscorlib]System.Environment::Exit(int32)
+      call       void [system.runtime.extensions]System.Environment::Exit(int32)
       ret
 
 IL_0047:
diff --git a/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj b/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
index eb379fd104..40f1d8452d 100644
--- a/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
+++ b/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ECA6C872-18D0-4F24-9429-3E36709DF29F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/tailcall_v4/delegatetail.ilproj b/tests/src/JIT/Methodical/tailcall_v4/delegatetail.ilproj
index 0617e31659..b2f96e91e9 100644
--- a/tests/src/JIT/Methodical/tailcall_v4/delegatetail.ilproj
+++ b/tests/src/JIT/Methodical/tailcall_v4/delegatetail.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj b/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj
index f92efe2970..b6b5338acf 100644
--- a/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj
+++ b/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
     <!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. -->
     <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
diff --git a/tests/src/JIT/Methodical/tailcall_v4/smallFrame.ilproj b/tests/src/JIT/Methodical/tailcall_v4/smallFrame.ilproj
index 7d29d2a440..1b68bc5dd9 100644
--- a/tests/src/JIT/Methodical/tailcall_v4/smallFrame.ilproj
+++ b/tests/src/JIT/Methodical/tailcall_v4/smallFrame.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/tailcall_v4/tailcall_AV.ilproj b/tests/src/JIT/Methodical/tailcall_v4/tailcall_AV.ilproj
index b55132db80..894778f84b 100644
--- a/tests/src/JIT/Methodical/tailcall_v4/tailcall_AV.ilproj
+++ b/tests/src/JIT/Methodical/tailcall_v4/tailcall_AV.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-0.csproj b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-0.csproj
index 213babe6c1..9f2bf2dac4 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-0.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-0.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-1.csproj b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-1.csproj
index e65439add3..9a3dc5149c 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-1.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-2.csproj b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-2.csproj
index 52c061b261..eb52fa8771 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-2.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-3.csproj b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-3.csproj
index 07c40803ff..d028d1a22b 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-3.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-4.csproj b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-4.csproj
index 0b198bc302..fa568901e7 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-4.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-5.csproj b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-5.csproj
index 8174baab90..4bdf68668f 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-5.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-6.csproj b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-6.csproj
index badcd4e21c..d5a7cd236b 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-6.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-0.csproj b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-0.csproj
index 131f748ebe..9390a5f156 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-0.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-0.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-1.csproj b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-1.csproj
index f934e938a7..37d229f6b8 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-1.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-2.csproj b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-2.csproj
index d63e28d2d5..fcf7afe1b1 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-2.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-3.csproj b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-3.csproj
index 1dc9e101e5..075771d537 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-3.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-4.csproj b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-4.csproj
index 4204259741..4ce3d693ea 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-4.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-5.csproj b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-5.csproj
index 9e86456cd4..d52ac7720d 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-5.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-6.csproj b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-6.csproj
index deda9df4cc..3a7f00d29e 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-6.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-0.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-0.csproj
index c76c2637dd..d708aa0893 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-0.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-0.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-1.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-1.csproj
index aa0f4738a0..1fea999e42 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-1.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-2.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-2.csproj
index 56dbe7945a..23e13babf7 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-2.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-3.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-3.csproj
index 97e53dbe45..e5a33497dc 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-3.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-4.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-4.csproj
index 395a9488fb..097b509144 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-4.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-5.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-5.csproj
index 0e09ad4a89..e88198108e 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-5.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-6.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-6.csproj
index 46d162cc85..fdf99f13e3 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-6.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-0.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-0.csproj
index 8b3638e350..2495384df3 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-0.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-0.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-1.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-1.csproj
index 3a88d5a414..9b3505239d 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-1.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-2.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-2.csproj
index de5b42b489..4a73b89a50 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-2.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-3.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-3.csproj
index 5ed9e6b8ff..67d6910dc4 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-3.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-4.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-4.csproj
index 426ab923e6..0df7ef9c69 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-4.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-5.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-5.csproj
index 93110aa64b..e6a85bd1ba 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-5.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-6.csproj b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-6.csproj
index e307f3789b..0ca4681591 100644
--- a/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-6.csproj
+++ b/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxblk/cpblk3_il_d.ilproj b/tests/src/JIT/Methodical/xxblk/cpblk3_il_d.ilproj
index 05f61e0a98..98cf86ede9 100644
--- a/tests/src/JIT/Methodical/xxblk/cpblk3_il_d.ilproj
+++ b/tests/src/JIT/Methodical/xxblk/cpblk3_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxblk/cpblk3_il_r.ilproj b/tests/src/JIT/Methodical/xxblk/cpblk3_il_r.ilproj
index 15ce8abade..ca46ae5f87 100644
--- a/tests/src/JIT/Methodical/xxblk/cpblk3_il_r.ilproj
+++ b/tests/src/JIT/Methodical/xxblk/cpblk3_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cpblk3.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/xxblk/initblk3_il_d.ilproj b/tests/src/JIT/Methodical/xxblk/initblk3_il_d.ilproj
index 885e46aa61..525e11e2cd 100644
--- a/tests/src/JIT/Methodical/xxblk/initblk3_il_d.ilproj
+++ b/tests/src/JIT/Methodical/xxblk/initblk3_il_d.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxblk/initblk3_il_r.ilproj b/tests/src/JIT/Methodical/xxblk/initblk3_il_r.ilproj
index 1f5f18f61b..e1e98abb5b 100644
--- a/tests/src/JIT/Methodical/xxblk/initblk3_il_r.ilproj
+++ b/tests/src/JIT/Methodical/xxblk/initblk3_il_r.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="initblk3.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I.ilproj
index b8e32421ff..d32c55aad2 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I8.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I8.ilproj
index 5fca0a588d..3ba6f0687a 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I8.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_I8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R4.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R4.ilproj
index ef763292ad..225d68e405 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R4.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R8.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R8.ilproj
index 47e49e0cad..2d23f65fca 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R8.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_R8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_U2.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_U2.ilproj
index 16909db2d7..ccf8d466aa 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_U2.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_U2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_V.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_V.ilproj
index 578989a52c..a44b6829a7 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_V.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_dbgldobj_V.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I.ilproj
index c403bb75c5..649cc060ad 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I8.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I8.ilproj
index acb8352b0e..96d50e55c0 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I8.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_I8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R4.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R4.ilproj
index 19e5a99ddd..83fc9125e1 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R4.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R8.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R8.ilproj
index 747400b9c1..3dacac1c99 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R8.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_R8.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_U2.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_U2.ilproj
index 38c5b839e5..96d73655c6 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_U2.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_U2.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_V.ilproj b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_V.ilproj
index bb54c8ca8c..8601da37e7 100644
--- a/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_V.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/ldobj/_il_relldobj_V.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj
index b1eab53512..0225a059b7 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7E21C292-9028-4A19-9BC4-31B8BAE3267C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
index b9d0cd2a4a..1da3cca292 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F5550373-AC46-4BEA-B446-4C335FF6E5F1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj
index b50cdbcbd6..70a240f2a7 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj
index 95c3116226..df18f87494 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj
index e58f601b15..745327a099 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj
index 164282b091..9f90fb234b 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj
index b1dcd93d5e..b5a084e258 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj
index cd562c192f..6afa4090b0 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj
index ba6b4c8c3a..5026d02147 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj
index 8eff76618f..c865b1f364 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj
index c17df3d6e8..a934534ac9 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj
index e221dccefa..1175fcfbb5 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj
index d5c9a2fac2..0240ada49a 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj
index 3389aee448..0e02d29167 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj
index 22df91b099..faf18d60df 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CF1D5ED4-2614-4962-8934-2419D50E65A1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
index 434ea1bcb9..6d6de466b7 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9BF89FA0-5D62-49B6-8F0B-3E9E3F9E6B56}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj
index dd5fbe1dc1..82d5593bcd 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1C8140E3-52CD-4983-B625-ADFDD9250249}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
index 5e26e6f6e5..903dddcb31 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DA709AE7-605E-4697-AF66-B20CBBD007DE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj
index 111cac03c9..f7e7aafbeb 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{78376B7F-ECE7-43AE-9BEF-081567876638}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
index efde571e42..d818a8ab4a 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{847D698E-DCFD-4838-9249-63C2D1E755CF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
index d350e3bc62..8f35c4bb65 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3BC10F3E-3ABC-4E95-AD1A-D76202055F5C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.csproj
index 8938d5c24b..b97c14b8d4 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.csproj
index 1e106be4bf..bf98063438 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.csproj
index bf8f42a38d..00ad25a2bd 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj b/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
index 0d953e7550..df34be2535 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj b/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
index c2f3badca1..48b6d9ffa9 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj b/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj
index 4e5493c05d..0c509da3fa 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj b/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
index fd612ebeed..7cddd43de3 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj b/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
index adc3c7970f..00cbd4c527 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj b/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
index 992abec11d..e1d3cbf9fe 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.csproj
index 3abd4bdda4..7e33cbb7f3 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.csproj
index e4bb3d357c..843c119b25 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.csproj
index 3825744321..1e30970d94 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.csproj
index e4c28f631b..ecd1acf944 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.csproj
index 2f9946b6ff..4e14ea6847 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.csproj
index fb09cbacf8..ad2e3d206d 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.csproj
index c7efbd1f56..fc6a196a7d 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.csproj
index 15d7995b81..118f451031 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.csproj b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.csproj
index 621230c08c..737761352f 100644
--- a/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.csproj
+++ b/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj
index 580bd54343..80afc6699a 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Adams/Adams.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj
index a8c38ad663..174ee76e18 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMk2/BenchMk2.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj
index a2acd3bea8..1594ae0a45 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/BenchMrk/BenchMrk.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj
index 210f6f1940..70fdb06897 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Bisect/Bisect.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj
index 6ca1184365..bd1b084df5 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/DMath/DMath.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj
index bfb377fe62..10f39efd08 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/FFT/FFT.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj
index 416c1b9662..975bf96f92 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/InProd/InProd.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj
index c7a4bb91b0..417f1c5631 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/InvMt/InvMt.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj
index cabdbd6607..6751cc2492 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/LLoops.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/THIRD-PARTY-NOTICES b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/THIRD-PARTY-NOTICES
new file mode 100644
index 0000000000..7e0bac5f31
--- /dev/null
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/LLoops/THIRD-PARTY-NOTICES
@@ -0,0 +1,17 @@
+.NET Core uses third-party libraries or other resources that may be
+distributed under licenses different than the .NET Core software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           dotnet@microsoft.com
+
+The attached notices are provided for information only.
+
+License notice for Livermore Loops coded in C 
+---------------------------------------------
+
+http://www.netlib.org/benchmark/livermorec
+
+No specific license is given, so attributing and using in "good faith" 
+in the same way that it has been offered. We will delete upon request.
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj
index 593474426a..1ab94d40c8 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Lorenz/Lorenz.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj
index 13238071d2..09454d9218 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/MatInv4/MatInv4.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj
index dcf02d3f67..1213cae10a 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtE/NewtE.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj
index 1502b85410..a6f11c0f06 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/NewtR/NewtR.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj
index 4cd3e0e069..37fa54eda8 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Regula/Regula.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj
index 64bbe04cdb..ca2c525458 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Romber/Romber.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj
index 1a0758ba51..27e3773834 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Secant/Secant.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj
index 67f81313f6..d7b09af860 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Simpsn/Simpsn.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj
index d371554449..90d780e258 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/SqMtx/SqMtx.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj
index 8a46ca61d7..e9f704cf6b 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Trap/Trap.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj b/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj
index 46898e3188..02eaf525e9 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchF/Whetsto/Whetsto.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj
index efef461379..a4c3de5674 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/8Queens/8Queens.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj
index 8d0feb5a01..8f72e1c87e 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Ackermann/Ackermann.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj
index 2fd1aae521..ffadd54595 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray/AddArray.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj
index cb8f12ddb2..2619b38c0c 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/AddArray2/AddArray2.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj
index b7d7918823..cb1ed7b648 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Array1/Array1.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj
index 0932bfb0ea..b368d85bda 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Array2/Array2.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj
index 0def91ffa2..6d58dc402f 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BenchE/BenchE.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj
index 6fabe89c8e..776afa72c0 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort/BubbleSort.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj
index 7b5fb93ed9..448892e8eb 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/BubbleSort2/BubbleSort2.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj
index 599dcd7b74..edbab6006b 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/CSieve/CSieve.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj
index 2b8c995bd8..ff30f8ccf7 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Fib/Fib.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj
index 2afbe54997..270e55060f 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/HeapSort/HeapSort.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj
index 2fab51071a..bcf7b40d72 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/IniArray/IniArray.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj
index 0281fb4ca7..669a0efdd5 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/LogicArray/LogicArray.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj
index e7e379be83..666ba47ce2 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Midpoint/Midpoint.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj
index 5046b02d9e..78573f88cc 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/MulMatrix/MulMatrix.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj
index ea175a5d04..5622ad71d2 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/NDhrystone/NDhrystone.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj
index cbe2114304..63339c8903 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Permutate/Permutate.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj
index d7d212eace..5228f957ba 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Pi/Pi.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj
index 185bb7c08e..ea10a44d83 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/Puzzle/Puzzle.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj
index f079692c3c..f16d1d38b1 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/QuickSort/QuickSort.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj
index 919c7d2b6e..caa2de7720 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeInsert/TreeInsert.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj
index b9f78517a9..9d253e28b4 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/TreeSort/TreeSort.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj b/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj
index 922fd5fc39..a234c09352 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchI/XposMatrix/XposMatrix.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/THIRD-PARTY-NOTICES b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/THIRD-PARTY-NOTICES
new file mode 100644
index 0000000000..2efc37d6e9
--- /dev/null
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/THIRD-PARTY-NOTICES
@@ -0,0 +1,46 @@
+.NET Core uses third-party libraries or other resources that may be
+distributed under licenses different than the .NET Core software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           dotnet@microsoft.com
+
+The attached notices are provided for information only.
+
+License notice for The Computer Language Benchmarks Game
+---------------------------
+
+Revised BSD license
+
+This is a specific instance of the Open Source Initiative (OSI) BSD license template
+http://www.opensource.org/licenses/bsd-license.php
+
+Copyright (c) 2004-2008 Brent Fulgham, 2005-2015 Isaac Gouy
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+   Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+   Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+   Neither the name of "The Computer Language Benchmarks Game" nor the name of
+   "The Computer Language Shootout Benchmarks" nor the names of its
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj
index 257a1d8466..3cbf952833 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj
index 169e33d322..a7c8f2daf3 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/binarytrees/binarytrees3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj
index c153dfae39..259d5e8ff3 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fasta/fasta.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj
index 38459d270f..8d77905de9 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/fastaredux/fastaredux.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj
index 94e1dfbda8..097a3a2534 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/k-nucleotide.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj
index 8bf75d660e..f8c3785f54 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/nbody/nbody.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj
index 005e93a306..7396e3b00f 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/pidigits/pi-digits.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj
index e77f257b42..6f334e9afb 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/regexdna/regexdna.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj
index b44017b188..69d39df429 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/revcomp/revcomp.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj
index 74ec22ac53..e12feab89a 100644
--- a/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/BenchmarksGame/spectralnorm/spectralnorm.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.cs b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.cs
index 11eccec14d..02dafa2dda 100644
--- a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.cs
@@ -5,7 +5,8 @@
 // .NET SIMD to solve Burgers' equation
 //
 // Benchmark based on 
-// http://taumuon-jabuka.blogspot.co.uk/2014/10/net-simd-to-solve-burgers-equation.html
+// https://github.com/taumuon/SIMD-Vectorisation-Burgers-Equation-CSharp
+// http://www.taumuon.co.uk/2014/10/net-simd-to-solve-burgers-equation.html
 
 using Microsoft.Xunit.Performance;
 using System;
diff --git a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj
index c26f227657..0f57308962 100644
--- a/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Burgers/Burgers.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/Burgers/THIRD-PARTY-NOTICES b/tests/src/JIT/Performance/CodeQuality/Burgers/THIRD-PARTY-NOTICES
new file mode 100644
index 0000000000..48cfac483f
--- /dev/null
+++ b/tests/src/JIT/Performance/CodeQuality/Burgers/THIRD-PARTY-NOTICES
@@ -0,0 +1,34 @@
+.NET Core uses third-party libraries or other resources that may be
+distributed under licenses different than the .NET Core software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           dotnet@microsoft.com
+
+The attached notices are provided for information only.
+
+License notice for SIMD-Vectorisation-Burgers-Equation-CSharp
+-------------------------------------------------------------
+
+MIT License
+
+Copyright (c) 2017 Gary Evans
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs
index 10699c67dc..280744bf5b 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/ByteMark.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
@@ -120,10 +116,12 @@ internal class global
     public const int LUARRAYROWS = 101;
     public const int LUARRAYCOLS = 101;
 
-
     // EMFLOAT constants
     public const int CPUEMFLOATLOOPMAX = 50000;
     public const int EMFARRAYSIZE = 3000;
+
+    // FOURIER constants
+    public const int FOURIERARRAYSIZE = 100;
 }
 
 /*
@@ -183,7 +181,7 @@ public abstract class HuffStruct : HarnessTest
 
 public abstract class FourierStruct : HarnessTest
 {
-    public int arraysize;                       /* Size of coeff. arrays */
+    public int arraysize = global.FOURIERARRAYSIZE;
     public override void ShowStats()
     {
         ByteMark.OutputString(
@@ -1261,15 +1259,15 @@ public class ByteMark
         global.write_to_file = false;
     }
 
-    const int NumericSortJaggedIterations = 20;
+    const int NumericSortJaggedIterations = 10;
 
     [Benchmark]
     public static void BenchNumericSortJagged()
     {
         Setup();
         NumericSortJagged t = new NumericSortJagged();
-        t.numarrays = 1000;
-        t.adjust = 0;
+        t.numarrays = 200;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1283,15 +1281,15 @@ public class ByteMark
         }
     }
 
-    const int NumericSortRectangularIterations = 20;
+    const int NumericSortRectangularIterations = 5;
 
     [Benchmark]
     public static void BenchNumericSortRectangular()
     {
         Setup();
         NumericSortRect t = new NumericSortRect();
-        t.numarrays = 1000;
-        t.adjust = 0;
+        t.numarrays = 200;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1312,8 +1310,8 @@ public class ByteMark
     {
         Setup();
         StringSort t = new StringSort();
-        t.numarrays = 1000;
-        t.adjust = 0;
+        t.numarrays = 40;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1326,14 +1324,15 @@ public class ByteMark
             }
         }
     }
-    const int BitOpsIterations = 15;
+
+    const int BitOpsIterations = 100000;
 
     [Benchmark]
     public static void BenchBitOps()
     {
         Setup();
         BitOps t = new BitOps();
-        t.adjust = 0;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1347,15 +1346,15 @@ public class ByteMark
         }
     }
 
-    const int EmFloatIterations = 8;
+    const int EmFloatIterations = 10;
 
     [Benchmark]
     public static void BenchEmFloat()
     {
         Setup();
         EmFloatStruct t = new EMFloat();
-        t.loops = 100;
-        t.adjust = 0;
+        t.loops = 50;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1369,15 +1368,15 @@ public class ByteMark
         }
     }
 
-    const int EmFloatClassIterations = 8;
+    const int EmFloatClassIterations = 2;
 
     [Benchmark]
     public static void BenchEmFloatClass()
     {
         Setup();
         EmFloatStruct t = new EMFloatClass();
-        t.loops = 100;
-        t.adjust = 0;
+        t.loops = 50;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1391,14 +1390,14 @@ public class ByteMark
         }
     }
 
-    const int FourierIterations = 20;
+    const int FourierIterations = 300;
 
     [Benchmark]
     public static void BenchFourier()
     {
         Setup();
         FourierStruct t = new Fourier();
-        t.adjust = 0;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1412,15 +1411,15 @@ public class ByteMark
         }
     }
 
-    const int AssignJaggedIterations = 15;
+    const int AssignJaggedIterations = 2;
 
     [Benchmark]
     public static void BenchAssignJagged()
     {
         Setup();
         AssignStruct t = new AssignJagged();
-        t.numarrays = 1000;
-        t.adjust = 0;
+        t.numarrays = 25;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1434,15 +1433,15 @@ public class ByteMark
         }
     }
 
-    const int AssignRectangularIterations = 20;
+    const int AssignRectangularIterations = 5;
 
     [Benchmark]
     public static void BenchAssignRectangular()
     {
         Setup();
         AssignStruct t = new AssignRect();
-        t.numarrays = 1000;
-        t.adjust = 0;
+        t.numarrays = 10;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1456,7 +1455,7 @@ public class ByteMark
         }
     }
 
-    const int IDEAEncryptionIterations = 20;
+    const int IDEAEncryptionIterations = 50;
 
     [Benchmark]
     public static void BenchIDEAEncryption()
@@ -1464,7 +1463,7 @@ public class ByteMark
         Setup();
         IDEAStruct t = new IDEAEncryption();
         t.loops = 100;
-        t.adjust = 0;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1478,15 +1477,15 @@ public class ByteMark
         }
     }
 
-    const int NeuralJaggedIterations = 20;
+    const int NeuralJaggedIterations = 10;
 
     [Benchmark]
     public static void BenchNeuralJagged()
     {
         Setup();
         NNetStruct t = new NeuralJagged();
-        t.loops = 100;
-        t.adjust = 0;
+        t.loops = 3;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1500,15 +1499,15 @@ public class ByteMark
         }
     }
 
-    const int NeuralIterations = 12;
+    const int NeuralIterations = 20;
 
     [Benchmark]
     public static void BenchNeural()
     {
         Setup();
         NNetStruct t = new Neural();
-        t.loops = 100;
-        t.adjust = 0;
+        t.loops = 1;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
@@ -1522,15 +1521,15 @@ public class ByteMark
         }
     }
 
-    const int LUDecompIterations = 20;
+    const int LUDecompIterations = 10;
 
     [Benchmark]
     public static void BenchLUDecomp()
     {
         Setup();
         LUStruct t = new LUDecomp();
-        t.numarrays = 1000;
-        t.adjust = 0;
+        t.numarrays = 250;
+        t.adjust = 1;
 
         foreach (var iteration in Benchmark.Iterations)
         {
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj b/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj
index 160660c9df..26a64c6e89 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/Bytemark.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,19 +7,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -54,6 +50,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/Huffman.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/Huffman.cs
index bfe9965919..f398b0ad10 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/Huffman.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/Huffman.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/StringSort.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/StringSort.cs
index e4888b2edd..12238e4447 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/StringSort.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/StringSort.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/THIRD-PARTY-NOTICES b/tests/src/JIT/Performance/CodeQuality/Bytemark/THIRD-PARTY-NOTICES
new file mode 100644
index 0000000000..3fe8ed3e4b
--- /dev/null
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/THIRD-PARTY-NOTICES
@@ -0,0 +1,38 @@
+.NET Core uses third-party libraries or other resources that may be
+distributed under licenses different than the .NET Core software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           dotnet@microsoft.com
+
+The attached notices are provided for information only.
+
+License notice for ByteMark
+---------------------------
+
+https://github.com/santoshsahoo/nbench (mirror of the same code)
+
+/*
+** BYTEmark (tm)
+** BYTE Magazine's Native Mode benchmarks
+** Rick Grehan, BYTE Magazine
+**
+** Create:
+** Revision: 3/95
+**
+** DISCLAIMER
+** The source, executable, and documentation files that comprise
+** the BYTEmark benchmarks are made available on an "as is" basis.
+** This means that we at BYTE Magazine have made every reasonable
+** effort to verify that the there are no errors in the source and
+** executable code.  We cannot, however, guarantee that the programs
+** are error-free.  Consequently, McGraw-HIll and BYTE Magazine make
+** no claims in regard to the fitness of the source code, executable
+** code, and documentation of the BYTEmark.
+** 
+** Furthermore, BYTE Magazine, McGraw-Hill, and all employees
+** of McGraw-Hill cannot be held responsible for any damages resulting
+** from the use of this code or the results obtained from using
+** this code.
+*/
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/assign_jagged.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/assign_jagged.cs
index 1ad69ff129..42c5d780fd 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/assign_jagged.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/assign_jagged.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/assign_rect.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/assign_rect.cs
index 43cab8a0ea..ac49cddddf 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/assign_rect.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/assign_rect.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/bitops.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/bitops.cs
index d692eeea23..41a006f2fc 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/bitops.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/bitops.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/emfloat.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/emfloat.cs
index e61b9380ab..1fba85cef8 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/emfloat.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/emfloat.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/emfloatclass.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/emfloatclass.cs
index 0ae261c16b..6d90823dfd 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/emfloatclass.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/emfloatclass.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/fourier.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/fourier.cs
index e2e0a5d609..1ef2f55085 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/fourier.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/fourier.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/idea.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/idea.cs
index 732a8f0ec9..9fa8dc212d 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/idea.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/idea.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/ludecomp.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/ludecomp.cs
index d45a51df59..e2ce4d80f2 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/ludecomp.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/ludecomp.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/neural-dat.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/neural-dat.cs
index 6e3ab36b94..e7104a6e4a 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/neural-dat.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/neural-dat.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/neural.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/neural.cs
index 9e842c3910..73854ee9cc 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/neural.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/neural.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/neuraljagged.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/neuraljagged.cs
index d9dd199c98..2276fde3de 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/neuraljagged.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/neuraljagged.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/Bytemark/numericsort.cs b/tests/src/JIT/Performance/CodeQuality/Bytemark/numericsort.cs
index 44da6e3a71..76484b34c5 100644
--- a/tests/src/JIT/Performance/CodeQuality/Bytemark/numericsort.cs
+++ b/tests/src/JIT/Performance/CodeQuality/Bytemark/numericsort.cs
@@ -2,10 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 /*
-** Copyright (c) Microsoft. All rights reserved.
-** Licensed under the MIT license. 
-** See LICENSE file in the project root for full license information.
-** 
 ** This program was translated to C# and adapted for xunit-performance.
 ** New variants of several tests were added to compare class versus 
 ** struct and to compare jagged arrays vs multi-dimensional arrays.
diff --git a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj
index d5ad1554b5..af7ce3b4c9 100644
--- a/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/FractalPerf/FractalPerf.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsByte.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsByte.cs
deleted file mode 100644
index 3b28f87fe5..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsByte.cs
+++ /dev/null
@@ -1,933 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsByte
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Bytes feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static byte Five = 5;
-    static byte Ten = 10;
-
-    static byte Id(byte x)
-    {
-        return x;
-    }
-
-    static byte F00(byte x)
-    {
-        return (byte) (x * x);
-    }
-
-    static bool Bench00p()
-    {
-        byte t = 10;
-        byte f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n()
-    {
-        byte t = Ten;
-        byte f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p1()
-    {
-        byte t = Id(10);
-        byte f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n1()
-    {
-        byte t = Id(Ten);
-        byte f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p2()
-    {
-        byte t = Id(10);
-        byte f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00n2()
-    {
-        byte t = Id(Ten);
-        byte f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00p3()
-    {
-        byte t = 10;
-        byte f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00n3()
-    {
-        byte t = Ten;
-        byte f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00p4()
-    {
-        byte t = 5;
-        byte f = F00((byte)(2 * t));
-        return (f == 100);
-    }
-
-    static bool Bench00n4()
-    {
-        byte t = Five;
-        byte f = F00((byte)(2 * t));
-        return (f == 100);
-    }
-
-    static byte F01(byte x)
-    {
-        return (byte)(1000 / x);
-    }
-
-    static bool Bench01p()
-    {
-        byte t = 10;
-        byte f = F01(t);
-        return (f == 100);
-    }
-
-    static bool Bench01n()
-    {
-        byte t = Ten;
-        byte f = F01(t);
-        return (f == 100);
-    }
-
-    static byte F02(byte x)
-    {
-        return (byte) (20 * (x / 2));
-    }
-
-    static bool Bench02p()
-    {
-        byte t = 10;
-        byte f = F02(t);
-        return (f == 100);
-    }
-
-    static bool Bench02n()
-    {
-        byte t = Ten;
-        byte f = F02(t);
-        return (f == 100);
-    }
-
-    static byte F03(byte x)
-    {
-        return (byte)(91 + 1009 % x);
-    }
-
-    static bool Bench03p()
-    {
-        byte t = 10;
-        byte f = F03(t);
-        return (f == 100);
-    }
-
-    static bool Bench03n()
-    {
-        byte t = Ten;
-        byte f = F03(t);
-        return (f == 100);
-    }
-
-    static byte F04(byte x)
-    {
-        return (byte)(50 * (x % 4));
-    }
-
-    static bool Bench04p()
-    {
-        byte t = 10;
-        byte f = F04(t);
-        return (f == 100);
-    }
-
-    static bool Bench04n()
-    {
-        byte t = Ten;
-        byte f = F04(t);
-        return (f == 100);
-    }
-
-    static byte F05(byte x)
-    {
-        return (byte)((1 << x) - 924);
-    }
-
-    static bool Bench05p()
-    {
-        byte t = 10;
-        byte f = F05(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n()
-    {
-        byte t = Ten;
-        byte f = F05(t);
-        return (f == 100);
-    }
-
-    static byte F051(byte x)
-    {
-        return (byte)(102400 >> x);
-    }
-
-    static bool Bench05p1()
-    {
-        byte t = 10;
-        byte f = F051(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n1()
-    {
-        byte t = Ten;
-        byte f = F051(t);
-        return (f == 100);
-    }
-
-    static byte F06(byte x)
-    {
-        return (byte)(-x + 110);
-    }
-
-    static bool Bench06p()
-    {
-        byte t = 10;
-        byte f = F06(t);
-        return (f == 100);
-    }
-
-    static bool Bench06n()
-    {
-        byte t = Ten;
-        byte f = F06(t);
-        return (f == 100);
-    }
-
-    static byte F07(byte x)
-    {
-        return (byte)(~x + 111);
-    }
-
-    static bool Bench07p()
-    {
-        byte t = 10;
-        byte f = F07(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n()
-    {
-        byte t = Ten;
-        byte f = F07(t);
-        return (f == 100);
-    }
-
-    static byte F071(byte x)
-    {
-        return (byte)((x ^ -1) + 111);
-    }
-
-    static bool Bench07p1()
-    {
-        byte t = 10;
-        byte f = F071(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n1()
-    {
-        byte t = Ten;
-        byte f = F071(t);
-        return (f == 100);
-    }
-
-    static byte F08(byte x)
-    {
-        return (byte)((x & 0x7) + 98);
-    }
-
-    static bool Bench08p()
-    {
-        byte t = 10;
-        byte f = F08(t);
-        return (f == 100);
-    }
-
-    static bool Bench08n()
-    {
-        byte t = Ten;
-        byte f = F08(t);
-        return (f == 100);
-    }
-
-    static byte F09(byte x)
-    {
-        return (byte)((x | 0x7) + 85);
-    }
-
-    static bool Bench09p()
-    {
-        byte t = 10;
-        byte f = F09(t);
-        return (f == 100);
-    }
-
-    static bool Bench09n()
-    {
-        byte t = Ten;
-        byte f = F09(t);
-        return (f == 100);
-    }
-
-    // Bytes feeding comparisons.
-    //
-    // Inlining in Bench1xp should enable branch optimization
-    // Inlining in Bench1xn will not enable branch optimization
-
-    static byte F10(byte x)
-    {
-        return x == 10 ? (byte) 100 : (byte) 0;
-    }
-
-    static bool Bench10p()
-    {
-        byte t = 10;
-        byte f = F10(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n()
-    {
-        byte t = Ten;
-        byte f = F10(t);
-        return (f == 100);
-    }
-
-    static byte F101(byte x)
-    {
-        return x != 10 ? (byte) 0 : (byte) 100;
-    }
-
-    static bool Bench10p1()
-    {
-        byte t = 10;
-        byte f = F101(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n1()
-    {
-        byte t = Ten;
-        byte f = F101(t);
-        return (f == 100);
-    }
-
-    static byte F102(byte x)
-    {
-        return x >= 10 ? (byte) 100 : (byte) 0;
-    }
-
-    static bool Bench10p2()
-    {
-        byte t = 10;
-        byte f = F102(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n2()
-    {
-        byte t = Ten;
-        byte f = F102(t);
-        return (f == 100);
-    }
-
-    static byte F103(byte x)
-    {
-        return x <= 10 ? (byte) 100 : (byte) 0;
-    }
-
-    static bool Bench10p3()
-    {
-        byte t = 10;
-        byte f = F103(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n3()
-    {
-        byte t = Ten;
-        byte f = F102(t);
-        return (f == 100);
-    }
-
-    static byte F11(byte x)
-    {
-        if (x == 10)
-        {
-            return 100;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    static bool Bench11p()
-    {
-        byte t = 10;
-        byte f = F11(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n()
-    {
-        byte t = Ten;
-        byte f = F11(t);
-        return (f == 100);
-    }
-
-    static byte F111(byte x)
-    {
-        if (x != 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p1()
-    {
-        byte t = 10;
-        byte f = F111(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n1()
-    {
-        byte t = Ten;
-        byte f = F111(t);
-        return (f == 100);
-    }
-
-    static byte F112(byte x)
-    {
-        if (x > 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p2()
-    {
-        byte t = 10;
-        byte f = F112(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n2()
-    {
-        byte t = Ten;
-        byte f = F112(t);
-        return (f == 100);
-    }
-    static byte F113(byte x)
-    {
-        if (x < 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p3()
-    {
-        byte t = 10;
-        byte f = F113(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n3()
-    {
-        byte t = Ten;
-        byte f = F113(t);
-        return (f == 100);
-    }
-
-    // Ununsed (or effectively unused) parameters
-    //
-    // Simple callee analysis may overstate inline benefit
-
-    static byte F20(byte x)
-    {
-        return 100;
-    }
-
-    static bool Bench20p()
-    {
-        byte t = 10;
-        byte f = F20(t);
-        return (f == 100);
-    }
-
-    static bool Bench20p1()
-    {
-        byte t = Ten;
-        byte f = F20(t);
-        return (f == 100);
-    }
-
-    static byte F21(byte x)
-    {
-        return (byte)(-x + 100 + x);
-    }
-
-    static bool Bench21p()
-    {
-        byte t = 10;
-        byte f = F21(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n()
-    {
-        byte t = Ten;
-        byte f = F21(t);
-        return (f == 100);
-    }
-
-    static byte F211(byte x)
-    {
-        return (byte)(x - x + 100);
-    }
-
-    static bool Bench21p1()
-    {
-        byte t = 10;
-        byte f = F211(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n1()
-    {
-        byte t = Ten;
-        byte f = F211(t);
-        return (f == 100);
-    }
-
-    static byte F22(byte x)
-    {
-        if (x > 0)
-        {
-            return 100;
-        }
-
-        return 100;
-    }
-
-    static bool Bench22p()
-    {
-        byte t = 10;
-        byte f = F22(t);
-        return (f == 100);
-    }
-
-    static bool Bench22p1()
-    {
-        byte t = Ten;
-        byte f = F22(t);
-        return (f == 100);
-    }
-
-    static byte F23(byte x)
-    {
-        if (x > 0)
-        {
-            return (byte)(90 + x);
-        }
-
-        return 100;
-    }
-
-    static bool Bench23p()
-    {
-        byte t = 10;
-        byte f = F23(t);
-        return (f == 100);
-    }
-
-    static bool Bench23n()
-    {
-        byte t = Ten;
-        byte f = F23(t);
-        return (f == 100);
-    }
-
-    // Multiple parameters
-
-    static byte F30(byte x, byte y)
-    {
-        return (byte)(y * y);
-    }
-
-    static bool Bench30p()
-    {
-        byte t = 10;
-        byte f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n()
-    {
-        byte t = Ten;
-        byte f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p1()
-    {
-        byte s = Ten;
-        byte t = 10;
-        byte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n1()
-    {
-        byte s = 10;
-        byte t = Ten;
-        byte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p2()
-    {
-        byte s = 10;
-        byte t = 10;
-        byte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n2()
-    {
-        byte s = Ten;
-        byte t = Ten;
-        byte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p3()
-    {
-        byte s = 10;
-        byte t = s;
-        byte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n3()
-    {
-        byte s = Ten;
-        byte t = s;
-        byte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static byte F31(byte x, byte y, byte z)
-    {
-        return (byte)(z * z);
-    }
-
-    static bool Bench31p()
-    {
-        byte t = 10;
-        byte f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n()
-    {
-        byte t = Ten;
-        byte f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p1()
-    {
-        byte r = Ten;
-        byte s = Ten;
-        byte t = 10;
-        byte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n1()
-    {
-        byte r = 10;
-        byte s = 10;
-        byte t = Ten;
-        byte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p2()
-    {
-        byte r = 10;
-        byte s = 10;
-        byte t = 10;
-        byte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n2()
-    {
-        byte r = Ten;
-        byte s = Ten;
-        byte t = Ten;
-        byte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p3()
-    {
-        byte r = 10;
-        byte s = r;
-        byte t = s;
-        byte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n3()
-    {
-        byte r = Ten;
-        byte s = r;
-        byte t = s;
-        byte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    // Two args, both used
-
-    static byte F40(byte x, byte y)
-    {
-        return (byte)(x * x + y * y - 100);
-    }
-
-    static bool Bench40p()
-    {
-        byte t = 10;
-        byte f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40n()
-    {
-        byte t = Ten;
-        byte f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p1()
-    {
-        byte s = Ten;
-        byte t = 10;
-        byte f = F40(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p2()
-    {
-        byte s = 10;
-        byte t = Ten;
-        byte f = F40(s, t);
-        return (f == 100);
-    }
-
-    static byte F41(byte x, byte y)
-    {
-        return (byte)(x * y);
-    }
-
-    static bool Bench41p()
-    {
-        byte t = 10;
-        byte f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41n()
-    {
-        byte t = Ten;
-        byte f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p1()
-    {
-        byte s = 10;
-        byte t = Ten;
-        byte f = F41(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p2()
-    {
-        byte s = Ten;
-        byte t = 10;
-        byte f = F41(s, t);
-        return (f == 100);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench00p1", "Bench00n1",
-        "Bench00p2", "Bench00n2",
-        "Bench00p3", "Bench00n3",
-        "Bench00p4", "Bench00n4",
-        "Bench01p",  "Bench01n",
-        "Bench02p",  "Bench02n",
-        "Bench03p",  "Bench03n",
-        "Bench04p",  "Bench04n",
-        "Bench05p",  "Bench05n",
-        "Bench05p1", "Bench05n1",
-        "Bench06p",  "Bench06n",
-        "Bench07p",  "Bench07n",
-        "Bench07p1", "Bench07n1",
-        "Bench08p",  "Bench08n",
-        "Bench09p",  "Bench09n",
-        "Bench10p",  "Bench10n",
-        "Bench10p1", "Bench10n1",
-        "Bench10p2", "Bench10n2",
-        "Bench10p3", "Bench10n3",
-        "Bench11p",  "Bench11n",
-        "Bench11p1", "Bench11n1",
-        "Bench11p2", "Bench11n2",
-        "Bench11p3", "Bench11n3",
-        "Bench20p",  "Bench20p1",
-        "Bench21p",  "Bench21n",
-        "Bench21p1", "Bench21n1",
-        "Bench22p",  "Bench22p1",
-        "Bench23p",  "Bench23n",
-        "Bench30p",  "Bench30n",
-        "Bench30p1", "Bench30n1",
-        "Bench30p2", "Bench30n2",
-        "Bench30p3", "Bench30n3",
-        "Bench31p",  "Bench31n",
-        "Bench31p1", "Bench31n1",
-        "Bench31p2", "Bench31n2",
-        "Bench31p3", "Bench31n3",
-        "Bench40p",  "Bench40n",
-        "Bench40p1", "Bench40p2",
-        "Bench41p",  "Bench41n",
-        "Bench41p1", "Bench41p2"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsByte).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsByte.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsByte.csproj
deleted file mode 100644
index 54a8a77e03..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsByte.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConstantArgsByte.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsChar.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsChar.cs
deleted file mode 100644
index 0cc4b9c558..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsChar.cs
+++ /dev/null
@@ -1,933 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsChar
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Chars feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static char Five = (char) 5;
-    static char Ten = (char) 10;
-
-    static char Id(char x)
-    {
-        return x;
-    }
-
-    static char F00(char x)
-    {
-        return (char) (x * x);
-    }
-
-    static bool Bench00p()
-    {
-        char t = (char) 10;
-        char f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n()
-    {
-        char t = Ten;
-        char f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p1()
-    {
-        char t = Id((char)10);
-        char f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n1()
-    {
-        char t = Id(Ten);
-        char f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p2()
-    {
-        char t = Id((char)10);
-        char f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00n2()
-    {
-        char t = Id(Ten);
-        char f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00p3()
-    {
-        char t = (char) 10;
-        char f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00n3()
-    {
-        char t = Ten;
-        char f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00p4()
-    {
-        char t = (char) 5;
-        char f = F00((char)(2 * t));
-        return (f == 100);
-    }
-
-    static bool Bench00n4()
-    {
-        char t = Five;
-        char f = F00((char)(2 * t));
-        return (f == 100);
-    }
-
-    static char F01(char x)
-    {
-        return (char)(1000 / x);
-    }
-
-    static bool Bench01p()
-    {
-        char t = (char) 10;
-        char f = F01(t);
-        return (f == 100);
-    }
-
-    static bool Bench01n()
-    {
-        char t = Ten;
-        char f = F01(t);
-        return (f == 100);
-    }
-
-    static char F02(char x)
-    {
-        return (char) (20 * (x / 2));
-    }
-
-    static bool Bench02p()
-    {
-        char t = (char) 10;
-        char f = F02(t);
-        return (f == 100);
-    }
-
-    static bool Bench02n()
-    {
-        char t = Ten;
-        char f = F02(t);
-        return (f == 100);
-    }
-
-    static char F03(char x)
-    {
-        return (char)(91 + 1009 % x);
-    }
-
-    static bool Bench03p()
-    {
-        char t = (char) 10;
-        char f = F03(t);
-        return (f == 100);
-    }
-
-    static bool Bench03n()
-    {
-        char t = Ten;
-        char f = F03(t);
-        return (f == 100);
-    }
-
-    static char F04(char x)
-    {
-        return (char)(50 * (x % 4));
-    }
-
-    static bool Bench04p()
-    {
-        char t = (char) 10;
-        char f = F04(t);
-        return (f == 100);
-    }
-
-    static bool Bench04n()
-    {
-        char t = Ten;
-        char f = F04(t);
-        return (f == 100);
-    }
-
-    static char F05(char x)
-    {
-        return (char)((1 << x) - 924);
-    }
-
-    static bool Bench05p()
-    {
-        char t = (char) 10;
-        char f = F05(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n()
-    {
-        char t = Ten;
-        char f = F05(t);
-        return (f == 100);
-    }
-
-    static char F051(char x)
-    {
-        return (char)(102400 >> x);
-    }
-
-    static bool Bench05p1()
-    {
-        char t = (char) 10;
-        char f = F051(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n1()
-    {
-        char t = Ten;
-        char f = F051(t);
-        return (f == 100);
-    }
-
-    static char F06(char x)
-    {
-        return (char)(-x + 110);
-    }
-
-    static bool Bench06p()
-    {
-        char t = (char) 10;
-        char f = F06(t);
-        return (f == 100);
-    }
-
-    static bool Bench06n()
-    {
-        char t = Ten;
-        char f = F06(t);
-        return (f == 100);
-    }
-
-    static char F07(char x)
-    {
-        return (char)(~x + 111);
-    }
-
-    static bool Bench07p()
-    {
-        char t = (char) 10;
-        char f = F07(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n()
-    {
-        char t = Ten;
-        char f = F07(t);
-        return (f == 100);
-    }
-
-    static char F071(char x)
-    {
-        return (char)((x ^ -1) + 111);
-    }
-
-    static bool Bench07p1()
-    {
-        char t = (char) 10;
-        char f = F071(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n1()
-    {
-        char t = Ten;
-        char f = F071(t);
-        return (f == 100);
-    }
-
-    static char F08(char x)
-    {
-        return (char)((x & 0x7) + 98);
-    }
-
-    static bool Bench08p()
-    {
-        char t = (char) 10;
-        char f = F08(t);
-        return (f == 100);
-    }
-
-    static bool Bench08n()
-    {
-        char t = Ten;
-        char f = F08(t);
-        return (f == 100);
-    }
-
-    static char F09(char x)
-    {
-        return (char)((x | 0x7) + 85);
-    }
-
-    static bool Bench09p()
-    {
-        char t = (char) 10;
-        char f = F09(t);
-        return (f == 100);
-    }
-
-    static bool Bench09n()
-    {
-        char t = Ten;
-        char f = F09(t);
-        return (f == 100);
-    }
-
-    // Chars feeding comparisons.
-    //
-    // Inlining in Bench1xp should enable branch optimization
-    // Inlining in Bench1xn will not enable branch optimization
-
-    static char F10(char x)
-    {
-        return x == 10 ? (char) 100 : (char) 0;
-    }
-
-    static bool Bench10p()
-    {
-        char t = (char) 10;
-        char f = F10(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n()
-    {
-        char t = Ten;
-        char f = F10(t);
-        return (f == 100);
-    }
-
-    static char F101(char x)
-    {
-        return x != 10 ? (char) 0 : (char) 100;
-    }
-
-    static bool Bench10p1()
-    {
-        char t = (char) 10;
-        char f = F101(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n1()
-    {
-        char t = Ten;
-        char f = F101(t);
-        return (f == 100);
-    }
-
-    static char F102(char x)
-    {
-        return x >= 10 ? (char) 100 : (char) 0;
-    }
-
-    static bool Bench10p2()
-    {
-        char t = (char) 10;
-        char f = F102(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n2()
-    {
-        char t = Ten;
-        char f = F102(t);
-        return (f == 100);
-    }
-
-    static char F103(char x)
-    {
-        return x <= 10 ? (char) 100 : (char) 0;
-    }
-
-    static bool Bench10p3()
-    {
-        char t = (char) 10;
-        char f = F103(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n3()
-    {
-        char t = Ten;
-        char f = F102(t);
-        return (f == 100);
-    }
-
-    static char F11(char x)
-    {
-        if (x == 10)
-        {
-            return (char) 100;
-        }
-        else
-        {
-            return (char) 0;
-        }
-    }
-
-    static bool Bench11p()
-    {
-        char t = (char) 10;
-        char f = F11(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n()
-    {
-        char t = Ten;
-        char f = F11(t);
-        return (f == 100);
-    }
-
-    static char F111(char x)
-    {
-        if (x != 10)
-        {
-            return (char) 0;
-        }
-        else
-        {
-            return (char) 100;
-        }
-    }
-
-    static bool Bench11p1()
-    {
-        char t = (char) 10;
-        char f = F111(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n1()
-    {
-        char t = Ten;
-        char f = F111(t);
-        return (f == 100);
-    }
-
-    static char F112(char x)
-    {
-        if (x > 10)
-        {
-            return (char) 0;
-        }
-        else
-        {
-            return (char) 100;
-        }
-    }
-
-    static bool Bench11p2()
-    {
-        char t = (char) 10;
-        char f = F112(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n2()
-    {
-        char t = Ten;
-        char f = F112(t);
-        return (f == 100);
-    }
-    static char F113(char x)
-    {
-        if (x < 10)
-        {
-            return (char) 0;
-        }
-        else
-        {
-            return (char) 100;
-        }
-    }
-
-    static bool Bench11p3()
-    {
-        char t = (char) 10;
-        char f = F113(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n3()
-    {
-        char t = Ten;
-        char f = F113(t);
-        return (f == 100);
-    }
-
-    // Ununsed (or effectively unused) parameters
-    //
-    // Simple callee analysis may overstate inline benefit
-
-    static char F20(char x)
-    {
-        return (char) 100;
-    }
-
-    static bool Bench20p()
-    {
-        char t = (char) 10;
-        char f = F20(t);
-        return (f == 100);
-    }
-
-    static bool Bench20p1()
-    {
-        char t = Ten;
-        char f = F20(t);
-        return (f == 100);
-    }
-
-    static char F21(char x)
-    {
-        return (char)(-x + 100 + x);
-    }
-
-    static bool Bench21p()
-    {
-        char t = (char) 10;
-        char f = F21(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n()
-    {
-        char t = Ten;
-        char f = F21(t);
-        return (f == 100);
-    }
-
-    static char F211(char x)
-    {
-        return (char)(x - x + 100);
-    }
-
-    static bool Bench21p1()
-    {
-        char t = (char) 10;
-        char f = F211(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n1()
-    {
-        char t = Ten;
-        char f = F211(t);
-        return (f == 100);
-    }
-
-    static char F22(char x)
-    {
-        if (x > 0)
-        {
-            return (char) 100;
-        }
-
-        return (char) 100;
-    }
-
-    static bool Bench22p()
-    {
-        char t = (char) 10;
-        char f = F22(t);
-        return (f == 100);
-    }
-
-    static bool Bench22p1()
-    {
-        char t = Ten;
-        char f = F22(t);
-        return (f == 100);
-    }
-
-    static char F23(char x)
-    {
-        if (x > 0)
-        {
-            return (char)(90 + x);
-        }
-
-        return (char) 100;
-    }
-
-    static bool Bench23p()
-    {
-        char t = (char) 10;
-        char f = F23(t);
-        return (f == 100);
-    }
-
-    static bool Bench23n()
-    {
-        char t = Ten;
-        char f = F23(t);
-        return (f == 100);
-    }
-
-    // Multiple parameters
-
-    static char F30(char x, char y)
-    {
-        return (char)(y * y);
-    }
-
-    static bool Bench30p()
-    {
-        char t = (char) 10;
-        char f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n()
-    {
-        char t = Ten;
-        char f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p1()
-    {
-        char s = Ten;
-        char t = (char) 10;
-        char f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n1()
-    {
-        char s = (char) 10;
-        char t = Ten;
-        char f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p2()
-    {
-        char s = (char) 10;
-        char t = (char) 10;
-        char f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n2()
-    {
-        char s = Ten;
-        char t = Ten;
-        char f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p3()
-    {
-        char s = (char) 10;
-        char t = s;
-        char f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n3()
-    {
-        char s = Ten;
-        char t = s;
-        char f = F30(s, t);
-        return (f == 100);
-    }
-
-    static char F31(char x, char y, char z)
-    {
-        return (char)(z * z);
-    }
-
-    static bool Bench31p()
-    {
-        char t = (char) 10;
-        char f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n()
-    {
-        char t = Ten;
-        char f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p1()
-    {
-        char r = Ten;
-        char s = Ten;
-        char t = (char) 10;
-        char f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n1()
-    {
-        char r = (char) 10;
-        char s = (char) 10;
-        char t = Ten;
-        char f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p2()
-    {
-        char r = (char) 10;
-        char s = (char) 10;
-        char t = (char) 10;
-        char f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n2()
-    {
-        char r = Ten;
-        char s = Ten;
-        char t = Ten;
-        char f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p3()
-    {
-        char r = (char) 10;
-        char s = r;
-        char t = s;
-        char f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n3()
-    {
-        char r = Ten;
-        char s = r;
-        char t = s;
-        char f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    // Two args, both used
-
-    static char F40(char x, char y)
-    {
-        return (char)(x * x + y * y - 100);
-    }
-
-    static bool Bench40p()
-    {
-        char t = (char) 10;
-        char f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40n()
-    {
-        char t = Ten;
-        char f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p1()
-    {
-        char s = Ten;
-        char t = (char) 10;
-        char f = F40(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p2()
-    {
-        char s = (char) 10;
-        char t = Ten;
-        char f = F40(s, t);
-        return (f == 100);
-    }
-
-    static char F41(char x, char y)
-    {
-        return (char)(x * y);
-    }
-
-    static bool Bench41p()
-    {
-        char t = (char) 10;
-        char f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41n()
-    {
-        char t = Ten;
-        char f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p1()
-    {
-        char s = (char) 10;
-        char t = Ten;
-        char f = F41(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p2()
-    {
-        char s = Ten;
-        char t = (char) 10;
-        char f = F41(s, t);
-        return (f == 100);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench00p1", "Bench00n1",
-        "Bench00p2", "Bench00n2",
-        "Bench00p3", "Bench00n3",
-        "Bench00p4", "Bench00n4",
-        "Bench01p",  "Bench01n",
-        "Bench02p",  "Bench02n",
-        "Bench03p",  "Bench03n",
-        "Bench04p",  "Bench04n",
-        "Bench05p",  "Bench05n",
-        "Bench05p1", "Bench05n1",
-        "Bench06p",  "Bench06n",
-        "Bench07p",  "Bench07n",
-        "Bench07p1", "Bench07n1",
-        "Bench08p",  "Bench08n",
-        "Bench09p",  "Bench09n",
-        "Bench10p",  "Bench10n",
-        "Bench10p1", "Bench10n1",
-        "Bench10p2", "Bench10n2",
-        "Bench10p3", "Bench10n3",
-        "Bench11p",  "Bench11n",
-        "Bench11p1", "Bench11n1",
-        "Bench11p2", "Bench11n2",
-        "Bench11p3", "Bench11n3",
-        "Bench20p",  "Bench20p1",
-        "Bench21p",  "Bench21n",
-        "Bench21p1", "Bench21n1",
-        "Bench22p",  "Bench22p1",
-        "Bench23p",  "Bench23n",
-        "Bench30p",  "Bench30n",
-        "Bench30p1", "Bench30n1",
-        "Bench30p2", "Bench30n2",
-        "Bench30p3", "Bench30n3",
-        "Bench31p",  "Bench31n",
-        "Bench31p1", "Bench31n1",
-        "Bench31p2", "Bench31n2",
-        "Bench31p3", "Bench31n3",
-        "Bench40p",  "Bench40n",
-        "Bench40p1", "Bench40p2",
-        "Bench41p",  "Bench41n",
-        "Bench41p1", "Bench41p2"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsChar).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsDouble.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsDouble.cs
deleted file mode 100644
index 4bd5683f0c..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsDouble.cs
+++ /dev/null
@@ -1,813 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsDouble
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Doubles feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static double Five = 5;
-    static double Ten = 10;
-
-    static double Id(double x)
-    {
-        return x;
-    }
-
-    static double F00(double x)
-    {
-        return x * x;
-    }
-
-    static bool Bench00p()
-    {
-        double t = 10;
-        double f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n()
-    {
-        double t = Ten;
-        double f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p1()
-    {
-        double t = Id(10);
-        double f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n1()
-    {
-        double t = Id(Ten);
-        double f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p2()
-    {
-        double t = Id(10);
-        double f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00n2()
-    {
-        double t = Id(Ten);
-        double f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00p3()
-    {
-        double t = 10;
-        double f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00n3()
-    {
-        double t = Ten;
-        double f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00p4()
-    {
-        double t = 5;
-        double f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static bool Bench00n4()
-    {
-        double t = Five;
-        double f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static double F01(double x)
-    {
-        return 1000 / x;
-    }
-
-    static bool Bench01p()
-    {
-        double t = 10;
-        double f = F01(t);
-        return (f == 100);
-    }
-
-    static bool Bench01n()
-    {
-        double t = Ten;
-        double f = F01(t);
-        return (f == 100);
-    }
-
-    static double F02(double x)
-    {
-        return 20 * (x / 2);
-    }
-
-    static bool Bench02p()
-    {
-        double t = 10;
-        double f = F02(t);
-        return (f == 100);
-    }
-
-    static bool Bench02n()
-    {
-        double t = Ten;
-        double f = F02(t);
-        return (f == 100);
-    }
-
-    static double F03(double x)
-    {
-        return 91 + 1009 % x;
-    }
-
-    static bool Bench03p()
-    {
-        double t = 10;
-        double f = F03(t);
-        return (f == 100);
-    }
-
-    static bool Bench03n()
-    {
-        double t = Ten;
-        double f = F03(t);
-        return (f == 100);
-    }
-
-    static double F04(double x)
-    {
-        return 50 * (x % 4);
-    }
-
-    static bool Bench04p()
-    {
-        double t = 10;
-        double f = F04(t);
-        return (f == 100);
-    }
-
-    static bool Bench04n()
-    {
-        double t = Ten;
-        double f = F04(t);
-        return (f == 100);
-    }
-
-    static double F06(double x)
-    {
-        return -x + 110;
-    }
-
-    static bool Bench06p()
-    {
-        double t = 10;
-        double f = F06(t);
-        return (f == 100);
-    }
-
-    static bool Bench06n()
-    {
-        double t = Ten;
-        double f = F06(t);
-        return (f == 100);
-    }
-
-    // Doubles feeding comparisons.
-    //
-    // Inlining in Bench1xp should enable branch optimization
-    // Inlining in Bench1xn will not enable branch optimization
-
-    static double F10(double x)
-    {
-        return x == 10 ? 100 : 0;
-    }
-
-    static bool Bench10p()
-    {
-        double t = 10;
-        double f = F10(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n()
-    {
-        double t = Ten;
-        double f = F10(t);
-        return (f == 100);
-    }
-
-    static double F101(double x)
-    {
-        return x != 10 ? 0 : 100;
-    }
-
-    static bool Bench10p1()
-    {
-        double t = 10;
-        double f = F101(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n1()
-    {
-        double t = Ten;
-        double f = F101(t);
-        return (f == 100);
-    }
-
-    static double F102(double x)
-    {
-        return x >= 10 ? 100 : 0;
-    }
-
-    static bool Bench10p2()
-    {
-        double t = 10;
-        double f = F102(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n2()
-    {
-        double t = Ten;
-        double f = F102(t);
-        return (f == 100);
-    }
-
-    static double F103(double x)
-    {
-        return x <= 10 ? 100 : 0;
-    }
-
-    static bool Bench10p3()
-    {
-        double t = 10;
-        double f = F103(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n3()
-    {
-        double t = Ten;
-        double f = F102(t);
-        return (f == 100);
-    }
-
-    static double F11(double x)
-    {
-        if (x == 10)
-        {
-            return 100;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    static bool Bench11p()
-    {
-        double t = 10;
-        double f = F11(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n()
-    {
-        double t = Ten;
-        double f = F11(t);
-        return (f == 100);
-    }
-
-    static double F111(double x)
-    {
-        if (x != 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p1()
-    {
-        double t = 10;
-        double f = F111(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n1()
-    {
-        double t = Ten;
-        double f = F111(t);
-        return (f == 100);
-    }
-
-    static double F112(double x)
-    {
-        if (x > 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p2()
-    {
-        double t = 10;
-        double f = F112(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n2()
-    {
-        double t = Ten;
-        double f = F112(t);
-        return (f == 100);
-    }
-    static double F113(double x)
-    {
-        if (x < 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p3()
-    {
-        double t = 10;
-        double f = F113(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n3()
-    {
-        double t = Ten;
-        double f = F113(t);
-        return (f == 100);
-    }
-
-    // Ununsed (or effectively unused) parameters
-    //
-    // Simple callee analysis may overstate inline benefit
-
-    static double F20(double x)
-    {
-        return 100;
-    }
-
-    static bool Bench20p()
-    {
-        double t = 10;
-        double f = F20(t);
-        return (f == 100);
-    }
-
-    static bool Bench20p1()
-    {
-        double t = Ten;
-        double f = F20(t);
-        return (f == 100);
-    }
-
-    static double F21(double x)
-    {
-        return -x + 100 + x;
-    }
-
-    static bool Bench21p()
-    {
-        double t = 10;
-        double f = F21(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n()
-    {
-        double t = Ten;
-        double f = F21(t);
-        return (f == 100);
-    }
-
-    static double F211(double x)
-    {
-        return x - x + 100;
-    }
-
-    static bool Bench21p1()
-    {
-        double t = 10;
-        double f = F211(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n1()
-    {
-        double t = Ten;
-        double f = F211(t);
-        return (f == 100);
-    }
-
-    static double F22(double x)
-    {
-        if (x > 0)
-        {
-            return 100;
-        }
-
-        return 100;
-    }
-
-    static bool Bench22p()
-    {
-        double t = 10;
-        double f = F22(t);
-        return (f == 100);
-    }
-
-    static bool Bench22p1()
-    {
-        double t = Ten;
-        double f = F22(t);
-        return (f == 100);
-    }
-
-    static double F23(double x)
-    {
-        if (x > 0)
-        {
-            return 90 + x;
-        }
-
-        return 100;
-    }
-
-    static bool Bench23p()
-    {
-        double t = 10;
-        double f = F23(t);
-        return (f == 100);
-    }
-
-    static bool Bench23n()
-    {
-        double t = Ten;
-        double f = F23(t);
-        return (f == 100);
-    }
-
-    // Multiple parameters
-
-    static double F30(double x, double y)
-    {
-        return y * y;
-    }
-
-    static bool Bench30p()
-    {
-        double t = 10;
-        double f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n()
-    {
-        double t = Ten;
-        double f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p1()
-    {
-        double s = Ten;
-        double t = 10;
-        double f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n1()
-    {
-        double s = 10;
-        double t = Ten;
-        double f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p2()
-    {
-        double s = 10;
-        double t = 10;
-        double f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n2()
-    {
-        double s = Ten;
-        double t = Ten;
-        double f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p3()
-    {
-        double s = 10;
-        double t = s;
-        double f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n3()
-    {
-        double s = Ten;
-        double t = s;
-        double f = F30(s, t);
-        return (f == 100);
-    }
-
-    static double F31(double x, double y, double z)
-    {
-        return z * z;
-    }
-
-    static bool Bench31p()
-    {
-        double t = 10;
-        double f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n()
-    {
-        double t = Ten;
-        double f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p1()
-    {
-        double r = Ten;
-        double s = Ten;
-        double t = 10;
-        double f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n1()
-    {
-        double r = 10;
-        double s = 10;
-        double t = Ten;
-        double f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p2()
-    {
-        double r = 10;
-        double s = 10;
-        double t = 10;
-        double f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n2()
-    {
-        double r = Ten;
-        double s = Ten;
-        double t = Ten;
-        double f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p3()
-    {
-        double r = 10;
-        double s = r;
-        double t = s;
-        double f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n3()
-    {
-        double r = Ten;
-        double s = r;
-        double t = s;
-        double f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    // Two args, both used
-
-    static double F40(double x, double y)
-    {
-        return x * x + y * y - 100;
-    }
-
-    static bool Bench40p()
-    {
-        double t = 10;
-        double f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40n()
-    {
-        double t = Ten;
-        double f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p1()
-    {
-        double s = Ten;
-        double t = 10;
-        double f = F40(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p2()
-    {
-        double s = 10;
-        double t = Ten;
-        double f = F40(s, t);
-        return (f == 100);
-    }
-
-    static double F41(double x, double y)
-    {
-        return x * y;
-    }
-
-    static bool Bench41p()
-    {
-        double t = 10;
-        double f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41n()
-    {
-        double t = Ten;
-        double f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p1()
-    {
-        double s = 10;
-        double t = Ten;
-        double f = F41(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p2()
-    {
-        double s = Ten;
-        double t = 10;
-        double f = F41(s, t);
-        return (f == 100);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench00p1", "Bench00n1",
-        "Bench00p2", "Bench00n2",
-        "Bench00p3", "Bench00n3",
-        "Bench00p4", "Bench00n4",
-        "Bench01p",  "Bench01n",
-        "Bench02p",  "Bench02n",
-        "Bench03p",  "Bench03n",
-        "Bench04p",  "Bench04n",
-        "Bench06p",  "Bench06n",
-        "Bench10p",  "Bench10n",
-        "Bench10p1", "Bench10n1",
-        "Bench10p2", "Bench10n2",
-        "Bench10p3", "Bench10n3",
-        "Bench11p",  "Bench11n",
-        "Bench11p1", "Bench11n1",
-        "Bench11p2", "Bench11n2",
-        "Bench11p3", "Bench11n3",
-        "Bench20p",  "Bench20p1",
-        "Bench21p",  "Bench21n",
-        "Bench21p1", "Bench21n1",
-        "Bench22p",  "Bench22p1",
-        "Bench23p",  "Bench23n",
-        "Bench30p",  "Bench30n",
-        "Bench30p1", "Bench30n1",
-        "Bench30p2", "Bench30n2",
-        "Bench30p3", "Bench30n3",
-        "Bench31p",  "Bench31n",
-        "Bench31p1", "Bench31n1",
-        "Bench31p2", "Bench31n2",
-        "Bench31p3", "Bench31n3",
-        "Bench40p",  "Bench40n",
-        "Bench40p1", "Bench40p2",
-        "Bench41p",  "Bench41n",
-        "Bench41p1", "Bench41p2"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsDouble).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsDouble.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsDouble.csproj
deleted file mode 100644
index beb3776b17..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsDouble.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConstantArgsDouble.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsFloat.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsFloat.cs
deleted file mode 100644
index f609a4bb44..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsFloat.cs
+++ /dev/null
@@ -1,813 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsFloat
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Floats feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static float Five = 5;
-    static float Ten = 10;
-
-    static float Id(float x)
-    {
-        return x;
-    }
-
-    static float F00(float x)
-    {
-        return x * x;
-    }
-
-    static bool Bench00p()
-    {
-        float t = 10;
-        float f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n()
-    {
-        float t = Ten;
-        float f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p1()
-    {
-        float t = Id(10);
-        float f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n1()
-    {
-        float t = Id(Ten);
-        float f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p2()
-    {
-        float t = Id(10);
-        float f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00n2()
-    {
-        float t = Id(Ten);
-        float f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00p3()
-    {
-        float t = 10;
-        float f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00n3()
-    {
-        float t = Ten;
-        float f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00p4()
-    {
-        float t = 5;
-        float f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static bool Bench00n4()
-    {
-        float t = Five;
-        float f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static float F01(float x)
-    {
-        return 1000 / x;
-    }
-
-    static bool Bench01p()
-    {
-        float t = 10;
-        float f = F01(t);
-        return (f == 100);
-    }
-
-    static bool Bench01n()
-    {
-        float t = Ten;
-        float f = F01(t);
-        return (f == 100);
-    }
-
-    static float F02(float x)
-    {
-        return 20 * (x / 2);
-    }
-
-    static bool Bench02p()
-    {
-        float t = 10;
-        float f = F02(t);
-        return (f == 100);
-    }
-
-    static bool Bench02n()
-    {
-        float t = Ten;
-        float f = F02(t);
-        return (f == 100);
-    }
-
-    static float F03(float x)
-    {
-        return 91 + 1009 % x;
-    }
-
-    static bool Bench03p()
-    {
-        float t = 10;
-        float f = F03(t);
-        return (f == 100);
-    }
-
-    static bool Bench03n()
-    {
-        float t = Ten;
-        float f = F03(t);
-        return (f == 100);
-    }
-
-    static float F04(float x)
-    {
-        return 50 * (x % 4);
-    }
-
-    static bool Bench04p()
-    {
-        float t = 10;
-        float f = F04(t);
-        return (f == 100);
-    }
-
-    static bool Bench04n()
-    {
-        float t = Ten;
-        float f = F04(t);
-        return (f == 100);
-    }
-
-    static float F06(float x)
-    {
-        return -x + 110;
-    }
-
-    static bool Bench06p()
-    {
-        float t = 10;
-        float f = F06(t);
-        return (f == 100);
-    }
-
-    static bool Bench06n()
-    {
-        float t = Ten;
-        float f = F06(t);
-        return (f == 100);
-    }
-
-    // Floats feeding comparisons.
-    //
-    // Inlining in Bench1xp should enable branch optimization
-    // Inlining in Bench1xn will not enable branch optimization
-
-    static float F10(float x)
-    {
-        return x == 10 ? 100 : 0;
-    }
-
-    static bool Bench10p()
-    {
-        float t = 10;
-        float f = F10(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n()
-    {
-        float t = Ten;
-        float f = F10(t);
-        return (f == 100);
-    }
-
-    static float F101(float x)
-    {
-        return x != 10 ? 0 : 100;
-    }
-
-    static bool Bench10p1()
-    {
-        float t = 10;
-        float f = F101(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n1()
-    {
-        float t = Ten;
-        float f = F101(t);
-        return (f == 100);
-    }
-
-    static float F102(float x)
-    {
-        return x >= 10 ? 100 : 0;
-    }
-
-    static bool Bench10p2()
-    {
-        float t = 10;
-        float f = F102(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n2()
-    {
-        float t = Ten;
-        float f = F102(t);
-        return (f == 100);
-    }
-
-    static float F103(float x)
-    {
-        return x <= 10 ? 100 : 0;
-    }
-
-    static bool Bench10p3()
-    {
-        float t = 10;
-        float f = F103(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n3()
-    {
-        float t = Ten;
-        float f = F102(t);
-        return (f == 100);
-    }
-
-    static float F11(float x)
-    {
-        if (x == 10)
-        {
-            return 100;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    static bool Bench11p()
-    {
-        float t = 10;
-        float f = F11(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n()
-    {
-        float t = Ten;
-        float f = F11(t);
-        return (f == 100);
-    }
-
-    static float F111(float x)
-    {
-        if (x != 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p1()
-    {
-        float t = 10;
-        float f = F111(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n1()
-    {
-        float t = Ten;
-        float f = F111(t);
-        return (f == 100);
-    }
-
-    static float F112(float x)
-    {
-        if (x > 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p2()
-    {
-        float t = 10;
-        float f = F112(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n2()
-    {
-        float t = Ten;
-        float f = F112(t);
-        return (f == 100);
-    }
-    static float F113(float x)
-    {
-        if (x < 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p3()
-    {
-        float t = 10;
-        float f = F113(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n3()
-    {
-        float t = Ten;
-        float f = F113(t);
-        return (f == 100);
-    }
-
-    // Ununsed (or effectively unused) parameters
-    //
-    // Simple callee analysis may overstate inline benefit
-
-    static float F20(float x)
-    {
-        return 100;
-    }
-
-    static bool Bench20p()
-    {
-        float t = 10;
-        float f = F20(t);
-        return (f == 100);
-    }
-
-    static bool Bench20p1()
-    {
-        float t = Ten;
-        float f = F20(t);
-        return (f == 100);
-    }
-
-    static float F21(float x)
-    {
-        return -x + 100 + x;
-    }
-
-    static bool Bench21p()
-    {
-        float t = 10;
-        float f = F21(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n()
-    {
-        float t = Ten;
-        float f = F21(t);
-        return (f == 100);
-    }
-
-    static float F211(float x)
-    {
-        return x - x + 100;
-    }
-
-    static bool Bench21p1()
-    {
-        float t = 10;
-        float f = F211(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n1()
-    {
-        float t = Ten;
-        float f = F211(t);
-        return (f == 100);
-    }
-
-    static float F22(float x)
-    {
-        if (x > 0)
-        {
-            return 100;
-        }
-
-        return 100;
-    }
-
-    static bool Bench22p()
-    {
-        float t = 10;
-        float f = F22(t);
-        return (f == 100);
-    }
-
-    static bool Bench22p1()
-    {
-        float t = Ten;
-        float f = F22(t);
-        return (f == 100);
-    }
-
-    static float F23(float x)
-    {
-        if (x > 0)
-        {
-            return 90 + x;
-        }
-
-        return 100;
-    }
-
-    static bool Bench23p()
-    {
-        float t = 10;
-        float f = F23(t);
-        return (f == 100);
-    }
-
-    static bool Bench23n()
-    {
-        float t = Ten;
-        float f = F23(t);
-        return (f == 100);
-    }
-
-    // Multiple parameters
-
-    static float F30(float x, float y)
-    {
-        return y * y;
-    }
-
-    static bool Bench30p()
-    {
-        float t = 10;
-        float f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n()
-    {
-        float t = Ten;
-        float f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p1()
-    {
-        float s = Ten;
-        float t = 10;
-        float f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n1()
-    {
-        float s = 10;
-        float t = Ten;
-        float f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p2()
-    {
-        float s = 10;
-        float t = 10;
-        float f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n2()
-    {
-        float s = Ten;
-        float t = Ten;
-        float f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p3()
-    {
-        float s = 10;
-        float t = s;
-        float f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n3()
-    {
-        float s = Ten;
-        float t = s;
-        float f = F30(s, t);
-        return (f == 100);
-    }
-
-    static float F31(float x, float y, float z)
-    {
-        return z * z;
-    }
-
-    static bool Bench31p()
-    {
-        float t = 10;
-        float f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n()
-    {
-        float t = Ten;
-        float f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p1()
-    {
-        float r = Ten;
-        float s = Ten;
-        float t = 10;
-        float f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n1()
-    {
-        float r = 10;
-        float s = 10;
-        float t = Ten;
-        float f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p2()
-    {
-        float r = 10;
-        float s = 10;
-        float t = 10;
-        float f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n2()
-    {
-        float r = Ten;
-        float s = Ten;
-        float t = Ten;
-        float f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p3()
-    {
-        float r = 10;
-        float s = r;
-        float t = s;
-        float f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n3()
-    {
-        float r = Ten;
-        float s = r;
-        float t = s;
-        float f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    // Two args, both used
-
-    static float F40(float x, float y)
-    {
-        return x * x + y * y - 100;
-    }
-
-    static bool Bench40p()
-    {
-        float t = 10;
-        float f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40n()
-    {
-        float t = Ten;
-        float f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p1()
-    {
-        float s = Ten;
-        float t = 10;
-        float f = F40(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p2()
-    {
-        float s = 10;
-        float t = Ten;
-        float f = F40(s, t);
-        return (f == 100);
-    }
-
-    static float F41(float x, float y)
-    {
-        return x * y;
-    }
-
-    static bool Bench41p()
-    {
-        float t = 10;
-        float f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41n()
-    {
-        float t = Ten;
-        float f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p1()
-    {
-        float s = 10;
-        float t = Ten;
-        float f = F41(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p2()
-    {
-        float s = Ten;
-        float t = 10;
-        float f = F41(s, t);
-        return (f == 100);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench00p1", "Bench00n1",
-        "Bench00p2", "Bench00n2",
-        "Bench00p3", "Bench00n3",
-        "Bench00p4", "Bench00n4",
-        "Bench01p",  "Bench01n",
-        "Bench02p",  "Bench02n",
-        "Bench03p",  "Bench03n",
-        "Bench04p",  "Bench04n",
-        "Bench06p",  "Bench06n",
-        "Bench10p",  "Bench10n",
-        "Bench10p1", "Bench10n1",
-        "Bench10p2", "Bench10n2",
-        "Bench10p3", "Bench10n3",
-        "Bench11p",  "Bench11n",
-        "Bench11p1", "Bench11n1",
-        "Bench11p2", "Bench11n2",
-        "Bench11p3", "Bench11n3",
-        "Bench20p",  "Bench20p1",
-        "Bench21p",  "Bench21n",
-        "Bench21p1", "Bench21n1",
-        "Bench22p",  "Bench22p1",
-        "Bench23p",  "Bench23n",
-        "Bench30p",  "Bench30n",
-        "Bench30p1", "Bench30n1",
-        "Bench30p2", "Bench30n2",
-        "Bench30p3", "Bench30n3",
-        "Bench31p",  "Bench31n",
-        "Bench31p1", "Bench31n1",
-        "Bench31p2", "Bench31n2",
-        "Bench31p3", "Bench31n3",
-        "Bench40p",  "Bench40n",
-        "Bench40p1", "Bench40p2",
-        "Bench41p",  "Bench41n",
-        "Bench41p1", "Bench41p2"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsFloat).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsFloat.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsFloat.csproj
deleted file mode 100644
index bb859c09c5..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsFloat.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConstantArgsFloat.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsInt.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsInt.cs
deleted file mode 100644
index f54e800d17..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsInt.cs
+++ /dev/null
@@ -1,933 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsInt
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Ints feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static int Five = 5;
-    static int Ten = 10;
-
-    static int Id(int x)
-    {
-        return x;
-    }
-
-    static int F00(int x)
-    {
-        return x * x;
-    }
-
-    static bool Bench00p()
-    {
-        int t = 10;
-        int f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n()
-    {
-        int t = Ten;
-        int f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p1()
-    {
-        int t = Id(10);
-        int f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n1()
-    {
-        int t = Id(Ten);
-        int f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p2()
-    {
-        int t = Id(10);
-        int f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00n2()
-    {
-        int t = Id(Ten);
-        int f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00p3()
-    {
-        int t = 10;
-        int f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00n3()
-    {
-        int t = Ten;
-        int f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00p4()
-    {
-        int t = 5;
-        int f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static bool Bench00n4()
-    {
-        int t = Five;
-        int f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static int F01(int x)
-    {
-        return 1000 / x;
-    }
-
-    static bool Bench01p()
-    {
-        int t = 10;
-        int f = F01(t);
-        return (f == 100);
-    }
-
-    static bool Bench01n()
-    {
-        int t = Ten;
-        int f = F01(t);
-        return (f == 100);
-    }
-
-    static int F02(int x)
-    {
-        return 20 * (x / 2);
-    }
-
-    static bool Bench02p()
-    {
-        int t = 10;
-        int f = F02(t);
-        return (f == 100);
-    }
-
-    static bool Bench02n()
-    {
-        int t = Ten;
-        int f = F02(t);
-        return (f == 100);
-    }
-
-    static int F03(int x)
-    {
-        return 91 + 1009 % x;
-    }
-
-    static bool Bench03p()
-    {
-        int t = 10;
-        int f = F03(t);
-        return (f == 100);
-    }
-
-    static bool Bench03n()
-    {
-        int t = Ten;
-        int f = F03(t);
-        return (f == 100);
-    }
-
-    static int F04(int x)
-    {
-        return 50 * (x % 4);
-    }
-
-    static bool Bench04p()
-    {
-        int t = 10;
-        int f = F04(t);
-        return (f == 100);
-    }
-
-    static bool Bench04n()
-    {
-        int t = Ten;
-        int f = F04(t);
-        return (f == 100);
-    }
-
-    static int F05(int x)
-    {
-        return (1 << x) - 924;
-    }
-
-    static bool Bench05p()
-    {
-        int t = 10;
-        int f = F05(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n()
-    {
-        int t = Ten;
-        int f = F05(t);
-        return (f == 100);
-    }
-
-    static int F051(int x)
-    {
-        return (102400 >> x);
-    }
-
-    static bool Bench05p1()
-    {
-        int t = 10;
-        int f = F051(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n1()
-    {
-        int t = Ten;
-        int f = F051(t);
-        return (f == 100);
-    }
-
-    static int F06(int x)
-    {
-        return -x + 110;
-    }
-
-    static bool Bench06p()
-    {
-        int t = 10;
-        int f = F06(t);
-        return (f == 100);
-    }
-
-    static bool Bench06n()
-    {
-        int t = Ten;
-        int f = F06(t);
-        return (f == 100);
-    }
-
-    static int F07(int x)
-    {
-        return ~x + 111;
-    }
-
-    static bool Bench07p()
-    {
-        int t = 10;
-        int f = F07(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n()
-    {
-        int t = Ten;
-        int f = F07(t);
-        return (f == 100);
-    }
-
-    static int F071(int x)
-    {
-        return (x ^ -1) + 111;
-    }
-
-    static bool Bench07p1()
-    {
-        int t = 10;
-        int f = F071(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n1()
-    {
-        int t = Ten;
-        int f = F071(t);
-        return (f == 100);
-    }
-
-    static int F08(int x)
-    {
-        return (x & 0x7) + 98;
-    }
-
-    static bool Bench08p()
-    {
-        int t = 10;
-        int f = F08(t);
-        return (f == 100);
-    }
-
-    static bool Bench08n()
-    {
-        int t = Ten;
-        int f = F08(t);
-        return (f == 100);
-    }
-
-    static int F09(int x)
-    {
-        return (x | 0x7) + 85;
-    }
-
-    static bool Bench09p()
-    {
-        int t = 10;
-        int f = F09(t);
-        return (f == 100);
-    }
-
-    static bool Bench09n()
-    {
-        int t = Ten;
-        int f = F09(t);
-        return (f == 100);
-    }
-
-    // Ints feeding comparisons.
-    //
-    // Inlining in Bench1xp should enable branch optimization
-    // Inlining in Bench1xn will not enable branch optimization
-
-    static int F10(int x)
-    {
-        return x == 10 ? 100 : 0;
-    }
-
-    static bool Bench10p()
-    {
-        int t = 10;
-        int f = F10(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n()
-    {
-        int t = Ten;
-        int f = F10(t);
-        return (f == 100);
-    }
-
-    static int F101(int x)
-    {
-        return x != 10 ? 0 : 100;
-    }
-
-    static bool Bench10p1()
-    {
-        int t = 10;
-        int f = F101(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n1()
-    {
-        int t = Ten;
-        int f = F101(t);
-        return (f == 100);
-    }
-
-    static int F102(int x)
-    {
-        return x >= 10 ? 100 : 0;
-    }
-
-    static bool Bench10p2()
-    {
-        int t = 10;
-        int f = F102(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n2()
-    {
-        int t = Ten;
-        int f = F102(t);
-        return (f == 100);
-    }
-
-    static int F103(int x)
-    {
-        return x <= 10 ? 100 : 0;
-    }
-
-    static bool Bench10p3()
-    {
-        int t = 10;
-        int f = F103(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n3()
-    {
-        int t = Ten;
-        int f = F102(t);
-        return (f == 100);
-    }
-
-    static int F11(int x)
-    {
-        if (x == 10)
-        {
-            return 100;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    static bool Bench11p()
-    {
-        int t = 10;
-        int f = F11(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n()
-    {
-        int t = Ten;
-        int f = F11(t);
-        return (f == 100);
-    }
-
-    static int F111(int x)
-    {
-        if (x != 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p1()
-    {
-        int t = 10;
-        int f = F111(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n1()
-    {
-        int t = Ten;
-        int f = F111(t);
-        return (f == 100);
-    }
-
-    static int F112(int x)
-    {
-        if (x > 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p2()
-    {
-        int t = 10;
-        int f = F112(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n2()
-    {
-        int t = Ten;
-        int f = F112(t);
-        return (f == 100);
-    }
-    static int F113(int x)
-    {
-        if (x < 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p3()
-    {
-        int t = 10;
-        int f = F113(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n3()
-    {
-        int t = Ten;
-        int f = F113(t);
-        return (f == 100);
-    }
-
-    // Ununsed (or effectively unused) parameters
-    //
-    // Simple callee analysis may overstate inline benefit
-
-    static int F20(int x)
-    {
-        return 100;
-    }
-
-    static bool Bench20p()
-    {
-        int t = 10;
-        int f = F20(t);
-        return (f == 100);
-    }
-
-    static bool Bench20p1()
-    {
-        int t = Ten;
-        int f = F20(t);
-        return (f == 100);
-    }
-
-    static int F21(int x)
-    {
-        return -x + 100 + x;
-    }
-
-    static bool Bench21p()
-    {
-        int t = 10;
-        int f = F21(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n()
-    {
-        int t = Ten;
-        int f = F21(t);
-        return (f == 100);
-    }
-
-    static int F211(int x)
-    {
-        return x - x + 100;
-    }
-
-    static bool Bench21p1()
-    {
-        int t = 10;
-        int f = F211(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n1()
-    {
-        int t = Ten;
-        int f = F211(t);
-        return (f == 100);
-    }
-
-    static int F22(int x)
-    {
-        if (x > 0)
-        {
-            return 100;
-        }
-
-        return 100;
-    }
-
-    static bool Bench22p()
-    {
-        int t = 10;
-        int f = F22(t);
-        return (f == 100);
-    }
-
-    static bool Bench22p1()
-    {
-        int t = Ten;
-        int f = F22(t);
-        return (f == 100);
-    }
-
-    static int F23(int x)
-    {
-        if (x > 0)
-        {
-            return 90 + x;
-        }
-
-        return 100;
-    }
-
-    static bool Bench23p()
-    {
-        int t = 10;
-        int f = F23(t);
-        return (f == 100);
-    }
-
-    static bool Bench23n()
-    {
-        int t = Ten;
-        int f = F23(t);
-        return (f == 100);
-    }
-
-    // Multiple parameters
-
-    static int F30(int x, int y)
-    {
-        return y * y;
-    }
-
-    static bool Bench30p()
-    {
-        int t = 10;
-        int f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n()
-    {
-        int t = Ten;
-        int f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p1()
-    {
-        int s = Ten;
-        int t = 10;
-        int f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n1()
-    {
-        int s = 10;
-        int t = Ten;
-        int f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p2()
-    {
-        int s = 10;
-        int t = 10;
-        int f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n2()
-    {
-        int s = Ten;
-        int t = Ten;
-        int f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p3()
-    {
-        int s = 10;
-        int t = s;
-        int f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n3()
-    {
-        int s = Ten;
-        int t = s;
-        int f = F30(s, t);
-        return (f == 100);
-    }
-
-    static int F31(int x, int y, int z)
-    {
-        return z * z;
-    }
-
-    static bool Bench31p()
-    {
-        int t = 10;
-        int f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n()
-    {
-        int t = Ten;
-        int f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p1()
-    {
-        int r = Ten;
-        int s = Ten;
-        int t = 10;
-        int f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n1()
-    {
-        int r = 10;
-        int s = 10;
-        int t = Ten;
-        int f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p2()
-    {
-        int r = 10;
-        int s = 10;
-        int t = 10;
-        int f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n2()
-    {
-        int r = Ten;
-        int s = Ten;
-        int t = Ten;
-        int f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p3()
-    {
-        int r = 10;
-        int s = r;
-        int t = s;
-        int f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n3()
-    {
-        int r = Ten;
-        int s = r;
-        int t = s;
-        int f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    // Two args, both used
-
-    static int F40(int x, int y)
-    {
-        return x * x + y * y - 100;
-    }
-
-    static bool Bench40p()
-    {
-        int t = 10;
-        int f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40n()
-    {
-        int t = Ten;
-        int f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p1()
-    {
-        int s = Ten;
-        int t = 10;
-        int f = F40(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p2()
-    {
-        int s = 10;
-        int t = Ten;
-        int f = F40(s, t);
-        return (f == 100);
-    }
-
-    static int F41(int x, int y)
-    {
-        return x * y;
-    }
-
-    static bool Bench41p()
-    {
-        int t = 10;
-        int f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41n()
-    {
-        int t = Ten;
-        int f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p1()
-    {
-        int s = 10;
-        int t = Ten;
-        int f = F41(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p2()
-    {
-        int s = Ten;
-        int t = 10;
-        int f = F41(s, t);
-        return (f == 100);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench00p1", "Bench00n1",
-        "Bench00p2", "Bench00n2",
-        "Bench00p3", "Bench00n3",
-        "Bench00p4", "Bench00n4",
-        "Bench01p",  "Bench01n",
-        "Bench02p",  "Bench02n",
-        "Bench03p",  "Bench03n",
-        "Bench04p",  "Bench04n",
-        "Bench05p",  "Bench05n",
-        "Bench05p1", "Bench05n1",
-        "Bench06p",  "Bench06n",
-        "Bench07p",  "Bench07n",
-        "Bench07p1", "Bench07n1",
-        "Bench08p",  "Bench08n",
-        "Bench09p",  "Bench09n",
-        "Bench10p",  "Bench10n",
-        "Bench10p1", "Bench10n1",
-        "Bench10p2", "Bench10n2",
-        "Bench10p3", "Bench10n3",
-        "Bench11p",  "Bench11n",
-        "Bench11p1", "Bench11n1",
-        "Bench11p2", "Bench11n2",
-        "Bench11p3", "Bench11n3",
-        "Bench20p",  "Bench20p1",
-        "Bench21p",  "Bench21n",
-        "Bench21p1", "Bench21n1",
-        "Bench22p",  "Bench22p1",
-        "Bench23p",  "Bench23n",
-        "Bench30p",  "Bench30n",
-        "Bench30p1", "Bench30n1",
-        "Bench30p2", "Bench30n2",
-        "Bench30p3", "Bench30n3",
-        "Bench31p",  "Bench31n",
-        "Bench31p1", "Bench31n1",
-        "Bench31p2", "Bench31n2",
-        "Bench31p3", "Bench31n3",
-        "Bench40p",  "Bench40n",
-        "Bench40p1", "Bench40p2",
-        "Bench41p",  "Bench41n",
-        "Bench41p1", "Bench41p2"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsInt).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsLong.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsLong.cs
deleted file mode 100644
index e5679f1638..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsLong.cs
+++ /dev/null
@@ -1,933 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsLong
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Longs feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static long Five = 5;
-    static long Ten = 10;
-
-    static long Id(long x)
-    {
-        return x;
-    }
-
-    static long F00(long x)
-    {
-        return x * x;
-    }
-
-    static bool Bench00p()
-    {
-        long t = 10;
-        long f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n()
-    {
-        long t = Ten;
-        long f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p1()
-    {
-        long t = Id(10);
-        long f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n1()
-    {
-        long t = Id(Ten);
-        long f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p2()
-    {
-        long t = Id(10);
-        long f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00n2()
-    {
-        long t = Id(Ten);
-        long f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00p3()
-    {
-        long t = 10;
-        long f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00n3()
-    {
-        long t = Ten;
-        long f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00p4()
-    {
-        long t = 5;
-        long f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static bool Bench00n4()
-    {
-        long t = Five;
-        long f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static long F01(long x)
-    {
-        return 1000 / x;
-    }
-
-    static bool Bench01p()
-    {
-        long t = 10;
-        long f = F01(t);
-        return (f == 100);
-    }
-
-    static bool Bench01n()
-    {
-        long t = Ten;
-        long f = F01(t);
-        return (f == 100);
-    }
-
-    static long F02(long x)
-    {
-        return 20 * (x / 2);
-    }
-
-    static bool Bench02p()
-    {
-        long t = 10;
-        long f = F02(t);
-        return (f == 100);
-    }
-
-    static bool Bench02n()
-    {
-        long t = Ten;
-        long f = F02(t);
-        return (f == 100);
-    }
-
-    static long F03(long x)
-    {
-        return 91 + 1009 % x;
-    }
-
-    static bool Bench03p()
-    {
-        long t = 10;
-        long f = F03(t);
-        return (f == 100);
-    }
-
-    static bool Bench03n()
-    {
-        long t = Ten;
-        long f = F03(t);
-        return (f == 100);
-    }
-
-    static long F04(long x)
-    {
-        return 50 * (x % 4);
-    }
-
-    static bool Bench04p()
-    {
-        long t = 10;
-        long f = F04(t);
-        return (f == 100);
-    }
-
-    static bool Bench04n()
-    {
-        long t = Ten;
-        long f = F04(t);
-        return (f == 100);
-    }
-
-    static long F05(long x)
-    {
-        return (1 << (int) x) - 924;
-    }
-
-    static bool Bench05p()
-    {
-        long t = 10;
-        long f = F05(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n()
-    {
-        long t = Ten;
-        long f = F05(t);
-        return (f == 100);
-    }
-
-    static long F051(long x)
-    {
-        return (102400 >> (int) x);
-    }
-
-    static bool Bench05p1()
-    {
-        long t = 10;
-        long f = F051(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n1()
-    {
-        long t = Ten;
-        long f = F051(t);
-        return (f == 100);
-    }
-
-    static long F06(long x)
-    {
-        return -x + 110;
-    }
-
-    static bool Bench06p()
-    {
-        long t = 10;
-        long f = F06(t);
-        return (f == 100);
-    }
-
-    static bool Bench06n()
-    {
-        long t = Ten;
-        long f = F06(t);
-        return (f == 100);
-    }
-
-    static long F07(long x)
-    {
-        return ~x + 111;
-    }
-
-    static bool Bench07p()
-    {
-        long t = 10;
-        long f = F07(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n()
-    {
-        long t = Ten;
-        long f = F07(t);
-        return (f == 100);
-    }
-
-    static long F071(long x)
-    {
-        return (x ^ -1) + 111;
-    }
-
-    static bool Bench07p1()
-    {
-        long t = 10;
-        long f = F071(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n1()
-    {
-        long t = Ten;
-        long f = F071(t);
-        return (f == 100);
-    }
-
-    static long F08(long x)
-    {
-        return (x & 0x7) + 98;
-    }
-
-    static bool Bench08p()
-    {
-        long t = 10;
-        long f = F08(t);
-        return (f == 100);
-    }
-
-    static bool Bench08n()
-    {
-        long t = Ten;
-        long f = F08(t);
-        return (f == 100);
-    }
-
-    static long F09(long x)
-    {
-        return (x | 0x7) + 85;
-    }
-
-    static bool Bench09p()
-    {
-        long t = 10;
-        long f = F09(t);
-        return (f == 100);
-    }
-
-    static bool Bench09n()
-    {
-        long t = Ten;
-        long f = F09(t);
-        return (f == 100);
-    }
-
-    // Longs feeding comparisons.
-    //
-    // Inlining in Bench1xp should enable branch optimization
-    // Inlining in Bench1xn will not enable branch optimization
-
-    static long F10(long x)
-    {
-        return x == 10 ? 100 : 0;
-    }
-
-    static bool Bench10p()
-    {
-        long t = 10;
-        long f = F10(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n()
-    {
-        long t = Ten;
-        long f = F10(t);
-        return (f == 100);
-    }
-
-    static long F101(long x)
-    {
-        return x != 10 ? 0 : 100;
-    }
-
-    static bool Bench10p1()
-    {
-        long t = 10;
-        long f = F101(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n1()
-    {
-        long t = Ten;
-        long f = F101(t);
-        return (f == 100);
-    }
-
-    static long F102(long x)
-    {
-        return x >= 10 ? 100 : 0;
-    }
-
-    static bool Bench10p2()
-    {
-        long t = 10;
-        long f = F102(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n2()
-    {
-        long t = Ten;
-        long f = F102(t);
-        return (f == 100);
-    }
-
-    static long F103(long x)
-    {
-        return x <= 10 ? 100 : 0;
-    }
-
-    static bool Bench10p3()
-    {
-        long t = 10;
-        long f = F103(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n3()
-    {
-        long t = Ten;
-        long f = F102(t);
-        return (f == 100);
-    }
-
-    static long F11(long x)
-    {
-        if (x == 10)
-        {
-            return 100;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    static bool Bench11p()
-    {
-        long t = 10;
-        long f = F11(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n()
-    {
-        long t = Ten;
-        long f = F11(t);
-        return (f == 100);
-    }
-
-    static long F111(long x)
-    {
-        if (x != 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p1()
-    {
-        long t = 10;
-        long f = F111(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n1()
-    {
-        long t = Ten;
-        long f = F111(t);
-        return (f == 100);
-    }
-
-    static long F112(long x)
-    {
-        if (x > 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p2()
-    {
-        long t = 10;
-        long f = F112(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n2()
-    {
-        long t = Ten;
-        long f = F112(t);
-        return (f == 100);
-    }
-    static long F113(long x)
-    {
-        if (x < 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p3()
-    {
-        long t = 10;
-        long f = F113(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n3()
-    {
-        long t = Ten;
-        long f = F113(t);
-        return (f == 100);
-    }
-
-    // Ununsed (or effectively unused) parameters
-    //
-    // Simple callee analysis may overstate inline benefit
-
-    static long F20(long x)
-    {
-        return 100;
-    }
-
-    static bool Bench20p()
-    {
-        long t = 10;
-        long f = F20(t);
-        return (f == 100);
-    }
-
-    static bool Bench20p1()
-    {
-        long t = Ten;
-        long f = F20(t);
-        return (f == 100);
-    }
-
-    static long F21(long x)
-    {
-        return -x + 100 + x;
-    }
-
-    static bool Bench21p()
-    {
-        long t = 10;
-        long f = F21(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n()
-    {
-        long t = Ten;
-        long f = F21(t);
-        return (f == 100);
-    }
-
-    static long F211(long x)
-    {
-        return x - x + 100;
-    }
-
-    static bool Bench21p1()
-    {
-        long t = 10;
-        long f = F211(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n1()
-    {
-        long t = Ten;
-        long f = F211(t);
-        return (f == 100);
-    }
-
-    static long F22(long x)
-    {
-        if (x > 0)
-        {
-            return 100;
-        }
-
-        return 100;
-    }
-
-    static bool Bench22p()
-    {
-        long t = 10;
-        long f = F22(t);
-        return (f == 100);
-    }
-
-    static bool Bench22p1()
-    {
-        long t = Ten;
-        long f = F22(t);
-        return (f == 100);
-    }
-
-    static long F23(long x)
-    {
-        if (x > 0)
-        {
-            return 90 + x;
-        }
-
-        return 100;
-    }
-
-    static bool Bench23p()
-    {
-        long t = 10;
-        long f = F23(t);
-        return (f == 100);
-    }
-
-    static bool Bench23n()
-    {
-        long t = Ten;
-        long f = F23(t);
-        return (f == 100);
-    }
-
-    // Multiple parameters
-
-    static long F30(long x, long y)
-    {
-        return y * y;
-    }
-
-    static bool Bench30p()
-    {
-        long t = 10;
-        long f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n()
-    {
-        long t = Ten;
-        long f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p1()
-    {
-        long s = Ten;
-        long t = 10;
-        long f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n1()
-    {
-        long s = 10;
-        long t = Ten;
-        long f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p2()
-    {
-        long s = 10;
-        long t = 10;
-        long f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n2()
-    {
-        long s = Ten;
-        long t = Ten;
-        long f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p3()
-    {
-        long s = 10;
-        long t = s;
-        long f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n3()
-    {
-        long s = Ten;
-        long t = s;
-        long f = F30(s, t);
-        return (f == 100);
-    }
-
-    static long F31(long x, long y, long z)
-    {
-        return z * z;
-    }
-
-    static bool Bench31p()
-    {
-        long t = 10;
-        long f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n()
-    {
-        long t = Ten;
-        long f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p1()
-    {
-        long r = Ten;
-        long s = Ten;
-        long t = 10;
-        long f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n1()
-    {
-        long r = 10;
-        long s = 10;
-        long t = Ten;
-        long f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p2()
-    {
-        long r = 10;
-        long s = 10;
-        long t = 10;
-        long f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n2()
-    {
-        long r = Ten;
-        long s = Ten;
-        long t = Ten;
-        long f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p3()
-    {
-        long r = 10;
-        long s = r;
-        long t = s;
-        long f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n3()
-    {
-        long r = Ten;
-        long s = r;
-        long t = s;
-        long f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    // Two args, both used
-
-    static long F40(long x, long y)
-    {
-        return x * x + y * y - 100;
-    }
-
-    static bool Bench40p()
-    {
-        long t = 10;
-        long f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40n()
-    {
-        long t = Ten;
-        long f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p1()
-    {
-        long s = Ten;
-        long t = 10;
-        long f = F40(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p2()
-    {
-        long s = 10;
-        long t = Ten;
-        long f = F40(s, t);
-        return (f == 100);
-    }
-
-    static long F41(long x, long y)
-    {
-        return x * y;
-    }
-
-    static bool Bench41p()
-    {
-        long t = 10;
-        long f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41n()
-    {
-        long t = Ten;
-        long f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p1()
-    {
-        long s = 10;
-        long t = Ten;
-        long f = F41(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p2()
-    {
-        long s = Ten;
-        long t = 10;
-        long f = F41(s, t);
-        return (f == 100);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench00p1", "Bench00n1",
-        "Bench00p2", "Bench00n2",
-        "Bench00p3", "Bench00n3",
-        "Bench00p4", "Bench00n4",
-        "Bench01p",  "Bench01n",
-        "Bench02p",  "Bench02n",
-        "Bench03p",  "Bench03n",
-        "Bench04p",  "Bench04n",
-        "Bench05p",  "Bench05n",
-        "Bench05p1", "Bench05n1",
-        "Bench06p",  "Bench06n",
-        "Bench07p",  "Bench07n",
-        "Bench07p1", "Bench07n1",
-        "Bench08p",  "Bench08n",
-        "Bench09p",  "Bench09n",
-        "Bench10p",  "Bench10n",
-        "Bench10p1", "Bench10n1",
-        "Bench10p2", "Bench10n2",
-        "Bench10p3", "Bench10n3",
-        "Bench11p",  "Bench11n",
-        "Bench11p1", "Bench11n1",
-        "Bench11p2", "Bench11n2",
-        "Bench11p3", "Bench11n3",
-        "Bench20p",  "Bench20p1",
-        "Bench21p",  "Bench21n",
-        "Bench21p1", "Bench21n1",
-        "Bench22p",  "Bench22p1",
-        "Bench23p",  "Bench23n",
-        "Bench30p",  "Bench30n",
-        "Bench30p1", "Bench30n1",
-        "Bench30p2", "Bench30n2",
-        "Bench30p3", "Bench30n3",
-        "Bench31p",  "Bench31n",
-        "Bench31p1", "Bench31n1",
-        "Bench31p2", "Bench31n2",
-        "Bench31p3", "Bench31n3",
-        "Bench40p",  "Bench40n",
-        "Bench40p1", "Bench40p2",
-        "Bench41p",  "Bench41n",
-        "Bench41p1", "Bench41p2"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsLong).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsLong.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsLong.csproj
deleted file mode 100644
index 62499dc019..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsLong.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConstantArgsLong.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsSByte.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsSByte.cs
deleted file mode 100644
index 0ec29b8341..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsSByte.cs
+++ /dev/null
@@ -1,933 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsSByte
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Sbytes feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static sbyte Five = 5;
-    static sbyte Ten = 10;
-
-    static sbyte Id(sbyte x)
-    {
-        return x;
-    }
-
-    static sbyte F00(sbyte x)
-    {
-        return (sbyte) (x * x);
-    }
-
-    static bool Bench00p()
-    {
-        sbyte t = 10;
-        sbyte f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n()
-    {
-        sbyte t = Ten;
-        sbyte f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p1()
-    {
-        sbyte t = Id(10);
-        sbyte f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n1()
-    {
-        sbyte t = Id(Ten);
-        sbyte f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p2()
-    {
-        sbyte t = Id(10);
-        sbyte f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00n2()
-    {
-        sbyte t = Id(Ten);
-        sbyte f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00p3()
-    {
-        sbyte t = 10;
-        sbyte f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00n3()
-    {
-        sbyte t = Ten;
-        sbyte f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00p4()
-    {
-        sbyte t = 5;
-        sbyte f = F00((sbyte)(2 * t));
-        return (f == 100);
-    }
-
-    static bool Bench00n4()
-    {
-        sbyte t = Five;
-        sbyte f = F00((sbyte)(2 * t));
-        return (f == 100);
-    }
-
-    static sbyte F01(sbyte x)
-    {
-        return (sbyte)(1000 / x);
-    }
-
-    static bool Bench01p()
-    {
-        sbyte t = 10;
-        sbyte f = F01(t);
-        return (f == 100);
-    }
-
-    static bool Bench01n()
-    {
-        sbyte t = Ten;
-        sbyte f = F01(t);
-        return (f == 100);
-    }
-
-    static sbyte F02(sbyte x)
-    {
-        return (sbyte) (20 * (x / 2));
-    }
-
-    static bool Bench02p()
-    {
-        sbyte t = 10;
-        sbyte f = F02(t);
-        return (f == 100);
-    }
-
-    static bool Bench02n()
-    {
-        sbyte t = Ten;
-        sbyte f = F02(t);
-        return (f == 100);
-    }
-
-    static sbyte F03(sbyte x)
-    {
-        return (sbyte)(91 + 1009 % x);
-    }
-
-    static bool Bench03p()
-    {
-        sbyte t = 10;
-        sbyte f = F03(t);
-        return (f == 100);
-    }
-
-    static bool Bench03n()
-    {
-        sbyte t = Ten;
-        sbyte f = F03(t);
-        return (f == 100);
-    }
-
-    static sbyte F04(sbyte x)
-    {
-        return (sbyte)(50 * (x % 4));
-    }
-
-    static bool Bench04p()
-    {
-        sbyte t = 10;
-        sbyte f = F04(t);
-        return (f == 100);
-    }
-
-    static bool Bench04n()
-    {
-        sbyte t = Ten;
-        sbyte f = F04(t);
-        return (f == 100);
-    }
-
-    static sbyte F05(sbyte x)
-    {
-        return (sbyte)((1 << x) - 924);
-    }
-
-    static bool Bench05p()
-    {
-        sbyte t = 10;
-        sbyte f = F05(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n()
-    {
-        sbyte t = Ten;
-        sbyte f = F05(t);
-        return (f == 100);
-    }
-
-    static sbyte F051(sbyte x)
-    {
-        return (sbyte)(102400 >> x);
-    }
-
-    static bool Bench05p1()
-    {
-        sbyte t = 10;
-        sbyte f = F051(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n1()
-    {
-        sbyte t = Ten;
-        sbyte f = F051(t);
-        return (f == 100);
-    }
-
-    static sbyte F06(sbyte x)
-    {
-        return (sbyte)(-x + 110);
-    }
-
-    static bool Bench06p()
-    {
-        sbyte t = 10;
-        sbyte f = F06(t);
-        return (f == 100);
-    }
-
-    static bool Bench06n()
-    {
-        sbyte t = Ten;
-        sbyte f = F06(t);
-        return (f == 100);
-    }
-
-    static sbyte F07(sbyte x)
-    {
-        return (sbyte)(~x + 111);
-    }
-
-    static bool Bench07p()
-    {
-        sbyte t = 10;
-        sbyte f = F07(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n()
-    {
-        sbyte t = Ten;
-        sbyte f = F07(t);
-        return (f == 100);
-    }
-
-    static sbyte F071(sbyte x)
-    {
-        return (sbyte)((x ^ -1) + 111);
-    }
-
-    static bool Bench07p1()
-    {
-        sbyte t = 10;
-        sbyte f = F071(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n1()
-    {
-        sbyte t = Ten;
-        sbyte f = F071(t);
-        return (f == 100);
-    }
-
-    static sbyte F08(sbyte x)
-    {
-        return (sbyte)((x & 0x7) + 98);
-    }
-
-    static bool Bench08p()
-    {
-        sbyte t = 10;
-        sbyte f = F08(t);
-        return (f == 100);
-    }
-
-    static bool Bench08n()
-    {
-        sbyte t = Ten;
-        sbyte f = F08(t);
-        return (f == 100);
-    }
-
-    static sbyte F09(sbyte x)
-    {
-        return (sbyte)((x | 0x7) + 85);
-    }
-
-    static bool Bench09p()
-    {
-        sbyte t = 10;
-        sbyte f = F09(t);
-        return (f == 100);
-    }
-
-    static bool Bench09n()
-    {
-        sbyte t = Ten;
-        sbyte f = F09(t);
-        return (f == 100);
-    }
-
-    // Sbytes feeding comparisons.
-    //
-    // Inlining in Bench1xp should enable branch optimization
-    // Inlining in Bench1xn will not enable branch optimization
-
-    static sbyte F10(sbyte x)
-    {
-        return x == 10 ? (sbyte) 100 : (sbyte) 0;
-    }
-
-    static bool Bench10p()
-    {
-        sbyte t = 10;
-        sbyte f = F10(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n()
-    {
-        sbyte t = Ten;
-        sbyte f = F10(t);
-        return (f == 100);
-    }
-
-    static sbyte F101(sbyte x)
-    {
-        return x != 10 ? (sbyte) 0 : (sbyte) 100;
-    }
-
-    static bool Bench10p1()
-    {
-        sbyte t = 10;
-        sbyte f = F101(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n1()
-    {
-        sbyte t = Ten;
-        sbyte f = F101(t);
-        return (f == 100);
-    }
-
-    static sbyte F102(sbyte x)
-    {
-        return x >= 10 ? (sbyte) 100 : (sbyte) 0;
-    }
-
-    static bool Bench10p2()
-    {
-        sbyte t = 10;
-        sbyte f = F102(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n2()
-    {
-        sbyte t = Ten;
-        sbyte f = F102(t);
-        return (f == 100);
-    }
-
-    static sbyte F103(sbyte x)
-    {
-        return x <= 10 ? (sbyte) 100 : (sbyte) 0;
-    }
-
-    static bool Bench10p3()
-    {
-        sbyte t = 10;
-        sbyte f = F103(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n3()
-    {
-        sbyte t = Ten;
-        sbyte f = F102(t);
-        return (f == 100);
-    }
-
-    static sbyte F11(sbyte x)
-    {
-        if (x == 10)
-        {
-            return 100;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    static bool Bench11p()
-    {
-        sbyte t = 10;
-        sbyte f = F11(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n()
-    {
-        sbyte t = Ten;
-        sbyte f = F11(t);
-        return (f == 100);
-    }
-
-    static sbyte F111(sbyte x)
-    {
-        if (x != 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p1()
-    {
-        sbyte t = 10;
-        sbyte f = F111(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n1()
-    {
-        sbyte t = Ten;
-        sbyte f = F111(t);
-        return (f == 100);
-    }
-
-    static sbyte F112(sbyte x)
-    {
-        if (x > 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p2()
-    {
-        sbyte t = 10;
-        sbyte f = F112(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n2()
-    {
-        sbyte t = Ten;
-        sbyte f = F112(t);
-        return (f == 100);
-    }
-    static sbyte F113(sbyte x)
-    {
-        if (x < 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p3()
-    {
-        sbyte t = 10;
-        sbyte f = F113(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n3()
-    {
-        sbyte t = Ten;
-        sbyte f = F113(t);
-        return (f == 100);
-    }
-
-    // Ununsed (or effectively unused) parameters
-    //
-    // Simple callee analysis may overstate inline benefit
-
-    static sbyte F20(sbyte x)
-    {
-        return 100;
-    }
-
-    static bool Bench20p()
-    {
-        sbyte t = 10;
-        sbyte f = F20(t);
-        return (f == 100);
-    }
-
-    static bool Bench20p1()
-    {
-        sbyte t = Ten;
-        sbyte f = F20(t);
-        return (f == 100);
-    }
-
-    static sbyte F21(sbyte x)
-    {
-        return (sbyte)(-x + 100 + x);
-    }
-
-    static bool Bench21p()
-    {
-        sbyte t = 10;
-        sbyte f = F21(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n()
-    {
-        sbyte t = Ten;
-        sbyte f = F21(t);
-        return (f == 100);
-    }
-
-    static sbyte F211(sbyte x)
-    {
-        return (sbyte)(x - x + 100);
-    }
-
-    static bool Bench21p1()
-    {
-        sbyte t = 10;
-        sbyte f = F211(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n1()
-    {
-        sbyte t = Ten;
-        sbyte f = F211(t);
-        return (f == 100);
-    }
-
-    static sbyte F22(sbyte x)
-    {
-        if (x > 0)
-        {
-            return 100;
-        }
-
-        return 100;
-    }
-
-    static bool Bench22p()
-    {
-        sbyte t = 10;
-        sbyte f = F22(t);
-        return (f == 100);
-    }
-
-    static bool Bench22p1()
-    {
-        sbyte t = Ten;
-        sbyte f = F22(t);
-        return (f == 100);
-    }
-
-    static sbyte F23(sbyte x)
-    {
-        if (x > 0)
-        {
-            return (sbyte)(90 + x);
-        }
-
-        return 100;
-    }
-
-    static bool Bench23p()
-    {
-        sbyte t = 10;
-        sbyte f = F23(t);
-        return (f == 100);
-    }
-
-    static bool Bench23n()
-    {
-        sbyte t = Ten;
-        sbyte f = F23(t);
-        return (f == 100);
-    }
-
-    // Multiple parameters
-
-    static sbyte F30(sbyte x, sbyte y)
-    {
-        return (sbyte)(y * y);
-    }
-
-    static bool Bench30p()
-    {
-        sbyte t = 10;
-        sbyte f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n()
-    {
-        sbyte t = Ten;
-        sbyte f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p1()
-    {
-        sbyte s = Ten;
-        sbyte t = 10;
-        sbyte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n1()
-    {
-        sbyte s = 10;
-        sbyte t = Ten;
-        sbyte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p2()
-    {
-        sbyte s = 10;
-        sbyte t = 10;
-        sbyte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n2()
-    {
-        sbyte s = Ten;
-        sbyte t = Ten;
-        sbyte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p3()
-    {
-        sbyte s = 10;
-        sbyte t = s;
-        sbyte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n3()
-    {
-        sbyte s = Ten;
-        sbyte t = s;
-        sbyte f = F30(s, t);
-        return (f == 100);
-    }
-
-    static sbyte F31(sbyte x, sbyte y, sbyte z)
-    {
-        return (sbyte)(z * z);
-    }
-
-    static bool Bench31p()
-    {
-        sbyte t = 10;
-        sbyte f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n()
-    {
-        sbyte t = Ten;
-        sbyte f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p1()
-    {
-        sbyte r = Ten;
-        sbyte s = Ten;
-        sbyte t = 10;
-        sbyte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n1()
-    {
-        sbyte r = 10;
-        sbyte s = 10;
-        sbyte t = Ten;
-        sbyte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p2()
-    {
-        sbyte r = 10;
-        sbyte s = 10;
-        sbyte t = 10;
-        sbyte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n2()
-    {
-        sbyte r = Ten;
-        sbyte s = Ten;
-        sbyte t = Ten;
-        sbyte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p3()
-    {
-        sbyte r = 10;
-        sbyte s = r;
-        sbyte t = s;
-        sbyte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n3()
-    {
-        sbyte r = Ten;
-        sbyte s = r;
-        sbyte t = s;
-        sbyte f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    // Two args, both used
-
-    static sbyte F40(sbyte x, sbyte y)
-    {
-        return (sbyte)(x * x + y * y - 100);
-    }
-
-    static bool Bench40p()
-    {
-        sbyte t = 10;
-        sbyte f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40n()
-    {
-        sbyte t = Ten;
-        sbyte f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p1()
-    {
-        sbyte s = Ten;
-        sbyte t = 10;
-        sbyte f = F40(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p2()
-    {
-        sbyte s = 10;
-        sbyte t = Ten;
-        sbyte f = F40(s, t);
-        return (f == 100);
-    }
-
-    static sbyte F41(sbyte x, sbyte y)
-    {
-        return (sbyte)(x * y);
-    }
-
-    static bool Bench41p()
-    {
-        sbyte t = 10;
-        sbyte f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41n()
-    {
-        sbyte t = Ten;
-        sbyte f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p1()
-    {
-        sbyte s = 10;
-        sbyte t = Ten;
-        sbyte f = F41(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p2()
-    {
-        sbyte s = Ten;
-        sbyte t = 10;
-        sbyte f = F41(s, t);
-        return (f == 100);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench00p1", "Bench00n1",
-        "Bench00p2", "Bench00n2",
-        "Bench00p3", "Bench00n3",
-        "Bench00p4", "Bench00n4",
-        "Bench01p",  "Bench01n",
-        "Bench02p",  "Bench02n",
-        "Bench03p",  "Bench03n",
-        "Bench04p",  "Bench04n",
-        "Bench05p",  "Bench05n",
-        "Bench05p1", "Bench05n1",
-        "Bench06p",  "Bench06n",
-        "Bench07p",  "Bench07n",
-        "Bench07p1", "Bench07n1",
-        "Bench08p",  "Bench08n",
-        "Bench09p",  "Bench09n",
-        "Bench10p",  "Bench10n",
-        "Bench10p1", "Bench10n1",
-        "Bench10p2", "Bench10n2",
-        "Bench10p3", "Bench10n3",
-        "Bench11p",  "Bench11n",
-        "Bench11p1", "Bench11n1",
-        "Bench11p2", "Bench11n2",
-        "Bench11p3", "Bench11n3",
-        "Bench20p",  "Bench20p1",
-        "Bench21p",  "Bench21n",
-        "Bench21p1", "Bench21n1",
-        "Bench22p",  "Bench22p1",
-        "Bench23p",  "Bench23n",
-        "Bench30p",  "Bench30n",
-        "Bench30p1", "Bench30n1",
-        "Bench30p2", "Bench30n2",
-        "Bench30p3", "Bench30n3",
-        "Bench31p",  "Bench31n",
-        "Bench31p1", "Bench31n1",
-        "Bench31p2", "Bench31n2",
-        "Bench31p3", "Bench31n3",
-        "Bench40p",  "Bench40n",
-        "Bench40p1", "Bench40p2",
-        "Bench41p",  "Bench41n",
-        "Bench41p1", "Bench41p2"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsSByte).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsSByte.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsSByte.csproj
deleted file mode 100644
index 52538e0fed..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsSByte.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConstantArgsSByte.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsShort.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsShort.cs
deleted file mode 100644
index f8cf23e8da..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsShort.cs
+++ /dev/null
@@ -1,933 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsShort
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Shorts feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static short Five = 5;
-    static short Ten = 10;
-
-    static short Id(short x)
-    {
-        return x;
-    }
-
-    static short F00(short x)
-    {
-        return (short) (x * x);
-    }
-
-    static bool Bench00p()
-    {
-        short t = 10;
-        short f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n()
-    {
-        short t = Ten;
-        short f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p1()
-    {
-        short t = Id(10);
-        short f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n1()
-    {
-        short t = Id(Ten);
-        short f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p2()
-    {
-        short t = Id(10);
-        short f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00n2()
-    {
-        short t = Id(Ten);
-        short f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00p3()
-    {
-        short t = 10;
-        short f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00n3()
-    {
-        short t = Ten;
-        short f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00p4()
-    {
-        short t = 5;
-        short f = F00((short)(2 * t));
-        return (f == 100);
-    }
-
-    static bool Bench00n4()
-    {
-        short t = Five;
-        short f = F00((short)(2 * t));
-        return (f == 100);
-    }
-
-    static short F01(short x)
-    {
-        return (short)(1000 / x);
-    }
-
-    static bool Bench01p()
-    {
-        short t = 10;
-        short f = F01(t);
-        return (f == 100);
-    }
-
-    static bool Bench01n()
-    {
-        short t = Ten;
-        short f = F01(t);
-        return (f == 100);
-    }
-
-    static short F02(short x)
-    {
-        return (short) (20 * (x / 2));
-    }
-
-    static bool Bench02p()
-    {
-        short t = 10;
-        short f = F02(t);
-        return (f == 100);
-    }
-
-    static bool Bench02n()
-    {
-        short t = Ten;
-        short f = F02(t);
-        return (f == 100);
-    }
-
-    static short F03(short x)
-    {
-        return (short)(91 + 1009 % x);
-    }
-
-    static bool Bench03p()
-    {
-        short t = 10;
-        short f = F03(t);
-        return (f == 100);
-    }
-
-    static bool Bench03n()
-    {
-        short t = Ten;
-        short f = F03(t);
-        return (f == 100);
-    }
-
-    static short F04(short x)
-    {
-        return (short)(50 * (x % 4));
-    }
-
-    static bool Bench04p()
-    {
-        short t = 10;
-        short f = F04(t);
-        return (f == 100);
-    }
-
-    static bool Bench04n()
-    {
-        short t = Ten;
-        short f = F04(t);
-        return (f == 100);
-    }
-
-    static short F05(short x)
-    {
-        return (short)((1 << x) - 924);
-    }
-
-    static bool Bench05p()
-    {
-        short t = 10;
-        short f = F05(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n()
-    {
-        short t = Ten;
-        short f = F05(t);
-        return (f == 100);
-    }
-
-    static short F051(short x)
-    {
-        return (short)(102400 >> x);
-    }
-
-    static bool Bench05p1()
-    {
-        short t = 10;
-        short f = F051(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n1()
-    {
-        short t = Ten;
-        short f = F051(t);
-        return (f == 100);
-    }
-
-    static short F06(short x)
-    {
-        return (short)(-x + 110);
-    }
-
-    static bool Bench06p()
-    {
-        short t = 10;
-        short f = F06(t);
-        return (f == 100);
-    }
-
-    static bool Bench06n()
-    {
-        short t = Ten;
-        short f = F06(t);
-        return (f == 100);
-    }
-
-    static short F07(short x)
-    {
-        return (short)(~x + 111);
-    }
-
-    static bool Bench07p()
-    {
-        short t = 10;
-        short f = F07(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n()
-    {
-        short t = Ten;
-        short f = F07(t);
-        return (f == 100);
-    }
-
-    static short F071(short x)
-    {
-        return (short)((x ^ -1) + 111);
-    }
-
-    static bool Bench07p1()
-    {
-        short t = 10;
-        short f = F071(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n1()
-    {
-        short t = Ten;
-        short f = F071(t);
-        return (f == 100);
-    }
-
-    static short F08(short x)
-    {
-        return (short)((x & 0x7) + 98);
-    }
-
-    static bool Bench08p()
-    {
-        short t = 10;
-        short f = F08(t);
-        return (f == 100);
-    }
-
-    static bool Bench08n()
-    {
-        short t = Ten;
-        short f = F08(t);
-        return (f == 100);
-    }
-
-    static short F09(short x)
-    {
-        return (short)((x | 0x7) + 85);
-    }
-
-    static bool Bench09p()
-    {
-        short t = 10;
-        short f = F09(t);
-        return (f == 100);
-    }
-
-    static bool Bench09n()
-    {
-        short t = Ten;
-        short f = F09(t);
-        return (f == 100);
-    }
-
-    // Shorts feeding comparisons.
-    //
-    // Inlining in Bench1xp should enable branch optimization
-    // Inlining in Bench1xn will not enable branch optimization
-
-    static short F10(short x)
-    {
-        return x == 10 ? (short) 100 : (short) 0;
-    }
-
-    static bool Bench10p()
-    {
-        short t = 10;
-        short f = F10(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n()
-    {
-        short t = Ten;
-        short f = F10(t);
-        return (f == 100);
-    }
-
-    static short F101(short x)
-    {
-        return x != 10 ? (short) 0 : (short) 100;
-    }
-
-    static bool Bench10p1()
-    {
-        short t = 10;
-        short f = F101(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n1()
-    {
-        short t = Ten;
-        short f = F101(t);
-        return (f == 100);
-    }
-
-    static short F102(short x)
-    {
-        return x >= 10 ? (short) 100 : (short) 0;
-    }
-
-    static bool Bench10p2()
-    {
-        short t = 10;
-        short f = F102(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n2()
-    {
-        short t = Ten;
-        short f = F102(t);
-        return (f == 100);
-    }
-
-    static short F103(short x)
-    {
-        return x <= 10 ? (short) 100 : (short) 0;
-    }
-
-    static bool Bench10p3()
-    {
-        short t = 10;
-        short f = F103(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n3()
-    {
-        short t = Ten;
-        short f = F102(t);
-        return (f == 100);
-    }
-
-    static short F11(short x)
-    {
-        if (x == 10)
-        {
-            return 100;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    static bool Bench11p()
-    {
-        short t = 10;
-        short f = F11(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n()
-    {
-        short t = Ten;
-        short f = F11(t);
-        return (f == 100);
-    }
-
-    static short F111(short x)
-    {
-        if (x != 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p1()
-    {
-        short t = 10;
-        short f = F111(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n1()
-    {
-        short t = Ten;
-        short f = F111(t);
-        return (f == 100);
-    }
-
-    static short F112(short x)
-    {
-        if (x > 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p2()
-    {
-        short t = 10;
-        short f = F112(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n2()
-    {
-        short t = Ten;
-        short f = F112(t);
-        return (f == 100);
-    }
-    static short F113(short x)
-    {
-        if (x < 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p3()
-    {
-        short t = 10;
-        short f = F113(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n3()
-    {
-        short t = Ten;
-        short f = F113(t);
-        return (f == 100);
-    }
-
-    // Ununsed (or effectively unused) parameters
-    //
-    // Simple callee analysis may overstate inline benefit
-
-    static short F20(short x)
-    {
-        return 100;
-    }
-
-    static bool Bench20p()
-    {
-        short t = 10;
-        short f = F20(t);
-        return (f == 100);
-    }
-
-    static bool Bench20p1()
-    {
-        short t = Ten;
-        short f = F20(t);
-        return (f == 100);
-    }
-
-    static short F21(short x)
-    {
-        return (short)(-x + 100 + x);
-    }
-
-    static bool Bench21p()
-    {
-        short t = 10;
-        short f = F21(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n()
-    {
-        short t = Ten;
-        short f = F21(t);
-        return (f == 100);
-    }
-
-    static short F211(short x)
-    {
-        return (short)(x - x + 100);
-    }
-
-    static bool Bench21p1()
-    {
-        short t = 10;
-        short f = F211(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n1()
-    {
-        short t = Ten;
-        short f = F211(t);
-        return (f == 100);
-    }
-
-    static short F22(short x)
-    {
-        if (x > 0)
-        {
-            return 100;
-        }
-
-        return 100;
-    }
-
-    static bool Bench22p()
-    {
-        short t = 10;
-        short f = F22(t);
-        return (f == 100);
-    }
-
-    static bool Bench22p1()
-    {
-        short t = Ten;
-        short f = F22(t);
-        return (f == 100);
-    }
-
-    static short F23(short x)
-    {
-        if (x > 0)
-        {
-            return (short)(90 + x);
-        }
-
-        return 100;
-    }
-
-    static bool Bench23p()
-    {
-        short t = 10;
-        short f = F23(t);
-        return (f == 100);
-    }
-
-    static bool Bench23n()
-    {
-        short t = Ten;
-        short f = F23(t);
-        return (f == 100);
-    }
-
-    // Multiple parameters
-
-    static short F30(short x, short y)
-    {
-        return (short)(y * y);
-    }
-
-    static bool Bench30p()
-    {
-        short t = 10;
-        short f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n()
-    {
-        short t = Ten;
-        short f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p1()
-    {
-        short s = Ten;
-        short t = 10;
-        short f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n1()
-    {
-        short s = 10;
-        short t = Ten;
-        short f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p2()
-    {
-        short s = 10;
-        short t = 10;
-        short f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n2()
-    {
-        short s = Ten;
-        short t = Ten;
-        short f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p3()
-    {
-        short s = 10;
-        short t = s;
-        short f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n3()
-    {
-        short s = Ten;
-        short t = s;
-        short f = F30(s, t);
-        return (f == 100);
-    }
-
-    static short F31(short x, short y, short z)
-    {
-        return (short)(z * z);
-    }
-
-    static bool Bench31p()
-    {
-        short t = 10;
-        short f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n()
-    {
-        short t = Ten;
-        short f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p1()
-    {
-        short r = Ten;
-        short s = Ten;
-        short t = 10;
-        short f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n1()
-    {
-        short r = 10;
-        short s = 10;
-        short t = Ten;
-        short f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p2()
-    {
-        short r = 10;
-        short s = 10;
-        short t = 10;
-        short f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n2()
-    {
-        short r = Ten;
-        short s = Ten;
-        short t = Ten;
-        short f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p3()
-    {
-        short r = 10;
-        short s = r;
-        short t = s;
-        short f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n3()
-    {
-        short r = Ten;
-        short s = r;
-        short t = s;
-        short f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    // Two args, both used
-
-    static short F40(short x, short y)
-    {
-        return (short)(x * x + y * y - 100);
-    }
-
-    static bool Bench40p()
-    {
-        short t = 10;
-        short f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40n()
-    {
-        short t = Ten;
-        short f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p1()
-    {
-        short s = Ten;
-        short t = 10;
-        short f = F40(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p2()
-    {
-        short s = 10;
-        short t = Ten;
-        short f = F40(s, t);
-        return (f == 100);
-    }
-
-    static short F41(short x, short y)
-    {
-        return (short)(x * y);
-    }
-
-    static bool Bench41p()
-    {
-        short t = 10;
-        short f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41n()
-    {
-        short t = Ten;
-        short f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p1()
-    {
-        short s = 10;
-        short t = Ten;
-        short f = F41(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p2()
-    {
-        short s = Ten;
-        short t = 10;
-        short f = F41(s, t);
-        return (f == 100);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench00p1", "Bench00n1",
-        "Bench00p2", "Bench00n2",
-        "Bench00p3", "Bench00n3",
-        "Bench00p4", "Bench00n4",
-        "Bench01p",  "Bench01n",
-        "Bench02p",  "Bench02n",
-        "Bench03p",  "Bench03n",
-        "Bench04p",  "Bench04n",
-        "Bench05p",  "Bench05n",
-        "Bench05p1", "Bench05n1",
-        "Bench06p",  "Bench06n",
-        "Bench07p",  "Bench07n",
-        "Bench07p1", "Bench07n1",
-        "Bench08p",  "Bench08n",
-        "Bench09p",  "Bench09n",
-        "Bench10p",  "Bench10n",
-        "Bench10p1", "Bench10n1",
-        "Bench10p2", "Bench10n2",
-        "Bench10p3", "Bench10n3",
-        "Bench11p",  "Bench11n",
-        "Bench11p1", "Bench11n1",
-        "Bench11p2", "Bench11n2",
-        "Bench11p3", "Bench11n3",
-        "Bench20p",  "Bench20p1",
-        "Bench21p",  "Bench21n",
-        "Bench21p1", "Bench21n1",
-        "Bench22p",  "Bench22p1",
-        "Bench23p",  "Bench23n",
-        "Bench30p",  "Bench30n",
-        "Bench30p1", "Bench30n1",
-        "Bench30p2", "Bench30n2",
-        "Bench30p3", "Bench30n3",
-        "Bench31p",  "Bench31n",
-        "Bench31p1", "Bench31n1",
-        "Bench31p2", "Bench31n2",
-        "Bench31p3", "Bench31n3",
-        "Bench40p",  "Bench40n",
-        "Bench40p1", "Bench40p2",
-        "Bench41p",  "Bench41n",
-        "Bench41p1", "Bench41p2"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsShort).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsShort.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsShort.csproj
deleted file mode 100644
index 0013834c8c..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsShort.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConstantArgsShort.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsString.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsString.cs
deleted file mode 100644
index 38a3f7e6b9..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsString.cs
+++ /dev/null
@@ -1,333 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-// Strings are the only ref class where there is built-in support for
-// constant objects.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsString
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Ints feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static string Ten = "Ten";
-    static string Five = "Five";
-
-    static string Id(string x)
-    {
-        return x;
-    }
-
-    static char F00(string x)
-    {
-        return x[0];
-    }
-
-    static bool Bench00p()
-    {
-        string t = "Ten";
-        char f = F00(t);
-        return (f == 'T');
-    }
-
-    static bool Bench00n()
-    {
-        string t = Ten;
-        char f = F00(t);
-        return (f == 'T');
-    }
-
-    static int F01(string x)
-    {
-        return x.Length;
-    }
-
-    static bool Bench01p()
-    {
-        string t = "Ten";
-        int f = F01(t);
-        return (f == 3);
-    }
-
-    static bool Bench01n()
-    {
-        string t = Ten;
-        int f = F01(t);
-        return (f == 3);
-    }
-
-    static bool Bench01p1()
-    {
-        return "Ten".Length == 3;
-    }
-
-    static bool Bench01n1()
-    {
-        return Ten.Length == 3;
-    }
-
-    static bool Bench02p()
-    {
-        return "Ten".Equals("Ten", StringComparison.Ordinal);
-    }
-
-    static bool Bench02n()
-    {
-        return "Ten".Equals(Ten, StringComparison.Ordinal);
-    }
-
-    static bool Bench02n1()
-    {
-        return Ten.Equals("Ten", StringComparison.Ordinal);
-    }
-
-    static bool Bench02n2()
-    {
-        return Ten.Equals(Ten, StringComparison.Ordinal);
-    }
-
-    static bool Bench03p()
-    {
-        return "Ten" == "Ten";
-    }
-
-    static bool Bench03n()
-    {
-        return "Ten" == Ten;
-    }
-
-    static bool Bench03n1()
-    {
-        return Ten == "Ten";
-    }
-
-    static bool Bench03n2()
-    {
-        return Ten == Ten;
-    }
-
-    static bool Bench04p()
-    {
-        return "Ten" != "Five";
-    }
-
-    static bool Bench04n()
-    {
-        return "Ten" != Five;
-    }
-
-    static bool Bench04n1()
-    {
-        return Ten != "Five";
-    }
-
-    static bool Bench04n2()
-    {
-        return Ten != Five;
-    }
-
-    static bool Bench05p()
-    {
-        string t = "Ten";
-        return (t == t);
-    }
-
-    static bool Bench05n()
-    {
-        string t = Ten;
-        return (t == t);
-    }
-
-    static bool Bench06p()
-    {
-        return "Ten" != null;
-    }
-
-    static bool Bench06n()
-    {
-        return Ten != null;
-    }
-
-    static bool Bench07p()
-    {
-        return !"Ten".Equals(null);
-    }
-
-    static bool Bench07n()
-    {
-        return !Ten.Equals(null);
-    }
-
-    static bool Bench08p()
-    {
-        return !"Ten".Equals("Five", StringComparison.Ordinal);
-    }
-
-    static bool Bench08n()
-    {
-        return !"Ten".Equals(Five, StringComparison.Ordinal);
-    }
-
-    static bool Bench08n1()
-    {
-        return !Ten.Equals("Five", StringComparison.Ordinal);
-    }
-
-    static bool Bench08n2()
-    {
-        return !Ten.Equals(Five, StringComparison.Ordinal);
-    }
-
-    static bool Bench09p()
-    {
-        return string.Equals("Ten", "Ten");
-    }
-
-    static bool Bench09n()
-    {
-        return string.Equals("Ten", Ten);
-    }
-
-    static bool Bench09n1()
-    {
-        return string.Equals(Ten, "Ten");
-    }
-
-    static bool Bench09n2()
-    {
-        return string.Equals(Ten, Ten);
-    }
-
-    static bool Bench10p()
-    {
-        return !string.Equals("Five", "Ten");
-    }
-
-    static bool Bench10n()
-    {
-        return !string.Equals(Five, "Ten");
-    }
-
-    static bool Bench10n1()
-    {
-        return !string.Equals("Five", Ten);
-    }
-
-    static bool Bench10n2()
-    {
-        return !string.Equals(Five, Ten);
-    }
-
-    static bool Bench11p()
-    {
-        return !string.Equals("Five", null);
-    }
-
-    static bool Bench11n()
-    {
-        return !string.Equals(Five, null);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench01p",  "Bench01n",
-        "Bench01p1", "Bench01n1",
-        "Bench02p",  "Bench02n",
-        "Bench02n1", "Bench02n2",
-        "Bench03p",  "Bench03n",
-        "Bench03n1", "Bench03n2",
-        "Bench04p",  "Bench04n",
-        "Bench04n1", "Bench04n2",
-        "Bench05p",  "Bench05n",
-        "Bench06p",  "Bench06n",
-        "Bench07p",  "Bench07n",
-        "Bench08p",  "Bench08n",
-        "Bench08n1", "Bench08n2",
-        "Bench09p",  "Bench09n",
-        "Bench09n1", "Bench09n2",
-        "Bench10p",  "Bench10n",
-        "Bench10n1", "Bench10n2",
-        "Bench11p",  "Bench11n"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsString).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsString.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsString.csproj
deleted file mode 100644
index 5b5005edfb..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsString.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConstantArgsString.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUInt.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUInt.cs
deleted file mode 100644
index e3f6e2aae8..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUInt.cs
+++ /dev/null
@@ -1,893 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsUInt
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Ints feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static uint Five = 5;
-    static uint Ten = 10;
-
-    static uint Id(uint x)
-    {
-        return x;
-    }
-
-    static uint F00(uint x)
-    {
-        return x * x;
-    }
-
-    static bool Bench00p()
-    {
-        uint t = 10;
-        uint f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n()
-    {
-        uint t = Ten;
-        uint f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p1()
-    {
-        uint t = Id(10);
-        uint f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n1()
-    {
-        uint t = Id(Ten);
-        uint f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p2()
-    {
-        uint t = Id(10);
-        uint f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00n2()
-    {
-        uint t = Id(Ten);
-        uint f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00p3()
-    {
-        uint t = 10;
-        uint f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00n3()
-    {
-        uint t = Ten;
-        uint f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00p4()
-    {
-        uint t = 5;
-        uint f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static bool Bench00n4()
-    {
-        uint t = Five;
-        uint f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static uint F01(uint x)
-    {
-        return 1000 / x;
-    }
-
-    static bool Bench01p()
-    {
-        uint t = 10;
-        uint f = F01(t);
-        return (f == 100);
-    }
-
-    static bool Bench01n()
-    {
-        uint t = Ten;
-        uint f = F01(t);
-        return (f == 100);
-    }
-
-    static uint F02(uint x)
-    {
-        return 20 * (x / 2);
-    }
-
-    static bool Bench02p()
-    {
-        uint t = 10;
-        uint f = F02(t);
-        return (f == 100);
-    }
-
-    static bool Bench02n()
-    {
-        uint t = Ten;
-        uint f = F02(t);
-        return (f == 100);
-    }
-
-    static uint F03(uint x)
-    {
-        return 91 + 1009 % x;
-    }
-
-    static bool Bench03p()
-    {
-        uint t = 10;
-        uint f = F03(t);
-        return (f == 100);
-    }
-
-    static bool Bench03n()
-    {
-        uint t = Ten;
-        uint f = F03(t);
-        return (f == 100);
-    }
-
-    static uint F04(uint x)
-    {
-        return 50 * (x % 4);
-    }
-
-    static bool Bench04p()
-    {
-        uint t = 10;
-        uint f = F04(t);
-        return (f == 100);
-    }
-
-    static bool Bench04n()
-    {
-        uint t = Ten;
-        uint f = F04(t);
-        return (f == 100);
-    }
-
-    static uint F06(uint x)
-    {
-        return 110 - x;
-    }
-
-    static bool Bench06p()
-    {
-        uint t = 10;
-        uint f = F06(t);
-        return (f == 100);
-    }
-
-    static bool Bench06n()
-    {
-        uint t = Ten;
-        uint f = F06(t);
-        return (f == 100);
-    }
-
-    static uint F07(uint x)
-    {
-        return ~x + 111;
-    }
-
-    static bool Bench07p()
-    {
-        uint t = 10;
-        uint f = F07(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n()
-    {
-        uint t = Ten;
-        uint f = F07(t);
-        return (f == 100);
-    }
-
-    static uint F071(uint x)
-    {
-        return (x ^ 0xFFFFFFFF) + 111;
-    }
-
-    static bool Bench07p1()
-    {
-        uint t = 10;
-        uint f = F071(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n1()
-    {
-        uint t = Ten;
-        uint f = F071(t);
-        return (f == 100);
-    }
-
-    static uint F08(uint x)
-    {
-        return (x & 0x7) + 98;
-    }
-
-    static bool Bench08p()
-    {
-        uint t = 10;
-        uint f = F08(t);
-        return (f == 100);
-    }
-
-    static bool Bench08n()
-    {
-        uint t = Ten;
-        uint f = F08(t);
-        return (f == 100);
-    }
-
-    static uint F09(uint x)
-    {
-        return (x | 0x7) + 85;
-    }
-
-    static bool Bench09p()
-    {
-        uint t = 10;
-        uint f = F09(t);
-        return (f == 100);
-    }
-
-    static bool Bench09n()
-    {
-        uint t = Ten;
-        uint f = F09(t);
-        return (f == 100);
-    }
-
-    // Uints feeding comparisons.
-    //
-    // Inlining in Bench1xp should enable branch optimization
-    // Inlining in Bench1xn will not enable branch optimization
-
-    static uint F10(uint x)
-    {
-        return x == 10 ? 100u : 0u;
-    }
-
-    static bool Bench10p()
-    {
-        uint t = 10;
-        uint f = F10(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n()
-    {
-        uint t = Ten;
-        uint f = F10(t);
-        return (f == 100);
-    }
-
-    static uint F101(uint x)
-    {
-        return x != 10 ? 0u : 100u;
-    }
-
-    static bool Bench10p1()
-    {
-        uint t = 10;
-        uint f = F101(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n1()
-    {
-        uint t = Ten;
-        uint f = F101(t);
-        return (f == 100);
-    }
-
-    static uint F102(uint x)
-    {
-        return x >= 10 ? 100u : 0u;
-    }
-
-    static bool Bench10p2()
-    {
-        uint t = 10;
-        uint f = F102(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n2()
-    {
-        uint t = Ten;
-        uint f = F102(t);
-        return (f == 100);
-    }
-
-    static uint F103(uint x)
-    {
-        return x <= 10 ? 100u : 0u;
-    }
-
-    static bool Bench10p3()
-    {
-        uint t = 10;
-        uint f = F103(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n3()
-    {
-        uint t = Ten;
-        uint f = F102(t);
-        return (f == 100);
-    }
-
-    static uint F11(uint x)
-    {
-        if (x == 10)
-        {
-            return 100;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    static bool Bench11p()
-    {
-        uint t = 10;
-        uint f = F11(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n()
-    {
-        uint t = Ten;
-        uint f = F11(t);
-        return (f == 100);
-    }
-
-    static uint F111(uint x)
-    {
-        if (x != 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p1()
-    {
-        uint t = 10;
-        uint f = F111(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n1()
-    {
-        uint t = Ten;
-        uint f = F111(t);
-        return (f == 100);
-    }
-
-    static uint F112(uint x)
-    {
-        if (x > 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p2()
-    {
-        uint t = 10;
-        uint f = F112(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n2()
-    {
-        uint t = Ten;
-        uint f = F112(t);
-        return (f == 100);
-    }
-    static uint F113(uint x)
-    {
-        if (x < 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p3()
-    {
-        uint t = 10;
-        uint f = F113(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n3()
-    {
-        uint t = Ten;
-        uint f = F113(t);
-        return (f == 100);
-    }
-
-    // Ununsed (or effectively unused) parameters
-    //
-    // Simple callee analysis may overstate inline benefit
-
-    static uint F20(uint x)
-    {
-        return 100;
-    }
-
-    static bool Bench20p()
-    {
-        uint t = 10;
-        uint f = F20(t);
-        return (f == 100);
-    }
-
-    static bool Bench20p1()
-    {
-        uint t = Ten;
-        uint f = F20(t);
-        return (f == 100);
-    }
-
-    static uint F21(uint x)
-    {
-        return (uint) -x + 100 + x;
-    }
-
-    static bool Bench21p()
-    {
-        uint t = 10;
-        uint f = F21(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n()
-    {
-        uint t = Ten;
-        uint f = F21(t);
-        return (f == 100);
-    }
-
-    static uint F211(uint x)
-    {
-        return x - x + 100;
-    }
-
-    static bool Bench21p1()
-    {
-        uint t = 10;
-        uint f = F211(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n1()
-    {
-        uint t = Ten;
-        uint f = F211(t);
-        return (f == 100);
-    }
-
-    static uint F22(uint x)
-    {
-        if (x > 0)
-        {
-            return 100;
-        }
-
-        return 100;
-    }
-
-    static bool Bench22p()
-    {
-        uint t = 10;
-        uint f = F22(t);
-        return (f == 100);
-    }
-
-    static bool Bench22p1()
-    {
-        uint t = Ten;
-        uint f = F22(t);
-        return (f == 100);
-    }
-
-    static uint F23(uint x)
-    {
-        if (x > 0)
-        {
-            return 90 + x;
-        }
-
-        return 100;
-    }
-
-    static bool Bench23p()
-    {
-        uint t = 10;
-        uint f = F23(t);
-        return (f == 100);
-    }
-
-    static bool Bench23n()
-    {
-        uint t = Ten;
-        uint f = F23(t);
-        return (f == 100);
-    }
-
-    // Multiple parameters
-
-    static uint F30(uint x, uint y)
-    {
-        return y * y;
-    }
-
-    static bool Bench30p()
-    {
-        uint t = 10;
-        uint f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n()
-    {
-        uint t = Ten;
-        uint f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p1()
-    {
-        uint s = Ten;
-        uint t = 10;
-        uint f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n1()
-    {
-        uint s = 10;
-        uint t = Ten;
-        uint f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p2()
-    {
-        uint s = 10;
-        uint t = 10;
-        uint f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n2()
-    {
-        uint s = Ten;
-        uint t = Ten;
-        uint f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p3()
-    {
-        uint s = 10;
-        uint t = s;
-        uint f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n3()
-    {
-        uint s = Ten;
-        uint t = s;
-        uint f = F30(s, t);
-        return (f == 100);
-    }
-
-    static uint F31(uint x, uint y, uint z)
-    {
-        return z * z;
-    }
-
-    static bool Bench31p()
-    {
-        uint t = 10;
-        uint f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n()
-    {
-        uint t = Ten;
-        uint f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p1()
-    {
-        uint r = Ten;
-        uint s = Ten;
-        uint t = 10;
-        uint f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n1()
-    {
-        uint r = 10;
-        uint s = 10;
-        uint t = Ten;
-        uint f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p2()
-    {
-        uint r = 10;
-        uint s = 10;
-        uint t = 10;
-        uint f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n2()
-    {
-        uint r = Ten;
-        uint s = Ten;
-        uint t = Ten;
-        uint f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p3()
-    {
-        uint r = 10;
-        uint s = r;
-        uint t = s;
-        uint f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n3()
-    {
-        uint r = Ten;
-        uint s = r;
-        uint t = s;
-        uint f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    // Two args, both used
-
-    static uint F40(uint x, uint y)
-    {
-        return x * x + y * y - 100;
-    }
-
-    static bool Bench40p()
-    {
-        uint t = 10;
-        uint f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40n()
-    {
-        uint t = Ten;
-        uint f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p1()
-    {
-        uint s = Ten;
-        uint t = 10;
-        uint f = F40(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p2()
-    {
-        uint s = 10;
-        uint t = Ten;
-        uint f = F40(s, t);
-        return (f == 100);
-    }
-
-    static uint F41(uint x, uint y)
-    {
-        return x * y;
-    }
-
-    static bool Bench41p()
-    {
-        uint t = 10;
-        uint f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41n()
-    {
-        uint t = Ten;
-        uint f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p1()
-    {
-        uint s = 10;
-        uint t = Ten;
-        uint f = F41(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p2()
-    {
-        uint s = Ten;
-        uint t = 10;
-        uint f = F41(s, t);
-        return (f == 100);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench00p1", "Bench00n1",
-        "Bench00p2", "Bench00n2",
-        "Bench00p3", "Bench00n3",
-        "Bench00p4", "Bench00n4",
-        "Bench01p",  "Bench01n",
-        "Bench02p",  "Bench02n",
-        "Bench03p",  "Bench03n",
-        "Bench04p",  "Bench04n",
-        "Bench06p",  "Bench06n",
-        "Bench07p",  "Bench07n",
-        "Bench07p1", "Bench07n1",
-        "Bench08p",  "Bench08n",
-        "Bench09p",  "Bench09n",
-        "Bench10p",  "Bench10n",
-        "Bench10p1", "Bench10n1",
-        "Bench10p2", "Bench10n2",
-        "Bench10p3", "Bench10n3",
-        "Bench11p",  "Bench11n",
-        "Bench11p1", "Bench11n1",
-        "Bench11p2", "Bench11n2",
-        "Bench11p3", "Bench11n3",
-        "Bench20p",  "Bench20p1",
-        "Bench21p",  "Bench21n",
-        "Bench21p1", "Bench21n1",
-        "Bench22p",  "Bench22p1",
-        "Bench23p",  "Bench23n",
-        "Bench30p",  "Bench30n",
-        "Bench30p1", "Bench30n1",
-        "Bench30p2", "Bench30n2",
-        "Bench30p3", "Bench30n3",
-        "Bench31p",  "Bench31n",
-        "Bench31p1", "Bench31n1",
-        "Bench31p2", "Bench31n2",
-        "Bench31p3", "Bench31n3",
-        "Bench40p",  "Bench40n",
-        "Bench40p1", "Bench40p2",
-        "Bench41p",  "Bench41n",
-        "Bench41p1", "Bench41p2"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsUInt).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUInt.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUInt.csproj
deleted file mode 100644
index 1775d19d1a..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUInt.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConstantArgsUInt.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsULong.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsULong.cs
deleted file mode 100644
index 7585a3e1fc..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsULong.cs
+++ /dev/null
@@ -1,893 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsULong
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Ints feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static ulong Five = 5;
-    static ulong Ten = 10;
-
-    static ulong Id(ulong x)
-    {
-        return x;
-    }
-
-    static ulong F00(ulong x)
-    {
-        return x * x;
-    }
-
-    static bool Bench00p()
-    {
-        ulong t = 10;
-        ulong f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n()
-    {
-        ulong t = Ten;
-        ulong f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p1()
-    {
-        ulong t = Id(10);
-        ulong f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n1()
-    {
-        ulong t = Id(Ten);
-        ulong f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p2()
-    {
-        ulong t = Id(10);
-        ulong f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00n2()
-    {
-        ulong t = Id(Ten);
-        ulong f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00p3()
-    {
-        ulong t = 10;
-        ulong f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00n3()
-    {
-        ulong t = Ten;
-        ulong f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00p4()
-    {
-        ulong t = 5;
-        ulong f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static bool Bench00n4()
-    {
-        ulong t = Five;
-        ulong f = F00(2 * t);
-        return (f == 100);
-    }
-
-    static ulong F01(ulong x)
-    {
-        return 1000 / x;
-    }
-
-    static bool Bench01p()
-    {
-        ulong t = 10;
-        ulong f = F01(t);
-        return (f == 100);
-    }
-
-    static bool Bench01n()
-    {
-        ulong t = Ten;
-        ulong f = F01(t);
-        return (f == 100);
-    }
-
-    static ulong F02(ulong x)
-    {
-        return 20 * (x / 2);
-    }
-
-    static bool Bench02p()
-    {
-        ulong t = 10;
-        ulong f = F02(t);
-        return (f == 100);
-    }
-
-    static bool Bench02n()
-    {
-        ulong t = Ten;
-        ulong f = F02(t);
-        return (f == 100);
-    }
-
-    static ulong F03(ulong x)
-    {
-        return 91 + 1009 % x;
-    }
-
-    static bool Bench03p()
-    {
-        ulong t = 10;
-        ulong f = F03(t);
-        return (f == 100);
-    }
-
-    static bool Bench03n()
-    {
-        ulong t = Ten;
-        ulong f = F03(t);
-        return (f == 100);
-    }
-
-    static ulong F04(ulong x)
-    {
-        return 50 * (x % 4);
-    }
-
-    static bool Bench04p()
-    {
-        ulong t = 10;
-        ulong f = F04(t);
-        return (f == 100);
-    }
-
-    static bool Bench04n()
-    {
-        ulong t = Ten;
-        ulong f = F04(t);
-        return (f == 100);
-    }
-
-    static ulong F06(ulong x)
-    {
-        return 110 - x;
-    }
-
-    static bool Bench06p()
-    {
-        ulong t = 10;
-        ulong f = F06(t);
-        return (f == 100);
-    }
-
-    static bool Bench06n()
-    {
-        ulong t = Ten;
-        ulong f = F06(t);
-        return (f == 100);
-    }
-
-    static ulong F07(ulong x)
-    {
-        return ~x + 111;
-    }
-
-    static bool Bench07p()
-    {
-        ulong t = 10;
-        ulong f = F07(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n()
-    {
-        ulong t = Ten;
-        ulong f = F07(t);
-        return (f == 100);
-    }
-
-    static ulong F071(ulong x)
-    {
-        return (x ^ 0xFFFFFFFFFFFFFFFF) + 111;
-    }
-
-    static bool Bench07p1()
-    {
-        ulong t = 10;
-        ulong f = F071(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n1()
-    {
-        ulong t = Ten;
-        ulong f = F071(t);
-        return (f == 100);
-    }
-
-    static ulong F08(ulong x)
-    {
-        return (x & 0x7) + 98;
-    }
-
-    static bool Bench08p()
-    {
-        ulong t = 10;
-        ulong f = F08(t);
-        return (f == 100);
-    }
-
-    static bool Bench08n()
-    {
-        ulong t = Ten;
-        ulong f = F08(t);
-        return (f == 100);
-    }
-
-    static ulong F09(ulong x)
-    {
-        return (x | 0x7) + 85;
-    }
-
-    static bool Bench09p()
-    {
-        ulong t = 10;
-        ulong f = F09(t);
-        return (f == 100);
-    }
-
-    static bool Bench09n()
-    {
-        ulong t = Ten;
-        ulong f = F09(t);
-        return (f == 100);
-    }
-
-    // Ulongs feeding comparisons.
-    //
-    // Inlining in Bench1xp should enable branch optimization
-    // Inlining in Bench1xn will not enable branch optimization
-
-    static ulong F10(ulong x)
-    {
-        return x == 10 ? 100u : 0u;
-    }
-
-    static bool Bench10p()
-    {
-        ulong t = 10;
-        ulong f = F10(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n()
-    {
-        ulong t = Ten;
-        ulong f = F10(t);
-        return (f == 100);
-    }
-
-    static ulong F101(ulong x)
-    {
-        return x != 10 ? 0u : 100u;
-    }
-
-    static bool Bench10p1()
-    {
-        ulong t = 10;
-        ulong f = F101(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n1()
-    {
-        ulong t = Ten;
-        ulong f = F101(t);
-        return (f == 100);
-    }
-
-    static ulong F102(ulong x)
-    {
-        return x >= 10 ? 100u : 0u;
-    }
-
-    static bool Bench10p2()
-    {
-        ulong t = 10;
-        ulong f = F102(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n2()
-    {
-        ulong t = Ten;
-        ulong f = F102(t);
-        return (f == 100);
-    }
-
-    static ulong F103(ulong x)
-    {
-        return x <= 10 ? 100u : 0u;
-    }
-
-    static bool Bench10p3()
-    {
-        ulong t = 10;
-        ulong f = F103(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n3()
-    {
-        ulong t = Ten;
-        ulong f = F102(t);
-        return (f == 100);
-    }
-
-    static ulong F11(ulong x)
-    {
-        if (x == 10)
-        {
-            return 100;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    static bool Bench11p()
-    {
-        ulong t = 10;
-        ulong f = F11(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n()
-    {
-        ulong t = Ten;
-        ulong f = F11(t);
-        return (f == 100);
-    }
-
-    static ulong F111(ulong x)
-    {
-        if (x != 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p1()
-    {
-        ulong t = 10;
-        ulong f = F111(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n1()
-    {
-        ulong t = Ten;
-        ulong f = F111(t);
-        return (f == 100);
-    }
-
-    static ulong F112(ulong x)
-    {
-        if (x > 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p2()
-    {
-        ulong t = 10;
-        ulong f = F112(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n2()
-    {
-        ulong t = Ten;
-        ulong f = F112(t);
-        return (f == 100);
-    }
-    static ulong F113(ulong x)
-    {
-        if (x < 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p3()
-    {
-        ulong t = 10;
-        ulong f = F113(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n3()
-    {
-        ulong t = Ten;
-        ulong f = F113(t);
-        return (f == 100);
-    }
-
-    // Ununsed (or effectively unused) parameters
-    //
-    // Simple callee analysis may overstate inline benefit
-
-    static ulong F20(ulong x)
-    {
-        return 100;
-    }
-
-    static bool Bench20p()
-    {
-        ulong t = 10;
-        ulong f = F20(t);
-        return (f == 100);
-    }
-
-    static bool Bench20p1()
-    {
-        ulong t = Ten;
-        ulong f = F20(t);
-        return (f == 100);
-    }
-
-    static ulong F21(ulong x)
-    {
-        return x + 100 - x;
-    }
-
-    static bool Bench21p()
-    {
-        ulong t = 10;
-        ulong f = F21(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n()
-    {
-        ulong t = Ten;
-        ulong f = F21(t);
-        return (f == 100);
-    }
-
-    static ulong F211(ulong x)
-    {
-        return x - x + 100;
-    }
-
-    static bool Bench21p1()
-    {
-        ulong t = 10;
-        ulong f = F211(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n1()
-    {
-        ulong t = Ten;
-        ulong f = F211(t);
-        return (f == 100);
-    }
-
-    static ulong F22(ulong x)
-    {
-        if (x > 0)
-        {
-            return 100;
-        }
-
-        return 100;
-    }
-
-    static bool Bench22p()
-    {
-        ulong t = 10;
-        ulong f = F22(t);
-        return (f == 100);
-    }
-
-    static bool Bench22p1()
-    {
-        ulong t = Ten;
-        ulong f = F22(t);
-        return (f == 100);
-    }
-
-    static ulong F23(ulong x)
-    {
-        if (x > 0)
-        {
-            return 90 + x;
-        }
-
-        return 100;
-    }
-
-    static bool Bench23p()
-    {
-        ulong t = 10;
-        ulong f = F23(t);
-        return (f == 100);
-    }
-
-    static bool Bench23n()
-    {
-        ulong t = Ten;
-        ulong f = F23(t);
-        return (f == 100);
-    }
-
-    // Multiple parameters
-
-    static ulong F30(ulong x, ulong y)
-    {
-        return y * y;
-    }
-
-    static bool Bench30p()
-    {
-        ulong t = 10;
-        ulong f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n()
-    {
-        ulong t = Ten;
-        ulong f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p1()
-    {
-        ulong s = Ten;
-        ulong t = 10;
-        ulong f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n1()
-    {
-        ulong s = 10;
-        ulong t = Ten;
-        ulong f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p2()
-    {
-        ulong s = 10;
-        ulong t = 10;
-        ulong f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n2()
-    {
-        ulong s = Ten;
-        ulong t = Ten;
-        ulong f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p3()
-    {
-        ulong s = 10;
-        ulong t = s;
-        ulong f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n3()
-    {
-        ulong s = Ten;
-        ulong t = s;
-        ulong f = F30(s, t);
-        return (f == 100);
-    }
-
-    static ulong F31(ulong x, ulong y, ulong z)
-    {
-        return z * z;
-    }
-
-    static bool Bench31p()
-    {
-        ulong t = 10;
-        ulong f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n()
-    {
-        ulong t = Ten;
-        ulong f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p1()
-    {
-        ulong r = Ten;
-        ulong s = Ten;
-        ulong t = 10;
-        ulong f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n1()
-    {
-        ulong r = 10;
-        ulong s = 10;
-        ulong t = Ten;
-        ulong f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p2()
-    {
-        ulong r = 10;
-        ulong s = 10;
-        ulong t = 10;
-        ulong f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n2()
-    {
-        ulong r = Ten;
-        ulong s = Ten;
-        ulong t = Ten;
-        ulong f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p3()
-    {
-        ulong r = 10;
-        ulong s = r;
-        ulong t = s;
-        ulong f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n3()
-    {
-        ulong r = Ten;
-        ulong s = r;
-        ulong t = s;
-        ulong f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    // Two args, both used
-
-    static ulong F40(ulong x, ulong y)
-    {
-        return x * x + y * y - 100;
-    }
-
-    static bool Bench40p()
-    {
-        ulong t = 10;
-        ulong f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40n()
-    {
-        ulong t = Ten;
-        ulong f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p1()
-    {
-        ulong s = Ten;
-        ulong t = 10;
-        ulong f = F40(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p2()
-    {
-        ulong s = 10;
-        ulong t = Ten;
-        ulong f = F40(s, t);
-        return (f == 100);
-    }
-
-    static ulong F41(ulong x, ulong y)
-    {
-        return x * y;
-    }
-
-    static bool Bench41p()
-    {
-        ulong t = 10;
-        ulong f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41n()
-    {
-        ulong t = Ten;
-        ulong f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p1()
-    {
-        ulong s = 10;
-        ulong t = Ten;
-        ulong f = F41(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p2()
-    {
-        ulong s = Ten;
-        ulong t = 10;
-        ulong f = F41(s, t);
-        return (f == 100);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench00p1", "Bench00n1",
-        "Bench00p2", "Bench00n2",
-        "Bench00p3", "Bench00n3",
-        "Bench00p4", "Bench00n4",
-        "Bench01p",  "Bench01n",
-        "Bench02p",  "Bench02n",
-        "Bench03p",  "Bench03n",
-        "Bench04p",  "Bench04n",
-        "Bench06p",  "Bench06n",
-        "Bench07p",  "Bench07n",
-        "Bench07p1", "Bench07n1",
-        "Bench08p",  "Bench08n",
-        "Bench09p",  "Bench09n",
-        "Bench10p",  "Bench10n",
-        "Bench10p1", "Bench10n1",
-        "Bench10p2", "Bench10n2",
-        "Bench10p3", "Bench10n3",
-        "Bench11p",  "Bench11n",
-        "Bench11p1", "Bench11n1",
-        "Bench11p2", "Bench11n2",
-        "Bench11p3", "Bench11n3",
-        "Bench20p",  "Bench20p1",
-        "Bench21p",  "Bench21n",
-        "Bench21p1", "Bench21n1",
-        "Bench22p",  "Bench22p1",
-        "Bench23p",  "Bench23n",
-        "Bench30p",  "Bench30n",
-        "Bench30p1", "Bench30n1",
-        "Bench30p2", "Bench30n2",
-        "Bench30p3", "Bench30n3",
-        "Bench31p",  "Bench31n",
-        "Bench31p1", "Bench31n1",
-        "Bench31p2", "Bench31n2",
-        "Bench31p3", "Bench31n3",
-        "Bench40p",  "Bench40n",
-        "Bench40p1", "Bench40p2",
-        "Bench41p",  "Bench41n",
-        "Bench41p1", "Bench41p2"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsULong).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsULong.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsULong.csproj
deleted file mode 100644
index 81e10be633..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsULong.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConstantArgsULong.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUShort.cs b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUShort.cs
deleted file mode 100644
index c96274e424..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUShort.cs
+++ /dev/null
@@ -1,933 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-using System.Collections.Generic;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-namespace Inlining
-{
-public static class ConstantArgsUShort
-{
-
-#if DEBUG
-    public const int Iterations = 1;
-#else
-    public const int Iterations = 100000;
-#endif
-
-    // Ushorts feeding math operations.
-    //
-    // Inlining in Bench0xp should enable constant folding
-    // Inlining in Bench0xn will not enable constant folding
-
-    static ushort Five = 5;
-    static ushort Ten = 10;
-
-    static ushort Id(ushort x)
-    {
-        return x;
-    }
-
-    static ushort F00(ushort x)
-    {
-        return (ushort) (x * x);
-    }
-
-    static bool Bench00p()
-    {
-        ushort t = 10;
-        ushort f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n()
-    {
-        ushort t = Ten;
-        ushort f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p1()
-    {
-        ushort t = Id(10);
-        ushort f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00n1()
-    {
-        ushort t = Id(Ten);
-        ushort f = F00(t);
-        return (f == 100);
-    }
-
-    static bool Bench00p2()
-    {
-        ushort t = Id(10);
-        ushort f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00n2()
-    {
-        ushort t = Id(Ten);
-        ushort f = F00(Id(t));
-        return (f == 100);
-    }
-
-    static bool Bench00p3()
-    {
-        ushort t = 10;
-        ushort f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00n3()
-    {
-        ushort t = Ten;
-        ushort f = F00(Id(Id(t)));
-        return (f == 100);
-    }
-
-    static bool Bench00p4()
-    {
-        ushort t = 5;
-        ushort f = F00((ushort)(2 * t));
-        return (f == 100);
-    }
-
-    static bool Bench00n4()
-    {
-        ushort t = Five;
-        ushort f = F00((ushort)(2 * t));
-        return (f == 100);
-    }
-
-    static ushort F01(ushort x)
-    {
-        return (ushort)(1000 / x);
-    }
-
-    static bool Bench01p()
-    {
-        ushort t = 10;
-        ushort f = F01(t);
-        return (f == 100);
-    }
-
-    static bool Bench01n()
-    {
-        ushort t = Ten;
-        ushort f = F01(t);
-        return (f == 100);
-    }
-
-    static ushort F02(ushort x)
-    {
-        return (ushort) (20 * (x / 2));
-    }
-
-    static bool Bench02p()
-    {
-        ushort t = 10;
-        ushort f = F02(t);
-        return (f == 100);
-    }
-
-    static bool Bench02n()
-    {
-        ushort t = Ten;
-        ushort f = F02(t);
-        return (f == 100);
-    }
-
-    static ushort F03(ushort x)
-    {
-        return (ushort)(91 + 1009 % x);
-    }
-
-    static bool Bench03p()
-    {
-        ushort t = 10;
-        ushort f = F03(t);
-        return (f == 100);
-    }
-
-    static bool Bench03n()
-    {
-        ushort t = Ten;
-        ushort f = F03(t);
-        return (f == 100);
-    }
-
-    static ushort F04(ushort x)
-    {
-        return (ushort)(50 * (x % 4));
-    }
-
-    static bool Bench04p()
-    {
-        ushort t = 10;
-        ushort f = F04(t);
-        return (f == 100);
-    }
-
-    static bool Bench04n()
-    {
-        ushort t = Ten;
-        ushort f = F04(t);
-        return (f == 100);
-    }
-
-    static ushort F05(ushort x)
-    {
-        return (ushort)((1 << x) - 924);
-    }
-
-    static bool Bench05p()
-    {
-        ushort t = 10;
-        ushort f = F05(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n()
-    {
-        ushort t = Ten;
-        ushort f = F05(t);
-        return (f == 100);
-    }
-
-    static ushort F051(ushort x)
-    {
-        return (ushort)(102400 >> x);
-    }
-
-    static bool Bench05p1()
-    {
-        ushort t = 10;
-        ushort f = F051(t);
-        return (f == 100);
-    }
-
-    static bool Bench05n1()
-    {
-        ushort t = Ten;
-        ushort f = F051(t);
-        return (f == 100);
-    }
-
-    static ushort F06(ushort x)
-    {
-        return (ushort)(-x + 110);
-    }
-
-    static bool Bench06p()
-    {
-        ushort t = 10;
-        ushort f = F06(t);
-        return (f == 100);
-    }
-
-    static bool Bench06n()
-    {
-        ushort t = Ten;
-        ushort f = F06(t);
-        return (f == 100);
-    }
-
-    static ushort F07(ushort x)
-    {
-        return (ushort)(~x + 111);
-    }
-
-    static bool Bench07p()
-    {
-        ushort t = 10;
-        ushort f = F07(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n()
-    {
-        ushort t = Ten;
-        ushort f = F07(t);
-        return (f == 100);
-    }
-
-    static ushort F071(ushort x)
-    {
-        return (ushort)((x ^ -1) + 111);
-    }
-
-    static bool Bench07p1()
-    {
-        ushort t = 10;
-        ushort f = F071(t);
-        return (f == 100);
-    }
-
-    static bool Bench07n1()
-    {
-        ushort t = Ten;
-        ushort f = F071(t);
-        return (f == 100);
-    }
-
-    static ushort F08(ushort x)
-    {
-        return (ushort)((x & 0x7) + 98);
-    }
-
-    static bool Bench08p()
-    {
-        ushort t = 10;
-        ushort f = F08(t);
-        return (f == 100);
-    }
-
-    static bool Bench08n()
-    {
-        ushort t = Ten;
-        ushort f = F08(t);
-        return (f == 100);
-    }
-
-    static ushort F09(ushort x)
-    {
-        return (ushort)((x | 0x7) + 85);
-    }
-
-    static bool Bench09p()
-    {
-        ushort t = 10;
-        ushort f = F09(t);
-        return (f == 100);
-    }
-
-    static bool Bench09n()
-    {
-        ushort t = Ten;
-        ushort f = F09(t);
-        return (f == 100);
-    }
-
-    // Ushorts feeding comparisons.
-    //
-    // Inlining in Bench1xp should enable branch optimization
-    // Inlining in Bench1xn will not enable branch optimization
-
-    static ushort F10(ushort x)
-    {
-        return x == 10 ? (ushort) 100 : (ushort) 0;
-    }
-
-    static bool Bench10p()
-    {
-        ushort t = 10;
-        ushort f = F10(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n()
-    {
-        ushort t = Ten;
-        ushort f = F10(t);
-        return (f == 100);
-    }
-
-    static ushort F101(ushort x)
-    {
-        return x != 10 ? (ushort) 0 : (ushort) 100;
-    }
-
-    static bool Bench10p1()
-    {
-        ushort t = 10;
-        ushort f = F101(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n1()
-    {
-        ushort t = Ten;
-        ushort f = F101(t);
-        return (f == 100);
-    }
-
-    static ushort F102(ushort x)
-    {
-        return x >= 10 ? (ushort) 100 : (ushort) 0;
-    }
-
-    static bool Bench10p2()
-    {
-        ushort t = 10;
-        ushort f = F102(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n2()
-    {
-        ushort t = Ten;
-        ushort f = F102(t);
-        return (f == 100);
-    }
-
-    static ushort F103(ushort x)
-    {
-        return x <= 10 ? (ushort) 100 : (ushort) 0;
-    }
-
-    static bool Bench10p3()
-    {
-        ushort t = 10;
-        ushort f = F103(t);
-        return (f == 100);
-    }
-
-    static bool Bench10n3()
-    {
-        ushort t = Ten;
-        ushort f = F102(t);
-        return (f == 100);
-    }
-
-    static ushort F11(ushort x)
-    {
-        if (x == 10)
-        {
-            return 100;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    static bool Bench11p()
-    {
-        ushort t = 10;
-        ushort f = F11(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n()
-    {
-        ushort t = Ten;
-        ushort f = F11(t);
-        return (f == 100);
-    }
-
-    static ushort F111(ushort x)
-    {
-        if (x != 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p1()
-    {
-        ushort t = 10;
-        ushort f = F111(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n1()
-    {
-        ushort t = Ten;
-        ushort f = F111(t);
-        return (f == 100);
-    }
-
-    static ushort F112(ushort x)
-    {
-        if (x > 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p2()
-    {
-        ushort t = 10;
-        ushort f = F112(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n2()
-    {
-        ushort t = Ten;
-        ushort f = F112(t);
-        return (f == 100);
-    }
-    static ushort F113(ushort x)
-    {
-        if (x < 10)
-        {
-            return 0;
-        }
-        else
-        {
-            return 100;
-        }
-    }
-
-    static bool Bench11p3()
-    {
-        ushort t = 10;
-        ushort f = F113(t);
-        return (f == 100);
-    }
-
-    static bool Bench11n3()
-    {
-        ushort t = Ten;
-        ushort f = F113(t);
-        return (f == 100);
-    }
-
-    // Ununsed (or effectively unused) parameters
-    //
-    // Simple callee analysis may overstate inline benefit
-
-    static ushort F20(ushort x)
-    {
-        return 100;
-    }
-
-    static bool Bench20p()
-    {
-        ushort t = 10;
-        ushort f = F20(t);
-        return (f == 100);
-    }
-
-    static bool Bench20p1()
-    {
-        ushort t = Ten;
-        ushort f = F20(t);
-        return (f == 100);
-    }
-
-    static ushort F21(ushort x)
-    {
-        return (ushort)(-x + 100 + x);
-    }
-
-    static bool Bench21p()
-    {
-        ushort t = 10;
-        ushort f = F21(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n()
-    {
-        ushort t = Ten;
-        ushort f = F21(t);
-        return (f == 100);
-    }
-
-    static ushort F211(ushort x)
-    {
-        return (ushort)(x - x + 100);
-    }
-
-    static bool Bench21p1()
-    {
-        ushort t = 10;
-        ushort f = F211(t);
-        return (f == 100);
-    }
-
-    static bool Bench21n1()
-    {
-        ushort t = Ten;
-        ushort f = F211(t);
-        return (f == 100);
-    }
-
-    static ushort F22(ushort x)
-    {
-        if (x > 0)
-        {
-            return 100;
-        }
-
-        return 100;
-    }
-
-    static bool Bench22p()
-    {
-        ushort t = 10;
-        ushort f = F22(t);
-        return (f == 100);
-    }
-
-    static bool Bench22p1()
-    {
-        ushort t = Ten;
-        ushort f = F22(t);
-        return (f == 100);
-    }
-
-    static ushort F23(ushort x)
-    {
-        if (x > 0)
-        {
-            return (ushort)(90 + x);
-        }
-
-        return 100;
-    }
-
-    static bool Bench23p()
-    {
-        ushort t = 10;
-        ushort f = F23(t);
-        return (f == 100);
-    }
-
-    static bool Bench23n()
-    {
-        ushort t = Ten;
-        ushort f = F23(t);
-        return (f == 100);
-    }
-
-    // Multiple parameters
-
-    static ushort F30(ushort x, ushort y)
-    {
-        return (ushort)(y * y);
-    }
-
-    static bool Bench30p()
-    {
-        ushort t = 10;
-        ushort f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n()
-    {
-        ushort t = Ten;
-        ushort f = F30(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p1()
-    {
-        ushort s = Ten;
-        ushort t = 10;
-        ushort f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n1()
-    {
-        ushort s = 10;
-        ushort t = Ten;
-        ushort f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p2()
-    {
-        ushort s = 10;
-        ushort t = 10;
-        ushort f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n2()
-    {
-        ushort s = Ten;
-        ushort t = Ten;
-        ushort f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30p3()
-    {
-        ushort s = 10;
-        ushort t = s;
-        ushort f = F30(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench30n3()
-    {
-        ushort s = Ten;
-        ushort t = s;
-        ushort f = F30(s, t);
-        return (f == 100);
-    }
-
-    static ushort F31(ushort x, ushort y, ushort z)
-    {
-        return (ushort)(z * z);
-    }
-
-    static bool Bench31p()
-    {
-        ushort t = 10;
-        ushort f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n()
-    {
-        ushort t = Ten;
-        ushort f = F31(t, t, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p1()
-    {
-        ushort r = Ten;
-        ushort s = Ten;
-        ushort t = 10;
-        ushort f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n1()
-    {
-        ushort r = 10;
-        ushort s = 10;
-        ushort t = Ten;
-        ushort f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p2()
-    {
-        ushort r = 10;
-        ushort s = 10;
-        ushort t = 10;
-        ushort f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n2()
-    {
-        ushort r = Ten;
-        ushort s = Ten;
-        ushort t = Ten;
-        ushort f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31p3()
-    {
-        ushort r = 10;
-        ushort s = r;
-        ushort t = s;
-        ushort f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    static bool Bench31n3()
-    {
-        ushort r = Ten;
-        ushort s = r;
-        ushort t = s;
-        ushort f = F31(r, s, t);
-        return (f == 100);
-    }
-
-    // Two args, both used
-
-    static ushort F40(ushort x, ushort y)
-    {
-        return (ushort)(x * x + y * y - 100);
-    }
-
-    static bool Bench40p()
-    {
-        ushort t = 10;
-        ushort f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40n()
-    {
-        ushort t = Ten;
-        ushort f = F40(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p1()
-    {
-        ushort s = Ten;
-        ushort t = 10;
-        ushort f = F40(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench40p2()
-    {
-        ushort s = 10;
-        ushort t = Ten;
-        ushort f = F40(s, t);
-        return (f == 100);
-    }
-
-    static ushort F41(ushort x, ushort y)
-    {
-        return (ushort)(x * y);
-    }
-
-    static bool Bench41p()
-    {
-        ushort t = 10;
-        ushort f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41n()
-    {
-        ushort t = Ten;
-        ushort f = F41(t, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p1()
-    {
-        ushort s = 10;
-        ushort t = Ten;
-        ushort f = F41(s, t);
-        return (f == 100);
-    }
-
-    static bool Bench41p2()
-    {
-        ushort s = Ten;
-        ushort t = 10;
-        ushort f = F41(s, t);
-        return (f == 100);
-    }
-
-    private static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    public static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "Bench00p",  "Bench00n",
-        "Bench00p1", "Bench00n1",
-        "Bench00p2", "Bench00n2",
-        "Bench00p3", "Bench00n3",
-        "Bench00p4", "Bench00n4",
-        "Bench01p",  "Bench01n",
-        "Bench02p",  "Bench02n",
-        "Bench03p",  "Bench03n",
-        "Bench04p",  "Bench04n",
-        "Bench05p",  "Bench05n",
-        "Bench05p1", "Bench05n1",
-        "Bench06p",  "Bench06n",
-        "Bench07p",  "Bench07n",
-        "Bench07p1", "Bench07n1",
-        "Bench08p",  "Bench08n",
-        "Bench09p",  "Bench09n",
-        "Bench10p",  "Bench10n",
-        "Bench10p1", "Bench10n1",
-        "Bench10p2", "Bench10n2",
-        "Bench10p3", "Bench10n3",
-        "Bench11p",  "Bench11n",
-        "Bench11p1", "Bench11n1",
-        "Bench11p2", "Bench11n2",
-        "Bench11p3", "Bench11n3",
-        "Bench20p",  "Bench20p1",
-        "Bench21p",  "Bench21n",
-        "Bench21p1", "Bench21n1",
-        "Bench22p",  "Bench22p1",
-        "Bench23p",  "Bench23n",
-        "Bench30p",  "Bench30n",
-        "Bench30p1", "Bench30n1",
-        "Bench30p2", "Bench30n2",
-        "Bench30p3", "Bench30n3",
-        "Bench31p",  "Bench31n",
-        "Bench31p1", "Bench31n1",
-        "Bench31p2", "Bench31n2",
-        "Bench31p3", "Bench31n3",
-        "Bench40p",  "Bench40n",
-        "Bench40p1", "Bench40p2",
-        "Bench41p",  "Bench41n",
-        "Bench41p1", "Bench41p2"
-    );
-
-    static Func<bool> LookupFunc(object o)
-    {
-        TypeInfo t = typeof(ConstantArgsUShort).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Func<bool>)) as Func<bool>;
-    }
-
-    [Benchmark]
-    [MemberData(nameof(TestFuncs))]
-    public static void Test(object funcName)
-    {
-        Func<bool> f = LookupFunc(funcName);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    f();
-                }
-            }
-        }
-    }
-
-    static bool TestBase(Func<bool> f)
-    {
-        bool result = true;
-        for (int i = 0; i < Iterations; i++)
-        {
-            result &= f();
-        }
-        return result;
-    }
-
-    public static int Main()
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Func<bool> func = LookupFunc(funcName);
-            bool thisResult = TestBase(func);
-            if (!thisResult)
-            {
-                Console.WriteLine("{0} failed", funcName);
-            }
-            result &= thisResult;
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUShort.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUShort.csproj
deleted file mode 100644
index fb88ffb4d2..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsUShort.csproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ConstantArgsUShort.cs" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj
index cb3381638c..7ecdbab687 100644
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Inlining/InlineGCStruct.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj
index 75f6176581..34b42c389f 100644
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Inlining/NoThrowInline.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj
index 99fa3f03c6..2fc6cb0419 100644
--- a/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Linq/Linq.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj
index 7e7a74e142..773472d4a4 100644
--- a/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Math/Functions/Functions.csproj
@@ -7,13 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C949CB07-60B2-420A-B3CA-59847ED4700B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj
index b99d74b9bc..baea313f2c 100644
--- a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,19 +7,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -39,6 +35,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+roslyn\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj
index 73a4c99541..b6224770fa 100644
--- a/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/SIMD/ConsoleMandel/ConsoleMandel.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -47,6 +43,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj
index 00db618453..0b1e5be0ae 100644
--- a/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/SIMD/RayTracer/RayTracer.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -53,6 +49,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs
index 3253e255d6..81d9c0952f 100644
--- a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs
+++ b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.cs
@@ -140,7 +140,7 @@ public static class SeekUnroll
 
 
     // Main method entrypoint runs the manual timer loop
-    public static int Main()
+    public static int Main(string[] args)
     {
         int failures = 0;
 
@@ -151,9 +151,20 @@ public static class SeekUnroll
             InnerIterations = 100000;
         }
 
+        int manualLoopCount = 1;
+        if (args == null || args.Length == 0)
+        {
+            Console.WriteLine("Warning: no iteration count specified; defaulting to 1 iteration per case");
+            Console.WriteLine("To use multiple iterations per case, pass the desired number of iterations as the first command-line argument to this test");
+        }
+        else
+        {
+            manualLoopCount = int.Parse(args[0]);
+        }
+
         foreach(int index in IndicesToTest)
         {
-            ManualLoopTimes = new long[10];
+            ManualLoopTimes = new long[manualLoopCount];
             bool passed = Test(index, false);
             if (!passed)
             {
diff --git a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj
index 53cfe42001..d5c72559ec 100644
--- a/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/SIMD/SeekUnroll/SeekUnroll.csproj
@@ -7,10 +7,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9AE6E18D-B3F9-4216-9809-125824387175}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj
index 28127efebc..917d749d41 100644
--- a/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/SciMark/SciMark.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,19 +7,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
     <AssemblyName>SciMark</AssemblyName>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -48,6 +44,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/SciMark/THIRD-PARTY-NOTICES b/tests/src/JIT/Performance/CodeQuality/SciMark/THIRD-PARTY-NOTICES
new file mode 100644
index 0000000000..5497232ed0
--- /dev/null
+++ b/tests/src/JIT/Performance/CodeQuality/SciMark/THIRD-PARTY-NOTICES
@@ -0,0 +1,33 @@
+.NET Core uses third-party libraries or other resources that may be
+distributed under licenses different than the .NET Core software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           dotnet@microsoft.com
+
+The attached notices are provided for information only.
+
+License notice for SciMark C#
+-----------------------------
+
+https://github.com/dosvidos/SciMark
+
+<license>
+This is a port of the SciMark2a Java Benchmark to C# by
+Chris Re (cmr28@cornell.edu) and Werner Vogels (vogels@cs.cornell.edu)
+
+For details on the original authors see http://math.nist.gov/scimark2
+
+This software is likely to burn your processor, bitflip your memory chips
+anihilate your screen and corrupt all your disks, so you it at your
+own risk.
+</license>
+
+License notice for SciMark 2.0
+------------------------------
+
+http://math.nist.gov/scimark2/credits.html
+
+As this software was developed as part of work done by the United States Government, it is not subject to copyright, and is in the public domain. 
+We would, however, appreciate acknowledgements if this work is found useful. Note that according to GNU.org public domain is compatible with GPL.
diff --git a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj
index 8f95407729..c08d1cd14b 100644
--- a/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Deserialize.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj
index 60df05075b..04798526f9 100644
--- a/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Serialization/Serialize.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark+serialize\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.cs b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.cs
new file mode 100644
index 0000000000..d84152132d
--- /dev/null
+++ b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.cs
@@ -0,0 +1,1194 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Text;
+using Xunit;
+using Microsoft.Xunit.Performance;
+
+[assembly: OptimizeForBenchmarks]
+[assembly: MeasureInstructionsRetired]
+
+namespace Span
+{
+    public class SpanBench
+    {
+
+#if DEBUG
+        const int BubbleSortIterations = 1;
+        const int QuickSortIterations = 1;
+        const int FillAllIterations = 1;
+        const int BaseIterations = 1;
+#else
+        // Appropriately-scaled iteration counts for the various benchmarks
+        const int BubbleSortIterations = 100;
+        const int QuickSortIterations = 1000;
+        const int FillAllIterations = 100000;
+        const int BaseIterations = 10000000;
+#endif
+
+        // Default length for arrays of mock input data
+        const int DefaultLength = 1024;
+
+        // Helpers
+        #region Helpers
+        [StructLayout(LayoutKind.Sequential)]
+        private sealed class TestClass<T>
+        {
+            private double _d;
+            public T[] C0;
+        }
+
+        // Copying the result of a computation to Sink<T>.Instance is a way
+        // to prevent the jit from considering the computation dead and removing it.
+        private sealed class Sink<T>
+        {
+            public T Data;
+            public static Sink<T> Instance = new Sink<T>();
+        }
+
+        // Use statics to smuggle some information from Main to Invoke when running tests
+        // from the command line.
+        static bool IsXunitInvocation = true; // xunit-perf leaves this true; command line Main sets to false
+        static int CommandLineInnerIterationCount = 0;   // used to communicate iteration count from BenchmarkAttribute
+                                                         // (xunit-perf exposes the same in static property Benchmark.InnerIterationCount)
+        static bool DoWarmUp; // Main sets this when calling a new benchmark routine
+
+
+        // Invoke routine to abstract away the difference between running under xunit-perf vs running from the
+        // command line.  Inner loop to be measured is taken as an Action<int>, and invoked passing the number
+        // of iterations that the inner loop should execute.
+        static void Invoke(Action<int> innerLoop, string nameFormat, params object[] nameArgs)
+        {
+            if (IsXunitInvocation)
+            {
+                foreach (var iteration in Benchmark.Iterations)
+                    using (iteration.StartMeasurement())
+                        innerLoop((int)Benchmark.InnerIterationCount);
+            }
+            else
+            {
+                if (DoWarmUp)
+                {
+                    // Run some warm-up iterations before measuring
+                    innerLoop(CommandLineInnerIterationCount);
+                    // Clear the flag since we're now warmed up (caller will
+                    // reset it before calling new code)
+                    DoWarmUp = false;
+                }
+
+                // Now do the timed run of the inner loop.
+                Stopwatch sw = Stopwatch.StartNew();
+                innerLoop(CommandLineInnerIterationCount);
+                sw.Stop();
+
+                // Print result.
+                string name = String.Format(nameFormat, nameArgs);
+                double timeInMs = sw.Elapsed.TotalMilliseconds;
+                Console.WriteLine("{0}: {1}ms", name, timeInMs);
+            }
+        }
+
+        // Helper for the sort tests to get some pseudo-random input
+        static int[] GetUnsortedData(int length)
+        {
+            int[] unsortedData = new int[length];
+            Random r = new Random(42);
+            for (int i = 0; i < unsortedData.Length; ++i)
+            {
+                unsortedData[i] = r.Next();
+            }
+            return unsortedData;
+        }
+        #endregion // helpers
+
+        // Tests that implement some vary basic algorithms (fill/sort) over spans and arrays
+        #region Algorithm tests
+
+        #region TestFillAllSpan
+        [Benchmark(InnerIterationCount = FillAllIterations)]
+        [InlineData(DefaultLength)]
+        public static void FillAllSpan(int length)
+        {
+            byte[] a = new byte[length];
+
+            Invoke((int innerIterationCount) =>
+            {
+                Span<byte> s = new Span<byte>(a);
+                for (int i = 0; i < innerIterationCount; ++i)
+                {
+                    TestFillAllSpan(s);
+                }
+            },
+            "TestFillAllSpan({0})", length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestFillAllSpan(Span<byte> span)
+        {
+            for (int i = 0; i < span.Length; ++i)
+            {
+                span[i] = unchecked((byte)i);
+            }
+        }
+        #endregion
+
+        #region TestFillAllArray
+        [Benchmark(InnerIterationCount = FillAllIterations)]
+        [InlineData(DefaultLength)]
+        public static void FillAllArray(int length)
+        {
+            byte[] a = new byte[length];
+
+            Invoke((int innerIterationCount) =>
+            {
+                for (int i = 0; i < innerIterationCount; ++i)
+                {
+                    TestFillAllArray(a);
+                }
+            },
+            "TestFillArray({0})", length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestFillAllArray(byte[] data)
+        {
+            for (int i = 0; i < data.Length; ++i)
+            {
+                data[i] = unchecked((byte)i);
+            }
+        }
+        #endregion
+
+        #region TestFillAllReverseSpan
+        [Benchmark(InnerIterationCount = FillAllIterations)]
+        [InlineData(DefaultLength)]
+        public static void FillAllReverseSpan(int length)
+        {
+            byte[] a = new byte[length];
+
+            Invoke((int innerIterationCount) =>
+            {
+                Span<byte> s = new Span<byte>(a);
+                for (int i = 0; i < innerIterationCount; ++i)
+                {
+                    TestFillAllReverseSpan(s);
+                }
+            },
+            "TestFillAllReverseSpan({0})", length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestFillAllReverseSpan(Span<byte> span)
+        {
+            for (int i = span.Length; --i >= 0;)
+            {
+                span[i] = unchecked((byte)i);
+            }
+        }
+        #endregion
+
+        #region TestFillAllReverseArray
+        [Benchmark(InnerIterationCount = FillAllIterations)]
+        [InlineData(DefaultLength)]
+        public static void FillAllReverseArray(int length)
+        {
+            byte[] a = new byte[length];
+
+            Invoke((int innerIterationCount) =>
+            {
+                for (int i = 0; i < innerIterationCount; ++i)
+                {
+                    TestFillAllReverseArray(a);
+                }
+            },
+            "TestFillAllReverseArray({0})", length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestFillAllReverseArray(byte[] data)
+        {
+            for (int i = data.Length; --i >= 0;)
+            {
+                data[i] = unchecked((byte)i);
+            }
+        }
+        #endregion
+
+        #region TestQuickSortSpan
+        [Benchmark(InnerIterationCount = QuickSortIterations)]
+        [InlineData(DefaultLength)]
+        public static void QuickSortSpan(int length)
+        {
+            int[] data = new int[length];
+            int[] unsortedData = GetUnsortedData(length);
+
+            Invoke((int innerIterationCount) =>
+            {
+                Span<int> span = new Span<int>(data);
+
+                for (int i = 0; i < innerIterationCount; ++i)
+                {
+                    Array.Copy(unsortedData, data, length);
+                    TestQuickSortSpan(span);
+                }
+            },
+            "TestQuickSortSpan({0})", length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestQuickSortSpan(Span<int> data)
+        {
+            if (data.Length <= 1)
+            {
+                return;
+            }
+
+            int lo = 0;
+            int hi = data.Length - 1;
+            int i, j;
+            int pivot, temp;
+            for (i = lo, j = hi, pivot = data[hi]; i < j;)
+            {
+                while (i < j && data[i] <= pivot)
+                {
+                    ++i;
+                }
+                while (j > i && data[j] >= pivot)
+                {
+                    --j;
+                }
+                if (i < j)
+                {
+                    temp = data[i];
+                    data[i] = data[j];
+                    data[j] = temp;
+                }
+            }
+            if (i != hi)
+            {
+                temp = data[i];
+                data[i] = pivot;
+                data[hi] = temp;
+            }
+
+            TestQuickSortSpan(data.Slice(0, i));
+            TestQuickSortSpan(data.Slice(i + 1));
+        }
+        #endregion
+
+        #region TestBubbleSortSpan
+        [Benchmark(InnerIterationCount = BubbleSortIterations)]
+        [InlineData(DefaultLength)]
+        public static void BubbleSortSpan(int length)
+        {
+            int[] data = new int[length];
+            int[] unsortedData = GetUnsortedData(length);
+
+            Invoke((int innerIterationCount) =>
+            {
+                Span<int> span = new Span<int>(data);
+
+                for (int i = 0; i < innerIterationCount; i++)
+                {
+                    Array.Copy(unsortedData, data, length);
+                    TestBubbleSortSpan(span);
+                }
+            },
+            "TestBubbleSortSpan({0})", length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestBubbleSortSpan(Span<int> span)
+        {
+            bool swap;
+            int temp;
+            int n = span.Length - 1;
+            do
+            {
+                swap = false;
+                for (int i = 0; i < n; i++)
+                {
+                    if (span[i] > span[i + 1])
+                    {
+                        temp = span[i];
+                        span[i] = span[i + 1];
+                        span[i + 1] = temp;
+                        swap = true;
+                    }
+                }
+                --n;
+            }
+            while (swap);
+        }
+        #endregion
+
+        #region TestQuickSortArray
+        [Benchmark(InnerIterationCount = QuickSortIterations)]
+        [InlineData(DefaultLength)]
+        public static void QuickSortArray(int length)
+        {
+            int[] data = new int[length];
+            int[] unsortedData = GetUnsortedData(length);
+
+            Invoke((int innerIterationCount) =>
+            {
+                for (int i = 0; i < innerIterationCount; i++)
+                {
+                    Array.Copy(unsortedData, data, length);
+                    TestQuickSortArray(data, 0, data.Length - 1);
+                }
+            },
+            "TestQuickSortArray({0})", length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestQuickSortArray(int[] data, int lo, int hi)
+        {
+            if (lo >= hi)
+            {
+                return;
+            }
+
+            int i, j;
+            int pivot, temp;
+            for (i = lo, j = hi, pivot = data[hi]; i < j;)
+            {
+                while (i < j && data[i] <= pivot)
+                {
+                    ++i;
+                }
+                while (j > i && data[j] >= pivot)
+                {
+                    --j;
+                }
+                if (i < j)
+                {
+                    temp = data[i];
+                    data[i] = data[j];
+                    data[j] = temp;
+                }
+            }
+            if (i != hi)
+            {
+                temp = data[i];
+                data[i] = pivot;
+                data[hi] = temp;
+            }
+
+            TestQuickSortArray(data, lo, i - 1);
+            TestQuickSortArray(data, i + 1, hi);
+        }
+        #endregion
+
+        #region TestBubbleSortArray
+        [Benchmark(InnerIterationCount = BubbleSortIterations)]
+        [InlineData(DefaultLength)]
+        public static void BubbleSortArray(int length)
+        {
+            int[] data = new int[length];
+            int[] unsortedData = GetUnsortedData(length);
+
+            Invoke((int innerIterationCount) =>
+            {
+                for (int i = 0; i < innerIterationCount; i++)
+                {
+                    Array.Copy(unsortedData, data, length);
+                    TestBubbleSortArray(data);
+                }
+            },
+            "TestBubbleSortArray({0})", length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestBubbleSortArray(int[] data)
+        {
+            bool swap;
+            int temp;
+            int n = data.Length - 1;
+            do
+            {
+                swap = false;
+                for (int i = 0; i < n; i++)
+                {
+                    if (data[i] > data[i + 1])
+                    {
+                        temp = data[i];
+                        data[i] = data[i + 1];
+                        data[i + 1] = temp;
+                        swap = true;
+                    }
+                }
+                --n;
+            }
+            while (swap);
+        }
+        #endregion
+
+        #endregion // Algorithm tests
+
+        // TestSpanAPIs (For comparison with Array and Slow Span)
+        #region TestSpanAPIs
+
+        #region TestSpanConstructor<T>
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanConstructorByte(int length)
+        {
+            InvokeTestSpanConstructor<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations / 100)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanConstructorString(int length)
+        {
+            InvokeTestSpanConstructor<string>(length);
+        }
+
+        static void InvokeTestSpanConstructor<T>(int length)
+        {
+            var array = new T[length];
+
+            Invoke((int innerIterationCount) => TestSpanConstructor<T>(array, innerIterationCount, false),
+                "TestSpanConstructor<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanConstructor<T>(T[] array, int iterationCount, bool untrue)
+        {
+            var sink = Sink<T>.Instance;
+
+            for (int i = 0; i < iterationCount; i++)
+            {
+                var span = new Span<T>(array);
+                // Under a condition that we know is false but the jit doesn't,
+                // add a read from 'span' to make sure it's not dead, and an assignment
+                // to 'array' so the constructor call won't get hoisted.
+                if (untrue) { sink.Data = span[0]; array = new T[iterationCount]; }
+            }
+        }
+        #endregion
+
+        #region TestSpanDangerousCreate<T>
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanDangerousCreateByte(int length)
+        {
+            InvokeTestSpanDangerousCreate<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanDangerousCreateString(int length)
+        {
+            InvokeTestSpanDangerousCreate<string>(length);
+        }
+
+        static void InvokeTestSpanDangerousCreate<T>(int length)
+        {
+            TestClass<T> testClass = new TestClass<T>();
+            testClass.C0 = new T[length];
+
+            Invoke((int innerIterationCount) => TestSpanDangerousCreate<T>(testClass, innerIterationCount, false),
+                "TestSpanDangerousCreate<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanDangerousCreate<T>(TestClass<T> testClass, int iterationCount, bool untrue)
+        {
+            var sink = Sink<T>.Instance;
+
+            for (int i = 0; i < iterationCount; i++)
+            {
+                var span = Span<T>.DangerousCreate(testClass, ref testClass.C0[0], testClass.C0.Length);
+                // Under a condition that we know is false but the jit doesn't,
+                // add a read from 'span' to make sure it's not dead, and an assignment
+                // to 'testClass' so the DangerousCreate call won't get hoisted.
+                if (untrue) { sink.Data = span[0]; testClass = new TestClass<T>(); }
+            }
+        }
+        #endregion
+
+        #region TestSpanDangerousGetPinnableReference<T>
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanDangerousGetPinnableReferenceByte(int length)
+        {
+            InvokeTestSpanDangerousGetPinnableReference<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanDangerousGetPinnableReferenceString(int length)
+        {
+            InvokeTestSpanDangerousGetPinnableReference<string>(length);
+        }
+
+        static void InvokeTestSpanDangerousGetPinnableReference<T>(int length)
+        {
+            var array = new T[length];
+
+            Invoke((int innerIterationCount) => TestSpanDangerousGetPinnableReference<T>(array, innerIterationCount),
+                "TestSpanDangerousGetPinnableReference<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanDangerousGetPinnableReference<T>(T[] array, int iterationCount)
+        {
+            var sink = Sink<T>.Instance;
+            var span = new Span<T>(array);
+
+            for (int i = 0; i < iterationCount; i++)
+            {
+                ref T temp = ref span.DangerousGetPinnableReference();
+                sink.Data = temp;
+            }
+        }
+        #endregion
+
+        #region TestSpanIndexHoistable<T>
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanIndexHoistableByte(int length)
+        {
+            InvokeTestSpanIndexHoistable<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanIndexHoistableString(int length)
+        {
+            InvokeTestSpanIndexHoistable<string>(length);
+        }
+
+        static void InvokeTestSpanIndexHoistable<T>(int length)
+        {
+            var array = new T[length];
+
+            Invoke((int innerIterationCount) => TestSpanIndexHoistable<T>(array, length, innerIterationCount),
+                "TestSpanIndexHoistable<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanIndexHoistable<T>(T[] array, int length, int iterationCount)
+        {
+            var sink = Sink<T>.Instance;
+            var span = new Span<T>(array);
+
+            for (int i = 0; i < iterationCount; i++)
+                    sink.Data = span[length/2];
+        }
+        #endregion
+
+        #region TestArrayIndexHoistable<T>
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestArrayIndexHoistableByte(int length)
+        {
+            InvokeTestArrayIndexHoistable<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestArrayIndexHoistableString(int length)
+        {
+            InvokeTestArrayIndexHoistable<string>(length);
+        }
+
+        static void InvokeTestArrayIndexHoistable<T>(int length)
+        {
+            var array = new T[length];
+            Invoke((int innerIterationCount) => TestArrayIndexHoistable<T>(array, length, innerIterationCount),
+                "TestArrayIndexHoistable<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestArrayIndexHoistable<T>(T[] array, int length, int iterationCount)
+        {
+            var sink = Sink<T>.Instance;
+
+            for (int i = 0; i < iterationCount; i++)
+                sink.Data = array[length / 2];
+        }
+        #endregion
+
+        #region TestSpanIndexVariant<T>
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanIndexVariantByte(int length)
+        {
+            InvokeTestSpanIndexVariant<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanIndexVariantString(int length)
+        {
+            InvokeTestSpanIndexVariant<string>(length);
+        }
+
+        static void InvokeTestSpanIndexVariant<T>(int length)
+        {
+            var array = new T[length];
+
+            Invoke((int innerIterationCount) => TestSpanIndexVariant<T>(array, length, innerIterationCount),
+                "TestSpanIndexVariant<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanIndexVariant<T>(T[] array, int length, int iterationCount)
+        {
+            var sink = Sink<T>.Instance;
+            var span = new Span<T>(array);
+            int mask = (length < 2 ? 0 : (length < 8 ? 1 : 7));
+
+            for (int i = 0; i < iterationCount; i++)
+                sink.Data = span[i & mask];
+        }
+        #endregion
+
+        #region TestArrayIndexVariant<T>
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestArrayIndexVariantByte(int length)
+        {
+            InvokeTestArrayIndexVariant<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestArrayIndexVariantString(int length)
+        {
+            InvokeTestArrayIndexVariant<string>(length);
+        }
+
+        static void InvokeTestArrayIndexVariant<T>(int length)
+        {
+            var array = new T[length];
+
+            Invoke((int innerIterationCount) => TestArrayIndexVariant<T>(array, length, innerIterationCount),
+                "TestArrayIndexVariant<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestArrayIndexVariant<T>(T[] array, int length, int iterationCount)
+        {
+            var sink = Sink<T>.Instance;
+            int mask = (length < 2 ? 0 : (length < 8 ? 1 : 7));
+
+            for (int i = 0; i < iterationCount; i++)
+            {
+                sink.Data = array[i & mask];
+            }
+        }
+        #endregion
+
+        #region TestSpanSlice<T>
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanSliceByte(int length)
+        {
+            InvokeTestSpanSlice<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanSliceString(int length)
+        {
+            InvokeTestSpanSlice<string>(length);
+        }
+
+        static void InvokeTestSpanSlice<T>(int length)
+        {
+            var array = new T[length];
+
+            Invoke((int innerIterationCount) => TestSpanSlice<T>(array, length, innerIterationCount, false),
+                "TestSpanSlice<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanSlice<T>(T[] array, int length, int iterationCount, bool untrue)
+        {
+            var span = new Span<T>(array);
+            var sink = Sink<T>.Instance;
+
+            for (int i = 0; i < iterationCount; i++)
+            {
+                var slice = span.Slice(length / 2);
+                // Under a condition that we know is false but the jit doesn't,
+                // add a read from 'span' to make sure it's not dead, and an assignment
+                // to 'array' so the slice call won't get hoisted.
+                if (untrue) { sink.Data = slice[0]; array = new T[iterationCount]; }
+            }
+        }
+        #endregion
+
+        #region TestSpanToArray<T>
+        [Benchmark(InnerIterationCount = BaseIterations / 100)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanToArrayByte(int length)
+        {
+            InvokeTestSpanToArray<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations / 100)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanToArrayString(int length)
+        {
+            InvokeTestSpanToArray<string>(length);
+        }
+
+        static void InvokeTestSpanToArray<T>(int length)
+        {
+            var array = new T[length];
+
+            Invoke((int innerIterationCount) => TestSpanToArray<T>(array, length, innerIterationCount),
+                "TestSpanToArray<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanToArray<T>(T[] array, int length, int iterationCount)
+        {
+            var span = new Span<T>(array);
+            var sink = Sink<T[]>.Instance;
+
+            for (int i = 0; i < iterationCount; i++)
+                sink.Data = span.ToArray();
+        }
+        #endregion
+
+        #region TestSpanCopyTo<T>
+        [Benchmark(InnerIterationCount = BaseIterations / 10)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanCopyToByte(int length)
+        {
+            InvokeTestSpanCopyTo<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations / 100)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanCopyToString(int length)
+        {
+            InvokeTestSpanCopyTo<string>(length);
+        }
+
+        static void InvokeTestSpanCopyTo<T>(int length)
+        {
+            var array = new T[length];
+            var destArray = new T[array.Length];
+
+            Invoke((int innerIterationCount) => TestSpanCopyTo<T>(array, destArray, innerIterationCount),
+                "TestSpanCopyTo<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanCopyTo<T>(T[] array, T[] destArray, int iterationCount)
+        {
+            var span = new Span<T>(array);
+            var destination = new Span<T>(destArray);
+
+            for (int i = 0; i < iterationCount; i++)
+                span.CopyTo(destination);
+        }
+        #endregion
+
+        #region TestArrayCopyTo<T>
+        [Benchmark(InnerIterationCount = BaseIterations / 10)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestArrayCopyToByte(int length)
+        {
+            InvokeTestArrayCopyTo<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations / 100)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestArrayCopyToString(int length)
+        {
+            InvokeTestArrayCopyTo<string>(length);
+        }
+
+        static void InvokeTestArrayCopyTo<T>(int length)
+        {
+            var array = new T[length];
+            var destination = new T[array.Length];
+
+            Invoke((int innerIterationCount) => TestArrayCopyTo<T>(array, destination, innerIterationCount),
+                "TestArrayCopyTo<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestArrayCopyTo<T>(T[] array, T[] destination, int iterationCount)
+        {
+            for (int i = 0; i < iterationCount; i++)
+                array.CopyTo(destination, 0);
+        }
+        #endregion
+
+        #region TestSpanFill<T>
+        [Benchmark(InnerIterationCount = BaseIterations * 10)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanFillByte(int length)
+        {
+            InvokeTestSpanFill<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations / 100)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanFillString(int length)
+        {
+            InvokeTestSpanFill<string>(length);
+        }
+
+        static void InvokeTestSpanFill<T>(int length)
+        {
+            var array = new T[length];
+
+            Invoke((int innerIterationCount) => TestSpanFill<T>(array, innerIterationCount),
+                "TestSpanFill<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanFill<T>(T[] array, int iterationCount)
+        {
+            var span = new Span<T>(array);
+            for (int i = 0; i < iterationCount; i++)
+                span.Fill(default(T));
+        }
+        #endregion
+
+        #region TestSpanClear<T>
+        [Benchmark(InnerIterationCount = BaseIterations / 10)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanClearByte(int length)
+        {
+            InvokeTestSpanClear<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations / 10)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanClearString(int length)
+        {
+            InvokeTestSpanClear<string>(length);
+        }
+
+        static void InvokeTestSpanClear<T>(int length)
+        {
+            var array = new T[length];
+
+            Invoke((int innerIterationCount) => TestSpanClear<T>(array, innerIterationCount),
+                "TestSpanClear<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanClear<T>(T[] array, int iterationCount)
+        {
+            var span = new Span<T>(array);
+            for (int i = 0; i < iterationCount; i++)
+                span.Clear();
+        }
+        #endregion
+
+        #region TestArrayClear<T>
+        [Benchmark(InnerIterationCount = BaseIterations / 10)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestArrayClearByte(int length)
+        {
+            InvokeTestArrayClear<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations / 10)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestArrayClearString(int length)
+        {
+            InvokeTestArrayClear<string>(length);
+        }
+
+        static void InvokeTestArrayClear<T>(int length)
+        {
+            var array = new T[length];
+
+            Invoke((int innerIterationCount) => TestArrayClear<T>(array, length, innerIterationCount),
+                "TestArrayClear<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestArrayClear<T>(T[] array, int length, int iterationCount)
+        {
+            for (int i = 0; i < iterationCount; i++)
+                Array.Clear(array, 0, length);
+        }
+        #endregion
+
+        #region TestSpanAsBytes<T>
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanAsBytesByte(int length)
+        {
+            InvokeTestSpanAsBytes<byte>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanAsBytesInt(int length)
+        {
+            InvokeTestSpanAsBytes<int>(length);
+        }
+
+        static void InvokeTestSpanAsBytes<T>(int length)
+            where T : struct
+        {
+            var array = new T[length];
+
+            Invoke((int innerIterationCount) => TestSpanAsBytes<T>(array, innerIterationCount, false),
+                "TestSpanAsBytes<{0}>({1})", typeof(T).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanAsBytes<T>(T[] array, int iterationCount, bool untrue)
+            where T : struct
+        {
+            var sink = Sink<byte>.Instance;
+            var span = new Span<T>(array);
+
+            for (int i = 0; i < iterationCount; i++)
+            {
+                var byteSpan = span.AsBytes();
+                // Under a condition that we know is false but the jit doesn't,
+                // add a read from 'byteSpan' to make sure it's not dead, and an assignment
+                // to 'span' so the AsBytes call won't get hoisted.
+                if (untrue) { sink.Data = byteSpan[0]; span = new Span<T>(); }
+            }
+        }
+        #endregion
+
+        #region TestSpanNonPortableCast<T>
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanNonPortableCastFromByteToInt(int length)
+        {
+            InvokeTestSpanNonPortableCast<byte, int>(length);
+        }
+
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanNonPortableCastFromIntToByte(int length)
+        {
+            InvokeTestSpanNonPortableCast<int, byte>(length);
+        }
+
+        static void InvokeTestSpanNonPortableCast<From, To>(int length)
+            where From : struct
+            where To : struct
+        {
+            var array = new From[length];
+
+            Invoke((int innerIterationCount) => TestSpanNonPortableCast<From, To>(array, innerIterationCount, false),
+                "TestSpanNonPortableCast<{0}, {1}>({2})", typeof(From).Name, typeof(To).Name, length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanNonPortableCast<From, To>(From[] array, int iterationCount, bool untrue)
+            where From : struct
+            where To : struct
+        {
+            var sink = Sink<To>.Instance;
+            var span = new Span<From>(array);
+
+            for (int i = 0; i < iterationCount; i++)
+            {
+                var toSpan = span.NonPortableCast<From, To>();
+                // Under a condition that we know is false but the jit doesn't,
+                // add a read from 'toSpan' to make sure it's not dead, and an assignment
+                // to 'span' so the AsBytes call won't get hoisted.
+                if (untrue) { sink.Data = toSpan[0]; span = new Span<From>(); }
+            }
+        }
+        #endregion
+
+        #region TestSpanAsSpanStringChar<T>
+        
+        [Benchmark(InnerIterationCount = BaseIterations)]
+        [InlineData(1)]
+        [InlineData(10)]
+        [InlineData(100)]
+        [InlineData(1000)]
+        public static void TestSpanAsSpanStringCharWrapper(int length)
+        {
+            StringBuilder sb = new StringBuilder();
+            Random rand = new Random(42);
+            char[] c = new char[1];
+            for (int i = 0; i < length; i++)
+            {
+                c[0] = (char)rand.Next(32, 126);
+                sb.Append(new string(c));
+            }
+            string s = sb.ToString();
+
+            Invoke((int innerIterationCount) => TestSpanAsSpanStringChar(s, innerIterationCount, false),
+                "TestSpanAsSpanStringChar({0})", length);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void TestSpanAsSpanStringChar(string s, int iterationCount, bool untrue)
+        {
+            var sink = Sink<char>.Instance;
+
+            for (int i = 0; i < iterationCount; i++)
+            {
+                var charSpan = s.AsSpan();
+                // Under a condition that we know is false but the jit doesn't,
+                // add a read from 'charSpan' to make sure it's not dead, and an assignment
+                // to 's' so the AsBytes call won't get hoisted.
+                if (untrue) { sink.Data = charSpan[0]; s = "block hoisting the call to AsSpan()"; }
+            }
+        }
+
+        #endregion      
+
+        #endregion // TestSpanAPIs
+
+
+        public static int Main(string[] args)
+        {
+            // When we call into Invoke, it'll need to know this isn't xunit-perf running
+            IsXunitInvocation = false;
+
+            // Now simulate xunit-perf's benchmark discovery so we know what tests to invoke
+            TypeInfo t = typeof(SpanBench).GetTypeInfo();
+            foreach(MethodInfo m in t.DeclaredMethods)
+            {
+                BenchmarkAttribute benchAttr = m.GetCustomAttribute<BenchmarkAttribute>();
+                if (benchAttr != null)
+                {
+                    // All benchmark methods in this test set the InnerIterationCount on their BenchmarkAttribute.
+                    // Take max of specified count and 1 since some tests use expressions for their count that
+                    // evaluate to 0 under DEBUG.
+                    CommandLineInnerIterationCount = Math.Max((int)benchAttr.InnerIterationCount, 1);
+
+                    // Request a warm-up iteration before measuring this benchmark method.
+                    DoWarmUp = true;
+
+                    // Get the benchmark to measure as a delegate taking the number of inner-loop iterations to run
+                    var invokeMethod = m.CreateDelegate(typeof(Action<int>)) as Action<int>;
+
+                    // All the benchmarks methods in this test use [InlineData] to specify how many times and with
+                    // what arguments they should be run.
+                    foreach (InlineDataAttribute dataAttr in m.GetCustomAttributes<InlineDataAttribute>())
+                    {
+                        foreach (object[] data in dataAttr.GetData(m))
+                        {
+                            // All the benchmark methods in this test take a single int parameter
+                            invokeMethod((int)data[0]);
+                        }
+                    }
+                }
+            }
+            
+            // The only failure modes are crash/exception.
+            return 100;
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/src/jit/Performance/CodeQuality/Span/SpanBench.csproj b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj
index e932acf2a2..7404828bcd 100644
--- a/tests/src/jit/Performance/CodeQuality/Span/SpanBench.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Always use latest Roslyn compiler -->
+  <Import Project="..\..\..\..\..\..\Tools\net46\roslyn\build\Microsoft.Net.Compilers.props"/>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -7,12 +9,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj
index 112d7b5a9e..ec9e4e1bbf 100644
--- a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/Crypto.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Crypto/THIRD-PARTY-NOTICES b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/THIRD-PARTY-NOTICES
new file mode 100644
index 0000000000..10aab05ff7
--- /dev/null
+++ b/tests/src/JIT/Performance/CodeQuality/V8/Crypto/THIRD-PARTY-NOTICES
@@ -0,0 +1,41 @@
+.NET Core uses third-party libraries or other resources that may be
+distributed under licenses different than the .NET Core software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           dotnet@microsoft.com
+
+The attached notices are provided for information only.
+
+License notice for V8.Crypto
+----------------------------
+
+ Copyright (c) 2003-2005  Tom Wu
+ All Rights Reserved.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ 
+ IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+ INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+ THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+ In addition, the following condition applies:
+ 
+ All redistributions must retain an intact copy of this copyright notice
+ and disclaimer.
diff --git a/tests/src/JIT/Performance/CodeQuality/V8/DeltaBlue/DeltaBlue.cs b/tests/src/JIT/Performance/CodeQuality/V8/DeltaBlue/DeltaBlue.cs
deleted file mode 100644
index 27f77182b2..0000000000
--- a/tests/src/JIT/Performance/CodeQuality/V8/DeltaBlue/DeltaBlue.cs
+++ /dev/null
@@ -1,1071 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-/*
-  This is a Java implemention of the DeltaBlue algorithm described in:
-    "The DeltaBlue Algorithm: An Incremental Constraint Hierarchy Solver"
-    by Bjorn N. Freeman-Benson and John Maloney
-    January 1990 Communications of the ACM,
-    also available as University of Washington TR 89-08-06.
-
-  This implementation by Mario Wolczko, Sun Microsystems, Sep 1996,
-  based on the Smalltalk implementation by John Maloney.
-
-*/
-
-// The code has been adapted for use as a C# benchmark by Microsoft.
-
-#define USE_STACK
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Collections;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-/*
-Strengths are used to measure the relative importance of constraints.
-New strengths may be inserted in the strength hierarchy without
-disrupting current constraints.  Strengths cannot be created outside
-this class, so pointer comparison can be used for value comparison.
-*/
-
-namespace V8
-{
-internal class Strength
-{
-    private int _strengthValue;
-    private String _name;
-
-    private Strength(int strengthValue, String name)
-    {
-        _strengthValue = strengthValue;
-        _name = name;
-    }
-
-    public static Boolean stronger(Strength s1, Strength s2)
-    {
-        return s1._strengthValue < s2._strengthValue;
-    }
-
-    public static Boolean weaker(Strength s1, Strength s2)
-    {
-        return s1._strengthValue > s2._strengthValue;
-    }
-
-    public static Strength weakestOf(Strength s1, Strength s2)
-    {
-        return weaker(s1, s2) ? s1 : s2;
-    }
-
-    public static Strength strongest(Strength s1, Strength s2)
-    {
-        return stronger(s1, s2) ? s1 : s2;
-    }
-
-    // for iteration
-    public Strength nextWeaker()
-    {
-        switch (_strengthValue)
-        {
-            case 0: return weakest;
-            case 1: return weakDefault;
-            case 2: return normal;
-            case 3: return strongDefault;
-            case 4: return preferred;
-            case 5: return strongPreferred;
-
-            case 6:
-            default:
-                Console.Error.WriteLine("Invalid call to nextStrength()!");
-                //System.exit(1);
-                return null;
-        }
-    }
-
-    // Strength constants
-    public static Strength required = new Strength(0, "required");
-    public static Strength strongPreferred = new Strength(1, "strongPreferred");
-    public static Strength preferred = new Strength(2, "preferred");
-    public static Strength strongDefault = new Strength(3, "strongDefault");
-    public static Strength normal = new Strength(4, "normal");
-    public static Strength weakDefault = new Strength(5, "weakDefault");
-    public static Strength weakest = new Strength(6, "weakest");
-
-    public void print()
-    {
-        Console.Write("strength[" + _strengthValue + "]");
-    }
-}
-
-
-
-
-//------------------------------ variables ------------------------------
-
-// I represent a constrained variable. In addition to my value, I
-// maintain the structure of the constraint graph, the current
-// dataflow graph, and various parameters of interest to the DeltaBlue
-// incremental constraint solver.
-
-internal class Variable
-{
-    public int value;               // my value; changed by constraints
-    public ArrayList constraints;   // normal constraints that reference me
-    public Constraint determinedBy; // the constraint that currently determines
-                                    // my value (or null if there isn't one)
-    public int mark;                // used by the planner to mark constraints
-    public Strength walkStrength;   // my walkabout strength
-    public Boolean stay;            // true if I am a planning-time constant
-    public String name;             // a symbolic name for reporting purposes
-
-
-    private Variable(String name, int initialValue, Strength walkStrength,
-             int nconstraints)
-    {
-        value = initialValue;
-        constraints = new ArrayList(nconstraints);
-        determinedBy = null;
-        mark = 0;
-        this.walkStrength = walkStrength;
-        stay = true;
-        this.name = name;
-    }
-
-    public Variable(String name, int value) : this(name, value, Strength.weakest, 2)
-    {
-    }
-
-    public Variable(String name) : this(name, 0, Strength.weakest, 2)
-    {
-    }
-
-    public void print()
-    {
-        Console.Write(name + "(");
-        walkStrength.print();
-        Console.Write("," + value + ")");
-    }
-
-    // Add the given constraint to the set of all constraints that refer to me.
-    public void addConstraint(Constraint c)
-    {
-        constraints.Add(c);
-    }
-
-    // Remove all traces of c from this variable.
-    public void removeConstraint(Constraint c)
-    {
-        constraints.Remove(c);
-        if (determinedBy == c) determinedBy = null;
-    }
-
-    // Attempt to assign the given value to me using the given strength.
-    public void setValue(int value, Strength strength)
-    {
-        EditConstraint e = new EditConstraint(this, strength);
-        if (e.isSatisfied())
-        {
-            this.value = value;
-            deltablue.planner.propagateFrom(this);
-        }
-        e.destroyConstraint();
-    }
-}
-
-
-
-
-//------------------------ constraints ------------------------------------
-
-// I am an abstract class representing a system-maintainable
-// relationship (or "constraint") between a set of variables. I supply
-// a strength instance variable; concrete subclasses provide a means
-// of storing the constrained variables and other information required
-// to represent a constraint.
-
-internal abstract class Constraint
-{
-    public Strength strength; // the strength of this constraint
-
-    public Constraint() { } // this has to be here because of
-                            // Java's constructor idiocy.
-
-    public Constraint(Strength strength)
-    {
-        this.strength = strength;
-    }
-
-    // Answer true if this constraint is satisfied in the current solution.
-    public abstract Boolean isSatisfied();
-
-    // Record the fact that I am unsatisfied.
-    public abstract void markUnsatisfied();
-
-    // Normal constraints are not input constraints. An input constraint
-    // is one that depends on external state, such as the mouse, the
-    // keyboard, a clock, or some arbitrary piece of imperative code.
-    public virtual Boolean isInput() { return false; }
-
-    // Activate this constraint and attempt to satisfy it.
-    public void addConstraint()
-    {
-        addToGraph();
-        deltablue.planner.incrementalAdd(this);
-    }
-
-    // Deactivate this constraint, remove it from the constraint graph,
-    // possibly causing other constraints to be satisfied, and destroy
-    // it.
-    public void destroyConstraint()
-    {
-        if (isSatisfied()) deltablue.planner.incrementalRemove(this);
-        else
-            removeFromGraph();
-    }
-
-    // Add myself to the constraint graph.
-    public abstract void addToGraph();
-
-    // Remove myself from the constraint graph.
-    public abstract void removeFromGraph();
-
-    // Decide if I can be satisfied and record that decision. The output
-    // of the choosen method must not have the given mark and must have
-    // a walkabout strength less than that of this constraint.
-    public abstract void chooseMethod(int mark);
-
-    // Set the mark of all input from the given mark.
-    public abstract void markInputs(int mark);
-
-    // Assume that I am satisfied. Answer true if all my current inputs
-    // are known. A variable is known if either a) it is 'stay' (i.e. it
-    // is a constant at plan execution time), b) it has the given mark
-    // (indicating that it has been computed by a constraint appearing
-    // earlier in the plan), or c) it is not determined by any
-    // constraint.
-    public abstract Boolean inputsKnown(int mark);
-
-    // Answer my current output variable. Raise an error if I am not
-    // currently satisfied.
-    public abstract Variable output();
-
-    // Attempt to find a way to enforce this constraint. If successful,
-    // record the solution, perhaps modifying the current dataflow
-    // graph. Answer the constraint that this constraint overrides, if
-    // there is one, or nil, if there isn't.
-    // Assume: I am not already satisfied.
-    //
-    public Constraint satisfy(int mark)
-    {
-        chooseMethod(mark);
-        if (!isSatisfied())
-        {
-            if (strength == Strength.required)
-            {
-                deltablue.error("Could not satisfy a required constraint");
-            }
-            return null;
-        }
-        // constraint can be satisfied
-        // mark inputs to allow cycle detection in addPropagate
-        markInputs(mark);
-        Variable outvar = output();
-        Constraint overridden = outvar.determinedBy;
-        if (overridden != null) overridden.markUnsatisfied();
-        outvar.determinedBy = this;
-        if (!deltablue.planner.addPropagate(this, mark))
-        {
-            Console.WriteLine("Cycle encountered");
-            return null;
-        }
-        outvar.mark = mark;
-        return overridden;
-    }
-
-    // Enforce this constraint. Assume that it is satisfied.
-    public abstract void execute();
-
-    // Calculate the walkabout strength, the stay flag, and, if it is
-    // 'stay', the value for the current output of this
-    // constraint. Assume this constraint is satisfied.
-    public abstract void recalculate();
-
-    public abstract void printInputs();
-
-    public void printOutput() { output().print(); }
-
-    public void print()
-    {
-        if (!isSatisfied())
-        {
-            Console.Write("Unsatisfied");
-        }
-        else
-        {
-            Console.Write("Satisfied(");
-            printInputs();
-            Console.Write(" -> ");
-            printOutput();
-            Console.Write(")");
-        }
-        Console.Write("\n");
-    }
-}
-
-
-
-//-------------unary constraints-------------------------------------------
-
-// I am an abstract superclass for constraints having a single
-// possible output variable.
-//
-internal abstract class UnaryConstraint : Constraint
-{
-    public Variable myOutput; // possible output variable
-    public Boolean satisfied; // true if I am currently satisfied
-
-    public UnaryConstraint(Variable v, Strength strength) : base(strength)
-
-    {
-        myOutput = v;
-        satisfied = false;
-        addConstraint();
-    }
-
-    // Answer true if this constraint is satisfied in the current solution.
-    public override Boolean isSatisfied() { return satisfied; }
-
-    // Record the fact that I am unsatisfied.
-    public override void markUnsatisfied() { satisfied = false; }
-
-    // Answer my current output variable.
-    public override Variable output() { return myOutput; }
-
-    // Add myself to the constraint graph.
-    public override void addToGraph()
-    {
-        myOutput.addConstraint(this);
-        satisfied = false;
-    }
-
-    // Remove myself from the constraint graph.
-    public override void removeFromGraph()
-    {
-        if (myOutput != null) myOutput.removeConstraint(this);
-        satisfied = false;
-    }
-
-    // Decide if I can be satisfied and record that decision.
-    public override void chooseMethod(int mark)
-    {
-        satisfied = myOutput.mark != mark
-                   && Strength.stronger(strength, myOutput.walkStrength);
-    }
-
-    public override void markInputs(int mark) { }   // I have no inputs
-
-    public override Boolean inputsKnown(int mark) { return true; }
-
-    // Calculate the walkabout strength, the stay flag, and, if it is
-    // 'stay', the value for the current output of this
-    // constraint. Assume this constraint is satisfied."
-    public override void recalculate()
-    {
-        myOutput.walkStrength = strength;
-        myOutput.stay = !isInput();
-        if (myOutput.stay) execute(); // stay optimization
-    }
-
-    public override void printInputs() { } // I have no inputs
-}
-
-
-// I am a unary input constraint used to mark a variable that the
-// client wishes to change.
-//
-internal class EditConstraint : UnaryConstraint
-{
-    public EditConstraint(Variable v, Strength str) : base(v, str) { }
-
-    // I indicate that a variable is to be changed by imperative code.
-    public override Boolean isInput() { return true; }
-
-    public override void execute() { } // Edit constraints do nothing.
-}
-
-// I mark variables that should, with some level of preference, stay
-// the same. I have one method with zero inputs and one output, which
-// does nothing. Planners may exploit the fact that, if I am
-// satisfied, my output will not change during plan execution. This is
-// called "stay optimization".
-//
-internal class StayConstraint : UnaryConstraint
-{
-    // Install a stay constraint with the given strength on the given variable.
-    public StayConstraint(Variable v, Strength str) : base(v, str) { }
-
-    public override void execute() { } // Stay constraints do nothing.
-}
-
-
-
-
-//-------------binary constraints-------------------------------------------
-
-
-// I am an abstract superclass for constraints having two possible
-// output variables.
-//
-internal abstract class BinaryConstraint : Constraint
-{
-    public Variable v1, v2; // possible output variables
-    public sbyte direction; // one of the following...
-    public static sbyte backward = -1;    // v1 is output
-    public static sbyte nodirection = 0;  // not satisfied
-    public static sbyte forward = 1;      // v2 is output
-
-    public BinaryConstraint() { } // this has to be here because of
-                                  // Java's constructor idiocy.
-
-    public BinaryConstraint(Variable var1, Variable var2, Strength strength)
-      : base(strength)
-    {
-        v1 = var1;
-        v2 = var2;
-        direction = nodirection;
-        addConstraint();
-    }
-
-    // Answer true if this constraint is satisfied in the current solution.
-    public override Boolean isSatisfied() { return direction != nodirection; }
-
-    // Add myself to the constraint graph.
-    public override void addToGraph()
-    {
-        v1.addConstraint(this);
-        v2.addConstraint(this);
-        direction = nodirection;
-    }
-
-    // Remove myself from the constraint graph.
-    public override void removeFromGraph()
-    {
-        if (v1 != null) v1.removeConstraint(this);
-        if (v2 != null) v2.removeConstraint(this);
-        direction = nodirection;
-    }
-
-    // Decide if I can be satisfied and which way I should flow based on
-    // the relative strength of the variables I relate, and record that
-    // decision.
-    //
-    public override void chooseMethod(int mark)
-    {
-        if (v1.mark == mark)
-            direction =
-          v2.mark != mark && Strength.stronger(strength, v2.walkStrength)
-            ? forward : nodirection;
-
-        if (v2.mark == mark)
-            direction =
-          v1.mark != mark && Strength.stronger(strength, v1.walkStrength)
-            ? backward : nodirection;
-
-        // If we get here, neither variable is marked, so we have a choice.
-        if (Strength.weaker(v1.walkStrength, v2.walkStrength))
-            direction =
-          Strength.stronger(strength, v1.walkStrength) ? backward : nodirection;
-        else
-            direction =
-          Strength.stronger(strength, v2.walkStrength) ? forward : nodirection;
-    }
-
-    // Record the fact that I am unsatisfied.
-    public override void markUnsatisfied() { direction = nodirection; }
-
-    // Mark the input variable with the given mark.
-    public override void markInputs(int mark)
-    {
-        input().mark = mark;
-    }
-
-    public override Boolean inputsKnown(int mark)
-    {
-        Variable i = input();
-        return i.mark == mark || i.stay || i.determinedBy == null;
-    }
-
-    // Answer my current output variable.
-    public override Variable output() { return direction == forward ? v2 : v1; }
-
-    // Answer my current input variable
-    public Variable input() { return direction == forward ? v1 : v2; }
-
-    // Calculate the walkabout strength, the stay flag, and, if it is
-    // 'stay', the value for the current output of this
-    // constraint. Assume this constraint is satisfied.
-    //
-    public override void recalculate()
-    {
-        Variable invar = input(), outvar = output();
-        outvar.walkStrength = Strength.weakestOf(strength, invar.walkStrength);
-        outvar.stay = invar.stay;
-        if (outvar.stay) execute();
-    }
-
-    public override void printInputs()
-    {
-        input().print();
-    }
-}
-
-
-// I constrain two variables to have the same value: "v1 = v2".
-//
-internal class EqualityConstraint : BinaryConstraint
-{
-    // Install a constraint with the given strength equating the given variables.
-    public EqualityConstraint(Variable var1, Variable var2, Strength strength)
-        : base(var1, var2, strength)
-
-    {
-    }
-
-    // Enforce this constraint. Assume that it is satisfied.
-    public override void execute()
-    {
-        output().value = input().value;
-    }
-}
-
-
-// I relate two variables by the linear scaling relationship: "v2 =
-// (v1 * scale) + offset". Either v1 or v2 may be changed to maintain
-// this relationship but the scale factor and offset are considered
-// read-only.
-//
-internal class ScaleConstraint : BinaryConstraint
-{
-    public Variable scale; // scale factor input variable
-    public Variable offset; // offset input variable
-
-    // Install a scale constraint with the given strength on the given variables.
-    public ScaleConstraint(Variable src, Variable scale, Variable offset,
-                   Variable dest, Strength strength)
-    {
-        // Curse this wretched language for insisting that constructor invocation
-        // must be the first thing in a method...
-        // ..because of that, we must copy the code from the inherited
-        // constructors.
-        this.strength = strength;
-        v1 = src;
-        v2 = dest;
-        direction = nodirection;
-        this.scale = scale;
-        this.offset = offset;
-        addConstraint();
-    }
-
-    // Add myself to the constraint graph.
-    public override void addToGraph()
-    {
-        base.addToGraph();
-        scale.addConstraint(this);
-        offset.addConstraint(this);
-    }
-
-    // Remove myself from the constraint graph.
-    public override void removeFromGraph()
-    {
-        base.removeFromGraph();
-        if (scale != null) scale.removeConstraint(this);
-        if (offset != null) offset.removeConstraint(this);
-    }
-
-    // Mark the inputs from the given mark.
-    public override void markInputs(int mark)
-    {
-        base.markInputs(mark);
-        scale.mark = offset.mark = mark;
-    }
-
-    // Enforce this constraint. Assume that it is satisfied.
-    public override void execute()
-    {
-        if (direction == forward)
-            v2.value = v1.value * scale.value + offset.value;
-        else
-            v1.value = (v2.value - offset.value) / scale.value;
-    }
-
-    // Calculate the walkabout strength, the stay flag, and, if it is
-    // 'stay', the value for the current output of this
-    // constraint. Assume this constraint is satisfied.
-    public override void recalculate()
-    {
-        Variable invar = input(), outvar = output();
-        outvar.walkStrength = Strength.weakestOf(strength, invar.walkStrength);
-        outvar.stay = invar.stay && scale.stay && offset.stay;
-        if (outvar.stay) execute(); // stay optimization
-    }
-}
-
-
-// ------------------------------------------------------------
-
-
-// A Plan is an ordered list of constraints to be executed in sequence
-// to resatisfy all currently satisfiable constraints in the face of
-// one or more changing inputs.
-
-internal class Plan
-{
-    private ArrayList _v;
-
-    public Plan() { _v = new ArrayList(); }
-
-    public void addConstraint(Constraint c) { _v.Add(c); }
-
-    public int size() { return _v.Count; }
-
-    public Constraint constraintAt(int index)
-    {
-        return (Constraint)_v[index];
-    }
-
-    public void execute()
-    {
-        for (int i = 0; i < size(); ++i)
-        {
-            Constraint c = (Constraint)constraintAt(i);
-            c.execute();
-        }
-    }
-}
-
-
-// ------------------------------------------------------------
-
-// The deltablue planner
-
-internal class Planner
-{
-    private int _currentMark = 0;
-
-    // Select a previously unused mark value.
-    private int newMark() { return ++_currentMark; }
-
-    public Planner()
-    {
-        _currentMark = 0;
-    }
-
-    // Attempt to satisfy the given constraint and, if successful,
-    // incrementally update the dataflow graph.  Details: If satifying
-    // the constraint is successful, it may override a weaker constraint
-    // on its output. The algorithm attempts to resatisfy that
-    // constraint using some other method. This process is repeated
-    // until either a) it reaches a variable that was not previously
-    // determined by any constraint or b) it reaches a constraint that
-    // is too weak to be satisfied using any of its methods. The
-    // variables of constraints that have been processed are marked with
-    // a unique mark value so that we know where we've been. This allows
-    // the algorithm to avoid getting into an infinite loop even if the
-    // constraint graph has an inadvertent cycle.
-    //
-    public void incrementalAdd(Constraint c)
-    {
-        int mark = newMark();
-        Constraint overridden = c.satisfy(mark);
-        while (overridden != null)
-        {
-            overridden = overridden.satisfy(mark);
-        }
-    }
-
-
-    // Entry point for retracting a constraint. Remove the given
-    // constraint and incrementally update the dataflow graph.
-    // Details: Retracting the given constraint may allow some currently
-    // unsatisfiable downstream constraint to be satisfied. We therefore collect
-    // a list of unsatisfied downstream constraints and attempt to
-    // satisfy each one in turn. This list is traversed by constraint
-    // strength, strongest first, as a heuristic for avoiding
-    // unnecessarily adding and then overriding weak constraints.
-    // Assume: c is satisfied.
-    //
-    public void incrementalRemove(Constraint c)
-    {
-        Variable outvar = c.output();
-        c.markUnsatisfied();
-        c.removeFromGraph();
-        ArrayList unsatisfied = removePropagateFrom(outvar);
-        Strength strength = Strength.required;
-        do
-        {
-            for (int i = 0; i < unsatisfied.Count; ++i)
-            {
-                Constraint u = (Constraint)unsatisfied[i];
-                if (u.strength == strength)
-                    incrementalAdd(u);
-            }
-            strength = strength.nextWeaker();
-        } while (strength != Strength.weakest);
-    }
-
-    // Recompute the walkabout strengths and stay flags of all variables
-    // downstream of the given constraint and recompute the actual
-    // values of all variables whose stay flag is true. If a cycle is
-    // detected, remove the given constraint and answer
-    // false. Otherwise, answer true.
-    // Details: Cycles are detected when a marked variable is
-    // encountered downstream of the given constraint. The sender is
-    // assumed to have marked the inputs of the given constraint with
-    // the given mark. Thus, encountering a marked node downstream of
-    // the output constraint means that there is a path from the
-    // constraint's output to one of its inputs.
-    //
-    public Boolean addPropagate(Constraint c, int mark)
-    {
-        ArrayList todo = new ArrayList();
-        todo.Add(c);
-        while (!(todo.Count == 0))
-        {
-#if USE_STACK
-            Constraint d = (Constraint)todo[todo.Count - 1];
-            todo.RemoveAt(todo.Count - 1);
-#else
-            Constraint d= (Constraint)todo[0];
-            todo.RemoveAt(0);
-#endif
-            if (d.output().mark == mark)
-            {
-                incrementalRemove(c);
-                return false;
-            }
-            d.recalculate();
-            addConstraintsConsumingTo(d.output(), todo);
-        }
-        return true;
-    }
-
-
-    // The given variable has changed. Propagate new values downstream.
-    public void propagateFrom(Variable v)
-    {
-        ArrayList todo = new ArrayList();
-        addConstraintsConsumingTo(v, todo);
-        while (!(todo.Count == 0))
-        {
-#if USE_STACK
-            Constraint c = (Constraint)todo[todo.Count - 1];
-            todo.RemoveAt(0);
-#else
-            Constraint c= (Constraint)todo[todo.Count-1];
-            todo.RemoveAt(0);
-#endif
-            c.execute();
-            addConstraintsConsumingTo(c.output(), todo);
-        }
-    }
-
-    // Update the walkabout strengths and stay flags of all variables
-    // downstream of the given constraint. Answer a collection of
-    // unsatisfied constraints sorted in order of decreasing strength.
-    //
-    public ArrayList removePropagateFrom(Variable outvar)
-    {
-        outvar.determinedBy = null;
-        outvar.walkStrength = Strength.weakest;
-        outvar.stay = true;
-        ArrayList unsatisfied = new ArrayList();
-        ArrayList todo = new ArrayList();
-        todo.Add(outvar);
-        while (!(todo.Count == 0))
-        {
-#if USE_STACK
-            Variable v = (Variable)todo[todo.Count - 1];
-            todo.RemoveAt(todo.Count - 1);
-#else
-            Variable v= (Variable)todo[0];
-            todo.RemoveAt(0);
-#endif
-            for (int i = 0; i < v.constraints.Count; ++i)
-            {
-                Constraint c = (Constraint)v.constraints[i];
-                if (!c.isSatisfied())
-                    unsatisfied.Add(c);
-            }
-            Constraint determiningC = v.determinedBy;
-            for (int i = 0; i < v.constraints.Count; ++i)
-            {
-                Constraint nextC = (Constraint)v.constraints[i];
-                if (nextC != determiningC && nextC.isSatisfied())
-                {
-                    nextC.recalculate();
-                    todo.Add(nextC.output());
-                }
-            }
-        }
-        return unsatisfied;
-    }
-
-    // Extract a plan for resatisfaction starting from the outputs of
-    // the given constraints, usually a set of input constraints.
-    //
-    public Plan extractPlanFromConstraints(ArrayList constraints)
-    {
-        ArrayList sources = new ArrayList();
-        for (int i = 0; i < constraints.Count; ++i)
-        {
-            Constraint c = (Constraint)constraints[i];
-            if (c.isInput() && c.isSatisfied())
-                sources.Add(c);
-        }
-        return makePlan(sources);
-    }
-
-    // Extract a plan for resatisfaction starting from the given source
-    // constraints, usually a set of input constraints. This method
-    // assumes that stay optimization is desired; the plan will contain
-    // only constraints whose output variables are not stay. Constraints
-    // that do no computation, such as stay and edit constraints, are
-    // not included in the plan.
-    // Details: The outputs of a constraint are marked when it is added
-    // to the plan under construction. A constraint may be appended to
-    // the plan when all its input variables are known. A variable is
-    // known if either a) the variable is marked (indicating that has
-    // been computed by a constraint appearing earlier in the plan), b)
-    // the variable is 'stay' (i.e. it is a constant at plan execution
-    // time), or c) the variable is not determined by any
-    // constraint. The last provision is for past states of history
-    // variables, which are not stay but which are also not computed by
-    // any constraint.
-    // Assume: sources are all satisfied.
-    //
-    public Plan makePlan(ArrayList sources)
-    {
-        int mark = newMark();
-        Plan plan = new Plan();
-        ArrayList todo = sources;
-        while (!(todo.Count == 0))
-        {
-#if USE_STACK
-            Constraint c = (Constraint)todo[todo.Count - 1];
-            todo.RemoveAt(todo.Count - 1);
-#else
-            Constraint c= (Constraint)todo[todo.Count-1];
-            todo.RemoveAt(0);
-#endif
-            if (c.output().mark != mark && c.inputsKnown(mark))
-            {
-                // not in plan already and eligible for inclusion
-                plan.addConstraint(c);
-                c.output().mark = mark;
-                addConstraintsConsumingTo(c.output(), todo);
-            }
-        }
-        return plan;
-    }
-
-    public void addConstraintsConsumingTo(Variable v, ArrayList coll)
-    {
-        Constraint determiningC = v.determinedBy;
-        ArrayList cc = v.constraints;
-        for (int i = 0; i < cc.Count; ++i)
-        {
-            Constraint c = (Constraint)cc[i];
-            if (c != determiningC && c.isSatisfied())
-                coll.Add(c);
-        }
-    }
-}
-
-//------------------------------------------------------------
-
-public class deltablue
-{
-    internal static Planner planner;
-    internal static int chains, projections;
-
-    public static int Main(String[] args)
-    {
-        deltablue d = new deltablue();
-        bool result = d.inst_main(args);
-        return (result ? 100 : -1);
-    }
-
-    [Benchmark]
-    public static void Bench()
-    {
-        deltablue d = new deltablue();
-        int iterations = 200;
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                d.inst_inner(iterations, false);
-            }
-        }
-    }
-
-    public bool inst_main(String[] args)
-    {
-        int iterations = 200; // read iterations from arguments, walter 7/97
-        if (args.Length > 0)
-        {
-            bool parsed = Int32.TryParse(args[0], out iterations);
-            if (!parsed)
-            {
-                Console.WriteLine("Error: expected iteration count, got '{0}'", args[0]);
-                return false;
-            }
-        }
-
-        inst_inner(iterations, true);
-
-        return true;
-    }
-
-    public void inst_inner(int iterations, bool verbose)
-    {
-        chains = 0;         // NS 11/11
-        projections = 0;    // NS 11/11
-        if (verbose)
-        {
-            Console.WriteLine("deltablue parameters: " + iterations + " iterations");
-        }
-
-        DateTime start = DateTime.Now;
-        for (int i = 0; i < iterations; i++)
-        {
-            chainTest(1000);
-            projectionTest(1000);
-        }
-        DateTime end = DateTime.Now;
-        TimeSpan dur = end - start;
-        if (verbose)
-        {
-            Console.WriteLine("chains : " + chains); //NS
-            Console.WriteLine("projections : " + projections); //NS
-            Console.WriteLine("Doing {0} iters of Deltablue takes {1} ms; {2} us/iter.",
-                              iterations, dur.TotalMilliseconds, (1000.0 * dur.TotalMilliseconds) / iterations);
-        }
-    }
-
-    //  This is the standard DeltaBlue benchmark. A long chain of
-    //  equality constraints is constructed with a stay constraint on
-    //  one end. An edit constraint is then added to the opposite end
-    //  and the time is measured for adding and removing this
-    //  constraint, and extracting and executing a constraint
-    //  satisfaction plan. There are two cases. In case 1, the added
-    //  constraint is stronger than the stay constraint and values must
-    //  propagate down the entire length of the chain. In case 2, the
-    //  added constraint is weaker than the stay constraint so it cannot
-    //  be accomodated. The cost in this case is, of course, very
-    //  low. Typical situations lie somewhere between these two
-    //  extremes.
-    //
-    private void chainTest(int n)
-    {
-        planner = new Planner();
-
-        Variable prev = null, first = null, last = null;
-
-        // Build chain of n equality constraints
-        for (int i = 0; i <= n; i++)
-        {
-            String name = "v" + i;
-            Variable v = new Variable(name);
-            if (prev != null)
-                new EqualityConstraint(prev, v, Strength.required);
-            if (i == 0) first = v;
-            if (i == n) last = v;
-            prev = v;
-        }
-
-        new StayConstraint(last, Strength.strongDefault);
-        Constraint editC = new EditConstraint(first, Strength.preferred);
-        ArrayList editV = new ArrayList();
-        editV.Add(editC);
-        Plan plan = planner.extractPlanFromConstraints(editV);
-        for (int i = 0; i < 100; i++)
-        {
-            first.value = i;
-            plan.execute();
-            if (last.value != i)
-                error("Chain test failed!");
-        }
-        editC.destroyConstraint();
-        deltablue.chains++;
-    }
-
-
-    // This test constructs a two sets of variables related to each
-    // other by a simple linear transformation (scale and offset). The
-    // time is measured to change a variable on either side of the
-    // mapping and to change the scale and offset factors.
-    //
-    private void projectionTest(int n)
-    {
-        planner = new Planner();
-
-        Variable scale = new Variable("scale", 10);
-        Variable offset = new Variable("offset", 1000);
-        Variable src = null, dst = null;
-
-        ArrayList dests = new ArrayList();
-
-        for (int i = 0; i < n; ++i)
-        {
-            src = new Variable("src" + i, i);
-            dst = new Variable("dst" + i, i);
-            dests.Add(dst);
-            new StayConstraint(src, Strength.normal);
-            new ScaleConstraint(src, scale, offset, dst, Strength.required);
-        }
-
-        change(src, 17);
-        if (dst.value != 1170) error("Projection test 1 failed!");
-
-        change(dst, 1050);
-        if (src.value != 5) error("Projection test 2 failed!");
-
-        change(scale, 5);
-        for (int i = 0; i < n - 1; ++i)
-        {
-            if (((Variable)dests[i]).value != i * 5 + 1000)
-                error("Projection test 3 failed!");
-        }
-
-        change(offset, 2000);
-        for (int i = 0; i < n - 1; ++i)
-        {
-            if (((Variable)dests[i]).value != i * 5 + 2000)
-                error("Projection test 4 failed!");
-        }
-        deltablue.projections++;
-    }
-
-    private void change(Variable var, int newValue)
-    {
-        EditConstraint editC = new EditConstraint(var, Strength.preferred);
-        ArrayList editV = new ArrayList();
-        editV.Add(editC);
-        Plan plan = planner.extractPlanFromConstraints(editV);
-        for (int i = 0; i < 10; i++)
-        {
-            var.value = newValue;
-            plan.execute();
-        }
-        editC.destroyConstraint();
-    }
-
-    public static void error(String s)
-    {
-        throw new Exception(s);
-    }
-}
-}
diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj
index b4572c61a5..f81039d693 100644
--- a/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj
+++ b/tests/src/JIT/Performance/CodeQuality/V8/Richards/Richards.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,18 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -38,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Performance/CodeQuality/V8/Richards/THIRD-PARTY-NOTICES b/tests/src/JIT/Performance/CodeQuality/V8/Richards/THIRD-PARTY-NOTICES
new file mode 100644
index 0000000000..7eff233b54
--- /dev/null
+++ b/tests/src/JIT/Performance/CodeQuality/V8/Richards/THIRD-PARTY-NOTICES
@@ -0,0 +1,21 @@
+.NET Core uses third-party libraries or other resources that may be
+distributed under licenses different than the .NET Core software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           dotnet@microsoft.com
+
+The attached notices are provided for information only.
+
+License notice for A Benchmark Test for Systems Implementation Languages
+------------------------------------------------------------------------
+
+http://www.cl.cam.ac.uk/~mr10/Bench/README
+
+Please feel free to re-implement this benchmark in any language you
+choose.  I would be happy to incorporate such tranlations into this
+distribution together with their timing/size results.
+
+Martin Richards
+23 February 2007
diff --git a/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj b/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj
index 64ceed990a..0489b0a8b0 100644
--- a/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj
+++ b/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,17 +7,13 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
   </PropertyGroup>
@@ -37,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj
index aef0938f5d..506de5d496 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2E7AFA2D-C20E-42E1-B4C8-9C8C30A09F47}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj
index cabe10b54e..233c67325b 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.ilproj
index 8a47dc7384..f4e3c987f6 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b16935/b16935.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16935.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj
index ec4f62d9e8..512aca1b05 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{54DFD24C-F147-4825-9E8E-A0ABD4FCC762}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj
index feee1ea3ee..2fd8a82ecd 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F524F545-6D93-4212-B51D-5D5F26897EFC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.ilproj
index 6b45d2d0a9..de445e4bfc 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b44018/b44018.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44018.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.ilproj
index b88e668a33..ed25c59755 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45046/b45046.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b45046.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj
index a624b7a78d..53748ed4b2 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E83A9A3C-3336-44A7-A167-07983121C529}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323.ilproj
index 59d9636705..80b8040cb7 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b26323/b26323.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b26323.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.ilproj
index 51624ceef2..6c9e9e2daf 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b35455/b35455.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b35455.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj
index d5c72f017e..2b612d1c82 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B7E09C27-56AB-4A8B-8AA7-C66F7D09349C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b47392/b47392.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b47392/b47392.ilproj
index 920d525a81..e96e26dcb5 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b47392/b47392.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b47392/b47392.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b47392.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj b/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj
index 57a5aafd1a..b820e23e8a 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj b/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj
index bf3c437bdb..dd5a3ca6f4 100644
--- a/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.ilproj
index 88e1fceb2a..b4af54753e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440a.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b06440a.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.ilproj
index 06e52bc41b..be06f87704 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440b.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b06440b.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.ilproj
index 5319ada349..75c01a4bcb 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b06440/b06440c.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b06440c.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.ilproj
index 523812e22a..7bbb8d9510 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b07341/b07341.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b07341.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b09495/b09495.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b09495/b09495.ilproj
index d505b04066..cc9c56434a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b09495/b09495.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b09495/b09495.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b09495.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10665/b10665.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10665/b10665.ilproj
index 88ce8711c4..a46d8ea928 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10665/b10665.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10665/b10665.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b10665.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10666/b10666.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10666/b10666.ilproj
index e78f7486fe..1a16a0c925 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10666/b10666.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10666/b10666.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b10666.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10894/b10894.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10894/b10894.ilproj
index 8fee2a8978..4eae36cc1d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10894/b10894.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10894/b10894.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b10894.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10897/b10897.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10897/b10897.ilproj
index ca7f8c3f13..e8ff6b15d5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10897/b10897.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10897/b10897.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b10897.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10939/b10939.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10939/b10939.ilproj
index 5a95d89629..c3db4c81d0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10939/b10939.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10939/b10939.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b10939.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940a.ilproj
index c19adfa5d8..a8e40953d9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940a.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b10940a.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940b.ilproj
index 651e8e43e2..dcf4d46c3f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b10940/b10940b.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b10940b.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11021/b11021.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11021/b11021.ilproj
index 12f2479f15..f12e793033 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11021/b11021.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11021/b11021.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b11021.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11413/b11413.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11413/b11413.ilproj
index b5172019d8..e0c0d074ee 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11413/b11413.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11413/b11413.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b11413.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj
index 15220f5ab4..a98e698f8c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11949/b11949.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11949/b11949.ilproj
index adb1d2a5b1..b0d1408760 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11949/b11949.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11949/b11949.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b11949.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.csproj
index fb20b043f4..9cbb49c6a8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12274/b12274.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12274/b12274.ilproj
index cd23200694..d6dd289d8a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12274/b12274.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12274/b12274.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b12274.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj
index 39a81b032c..9b2a9d1909 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12487/b12487.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12487/b12487.ilproj
index ab23d3bb97..6273960c7c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12487/b12487.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12487/b12487.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b12487.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj
index 39d2f46f90..352cda3595 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12795/b12795.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12795/b12795.csproj
index 1ebb32fb97..3a15373bd6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12795/b12795.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12795/b12795.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13509/b13509.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13509/b13509.ilproj
index 85f4f264ce..dd37d61607 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13509/b13509.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13509/b13509.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b13509.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13522/b13522.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13522/b13522.ilproj
index d3fc48ffe6..2c8f88f068 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13522/b13522.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13522/b13522.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b13522.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj
index 9ce80d499a..b7bbc9f3b0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13586/b13586.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13586/b13586.ilproj
index b5ddb7cb61..4859a4c312 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13586/b13586.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13586/b13586.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b13586.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13738/b13738.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13738/b13738.ilproj
index 6281d28f07..fb3f03b4a5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13738/b13738.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13738/b13738.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b13738.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.csproj
index dc37810575..3a5dac9989 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067a.ilproj
index e4cde58d82..5d023c7903 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067a.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14067a.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067b.ilproj
index 169e50c1d0..7e3f6004d1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14067/b14067b.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14067b.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14068/b14068.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14068/b14068.ilproj
index 8aa8130ea2..fac9cedb29 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14068/b14068.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14068/b14068.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14068.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14070/b14070.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14070/b14070.ilproj
index 12ff12632b..98529eec00 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14070/b14070.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14070/b14070.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14070.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.csproj
index 64141d1c6f..20985d1333 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14135/b14135.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14135/b14135.ilproj
index 41703551d3..e7741c6328 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14135/b14135.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14135/b14135.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14135.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14197/b14197.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14197/b14197.ilproj
index c57dcb682c..e1455a00fb 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14197/b14197.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14197/b14197.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14197.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14199/b14199.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14199/b14199.ilproj
index 61da7c25ce..708135701a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14199/b14199.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14199/b14199.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14199.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14202/b14202.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14202/b14202.ilproj
index 852aea9cf6..5830fbb513 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14202/b14202.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14202/b14202.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14202.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14264/b14264.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14264/b14264.ilproj
index 3aec5521b5..1f12137710 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14264/b14264.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14264/b14264.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14264.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14294/b14294.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14294/b14294.ilproj
index c72f148a07..68ac056822 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14294/b14294.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14294/b14294.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14294.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14325/b14325.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14325/b14325.ilproj
index 07bf13bbec..23c2310619 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14325/b14325.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14325/b14325.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14325.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14326/b14326.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14326/b14326.ilproj
index 20d6006b2b..623cf3cebd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14326/b14326.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14326/b14326.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14326.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14329/b14329.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14329/b14329.ilproj
index e47303b4de..77f5d1403e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14329/b14329.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14329/b14329.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14329.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14350/b14350.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14350/b14350.ilproj
index 27b605953e..f56df2e78c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14350/b14350.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14350/b14350.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14350.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14431/b14431.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14431/b14431.ilproj
index eb30d3873c..2808e67148 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14431/b14431.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14431/b14431.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14431.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14591/b14591.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14591/b14591.ilproj
index da426f3f2d..e2e13748db 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14591/b14591.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14591/b14591.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14591.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj
index 444fde05b6..99264b61f0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14769/b14769.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14769/b14769.ilproj
index ad035d8412..0fb20babf9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14769/b14769.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14769/b14769.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14769.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14770/b14770.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14770/b14770.ilproj
index b5bebc71c4..4491387f4d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14770/b14770.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14770/b14770.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14770.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14777/b14777.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14777/b14777.ilproj
index 3aa0936dc8..d07f5cf61b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14777/b14777.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14777/b14777.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14777.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14927/b14927.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14927/b14927.ilproj
index b428094d56..9602c2e368 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14927/b14927.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14927/b14927.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14927.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14928/b14928.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14928/b14928.ilproj
index 84fc4744d5..e58602d77d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14928/b14928.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14928/b14928.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14928.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15203/b15203.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15203/b15203.csproj
index 9a9e4cd75c..e88b00a0fe 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15203/b15203.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15203/b15203.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15222/b15222.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15222/b15222.ilproj
index 929b9ee6d3..16e17fae6e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15222/b15222.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15222/b15222.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b15222.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15244/b15244.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15244/b15244.ilproj
index c5c472a378..e5fa6884c5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15244/b15244.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15244/b15244.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b15244.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15299/b15299.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15299/b15299.ilproj
index cc53e6b407..54d3ba5074 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15299/b15299.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15299/b15299.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b15299.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj
index cc23a2504e..59b47cdfb6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.ilproj
index 5a9c6098ba..aaac88663e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16039/b16039.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16039.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16049/b16049.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16049/b16049.ilproj
index 4eabf518e0..f0ac47854b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16049/b16049.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16049/b16049.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16049.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16071/b16071.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16071/b16071.ilproj
index c0eda6a33b..9eebdb17b7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16071/b16071.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16071/b16071.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16071.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj
index 87ee2587b3..7b005205e0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16295/b16295.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16295/b16295.ilproj
index d535284970..dccffb4997 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16295/b16295.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16295/b16295.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16295.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj
index 30ffdadb9f..5d244f97bd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj
index 185ae01e35..005730378b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.csproj
index 59a6f1452d..600318ca71 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj
index 748663dc30..a2b881318f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16498/b16498.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16498/b16498.ilproj
index 19a850e7d7..8858f37fc0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16498/b16498.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16498/b16498.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16498.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499a.ilproj
index 2305d0f8b7..345c9f8fcc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499a.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16499a.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499b.ilproj
index 28723393d7..bcd9a51f7c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16499/b16499b.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16499b.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16500/b16500.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16500/b16500.ilproj
index 068e3b02ce..dc550efe04 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16500/b16500.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16500/b16500.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16500.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16503/b16503.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16503/b16503.ilproj
index 66daa242c8..26d34d8c27 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16503/b16503.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16503/b16503.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16503.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16554/b16554.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16554/b16554.ilproj
index 09390da6d6..ad86a924e3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16554/b16554.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16554/b16554.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16554.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881a.ilproj
index d7e79eeec0..897fb0b85b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881a.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16881a.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881b.ilproj
index 7956882285..ff53fde71b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16881/b16881b.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16881b.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16886/b16886.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16886/b16886.ilproj
index c4f12ec1b4..a5318cbcac 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16886/b16886.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16886/b16886.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16886.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16895/b16895.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16895/b16895.ilproj
index ac56124a3c..e978fb48dc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16895/b16895.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16895/b16895.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16895.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16896/b16896.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16896/b16896.ilproj
index a4aca434e0..a25d74b5a6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16896/b16896.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16896/b16896.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16896.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16922/b16922.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16922/b16922.ilproj
index 63fdd0feb2..a96cc3d9b9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16922/b16922.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16922/b16922.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16922.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16928/b16928.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16928/b16928.ilproj
index 32a38bb213..5cae47ce48 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16928/b16928.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16928/b16928.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16928.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b18852/b18852.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b18852/b18852.ilproj
index f012204ba9..f4bd49ea68 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b18852/b18852.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b18852/b18852.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b18852.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20079/b20079.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20079/b20079.ilproj
index beff9485c0..94ea43637f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20079/b20079.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20079/b20079.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b20079.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20217/b20217.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20217/b20217.ilproj
index afa60664b6..a2181bcdcd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20217/b20217.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20217/b20217.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b20217.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20249/b20249.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20249/b20249.ilproj
index 88e7d56e1c..406519533e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20249/b20249.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20249/b20249.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b20249.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj
index f8bcaaf906..e05411a9f8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj
index f04c333621..9a4b843cc9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj
index 114eb8dd8c..e461ce19c6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj
index 9d2c3ce249..5f2837e2d8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25458/b25458.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25458/b25458.ilproj
index 43e0407488..9a06145d4e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25458/b25458.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25458/b25458.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25458.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25459/b25459.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25459/b25459.ilproj
index 708e272310..cbed765eb9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25459/b25459.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25459/b25459.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25459.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25463/b25463.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25463/b25463.ilproj
index f065b3f4a9..a1a49e920c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25463/b25463.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25463/b25463.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25463.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25468/b25468.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25468/b25468.ilproj
index 2dce18e122..ece72c8977 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25468/b25468.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25468/b25468.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25468-ia64.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25474/b25474.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25474/b25474.ilproj
index 0b155fc1fe..c364c7caa3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25474/b25474.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25474/b25474.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25474.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25491/b25491.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25491/b25491.ilproj
index 7b86073e3a..ecb0aada43 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25491/b25491.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25491/b25491.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25491.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25507/b25507.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25507/b25507.ilproj
index 007f68ea70..5ad4f09001 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25507/b25507.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25507/b25507.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25507.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj
index 5d6cfd1ae8..7becd7575c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25701/b25701.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25701/b25701.ilproj
index 1384e5a0af..9c1e64af66 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25701/b25701.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25701/b25701.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25701-ia64.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25739/b25739.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25739/b25739.ilproj
index f22af22c30..5b845fd8a9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25739/b25739.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25739/b25739.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25739.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25813/b25813.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25813/b25813.ilproj
index 8a5d8fb1fa..cfbd1d9b99 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25813/b25813.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25813/b25813.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25813.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25815/b25815.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25815/b25815.ilproj
index f524b7e956..80101747c3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25815/b25815.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25815/b25815.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25815.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25833/b25833.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25833/b25833.ilproj
index ad68f5f806..bdbdd6e9af 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25833/b25833.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25833/b25833.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25833.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25835/b25835.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25835/b25835.ilproj
index fc3c53a0d1..3bbd1541c8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25835/b25835.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25835/b25835.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b25835.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25882/b25882.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25882/b25882.csproj
index 91043ef9d0..ab4e3dd71b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25882/b25882.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25882/b25882.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26020/b26020.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26020/b26020.ilproj
index 17e8e14e4f..9c3020ebbd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26020/b26020.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26020/b26020.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b26020.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26153/b26153.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26153/b26153.ilproj
index bad9a0c097..40426061d2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26153/b26153.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26153/b26153.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b26153.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26155/b26155.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26155/b26155.ilproj
index 98a64e125d..2d96830158 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26155/b26155.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26155/b26155.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b26155.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj
index 07a7a193bf..2495b4c70a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj
index 60c3499f1b..493f088e65 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26332/b26332.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26332/b26332.ilproj
index 32e35e1878..1153685219 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26332/b26332.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26332/b26332.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b26332.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26512/b26512.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26512/b26512.ilproj
index d89c8d4a58..8c8a653e86 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26512/b26512.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26512/b26512.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b26512.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj
index ff1c2c9801..1a13cd2a0a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj
index 8e1e820910..c428b28e56 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj
index 724413e8e6..a107848acd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26748/b26748.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26748/b26748.ilproj
index 9290f820ac..7de4a28b21 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26748/b26748.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26748/b26748.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b26748.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj
index 946a6ab0da..4ad33ae3e8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26888/b26888.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26888/b26888.ilproj
index b185786281..897c8f30d8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26888/b26888.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26888/b26888.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b26888.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26957/b26957.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26957/b26957.ilproj
index dedcd3509c..ccd257745e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26957/b26957.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26957/b26957.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b26957.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27535/b27535.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27535/b27535.ilproj
index effc74e7b3..7334e8f268 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27535/b27535.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27535/b27535.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b27535.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27538/b27538.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27538/b27538.ilproj
index 02ea3044da..66ef3d3d6e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27538/b27538.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27538/b27538.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b27538.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27564/b27564.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27564/b27564.ilproj
index 6e7f4b9975..ea42e8565b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27564/b27564.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27564/b27564.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b27564.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27657/b27657.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27657/b27657.ilproj
index d4e291b25f..054a140744 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27657/b27657.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27657/b27657.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b27657.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27658/b27658.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27658/b27658.ilproj
index 8406c61e13..88cefc5c0b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27658/b27658.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27658/b27658.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b27658.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj
index 300e4e886e..10b5fe32af 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj
index b74e4f1086..61d72d12e3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj
index ed876566e3..5d3da88253 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27880/b27880.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27880/b27880.ilproj
index b168fd0ad0..8295bd8d95 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27880/b27880.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27880/b27880.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b27880.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27883/b27883.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27883/b27883.ilproj
index 88dd2f0899..9332a7ac6e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27883/b27883.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27883/b27883.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b27883.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27917/b27917.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27917/b27917.ilproj
index 33a2255e37..77d6e0a476 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27917/b27917.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27917/b27917.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b27917.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj
index 83f946f666..e0dfb7b1e9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj
index 1dbc782486..65bc64bca8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28080/b28080.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28080/b28080.ilproj
index 3c514f326b..cc7aa014ef 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28080/b28080.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28080/b28080.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b28080.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28522/b28522.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28522/b28522.ilproj
index 819551e4d9..081139382c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28522/b28522.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28522/b28522.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b28522.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28594/b28594.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28594/b28594.ilproj
index 4cb98225cf..ce139fbb35 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28594/b28594.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28594/b28594.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b28594.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28595/b28595.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28595/b28595.ilproj
index 1e1ddfa351..ff74de1231 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28595/b28595.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28595/b28595.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b28595.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28596/b28596.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28596/b28596.ilproj
index df1373d76d..ac7adf1fee 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28596/b28596.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28596/b28596.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b28596.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28597/b28597.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28597/b28597.ilproj
index 6a5d773860..0ebea59f43 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28597/b28597.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28597/b28597.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b28597.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj
index 457099bddf..7078852197 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj
index 425bfb6980..8d2c27f148 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj
index f03126762f..2d38d8e3fe 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28805/b28805.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28805/b28805.ilproj
index 812765dfdc..d9adb466e3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28805/b28805.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28805/b28805.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b28805.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28806/b28806.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28806/b28806.ilproj
index 39cb46137a..3804656b60 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28806/b28806.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28806/b28806.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b28806.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj
index 1472e1de45..f7d8ffbad7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28901/b28901.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b28901.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28927/b28927.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28927/b28927.ilproj
index 7b24c559e9..6f95afdce5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28927/b28927.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28927/b28927.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b28927.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29068/b29068.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29068/b29068.csproj
index 92ea3aee9c..0da72acc1b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29068/b29068.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29068/b29068.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.csproj
index 7b6b8f4db9..8680694d7a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.ilproj
index 20116d6cea..93d4e377b0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29583/b29583.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b29583.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.ilproj
index 69f009f64d..553b59b5f4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30125/b30125.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b30125.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj
index 4990397431..272873c067 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj
index 4c24c770d4..8fd27d2b1d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj
index f4d50ce388..0227444cb8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30792/b30792.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30792/b30792.ilproj
index b30238b7a2..9b219697fd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30792/b30792.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30792/b30792.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b30792.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30799/b30799.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30799/b30799.ilproj
index 345d8ec793..5f4d260652 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30799/b30799.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30799/b30799.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b30799.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj
index f475ceb2aa..010d2b3703 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30838/b30838.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b30838.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.ilproj
index 38306b3e7c..1a28d97265 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30862/b30862.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b30862.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj
index abb4a75e1a..17d581332a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30864/b30864.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b30864.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30869/b30869.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30869/b30869.ilproj
index 03989d6f3a..0e658fc68f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30869/b30869.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30869/b30869.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b30869.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.ilproj
index fbec20ea2b..03e8859dbe 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30892/b30892.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b30892.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30905/b30905.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30905/b30905.ilproj
index 9b238b1918..70d93c7e47 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30905/b30905.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30905/b30905.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.ilproj
index e2ac5f8204..36fdbf74f2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31102/b31102.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31102.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.csproj
index b0c779e915..b577011f6c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.ilproj
index 84a1129a7e..11d06697bd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31273/b31273.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31273.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.ilproj
index f0ef4e4e4b..c4df80e7fe 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31321/b31321.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31321.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.ilproj
index a009ade9cb..cd1b761031 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31343/b31343.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31343.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.ilproj
index cf9f28ad5b..75b0183bdc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31448/b31448.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31448.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj
index 68352fd398..1bddcdfbd0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj
index 938e574e56..c87ceac7bb 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj
index b1346c521c..9aec3061e6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj
index 9e3d486052..312beacd76 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj
index c9ed741756..0315f7a93c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.ilproj
index 358df28a81..ce3ca6e3d2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32093/b32093.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b32093.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj
index 97527665da..5d8bad0f9a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj
index a5f61bc40f..56ed628959 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj
index 41b4f4b475..929403e21c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32374/b32374.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b32374.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551a.ilproj
index a73ffcf741..69588896e3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551a.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b32551a.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551b.ilproj
index 2ba3c5c1b9..a8ecd7d39b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32551/b32551b.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b32551b.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj
index 00cba27458..a0b5beba40 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj
index 2ea2c59bdd..4637dfa768 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32879/b32879.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32879/b32879.ilproj
index a173f1f63f..eac61f8713 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32879/b32879.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32879/b32879.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.ilproj
index 0f6393f694..2f7359b428 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b34423/b34423.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b34423.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj
index 1e068c8fa3..85ca00615d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj
index a7d162eb25..b86b9a2a1a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.csproj
index 4ea5d44dee..37cf02b88a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj
index 3aca4fec02..85f9f29db4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.csproj
index 2681c19e4b..71268163f6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj
index d9720bb7ce..21d5dd7e4d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj
index bc5cf3adad..286c79ee07 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.csproj
index 0d2d3449f4..a534e59a27 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj
index cbc0dc3a69..b0f0a5390e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj
index 73ac65c242..3f5a9f7610 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.csproj
index bb196026d6..4bde14e0c7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj
index 0ba319d2b4..105349285f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj
index f52c361f06..2495dece0b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj
index b78982838e..0a824b9c19 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj
index 74cabb8609..e9c04491b5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj
index 2f3c648982..358325d7c6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.csproj
index 62a938e5e6..3e40daf4e0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj
index 13dd352a68..ec3e762d84 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj
index 685c301331..cead30a01a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj
index 0f6b06754e..615723c613 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj
index 201adc8666..5b5b76835b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.csproj
index debf8b48c2..a171ea10cc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj
index 047444520b..8e9dafeeea 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.csproj
index 99001653cf..87938d83e9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj
index aecc56e049..a85e60d7f1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj
index 6e0b8dadf1..66ff00067f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj
index 2cf6c123f1..35272b9e56 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj
index 3e4acf303d..811d2c7466 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj
index eb604c6f7b..3700157142 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj
index 1135803833..aecb672f13 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16054/b16054.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16054/b16054.ilproj
index 8bf2819b61..625bd93883 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16054/b16054.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16054/b16054.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
index bb5d92cb52..19d154effa 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj
index ea8a88f228..68791994cc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02043/b02043.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02043/b02043.ilproj
index ce35fd0ae1..f4c5c487e2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02043/b02043.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02043/b02043.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b02043.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj
index b092b50942..ddefc553e1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02062/b02062.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02062/b02062.ilproj
index 4d085e4582..40cc5e6dcf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02062/b02062.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02062/b02062.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b02062.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj
index ead60eb8c0..c63ead1556 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02352/b02352.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02352/b02352.csproj
index 79198209b1..c6216e606f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02352/b02352.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02352/b02352.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b03995/b03995.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b03995/b03995.ilproj
index bbd58c1efe..6e64ff8e04 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b03995/b03995.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b03995/b03995.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b03995.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04083/b04083.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04083/b04083.ilproj
index fde245177d..5ded364030 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04083/b04083.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04083/b04083.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04083.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04250/b04250.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04250/b04250.ilproj
index 3d5c69db8b..435eec662c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04250/b04250.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04250/b04250.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04250.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04257/b04257.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04257/b04257.ilproj
index 625a12f0ea..02a2377311 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04257/b04257.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04257/b04257.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04257.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04306/b04306.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04306/b04306.ilproj
index 8db210d1fe..0c8859bae0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04306/b04306.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04306/b04306.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04306.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj
index 730b02babb..a009a89710 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="B04345.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04384/b04384.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04384/b04384.ilproj
index afa6bc5265..ae1b2e70b0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04384/b04384.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04384/b04384.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04384.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04538/b04538.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04538/b04538.ilproj
index 23a8004689..f3ad101166 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04538/b04538.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04538/b04538.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04538.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04574/b04574.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04574/b04574.ilproj
index 4bfbe9c00c..7e7f7b7e4e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04574/b04574.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04574/b04574.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04574.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04583/b04583.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04583/b04583.ilproj
index e9f7634093..317d745337 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04583/b04583.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04583/b04583.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04583.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04612/b04612.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04612/b04612.ilproj
index 6600fc0699..1807516d57 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04612/b04612.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04612/b04612.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04612.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04639/b04639.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04639/b04639.ilproj
index 3d2b6e9d22..bd890adea8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04639/b04639.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04639/b04639.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04639.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04726/b04726.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04726/b04726.ilproj
index e4c582b2b9..47c6036bb1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04726/b04726.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04726/b04726.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04726.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.csproj
index dfe15fa257..3e1cd0554e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05214/b05214.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05214/b05214.ilproj
index 413902b161..1b9e69462b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05214/b05214.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05214/b05214.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05214.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj
index 49b9d9c32e..aabe3abaaf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05617/b05617.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05617/b05617.ilproj
index 6471d59872..b861147176 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05617/b05617.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05617/b05617.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05617.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05619/b05619.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05619/b05619.ilproj
index ff4da0594d..c7d1f90310 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05619/b05619.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05619/b05619.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05619.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05621/b05621.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05621/b05621.ilproj
index 2890e0fbe6..667961f36a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05621/b05621.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05621/b05621.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05621.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05622/b05622.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05622/b05622.ilproj
index e8b67ff131..5b6cfea95a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05622/b05622.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05622/b05622.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05622.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05637/b05637.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05637/b05637.ilproj
index 77743c27a2..183a9bdcca 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05637/b05637.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05637/b05637.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05637.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05639/b05639.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05639/b05639.ilproj
index 9e24847b74..5f0212131a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05639/b05639.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05639/b05639.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05639.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05737/b05737.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05737/b05737.ilproj
index ec5ed8d4a8..e52986d6fa 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05737/b05737.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05737/b05737.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05737.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05740/b05740.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05740/b05740.ilproj
index 7b0823590b..9d398e3599 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05740/b05740.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05740/b05740.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05740.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05773/b05773.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05773/b05773.ilproj
index 493ac7a848..9a189bd390 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05773/b05773.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05773/b05773.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05773.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05780/b05780.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05780/b05780.ilproj
index 73febbdac1..7ce2bc3683 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05780/b05780.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05780/b05780.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05780.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05784/b05784.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05784/b05784.ilproj
index 5db98b9607..64436a7cab 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05784/b05784.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05784/b05784.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05784.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05933/b05933.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05933/b05933.ilproj
index 92d5c9b542..37521dd8c9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05933/b05933.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05933/b05933.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b05933.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06436/b06436.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06436/b06436.ilproj
index c4d9e39b5f..d8b242a5ed 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06436/b06436.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06436/b06436.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b06436.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj
index e534629219..43ec61ea4a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06595/b06595.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06595/b06595.ilproj
index 9250e0c3a4..4fdebefa68 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06595/b06595.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06595/b06595.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b06595.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj
index 718a1bdfa8..a2bc52b98b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06730/b06730.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06730/b06730.ilproj
index ef77295ec5..059e2b2829 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06730/b06730.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06730/b06730.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b06730.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06754/b06754.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06754/b06754.ilproj
index 24db9c8bfb..f9a27195c4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06754/b06754.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06754/b06754.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b06754.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06811/b06811.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06811/b06811.csproj
index ed01811176..f6b69fd089 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06811/b06811.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06811/b06811.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06812/b06812.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06812/b06812.csproj
index 892fa1b03a..fa9905119b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06812/b06812.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06812/b06812.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj
index 759d5a416f..ad7c7b4ce7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj
index dd5551d772..25ce27f62f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07082/b07082.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07082/b07082.ilproj
index d9d4dcee2d..a08ba0206e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07082/b07082.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07082/b07082.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b07082.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07411/b07411.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07411/b07411.ilproj
index 1ae8787035..95eb8f06b9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07411/b07411.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07411/b07411.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b07411.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07458/b07458.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07458/b07458.ilproj
index e845c6a04c..89304c356a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07458/b07458.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07458/b07458.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b07458.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj
index 0250ecdc5c..2db33375d2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07704/b07704.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07704/b07704.ilproj
index 24872ff9b9..0da0e3c8c0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07704/b07704.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07704/b07704.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b07704.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08109/b08109.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08109/b08109.ilproj
index 03c995a05f..a89cfce9b3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08109/b08109.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08109/b08109.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b08109.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.csproj
index eb5547a784..35c7c51255 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08672/b08672.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08672/b08672.ilproj
index 9ff4d172fb..6159c3d2a4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08672/b08672.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08672/b08672.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b08672.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08797/b08797.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08797/b08797.ilproj
index 81817736bd..787490610a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08797/b08797.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08797/b08797.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b08797.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj
index 5289dcc1ca..3ee8d8a22c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj
index 0cd8ef1ec1..755d0f4f5b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.csproj
index 64a883f145..85c1dc1772 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09254/b09254.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09254/b09254.ilproj
index 52547ed7f3..863b7a9682 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09254/b09254.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09254/b09254.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b09254.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj
index c20a77dd2d..c499c2015d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj
index 2a50beeace..82cb325042 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj
index a8a6aa98b8..5851b755f8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj
index 744f27afc9..8e38af7192 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b27873/b27873.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b27873/b27873.ilproj
index 0b696b455d..38b8c94f09 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b27873/b27873.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b27873/b27873.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b27873.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.ilproj
index 673b258e89..d0a43f5878 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b29351/b29351.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b29351.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj
index 6ec0f93140..b6916c528b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj
index 45738e4d21..ffebd29bd7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.ilproj
index e3f8c887f2..af14c2c0ea 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33759/b33759.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33759.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.ilproj
index 9b41f8fbc8..9e8ca3dc8d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33792/b33792.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33792.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.ilproj
index 945822bbb4..e484813360 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33888/b33888.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33888.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.ilproj
index f876f843d3..6c255f3541 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33922/b33922.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33922.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.ilproj
index f5f54f180f..a2cf3f99b0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b33928/b33928.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33928.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj
index fc19084f43..ccddefba6e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj
index 9dbec8430b..a4eda9734b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b35784/b35784.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b35784.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.ilproj
index 9d3c75d801..88a7813b66 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36030/b36030.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b36030.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj
index 9d5c6f1e55..ea1be30337 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj
index 76422312f3..924a1fe990 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj
index 62f114c844..76037503f0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj
index 41f6ebc2e0..93a0a3d16c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
index d58e6066a6..b769cfbc99 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj
index f2ab022d08..dff71905bf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
index 8e94102b11..b14cde9ae5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj
index a9b0808ec3..e03a337b77 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj
index 4917cff723..5e3ec6eaa6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj
index e7ec6fe769..3f83d5b770 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj
index db57d0fc39..c08a28bd18 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj
index 99a09a23d3..29743f9657 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj
index 87d8049822..8991139603 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.ilproj
index f3716e9cbf..d955d2b8a5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39381/b39381.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b39381.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.ilproj
index 2304f8b200..5588a3faee 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39397/b39397.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b39397.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.ilproj
index 7926157d04..7dd5fd1c0f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39417/b39417.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b39417.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.ilproj
index 4154c10dee..4cc4ee6f1e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39455/b39455.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b39455.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.ilproj
index bcf72a35d8..4944e63d38 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b39946.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj
index bf46a9ba8e..f58274e3d6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj
index a27ab9cfa2..5002789d0e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.ilproj
index ee3dacc965..d5914b9deb 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40174/b40174.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b40174.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.ilproj
index 1c1140dfff..1c242463fa 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40199/b40199.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b40199.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj
index 03c1b1592f..f32297627f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj
index ed83ac38d8..3687c87a70 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.ilproj
index 7cae76d772..1174bfb8a1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40269/b40269.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b40269.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.ilproj
index 1a392d9bd0..40c27f4305 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40347/b40347.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b40347.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.ilproj
index 35d48cbb79..fb523b7884 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40380/b40380.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b40380.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.ilproj
index 7046bf892c..b32e232248 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40411/b40411.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b40411.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj
index 4cbbcfe93a..6345069605 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj
index f337a466a6..cba64d2380 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.ilproj
index 8acaa5e035..dce557cb8e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40721/b40721.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b40721.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.ilproj
index 4d57defc42..4ec291be4a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40725/b40725.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b40725.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.ilproj
index df2b983cd1..bd63407db9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41002/b41002.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b41002.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj
index 1ec26bc1c0..b9cc184e1c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.ilproj
index b774a96850..6e1dc4e25a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41126/b41126.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b41126.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.ilproj
index 1b0eb6db2f..6acde761b3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41129/b41129.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b41129.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.ilproj
index 01f0e9e34b..353a6fe3c0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41149/b41149.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b41149.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.ilproj
index f9e1aae2a4..837c01edac 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41164/b41164.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b41164.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj
index b7ff07a536..ca09cf6e05 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41262/b41262.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41262/b41262.ilproj
index 87123d89db..11a2c572fc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41262/b41262.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41262/b41262.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b41262.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.ilproj
index 0cc8af1324..1b4648834a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41278/b41278.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b41278.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj
index fc6645284f..f383394c9d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj
index 61383a811f..4d2214769c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj
index 4b57752a85..aaeebfd513 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj
index 65147297f4..851eeb3a85 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj
index 2076721785..fd01c7efa1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.ilproj
index 98fe8282fa..a2ed1d90c1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41627/b41627.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b41627.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj
index be71af58c4..05fa9a20a9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.csproj
index 63448c2d70..1a057219a6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj
index 3044ac1cfd..3ca7de8196 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj
index 35856f99fd..a748c1e50b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.ilproj
index 835d0ee939..ec4606cb20 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42387/b42387.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b42387.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.ilproj
index cbd58c8fdd..c5f3b674b0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42732/b42732.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b42732.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj
index 2dac67975b..ecdb68438a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj
index b67604dd65..880afb8dff 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj
index 263440f872..35ba797e75 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.ilproj
index a015822fde..95abd7ff32 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43033/b43033.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b43033.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.ilproj
index db7f42b3d7..fa69dc103e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43040/b43040.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b43040.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.ilproj
index e4092c8f7e..afca0dcaeb 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43069/b43069.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b43069.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.ilproj
index ab5867dd75..faa6494b8d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43115/b43115.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b43115.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.ilproj
index d08e21317f..94baa65d51 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43121/b43121.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b43121.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.ilproj
index 39c9bb9a49..5f81bd4bb1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43160/b43160.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b43160.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj
index c2e94b7a49..80482ccc70 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj
index a44be7447a..110bb42798 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.ilproj
index 6407fa933e..685b14e78f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43378/b43378.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b43378.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.ilproj
index 09c0a1c081..2fe7a181b4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43714/b43714.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b43714.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj
index ea2dfa9be5..b343899604 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj
index 7a7b3c5f35..0ddf0384a6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.ilproj
index f40fd68d15..a474663497 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43963/b43963.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b43963.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.ilproj
index 98168b01c0..72cafdc371 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43994/b43994.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b43994.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.ilproj
index 2dd77fc712..f297d896c1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44020/b44020.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44020.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj
index e3f7d3b2b2..53d9bf53f1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.ilproj
index 441fa256fe..83870a43cf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44204/b44204.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44204.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.ilproj
index 002fe58614..662b0c8803 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44224/b44224.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44224.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj
index 990c320e32..91f9afaca2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj
index 82c1b71e5e..9df58a7707 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.ilproj
index 67abfb37d7..464c3fa042 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44657/b44657.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44657.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.ilproj
index 01e4b0e00f..6f723aaf5f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44723/b44723.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44723.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.ilproj
index 7611aa435e..d9ee1a8650 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44724/b44724.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44724.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.ilproj
index af58361a1b..b7d4eb4514 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44861/b44861.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44861.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.ilproj
index d65ff0ef58..ea53100171 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44879/b44879.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44879.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.ilproj
index 50ac7f3b15..7462c3f51e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44946/b44946.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44946.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.ilproj
index 420fd4cb12..d12c5e5e58 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44983/b44983.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44983.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.ilproj
index 20637e319d..1bf30a3c58 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44984/b44984.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44984.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.ilproj
index 7c876fe7bb..33d9b48aaa 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44985/b44985.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b44985.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj
index 8c990bc9fb..1f359708db 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj
index ad181bf495..fe681f9798 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj
index 55c04fe70e..33c0d44831 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.ilproj
index b6e24f2f5e..946d8c75ee 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45439/b45439.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b45439.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj
index 3101a4d43c..089eb282dd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj
index 7be35c06d1..43a58c1411 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.ilproj
index bc6a6c5231..c5237a4d96 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45541/b45541.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b45541.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.ilproj
index 6537bea719..474141fa2d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45956/b45956.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b45956.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.ilproj
index 0404fdbd51..5dde54d5da 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45984/b45984.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b45984.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.ilproj
index 2ba8704a9a..215080ebed 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45985/b45985.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b45985.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj
index b8e30dd5b9..4820575779 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.ilproj
index 37550f3d08..45cc8b7009 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46292/b46292.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b46292.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.ilproj
index c957ba605c..92e2a78554 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46569/b46569.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b46569.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.ilproj
index 8ed99749f5..085bf012a9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46576/b46576.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b46576.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.ilproj
index 009a9989ed..30af30227a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46583/b46583.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b46583.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj
index df369dfcbb..5e6e28ed92 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj
index dfd49d8034..5bedc1fe9e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj
index d2f1986ed9..9ab6110699 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
index e3c110dced..ebcfdc554a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.ilproj
index 96c6479f3a..bb6e85749a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46897/b46897.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b46897.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.ilproj
index 3dcd54b271..fec20a47af 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47022/b47022.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b47022.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj
index dece3c84ee..4816ec28b6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080.ilproj
index ddc1121ed5..6f7ec24ba0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47080/b47080.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b47080-ia64.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.ilproj
index 0adfeb0567..5d2581a9fc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47093/b47093.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b47093.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.ilproj
index c1fbc8e636..c200eccbb8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47610/b47610.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b47610.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.ilproj
index a255aaf460..1b88bcfc69 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47885/b47885.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b47885.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.ilproj
index 61a4fbd014..ff9e2b827a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47906/b47906.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b47906.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj
index 205d11c872..2952926206 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.ilproj
index 69af84f682..5887e68b58 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48350/b48350.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b48350.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554a.ilproj
index 678e774274..88d993058c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554a.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b48554a.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554b.ilproj
index 1ddc4e820c..832746117b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48554/b48554b.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b48554b.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.ilproj
index ed9edc7de1..b399d7f34b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48614/b48614.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b48614.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj
index 9658a8d2db..6ee816a4d3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj
index 79a6407e59..7ee0c71cb1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj
index 66bd5c9ac1..5e0669ea3a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj
index 9a069e6cb4..450186d2a1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj
index e643e88ba8..a24f8147d4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj
index 5a106f8e8d..29b08fc428 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.ilproj
index 9afaabed16..01b33f43fa 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49101/b49101.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b49101.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj
index 339877f829..71f95747de 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj
index 8daa32415a..fd82a1a8d9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj
index 09b66a04ed..8d03e54e1e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj
index 8e55896e19..e77ba49502 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.ilproj
index 8ca8c33a89..e60fdb23b5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49984/b49984.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b49984.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.csproj
index 88f85322fb..960c7f0762 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b16122/b16122.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b16122/b16122.ilproj
index aa165cc35a..ff30153e41 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b16122/b16122.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b16122/b16122.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b16122.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b18857/b18857.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b18857/b18857.ilproj
index b25862bcf2..72e8da05ee 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b18857/b18857.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b18857/b18857.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b18857.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28598/b28598.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28598/b28598.ilproj
index 48b5e2cb71..6369242ced 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28598/b28598.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b28598/b28598.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b28598.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.ilproj
index c339ca39a4..a6029b154f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b30868/b30868.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b30868.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj
index 463fb64171..8d34b89b00 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.ilproj
index 852756a71d..599b009554 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31283/b31283.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31283.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.ilproj
index 9f6b57d476..adc8e42e22 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31289/b31289.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31289.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.ilproj
index 8fdbe3762e..b947de35a5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31292/b31292.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31292.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.ilproj
index 3586a63893..74b89d7086 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31423/b31423.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31423.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.ilproj
index 5ca192357e..d11f9ba9e9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31452/b31452.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31452.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.ilproj
index 323e2a7b56..58760416ab 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31493/b31493.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31493.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.ilproj
index 9f9fe13862..2d35efc1d7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31547/b31547.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31547.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
index 23b8e0b31a..1c0ae4ef71 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj
index b1b4fa665f..986dcbf238 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj
index 70176675b9..46abab12f7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.ilproj
index 091d9ab214..77d5bd0adf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31780/b31780.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31780.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.ilproj
index 401ad1f0cb..1f76cfaf70 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31784/b31784.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b31784.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj
index 7ac21fc649..a01b82b05b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj
index 263f1a2849..3efd2ae147 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32613/b32613.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32613/b32613.ilproj
index 6a8a01ec3a..a74e219fbd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32613/b32613.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32613/b32613.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b32613.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.ilproj
index 616abe437b..852681a8cf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b32614/b32614.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b32614.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.ilproj
index a6583f0baa..44e75bfae9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33125/b33125.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33125.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.ilproj
index 225cc8f38a..1e89783d8d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33131/b33131.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33131.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.ilproj
index a7251a0b56..7f66ed3a9b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33135/b33135.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33135.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.ilproj
index 983b7e80e4..8fb41681be 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33335/b33335.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33335.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.ilproj
index 1001ee3055..999c196024 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33361/b33361.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33361.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.ilproj
index e83b5e444c..4ec32cdd55 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33362/b33362.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33362.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.ilproj
index 4886601fa3..b1706a4edc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33388/b33388.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33388.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.ilproj
index 0bcb8ea32d..784ceb98c3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33585/b33585.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33585.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.ilproj
index 58035d73f6..f960f34c5d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b33586/b33586.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b33586.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.ilproj
index 2e04246da2..3220e77218 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34951/b34951.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b34951.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.ilproj
index 2cfcac2721..068bbad158 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34952/b34952.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b34952.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.ilproj
index f4ae77c16b..a05722af45 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b34953/b34953.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b34953.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.ilproj
index 2acb75a95a..9dcde0ecec 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35315/b35315.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b35315.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.ilproj
index 9dea33c691..381351fdff 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35344/b35344.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b35344.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.ilproj
index c1bf1b5b2a..3c3b009706 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35348/b35348.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b35348.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.ilproj
index 2908c30e5f..0fd99d5c66 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35351/b35351.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b35351.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.ilproj
index 6ba7d283d6..5087fc7ad4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35354/b35354.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b35354.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.ilproj
index a78586b030..f54ec928f3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35366/b35366.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b35366.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.ilproj
index 3aac200aa1..a18e9a1f62 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35486/b35486.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b35486.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.ilproj
index 20d19b2d19..e1282805ff 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35635/b35635.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b35635.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.ilproj
index 439c068a38..2316ae985d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b35779/b35779.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b35779.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.ilproj
index c480d80666..a4c7ccfc7c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36301/b36301.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b36301.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.ilproj
index 299f590efd..1fdc790503 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36302/b36302.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b36302.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.ilproj
index e0a30e3c94..25f37aa161 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36304/b36304.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b36304.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.ilproj
index e7fb4927a1..f3746992e2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b36975/b36975.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b36975.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.ilproj
index 3027784dfe..13a440f25e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37214/b37214.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b37214.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.ilproj
index 1f4e432fe8..5435175e05 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37215/b37215.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b37215.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.ilproj
index 0b591cb25d..dc4e7f9925 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37238/b37238.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b37238.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.ilproj
index 0de2695e69..8978a83e46 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37256/b37256.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b37256.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.ilproj
index 61609b7f13..5f32530b92 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37578/b37578.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b37578.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj
index 8e26b47df3..78621330d6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.ilproj
index 7e58089c5e..52ac3bbb1e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37830/b37830.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b37830.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj
index 5d774c87fc..81a5f3a7ca 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.ilproj
index 23ed0a605d..ed24088804 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40006/b40006.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b40006.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40347/b40347.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40347/b40347.ilproj
index 1a392d9bd0..40c27f4305 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40347/b40347.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b40347/b40347.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b40347.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj
index c1c9e78860..def5dc7f5f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.ilproj
index 7df5b90d16..8f80a5b961 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.ilproj
index db8dc9d9a7..b5c72e3987 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b46566/b46566.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b46566/b46566.ilproj
index abdc672533..04e3cfee1e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b46566/b46566.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b46566/b46566.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b46566.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.ilproj
index 8c8694b6d3..a5595b5d86 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47471/b47471.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b47471.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.ilproj
index dd47c6b1df..ad03e1ec7c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47886/b47886.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b47886.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj
index 3c20f80600..4287c08632 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj
index e2ae545e34..d6bdfdc2a7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.ilproj
index 5089591837..88078b6137 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49104/b49104.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b49104.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49142/b49142.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49142/b49142.ilproj
index 19260ff814..684284374b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49142/b49142.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49142/b49142.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b49142.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.ilproj
index 535d910586..ee26ea8849 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49335/b49335.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b49335.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435.ilproj
index d16ba169c0..6ec77eb093 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49435/b49435.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b49435-ia64.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj
index cbae371ed8..90210dd969 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.ilproj
index 083361f4cb..a53c395b11 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50026/b50026.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b50026.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.ilproj
index 2094ff67d7..1a9722d2de 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50027/b50027.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b50027.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.ilproj
index f17c4dd662..34e8f3690a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50033/b50033.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b50033.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj
index 1437d6fc17..d24bff5e1e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj
index 441eff6887..f9f75c3fd4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj
index aa178cd8f6..37e768cbc6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj
index b2f41db92b..f103bac3fd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj
index bdaefd15ff..28c3df27dd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj
index a74a8b9042..83c48edbae 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.ilproj
index 2e2764f760..0e07ee58b5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51420/b51420.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b51420.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj
index b0c31fdfe9..987568493f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj
index 69ac570bfd..a3e365df74 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.ilproj
index 3739568044..fee89f0d87 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51515/b51515.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b51515.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj
index 22fc1122b8..b23d96a330 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.ilproj
index e4cc7430e1..3ca6ffb03f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51575/b51575.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b51575.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj
index 0028719b95..46b4b8e24f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj
index 13f4731d87..f1d6ea0014 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/Desktop/b51875.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/Desktop/b51875.csproj
index 7ec1d77228..e7edb6c413 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/Desktop/b51875.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/Desktop/b51875.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.csproj
index da4542a5d4..e6b66127f5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj
index bb78438e88..6059afb6bf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj
index e19898c24b..e99a483137 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj
index 2294111b04..fb24d78107 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj
index 446a5decf7..2358d4970f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj
index be5f55113d..42b0d5e89f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj
index cbeaef9735..f02490764e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj
index 6b6c6ab241..be10bd8cc4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj
index 371fdaccc1..afb664c8ae 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj
index 5af7b2bc1a..26cd0e80c3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj
index 8ea628a9df..3c046ea754 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj
index bf819a6efa..9acb19163a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.csproj
index 624b9cfe3d..c8d7205128 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.ilproj
index 9bb0027580..841abbe564 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53650/b53650.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b53650.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.ilproj
index 6f10a250b7..651bc0a6a5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53662/b53662.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b53662.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.ilproj
index 4cac22ab11..7aa4955a7b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53878/b53878.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b53878.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.ilproj
index 7fdd5810cc..fc777c2215 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53884/b53884.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b53884.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942a.ilproj
index 917eb8bdb8..dee3a3ea9d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942a.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b53942a.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942b.ilproj
index 583a9f6178..c868643985 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53942/b53942b.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b53942b.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.ilproj
index b5a474c1f4..972b38a43e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53958/b53958.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b53958.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.ilproj
index 65ca699826..6f406d5be3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53977/b53977.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b53977.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.ilproj
index 5fb19cdc9e..33dfecf7ea 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53980/b53980.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b53980.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.ilproj
index ffd0cf924b..98c425be5f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53994/b53994.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b53994.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.ilproj
index 4fbbd5780a..51ca7086f4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53995/b53995.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b53995.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.ilproj
index d1ae854dfd..cc807ab4be 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54006/b54006.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b54006.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.ilproj
index c576deef13..61d3f9acdd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54565/b54565.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b54565.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.ilproj
index a4269a36a7..8de4c80c8e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54566/b54566.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b54566.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.ilproj
index b9e44cccbc..40c77930c9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54611/b54611.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b54611.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj
index 56a3a3f80f..ac06b55365 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.ilproj
index 290dac8cd2..54c7d76d4f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54971/b54971.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b54971.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj
index f72846c473..03410d6df9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj
index b3739a5480..ea1414a68f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55216/b55216.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55216/b55216.ilproj
index 2109fe48e5..195cbf7232 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55216/b55216.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55216/b55216.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b55216.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55875/b55875.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55875/b55875.ilproj
index a5b3d993eb..f9e7a1b24e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55875/b55875.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55875/b55875.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b55875.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.ilproj
index 35d7d4640d..63d1b30461 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55923/b55923.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b55923.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.ilproj
index 3873def05b..44cd1680c4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56066/b56066.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b56066.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.ilproj
index ec02f5429f..6bccf69187 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56068/b56068.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b56068.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj
index 7661fa10f6..964c44ac0b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj
index 46b7328394..92d7d617c4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj
index f129707e05..a7fe19f759 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56174/b56174.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56174/b56174.ilproj
index 77b155b2dd..f2a601f55f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56174/b56174.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56174/b56174.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b56174.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.ilproj
index dc33e82b23..1816902cad 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56349/b56349.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b56349.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.csproj
index 86ce367260..a7952818bc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56780/b56780.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56780/b56780.ilproj
index a90c6e806a..b3608526ea 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56780/b56780.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56780/b56780.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b56780.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.ilproj
index 37b07bceee..4fa0c21c53 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57492/b57492.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b57492.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.ilproj
index be5552fd04..c17122939d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57493/b57493.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b57493.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.ilproj
index ebbd331e1a..aba32e0407 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57516/b57516.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b57516.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.ilproj
index cda214cebc..53bc118c1e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57518/b57518.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b57518.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.ilproj
index 9a20a82a7a..f708b1f7aa 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57952/b57952.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b57952.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.ilproj
index 709255d21f..1d0d817442 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58358/b58358.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b58358.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.ilproj
index 0d33b1b72a..7f05508f3e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58360/b58360.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b58360.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.ilproj
index 2cebdd8760..33cdb5db58 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58689/b58689.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b58689.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.ilproj
index f8ba429e80..f128b81bda 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58690/b58690.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b58690.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.ilproj
index bb76a97e05..1d3d162d95 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b58866/b58866.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b58866.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj
index 4f4579229d..b812e5ec2d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.ilproj
index bfd3bdded4..5e64ff8441 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59319/b59319.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59319.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.ilproj
index 6a99905bc6..85ade31b9c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59320/b59320.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59320.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.ilproj
index 92fd27285c..f6b306e230 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59337/b59337.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59337.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.ilproj
index 15a06d8ee9..89e8c6b03a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59477/b59477.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59477.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.ilproj
index 464724857c..9ef729f358 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59478/b59478.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59478.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.ilproj
index 58289af51f..2a694468e4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59508/b59508.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59508.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.ilproj
index bdb0aa2db1..f6deb7fac3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.ilproj
index 80d18729f8..fd3c5c718a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59554/b59554.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59554.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.ilproj
index 2d1d37cfb6..c2d9370b4e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59647/b59647.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59647.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.ilproj
index d3981d1bda..e47f398006 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.ilproj
index 3e367b51d9..6c0a84c480 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59782/b59782.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59782.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.ilproj
index cb64eeb26c..a8caef00c4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59822/b59822.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59822.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59857/b59857.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59857/b59857.ilproj
index 321161aa8a..21ab42f66d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59857/b59857.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59857/b59857.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59857.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59858/b59858.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59858/b59858.ilproj
index 4b68e63444..6c3ccb0f72 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59858/b59858.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59858/b59858.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59858.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59899/b59899.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59899/b59899.csproj
index 2708eb5880..9331842adf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59899/b59899.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59899/b59899.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.ilproj
index 76f59b70a0..736eb2f9a7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59947/b59947.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59947.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.ilproj
index f04120656c..8bfaf893c8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59948/b59948.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59948.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.ilproj
index 53908a5827..a989538971 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59949/b59949.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59949.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.ilproj
index 71420450c8..871919bf8e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59952/b59952.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59952.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.ilproj
index 7ecd91a580..aebf7f69b9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59953/b59953.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b59953.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.ilproj
index 622547b4d9..451ee71902 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60127/b60127.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b60127.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.ilproj
index 8e0b7a8fef..f7db2adb25 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60142/b60142.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b60142.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.ilproj
index 815b32a2fd..c62dfdd8f1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60194/b60194.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b60194.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.csproj
index d74ef166de..fc759fb894 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj
index 6846060a7c..aa2c39c2b5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.ilproj
index 9b60856ef7..5c870033ac 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61025/b61025.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b61025.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj
index d2f6ec4dda..d64eca9371 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.ilproj
index 77055c56a2..c6495027bb 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61185/b61185.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b61185.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.ilproj
index 6339fc0e8c..e982a8c812 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61215/b61215.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b61215.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj
index 5bca83a841..747883dbd6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj
index feaa5c7a06..45d3284e29 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.ilproj
index d404e15045..412d124bef 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62145/b62145.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b62145.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj
index 7926edf0f0..c3dd660872 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj
index c69eb43571..956608da87 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj
index c8acffc9a5..3bbaa22a25 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj
index 76d06e9666..dd05872949 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.ilproj
index afd1fd217f..d23958cab4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63552/b63552.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b63552.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.ilproj
index 13f8a0e141..e590336bce 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63725/b63725.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b63725.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.ilproj
index 10a285acd6..2f9826c1d8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63726/b63726.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b63726.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.ilproj
index 617ef2d427..f07122a5a6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63730/b63730.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b63730.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.ilproj
index 62bd4da3c1..c8b8932c55 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63732/b63732.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b63732.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.ilproj
index 7da04c9987..fd62fee5c9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.ilproj
index a7e0a3841e..9ec563b7f2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63823/b63823.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b63823.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.ilproj
index edc729a1a0..ba106694ae 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64026/b64026.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b64026.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.ilproj
index 5b1e7193b2..2726c6fb50 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64560/b64560.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b64560.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.csproj
index 27ed53ccca..e008645507 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.ilproj
index 345df95538..7708b088be 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65087/b65087.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b65087.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.ilproj
index 47e5b1451e..fb5c906c44 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65176/b65176.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b65176.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.ilproj
index e1c6381f25..0902fd16c3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65407/b65407.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b65407.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.il b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.il
index 6ee5c78fed..6bcc7536d2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.il
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.il
@@ -248,11 +248,11 @@
                                                                                class System.String)
 	IL_003d:  call       void ['mscorlib']System.Console::WriteLine(class System.String)
 	IL_0042:  ldsfld     int32 b1904::Count
-	IL_0047:  call       void ['mscorlib']System.Environment::set_ExitCode(int32)
+	IL_0047:  call       void ['system.runtime.extensions']System.Environment::set_ExitCode(int32)
 	IL_004c:  leave.s    IL_0083 
     }
-    IL_0083:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_0083:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.ilproj
index aec60831fd..5f2a2f8bcf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.ilproj
index 7ddba30ceb..e46161090c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66226/b66226.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b66226.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.ilproj
index c3da4c04d0..d52215cb93 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66425/b66425.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b66425.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj
index 2fd73d0a9a..1067ba1e42 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.ilproj
index be040100d2..2604e36a1b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66583/b66583.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b66583.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.ilproj
index dbdd1a9090..1cb1293f3c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66620/b66620.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b66620.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.ilproj
index cae28718da..1038961c2d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66679/b66679.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b66679.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.ilproj
index 8e3fa0eb68..a73f873242 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67351/b67351.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b67351.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67414/b67414.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67414/b67414.csproj
index e10e370cd4..81c6f6b7ed 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67414/b67414.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67414/b67414.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.ilproj
index 263fe617ac..e1754ab197 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67744/b67744.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b67744.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.ilproj
index b3cee19a9b..dc591fdeba 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67819/b67819.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b67819.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.ilproj
index de8a964b44..c8bcdbb8c2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67987/b67987.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b67987.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.ilproj
index d18cf41c84..f9f58d92d7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68028/b68028.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b68028.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.ilproj
index 774923d684..b7ef6426e8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68045/b68045.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b68045.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj
index f3ac5a18e6..302555febd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj
index 5dd213f4d2..28d480090c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.ilproj
index cdd670c4ae..952747bf59 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.ilproj
index b44c86fde5..7b5992949e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68872/b68872.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b68872.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.ilproj
index d51ac0a354..dbbe434621 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69225/b69225.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b69225.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.ilproj
index ccdb654993..27f45895c1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69227/b69227.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b69227.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.ilproj
index e39d63bffd..930f474195 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69512/b69512.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b69512.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.ilproj
index 0eeed7307e..34eca74e00 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69528/b69528.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b69528.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.ilproj
index 6992c9a7a6..1a7e41a323 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b69848/b69848.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b69848.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.ilproj
index 4237bf0eba..6162816aba 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70267/b70267.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b70267.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.ilproj
index a00853b48f..8cb3294a85 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70289/b70289.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b70289.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.ilproj
index ffc880f83a..e71c057856 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70335/b70335.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b70335.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70354/b70354.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70354/b70354.ilproj
index 82b6931793..7c1a87c23a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70354/b70354.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70354/b70354.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b70354.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.ilproj
index 92c0833312..a948ddba63 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70808/b70808.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b70808.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70909/b70909.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70909/b70909.ilproj
index 92520bc360..a17a02071d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70909/b70909.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70909/b70909.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b70909.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.ilproj
index bd0ccb06ab..d6edbac357 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70964/b70964.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b70964.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.ilproj
index 29c83e28de..6c98edc32b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70967/b70967.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b70967.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.ilproj
index e3fa3e8d22..77ef4e2c3a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70992/b70992.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b70992.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.ilproj
index 831b927c8c..569dd8a815 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b70994/b70994.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b70994.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.ilproj
index ddac874f12..dfb6660ae3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71003/b71003.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b71003.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.csproj
index 3ad64fda04..95adfc3c47 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.csproj
index a219e7fbed..f716fa4b02 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj
index 7fc4007b5e..86d4d3f34b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj
index b6f8062430..a6b880c4f5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj
index cb7e9db6f1..56e897cea8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj
index c915f1fd70..39795f0c4f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.ilproj
index f8d569d25a..2df9f1e2ea 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71179/b71179.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b71179.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj
index 41228516c5..3e4f0e517b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71318/b71318.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71318/b71318.ilproj
index 58673a610c..60caac12c5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71318/b71318.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71318/b71318.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b71318.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.ilproj
index b328d658a8..e4580ea295 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71722/b71722.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b71722.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71831/b71831.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71831/b71831.ilproj
index fb85f4e0de..6746966fbf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71831/b71831.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71831/b71831.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b71831.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71869/b71869.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71869/b71869.ilproj
index d78e210a57..cb361d9d6f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71869/b71869.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71869/b71869.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b71869.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.ilproj
index 526acf3c18..5022dad732 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71999/b71999.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b71999.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj
index ba795bae5a..34b8096210 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72160/b72160.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72160/b72160.ilproj
index 4525643b4d..9cb43089b3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72160/b72160.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72160/b72160.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b72160.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72161/b72161.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72161/b72161.ilproj
index 96eabaf35d..ca28bbbbb7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72161/b72161.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72161/b72161.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b72161.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.csproj
index c87dfea969..dd0c696d3e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.csproj
index aa43788c81..f54506dee8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.ilproj
index 9891ce26ce..a394e59faa 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72518/b72518.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b72518.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.ilproj
index 2208262adb..48685f02d4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72522/b72522.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b72522.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.csproj
index cc59e17c37..41227dd595 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.ilproj
index a27b06034c..6c9248b1a8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72699/b72699.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b72699.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72828/b72828.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72828/b72828.ilproj
index a9771edd34..9393a4e437 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72828/b72828.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72828/b72828.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b72828.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.csproj
index a5a53dc70b..d9af8b1d09 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.csproj
index 9d80ff8011..31f711edb9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj
index e7cce6835b..5a951b5f93 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.ilproj
index 59c7d14480..b803eac35d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73079/b73079.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b73079.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73207/b73207.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73207/b73207.ilproj
index 00089f3e98..c8c3ec2572 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73207/b73207.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73207/b73207.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b73207.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.ilproj
index 6d10322daf..3be2cbfc9c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73283/b73283.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b73283.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73786/b73786.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73786/b73786.ilproj
index 04208c0d7c..155339e684 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73786/b73786.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73786/b73786.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b73786.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj
index 4690f0c36d..639ca00485 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj
index 3f6fb17409..48de71d93c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74608/b74608.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74608/b74608.ilproj
index 228f98f150..6774de2914 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74608/b74608.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74608/b74608.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b74608.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.ilproj
index 48668be13d..f02136f067 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74937/b74937.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b74937.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74939/b74939.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74939/b74939.ilproj
index db64d841fd..fbf04dd667 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74939/b74939.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74939/b74939.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b74939.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74976/b74976.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74976/b74976.ilproj
index c834ad0441..c2fa73cb1e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74976/b74976.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74976/b74976.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b74976.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj
index 6e64a2fe37..3f7ae41c37 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj
index 76f537815f..c3428e1149 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75888/b75888.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75888/b75888.ilproj
index c224780d0d..c905b43a5e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75888/b75888.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75888/b75888.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b75888.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75890/b75890.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75890/b75890.ilproj
index 9b00603821..981a72b507 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75890/b75890.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75890/b75890.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b75890.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75944/b75944.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75944/b75944.ilproj
index fed4bca3f3..43402e90b0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75944/b75944.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75944/b75944.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b75944.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.ilproj
index 15ee0151fc..972ad95109 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75945/b75945.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b75945.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.ilproj
index b5684ea75a..2930b7a4ae 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.csproj
index bb1f5806d1..0f241c864a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.csproj
index 9cc0bef880..16bfe6b18b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj
index 93d48b115b..82bd0588c2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.csproj
index 32cd6032c0..aa83ce7903 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77304/b77304.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77304/b77304.ilproj
index 6a4c09ffe8..15376bf54e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77304/b77304.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77304/b77304.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b77304.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj
index d5296c587a..bb5c4e34cc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj
index 44c7df3944..2fd65b8833 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.ilproj
index 602c012d95..c6aa160281 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77806/b77806.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b77806.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77950/b77950.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77950/b77950.ilproj
index 565df05e4a..89b91b3072 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77950/b77950.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77950/b77950.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b77950.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj
index 6040e139b0..2115e38009 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.csproj
index be001e3901..24b89744cc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj
index 4ebbfa3bae..0a65dc6de1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b79250.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj
index 5bfc486a1f..28e1293b6d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.csproj
index 57fdd42084..d79df28510 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80043/b80043.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80043/b80043.ilproj
index 21057d3db2..76a11b3460 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80043/b80043.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80043/b80043.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b80043.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj
index 33941209dc..275502be18 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.csproj
index 947b1e326c..abab005c1c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.ilproj
index e3506c518a..21e7281ad7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80824/b80824.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b80824.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.csproj
index 19b6754072..60c47fe759 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81938/b81938.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81938/b81938.ilproj
index a7e262765c..50b8b98b6e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81938/b81938.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81938/b81938.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b81938.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.csproj
index 039d7198b1..8e04d9a909 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.ilproj
index 2520b8ec6b..39a63aac62 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82160/b82160.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b82160.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.ilproj
index 25fec6625c..de2e9623f6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82247/b82247.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b82247.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.ilproj
index 73dc0eff60..bcfe4e2ecd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82249/b82249.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b82249.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.ilproj
index e64e2654ae..ac06d1304b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82715/b82715.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b82715.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj
index 80c7918713..f6f66fb145 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj
index a16c77c3f9..d23b28353c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.csproj
index 929cd9b2b6..cd849b9f93 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj
index 0b7d4919a9..87e87b0e06 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.ilproj
index eee9a9c9de..08824a6d21 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84909/b84909.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84909.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.ilproj
index a7b682fe59..b492096651 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84916/b84916.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84916.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.ilproj
index 89b926fceb..36d5f88b8d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84971/b84971.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84971.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.ilproj
index 336104284a..983d39c07a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b85316/b85316.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b85316.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj
index 3f51fce8f9..75370bd9fc 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b101147/b101147.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b101147/b101147.ilproj
index 910cedf8f3..fe00790aaa 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b101147/b101147.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b101147/b101147.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b101147.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.csproj
index bfa9096612..5ab52ba8f5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.ilproj
index f88ddd326b..269a46bb31 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b85477/b85477.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b85477.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.ilproj
index 22e42c069e..31a3b6530b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b86139/b86139.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b86139.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj
index e6637fbf14..33df77bb78 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.csproj
index 938bc14c9d..781c68b41f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj
index c1631a4cee..b9dc922a42 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
index a78e36e42b..9dedfc9dbb 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj
index e48423d52e..67ade494d8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj
index 014758615b..b1fffdb1bf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj
index d5eefaaea3..9a024e2178 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.ilproj
index ddf82ff678..39b925e081 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89409/b89409.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b89409.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj
index 8bd35014a2..3c902944f9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.ilproj
index 84c2adb761..5f7f824144 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89546/b89546.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b89546.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj
index 32e788b21d..f5202b3607 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.csproj
index dc72268576..f3564f3342 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj
index 43ce284f51..8e2c221937 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b90129/b90129.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b90129/b90129.ilproj
index 658fc30845..fc0278e0df 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b90129/b90129.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b90129/b90129.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b90129.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.ilproj
index d3c73f2364..7cbf7fefc2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91021/b91021.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b91021.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj
index d5ad46d1b5..d93789e7d4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.ilproj
index f1f9d112a9..b1ed3e0512 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91203/b91203.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b91203.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.ilproj
index 4bc58cf618..3a177db7a4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91223/b91223.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b91223.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj
index ae550b6f0e..ce3b278076 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
index 97898e3227..e436ce10cb 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.ilproj
index 1daf0b0749..d063ae6efa 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91359/b91359.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b91359.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj
index a92c37d7a0..71b20070c1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj
index 6db1126b20..660c6b7b23 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj
index 52eb88c8c1..8e7f6f4c30 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj
index 0dbfdb6f03..e2e5130ad8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.ilproj
index dbdd4e2eb7..15fcd907a7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.ilproj
index edfa945e5e..20d66a0800 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.ilproj
index 08700d498e..352040ed28 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj
index 7bbc81e94d..8f4f5feef0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj
index fd43d3f4bc..8625bebb10 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj
index 0c5f96d15f..f40eefd341 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.csproj
index f0f441aadf..6a99471139 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.ilproj
index f5166a0a58..cbc8d42c65 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92736/b92736.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b92736.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj
index ec5b9180a9..1ec71a412e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.ilproj
index ff20daf882..07c7a74b38 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.ilproj
index 0265f71848..e45137890c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b94306/b94306.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b94306.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.ilproj
index e44a70aa98..86ea456090 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.csproj
index 97017167cd..412b567174 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.csproj
index c5ec89780f..abdbbc96a1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99667/b99667.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99667/b99667.ilproj
index 9f4a0fc1e7..0bc33e85c7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99667/b99667.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99667/b99667.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b99667.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj
index 96899e878e..7a08db245f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj
index 8c51221920..458652d67a 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj
index f3cd8802bc..29cee97d99 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147814/b147814_il.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147814/b147814_il.ilproj
index ca282e9fae..d71aceed26 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147814/b147814_il.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147814/b147814_il.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="rembug.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147816/b147816.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147816/b147816.ilproj
index 85d7a11ae0..b04eaea898 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147816/b147816.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b147816/b147816.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="loop.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj
index eb0bd82101..3da4f56e8d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.ilproj
index a08cca6f30..7b8ea951af 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-mixed.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="params-mixed.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.ilproj
index 084b351151..206d12e149 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-none.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="params-none.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.ilproj
index 46e3f6c62e..c69bbf5e20 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-object.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="params-object.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.ilproj
index 7e5515f586..a0d88237cf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-value.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="params-value.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.ilproj
index 61c2a64022..d0222d8b91 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/params-varargs.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="params-varargs.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.ilproj
index 0a294ee147..0a06d8bfaf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-mixed.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="static-mixed.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.il b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.il
index 082eba7635..0b1fe28339 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.il
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.il
@@ -36,7 +36,7 @@
              int32 V_7)
     IL_0000:  ldc.i4.1
     IL_0001:  stloc.0
-    IL_0002:  ldftn       string[] [mscorlib]System.Environment::GetCommandLineArgs()
+    IL_0002:  ldftn       string[] [system.runtime.extensions]System.Environment::GetCommandLineArgs()
     IL_0003:  calli       string[]()
     IL_0007:  stloc.1
     IL_0008:  ldloc.1
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.ilproj
index bd8c296162..2e8483fa74 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.ilproj
index 5fec47a0db..ba77cf6bd0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-object.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="static-object.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.ilproj
index 4f3a2ef5bd..ead818daf0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj
index fe8223461c..8139d316e2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj
index f2ef0c8d13..943301da4f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.ilproj
index cecb3f840d..4d628764c2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b139895/b139895.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b139895.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.ilproj
index 90349c3c17..52e0746b8d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140118/b140118.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b140118.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj
index 879bed63c7..5417652d47 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.csproj
index 2ab7eb97bc..4b661d442e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.il b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.il
index 8d59238c6c..6af1c6d15f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.il
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.il
@@ -43,7 +43,7 @@
   {
     .entrypoint
     .maxstack  3
-    .locals init (class [mscorlib]System.Threading.Thread V_0,
+    .locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
              class ExternalException V_1,
              int32 V_2)
     IL_0000:  newobj     instance void ExternalException::.ctor()
@@ -54,14 +54,14 @@
 
     IL_000a:  ldloc.1
     IL_000b:  ldftn      instance void ExternalException::runtest()
-    IL_0011:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0011:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0016:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0016:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_001b:  stloc.0
     .try
     {
       IL_001c:  ldloc.0
-      IL_001d:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+      IL_001d:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
       IL_0022:  leave.s    IL_0031
 
     }  
@@ -174,7 +174,7 @@
       IL_0047:  ldstr      "TryCatch Test Passed"
       IL_004c:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0051:  ldc.i4 100
-      IL_0052:  call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      IL_0052:  call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       IL_0057:  leave.s    IL_0060
 
     }  
@@ -197,7 +197,7 @@
       IL_0074:  ldloc.0
       IL_0075:  call       void [System.Console]System.Console::WriteLine(int32)
       IL_007a:  ldc.i4.1
-      IL_007b:  call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      IL_007b:  call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       IL_0080:  leave.s    IL_0089
 
     }  
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.ilproj
index d54d4c9192..659fd5bcff 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.ilproj
@@ -8,18 +8,16 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -33,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj
index 96a06cb7a5..fbd8482928 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj
index 3600196792..820215df49 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.csproj
index 51c2c45a5c..79b1c3a680 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -42,10 +38,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj
index c5559d7d47..6134a7a3a2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147147/b147147.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147147/b147147.ilproj
index daf0f4f297..053508ca12 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147147/b147147.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147147/b147147.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="samabo.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147924/b147924.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147924/b147924.ilproj
index 585adec8a8..3d221296f9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147924/b147924.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b147924/b147924.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bigdat.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj
index 94ba2e1b94..77e17e69bd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj
index b72bf34556..9b3d2e9cc5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj
index 3659dd810c..329361ae45 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj
index 7655928370..2a557f26a7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381b.ilproj
index 7fcfb5fae3..788d13d695 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381b.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="constrained2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj
index c02f446ba7..e936555796 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharpgenerictypes.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharpgenerictypes.csproj
index 9153c93db8..57c28a3dc4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharpgenerictypes.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharpgenerictypes.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj
index c6acbd04b4..a3d950fe88 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/b213516.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/b213516.ilproj
index 8fa51d93dc..c5d84f905c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/b213516.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/b213516.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,9 +30,8 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference  Include="lib-219037.ilproj"/>
+    <ProjectReference Include="lib-219037.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/lib-219037.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/lib-219037.ilproj
index 12abd95f0e..bf19527ccf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/lib-219037.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/lib-219037.ilproj
@@ -8,19 +8,17 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <GenerateRunScript>false</GenerateRunScript> 
+    <GenerateRunScript>false</GenerateRunScript>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -34,6 +32,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj
index 4bb90573b1..33f259d557 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/b220968.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/b220968.ilproj
index a36d992741..57747d86e1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/b220968.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b220968/b220968.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/b223924.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/b223924.ilproj
index 417a192563..bdd45fd5c8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/b223924.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223924/b223924.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/b223932.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/b223932.ilproj
index f6a83f035a..fa7de1c1a4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/b223932.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223932/b223932.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug3.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/b223936.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/b223936.ilproj
index 899816a3db..88231676a4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/b223936.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b223936/b223936.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug4.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.ilproj
index 89b8d68dff..9491081ef0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00722/b00722.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b00722.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj
index f73b9a3da1..20bfee5228 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj
index 04916447a6..f4457b4c4f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.csproj
index 84a7f0c4be..e29ac54730 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj
index f50d084292..13d998e377 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.ilproj
index da8a8fd3fd..759e3dcca2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b04319/b04319.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b04319.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b06020/b06020.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b06020/b06020.ilproj
index 5b3d7b9611..fc7ecebb3f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b06020/b06020.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b06020/b06020.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b06020.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj
index f2ef0c8d13..943301da4f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07369/b07369.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07369/b07369.ilproj
index 1d28dec89f..c7046a4022 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07369/b07369.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07369/b07369.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b07369.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.ilproj
index af2e738176..880cba9fd9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07383/b07383.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b07383.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj
index 2ac4056e49..4d4c9455f9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07947/b07947.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07947/b07947.ilproj
index 08bb05aec6..59edfb0625 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07947/b07947.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07947/b07947.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b07947.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj
index e6616aca0a..18a5bac48d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/SyncGCHole.il b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/SyncGCHole.il
index e91a93902f..1b1b689476 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/SyncGCHole.il
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/SyncGCHole.il
@@ -43,7 +43,7 @@
   {
     .entrypoint
     .maxstack  3
-    .locals init (class [mscorlib]System.Threading.Thread V_0,
+    .locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
              class ExternalException V_1,
              int32 V_2)
     IL_0000:  newobj     instance void ExternalException::.ctor()
@@ -54,14 +54,14 @@
 
     IL_000a:  ldloc.1
     IL_000b:  ldftn      instance void ExternalException::runtest()
-    IL_0011:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0011:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0016:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0016:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_001b:  stloc.0
     .try
     {
       IL_001c:  ldloc.0
-      IL_001d:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+      IL_001d:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
       IL_0022:  leave.s    IL_0031
 
     }  
@@ -81,8 +81,8 @@
     IL_0036:  ldc.i4.s   10
     IL_0038:  blt.s      IL_000a
 
-    IL_003a:  call       int32 ['mscorlib']System.Environment::get_ExitCode()
-              call       void ['mscorlib']System.Environment::Exit(int32)
+    IL_003a:  call       int32 ['system.runtime.extensions']System.Environment::get_ExitCode()
+              call       void ['system.runtime.extensions']System.Environment::Exit(int32)
               ret
   } 
 
@@ -174,7 +174,7 @@
       IL_0047:  ldstr      "TryCatch Test Passed"
       IL_004c:  call       void [System.Console]System.Console::WriteLine(string)
       IL_0051:  ldc.i4 100
-      IL_0052:  call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      IL_0052:  call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       IL_0057:  leave.s    IL_0060
 
     }  
@@ -197,7 +197,7 @@
       IL_0074:  ldloc.0
       IL_0075:  call       void [System.Console]System.Console::WriteLine(int32)
       IL_007a:  ldc.i4.1
-      IL_007b:  call       void [mscorlib]System.Environment::set_ExitCode(int32)
+      IL_007b:  call       void [system.runtime.extensions]System.Environment::set_ExitCode(int32)
       IL_0080:  leave.s    IL_0089
 
     }  
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj
index b01684a218..8a2aeb3542 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj
index bc693090f1..4cd3bbb254 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.ilproj
index cae6d81604..fec9fd89c1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b13452/b13452.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b13452.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.ilproj
index b12647c727..7e1bc2862f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b14617/b14617.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b14617.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b15617/b15617.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b15617/b15617.ilproj
index 2037ae76ba..2dbd2681f7 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b15617/b15617.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b15617/b15617.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="arrayDim.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16378/b16378.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16378/b16378.ilproj
index 6660363c9f..d433d8fbad 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16378/b16378.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16378/b16378.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16382/b16382.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16382/b16382.ilproj
index 9ad32ed7f0..df8445586f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16382/b16382.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16382/b16382.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj
index f3d4a247d1..6456bbca97 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj
index ed5ede38e1..38bbe976b3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/b16473.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/b16473.ilproj
index 4722276a87..50b58bab1b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/b16473.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/b16473.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.csproj
index 9511ad0153..eb36656167 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b18049/b18049.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b18049/b18049.ilproj
index 730e077863..82621bece8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b18049/b18049.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b18049/b18049.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="loop2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.csproj
index 0f9ae2c137..2c6d38f129 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962a.ilproj
index 3bea633c3b..6734cbdb4c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962a.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="t.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962b.ilproj
index 5aae266d77..d7ea63d8fe 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962b.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="t2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962c.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962c.ilproj
index 4fe424cbb7..741e5bcfce 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962c.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b102962/b102962c.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="vc178279.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932a.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932a.ilproj
index 3bea633c3b..6734cbdb4c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932a.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932a.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="t.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932b.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932b.ilproj
index 4cc205ef0e..4ce9143d84 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932b.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b115932/b115932b.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="t1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b118260/b118260.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b118260/b118260.ilproj
index 68cd3fb704..0c50e90bb6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b118260/b118260.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b118260/b118260.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b118260.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b138117/b138117.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b138117/b138117.ilproj
index 45a04dc27c..9f1fe2ebbd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b138117/b138117.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b138117/b138117.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldsfldainitonlyvt.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj
index a2a2497eca..ac5beb0e48 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b21296/b21296.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b21296/b21296.csproj
index cced4a364c..05a8bb388f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b21296/b21296.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b21296/b21296.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj
index 0a0cc419b3..6b93093c0e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.csproj
index aa1d6527f5..59ca4c5945 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/b091942.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/b091942.ilproj
index 96e10f9a4b..610509873b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/b091942.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b091942/b091942.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="nullref.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj
index af02f1acd4..3a774d6212 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/b125091.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/b125091.ilproj
index 2c3994a6f5..99f110b101 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/b125091.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/b125091.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj
index fdaba30aa9..9339e1e32d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/b309555.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/b309555.ilproj
index f2270564f6..9e27b0b687 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/b309555.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b309555/b309555.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="x86-test-1084346006.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj
index 8386a1a7ed..341dac6f0c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj
index ba51d2ab41..fe02484615 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-dbg.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-dbg.ilproj
index cc2b1caa00..e912250f0b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-dbg.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-ret.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-ret.ilproj
index 68df85a557..54448eb796 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-ret.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b323557/b323557-ret.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj
index 418226e76e..59d536a17b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b353858/b353858.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b353858/b353858.ilproj
index 249526ee61..f6e829fb00 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b353858/b353858.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b353858/b353858.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b353858.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/b359564.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/b359564.ilproj
index 7ce0db6714..afc12968ff 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/b359564.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/b359564.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/b374944.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/b374944.ilproj
index 8b28446efb..7c94450108 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/b374944.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b374944/b374944.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="helper.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj
index b606bbf796..0c880dafac 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.reflect.xml b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.reflect.xml
new file mode 100644
index 0000000000..7cb18da901
--- /dev/null
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="b399444a">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj
index 2a18a58ab7..59e45d57b9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.reflect.xml b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.reflect.xml
new file mode 100644
index 0000000000..5999dda049
--- /dev/null
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="b399444b">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj
index af70703e67..c496a7c47e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.ilproj
index 0460c68cdd..ffb8d603e1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409617/b409617.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b409617.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj
index 3bf63ac020..b9561aa24d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.ilproj
index 2b7c5f3dc7..a870735345 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b415164/b415164.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b415164.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj
index 5c7f89f5b5..9546f3cd8b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.csproj
index 5525acbfa0..42685ee131 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="c1.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/c1.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/c1.csproj
index dbb5410655..bece7d581e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/c1.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/c1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript>
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/Desktop/b423755.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/Desktop/b423755.ilproj
index f405838b62..927d3330f8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/Desktop/b423755.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/Desktop/b423755.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b423755.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/b423755.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/b423755.ilproj
index 0d2ab98f35..def8cd8a84 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/b423755.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/b423755.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b425314/b425314.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b425314/b425314.csproj
index b232ef8ddd..1c73df74cd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b425314/b425314.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b425314/b425314.csproj
@@ -8,16 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
-    <!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. -->
-    <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
-    <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible>
+    <!-- NOTE: This test takes too long and internally times out under GCStress/heap verify. It is not fundamentally incompatible if stress testing is fast enough.  -->
+    <GCStressIncompatible>true</GCStressIncompatible>
+    <HeapVerifyIncompatible>true</HeapVerifyIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.il b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.il
index 6facf13ae3..6855bc4b16 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.il
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.il
@@ -218,34 +218,34 @@
     .entrypoint
     .maxstack  5
     .locals init (class cs1 V_0,
-             class [mscorlib]System.Threading.Thread V_1,
+             class [System.Threading.Thread]System.Threading.Thread V_1,
              class [mscorlib]System.Threading.Timer V_2,
-             class [mscorlib]System.Threading.Thread V_flip
+             class [System.Threading.Thread]System.Threading.Thread V_flip
 		)
     IL_0000:  nop
     IL_0001:  newobj     instance void cs1::.ctor()
     IL_0006:  stloc.0
     IL_0007:  ldloc.0
     IL_0008:  ldftn      instance void cs1::CheckVal()
-    IL_000e:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_000e:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0013:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0013:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0018:  stloc.1
     IL_0019:  ldloc.1
-    IL_001a:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_001a:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_001f:  nop
     IL_0020:  ldc.i4.0
-    IL_0021:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0021:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_0026:  nop
     IL_0027:  ldloc.0
 
     ldftn      instance void cs1::Flip()
-    newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     stloc V_flip
     ldloc V_flip
-    callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     nop
 
 
@@ -263,11 +263,11 @@
                                                                                int32)
     IL_0046:  stloc.2
     IL_0047:  ldloc.1
-    IL_0048:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0048:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_004d:  nop
 
     ldloc V_flip
-    callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     nop
 
     IL_004e:  ldstr      "Test SUCCESS"
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.ilproj
index e640a22bad..787e9acc3b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.ilproj
index 920edb766b..fbe6c407fa 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b448208/Desktop/b448208.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b448208/Desktop/b448208.csproj
index 745485a234..dd1b8aaf93 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b448208/Desktop/b448208.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b448208/Desktop/b448208.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -31,11 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.csproj
index 35b8623b2f..87f3305aee 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj
index 0138d03ecb..1e468e46f6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.ilproj
index 4468683afd..830d00d12e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b471305/b471305.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b471305.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.ilproj
index 203eefed4f..5378c83aaa 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.ilproj
index bf95eb8e2f..056ac828c1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.ilproj
index e890176b56..323ac78900 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b489329/b489329.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b489329.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.csproj
index 53eea833d7..29af7cd063 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b518440/b518440.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b518440/b518440.ilproj
index 7a2984a6c3..e39cb34681 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b518440/b518440.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b518440/b518440.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b518440.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.ilproj
index 67dd71091d..ce73173b2c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.ilproj
index 7ea9dfaedf..7d50e5cdaf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.ilproj
index f2c0e99b8a..10dd8496e0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b598031/test2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b604247/b604247.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b604247/b604247.csproj
index 1b09c33d25..7e28daa933 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b604247/b604247.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b604247/b604247.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj
index e68b64fade..12faf38f25 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.csproj
index 30c26e8486..9820a0abce 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj
index 65964ebf51..828fb6abb4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj
index 103c74dd3f..58531b40b0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.csproj
index 1fb4053ce6..23559a4e69 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b404051/b404051.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b404051/b404051.ilproj
index 01eb549048..bdeafa4f44 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b404051/b404051.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b404051/b404051.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.ilproj
index 96ecb1108c..3aa72e4ba3 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.ilproj
index 04fbfb9098..f628fe72da 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b464149/b464149.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b464149.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj
index b586abe802..ff1a363ed4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v1-m08/b12668/b12668.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v1-m08/b12668/b12668.csproj
index 83c3b704b1..0727ead15c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v1-m08/b12668/b12668.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v1-m08/b12668/b12668.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.ilproj
index e168743269..83244929a5 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/B168384/LdfldaHack.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj
index 87dc043203..3a91575db8 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj
index 1746ba8b10..eca673abb2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj
index 67f25992ff..dd26011a77 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj
index aead2c49ac..cf4996e29d 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj
index c1abcf8378..eb3bb4116f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362_il.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362_il.ilproj
index 3a152a6d38..3ff4ae3ec2 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362_il.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362_il.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b170362.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/b174294.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/b174294.ilproj
index 5401226ff1..c8f8081a1c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/b174294.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b174294/b174294.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="spill.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.ilproj
index 5a6c05e15b..af3a8aa63f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.ilproj
index 5e684af181..662886074b 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b176032/b176032.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b176032.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.csproj
index fbe7d85214..794e6af4ab 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.csproj
index a3f6391d17..4d6c0af9c6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj
index b3c2d379f4..7cfa73abc1 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj
index b3a3972edb..9a22055877 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj
index f7b65c5d1c..1afa16cc6e 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj
index 80152545fe..98baf3c3b4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj
index 06dc89b58a..0308c2f46f 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.ilproj
index fe827cf5e3..e350abf8e0 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b173313/b173313.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b173313.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.ilproj
index 11fb788885..82b967eb76 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b193264/b193264.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b48850/b48850.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b48850/b48850.ilproj
index 973e25de89..1b3f676c25 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b48850/b48850.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b48850/b48850.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b48850.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b561129/b561129.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b561129/b561129.csproj
index 26258612c0..dd4b669c15 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b561129/b561129.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b561129/b561129.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj
index 83ad52db4c..e71b86e2f9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.csproj
index 64f6f5279e..6c26aa3f02 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj
index ca71adb4bf..69309632da 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj
index 4fcedafa70..0d7644a2dd 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj
index 3a3f09a652..e780cda850 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj
index d62c3005b3..f25e2483d4 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj
index 9e95a7e905..db49a4eb55 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj
index 2216309d66..c0934ec518 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj
index 023a0009e2..ae47eeea87 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.ilproj
index 745b11940b..133c20a636 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b609988.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.ilproj
index ca858225ad..593dadc9bf 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj
index 2aabfe9252..66393c94e9 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj
index 49198ec204..8455afca4c 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj
index 49ddebed48..76a0452ddb 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj
index d86159bcf6..785987df82 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj
index 6713404063..16cb0a27f6 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/b429039/b429039.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/b429039/b429039.ilproj
index 6d258b7040..8deaf0a794 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/b429039/b429039.ilproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/b429039/b429039.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b429039.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.csproj b/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.csproj
index ef9e4f8b83..417bdd0507 100644
--- a/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.csproj
+++ b/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj b/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj
index a531a422d9..06b4d5f04d 100644
--- a/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3859861E-6A53-4035-8A98-AD77F6510A6E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj
index 21c63cc535..ad2b491678 100644
--- a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj
index ee76b58f44..e29bee3c19 100644
--- a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="Test_HndIndex_10_Reordered.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj b/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj
index c16a02c29d..9a31a9b7f6 100644
--- a/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D3D5B4F2-7924-4185-85A8-C908D9A67A0C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj b/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj
index f51097a1e1..293bf6b8ff 100644
--- a/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6F0362F9-F1B0-4B95-A920-52C29062C546}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj b/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj
index 7b7e014a9a..c79bd438f8 100644
--- a/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DC3BD7FA-ED25-46BF-B14C-1F6516B4AECD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.ilproj
index a9454f2b54..fc0f84adb7 100644
--- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b473131.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.ilproj
index 4cab9b1909..3e1e8bebfd 100644
--- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.ilproj
index 6b658b51d8..f99f6d3bbe 100644
--- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b473131_fld.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.ilproj
index 4b7d94cdb2..d676c6be2e 100644
--- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b473131_intptr.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.ilproj
index c2fc452b11..4c34fa686a 100644
--- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.ilproj
+++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b473131_struct.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj b/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj
index 0059375ba5..0e97e798df 100644
--- a/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj
+++ b/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0E2A5683-562D-486C-AA48-B1CD596B13DC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.ilproj b/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.ilproj
index 289f86b552..1275bf6e3e 100644
--- a/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.ilproj
+++ b/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="DevDiv2_11321.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj b/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj
index 8d1d2380df..7af644020f 100644
--- a/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj
+++ b/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C52624DA-3555-49A1-BEB7-3462A37EFBA9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.ilproj b/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.ilproj
index eb482bb691..617ed60010 100644
--- a/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.ilproj
+++ b/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="VectorForwarder.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/Dev11/External/Dev11_243742/app.csproj b/tests/src/JIT/Regression/Dev11/External/Dev11_243742/app.csproj
index e67d646cb5..7547f9bd7a 100644
--- a/tests/src/JIT/Regression/Dev11/External/Dev11_243742/app.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/Dev11_243742/app.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="dll.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/Regression/Dev11/External/Dev11_243742/dll.csproj b/tests/src/JIT/Regression/Dev11/External/Dev11_243742/dll.csproj
index c066a9406f..2ac0c62446 100644
--- a/tests/src/JIT/Regression/Dev11/External/Dev11_243742/dll.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/Dev11_243742/dll.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.ilproj b/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.ilproj
index 67a2bd376f..f2e4b742ea 100644
--- a/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.ilproj
+++ b/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="UseUnalignedDouble.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_111914/BadMax1.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_111914/BadMax1.csproj
index 7b6bb0b840..bd4b306882 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_111914/BadMax1.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_111914/BadMax1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_131317/BadBox1.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_131317/BadBox1.csproj
index 2a9f2a6e8b..4774bbd6d8 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_131317/BadBox1.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_131317/BadBox1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj
index 5d25520b5b..2d1444bd17 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_132534/jmpwrappers.ilproj b/tests/src/JIT/Regression/Dev11/External/dev11_132534/jmpwrappers.ilproj
index e5416e14d6..2506c2f1ab 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_132534/jmpwrappers.ilproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_132534/jmpwrappers.ilproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_135245/R3Trasher1.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_135245/R3Trasher1.csproj
index 06216dc5b5..f11841ef82 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_135245/R3Trasher1.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_135245/R3Trasher1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj b/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj
index 258c4ed025..1bc8a3d7d2 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ReflectOnField.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.reflect.xml b/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.reflect.xml
new file mode 100644
index 0000000000..9b45130938
--- /dev/null
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="reflectOnField">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj
index 5120d3176b..dbca4d7a8b 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_145295/ilpart.ilproj b/tests/src/JIT/Regression/Dev11/External/dev11_145295/ilpart.ilproj
index f756790e4e..cb569369ca 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_145295/ilpart.ilproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_145295/ilpart.ilproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_149090/GCHole1.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_149090/GCHole1.csproj
index 2d74203360..092eb6d8c1 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_149090/GCHole1.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_149090/GCHole1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_154899/DynamicStaticAlignment.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_154899/DynamicStaticAlignment.csproj
index 3b8090f54a..052eec4202 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_154899/DynamicStaticAlignment.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_154899/DynamicStaticAlignment.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_239804/ShowLocallocAlignment.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_239804/ShowLocallocAlignment.csproj
index 021afcfdb2..d4ea27d5af 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_239804/ShowLocallocAlignment.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_239804/ShowLocallocAlignment.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_27971/UninitializedHighWord.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_27971/UninitializedHighWord.csproj
index bb1d3bde79..8df35a43ea 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_27971/UninitializedHighWord.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_27971/UninitializedHighWord.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_28763/R3Contention.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_28763/R3Contention.csproj
index 13e845d042..8d857f2407 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_28763/R3Contention.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_28763/R3Contention.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_77709/BadCheckedAdd1.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_77709/BadCheckedAdd1.csproj
index 5bb8492a73..ce62ed04a3 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_77709/BadCheckedAdd1.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_77709/BadCheckedAdd1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/External/dev11_91048/UseTrashedVfp1.csproj b/tests/src/JIT/Regression/Dev11/External/dev11_91048/UseTrashedVfp1.csproj
index 888f1fb62c..2afc7ae630 100644
--- a/tests/src/JIT/Regression/Dev11/External/dev11_91048/UseTrashedVfp1.csproj
+++ b/tests/src/JIT/Regression/Dev11/External/dev11_91048/UseTrashedVfp1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj b/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj
index b6021de513..b7deb8bade 100644
--- a/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj
+++ b/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj b/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj
index ee58675a14..89674139ad 100644
--- a/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7BE1774F-860F-4340-B6D5-222EC7BCC804}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.il b/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.il
index f2f32923d4..5a2bb323d4 100644
--- a/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.il
+++ b/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.il
@@ -23,7 +23,7 @@
 
 .try
 {
-call int32 [mscorlib]System.Environment::get_TickCount()
+call int32 [system.runtime.extensions]System.Environment::get_TickCount()
 conv.i8
 ldc.i8 0x80000000
 or
diff --git a/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.ilproj b/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.ilproj
index 8813c65c84..ab8c7600a1 100644
--- a/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.ilproj
+++ b/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj b/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj
index 35b5d179c4..412406d4a7 100644
--- a/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3E06549B-CCE6-4D5F-BCCB-C6E6B63CD59D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj b/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj
index 55deee5479..a167eacd79 100644
--- a/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6DD26EFC-D9EF-43B2-BA66-22215741D30E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_d.csproj b/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_d.csproj
index 42ff39ab63..3465f499a7 100644
--- a/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_d.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_do.csproj b/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_do.csproj
index 31713b1d73..82c22ed7f6 100644
--- a/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_do.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_r.csproj b/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_r.csproj
index 62445272d8..aa065ef0f8 100644
--- a/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_r.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_ro.csproj b/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_ro.csproj
index 7ebe84cf66..6238865453 100644
--- a/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_ro.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/dev11_4421/Dev11_4421.csproj b/tests/src/JIT/Regression/Dev11/dev11_4421/Dev11_4421.csproj
index 3d1e3e01e6..aa39807637 100644
--- a/tests/src/JIT/Regression/Dev11/dev11_4421/Dev11_4421.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev11_4421/Dev11_4421.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev11/dev11_76013/Dev11_76013.csproj b/tests/src/JIT/Regression/Dev11/dev11_76013/Dev11_76013.csproj
index 95902c707b..7fa55307c6 100644
--- a/tests/src/JIT/Regression/Dev11/dev11_76013/Dev11_76013.csproj
+++ b/tests/src/JIT/Regression/Dev11/dev11_76013/Dev11_76013.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
index 7624696ad3..db30d47ce5 100644
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{145DA044-A94A-4360-98F9-9D977F6FEF42}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
index f3b51478fd..33871b0b9d 100644
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7FD45662-ED85-4F11-A3A5-1FDCE55FD9B7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
index 91a9f8a6d8..d6a745cf39 100644
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D66FECBC-01AB-4181-9D6A-B72E54E603E1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
index 2c818a5497..4abcfd9dca 100644
--- a/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
+++ b/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{75177B03-2F77-4FEE-AC80-E54CBB0A336E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/CoreFX_15913/CoreFX_15913.cs b/tests/src/JIT/Regression/JitBlue/CoreFX_15913/CoreFX_15913.cs
new file mode 100644
index 0000000000..326c920574
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/CoreFX_15913/CoreFX_15913.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+
+// This test ensures that we pass by-value Vector3 arguments correctly, especially on x86.
+// On x86, we must ensure that we properly treat an outgoing Vector3 as a 12-byte value
+// when pushing it onto the stack.
+
+static class CoreFX15913
+{
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    static float Sum(float v3, Vector3 v)
+    {
+        return v3 + v.X + v.Y + v.Z;
+    }
+
+    static int Main()
+    {
+        float f = 4.0f;
+        return Sum(f, Vector3.Zero) == f ? 100 : 0;
+    }
+}
diff --git a/tests/src/JIT/Regression/JitBlue/CoreFX_15913/CoreFX_15913.csproj b/tests/src/JIT/Regression/JitBlue/CoreFX_15913/CoreFX_15913.csproj
new file mode 100644
index 0000000000..374da4973c
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/CoreFX_15913/CoreFX_15913.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CoreFX_15913.cs" />
+  </ItemGroup>
+  <!--  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
+  </PropertyGroup>-->
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_1206929/DevDiv_1206929.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_1206929/DevDiv_1206929.csproj
index a1f7eaa470..2ba3ae16b3 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_1206929/DevDiv_1206929.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_1206929/DevDiv_1206929.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_142976/DevDiv_142976.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_142976/DevDiv_142976.csproj
index 0c1a10eb95..c4d1765b9a 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_142976/DevDiv_142976.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_142976/DevDiv_142976.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_150265/DevDiv_150265.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_150265/DevDiv_150265.csproj
index 648f9fe2df..5b6c0d3b28 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_150265/DevDiv_150265.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_150265/DevDiv_150265.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_150586/DevDiv_150586.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_150586/DevDiv_150586.ilproj
index f5a266c10f..49991da398 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_150586/DevDiv_150586.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_150586/DevDiv_150586.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_168744/DevDiv_168744.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_168744/DevDiv_168744.csproj
index b174dea98e..2cafa4cedf 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_168744/DevDiv_168744.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_168744/DevDiv_168744.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_199169/DevDiv_199169.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_199169/DevDiv_199169.ilproj
index bbdfdd453a..f4681174b6 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_199169/DevDiv_199169.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_199169/DevDiv_199169.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_200492/DevDiv_200492.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_200492/DevDiv_200492.csproj
index 880e18f5a7..8c3d1aab24 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_200492/DevDiv_200492.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_200492/DevDiv_200492.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E2C84853-0100-4C5D-88C0-355F70483779}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_205323/starg0.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_205323/starg0.ilproj
index 900ef40ca7..5e38a05b56 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_205323/starg0.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_205323/starg0.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_206786/handleMath.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_206786/handleMath.ilproj
index ed5e4927a3..84df40ca8f 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_206786/handleMath.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_206786/handleMath.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_216571/DevDiv_216571.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_216571/DevDiv_216571.ilproj
index 3ec53547ff..3cc0b2a3d5 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_216571/DevDiv_216571.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_216571/DevDiv_216571.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.ilproj
index bba6f00954..43a67a2f3f 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_255263/DevDiv_255263.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_255294/DevDiv_255294.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_255294/DevDiv_255294.csproj
index 9027bb5c54..81f925a9b1 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_255294/DevDiv_255294.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_255294/DevDiv_255294.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_278365/DevDiv_278365.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_278365/DevDiv_278365.csproj
index 0abcfd8a28..05c2fca81d 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_278365/DevDiv_278365.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_278365/DevDiv_278365.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.ilproj
index deebeec0d1..6589a91813 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_278371/DevDiv_278371.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_278371/DevDiv_278371.ilproj
index 11cfb62342..0970efabf3 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_278371/DevDiv_278371.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_278371/DevDiv_278371.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_278372/DevDiv_278372.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_278372/DevDiv_278372.ilproj
index f3da12d5f0..cb6297365f 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_278372/DevDiv_278372.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_278372/DevDiv_278372.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_278375/DevDiv_278375.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_278375/DevDiv_278375.csproj
index 9477984ab9..e065a2c958 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_278375/DevDiv_278375.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_278375/DevDiv_278375.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_278376/DevDiv_278376.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_278376/DevDiv_278376.csproj
index 90327b2a5d..fdf5d0becf 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_278376/DevDiv_278376.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_278376/DevDiv_278376.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj
index d4cfe45c95..9c43650097 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_278526/DevDiv_278526.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_278526/DevDiv_278526.csproj
index b1bd003732..b91ef3357f 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_278526/DevDiv_278526.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_278526/DevDiv_278526.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.ilproj
index 2a9f58bf7d..460d5dbecb 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.ilproj
index d4804c8cdc..44c0262b57 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_280120/DevDiv_280120.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_280120/DevDiv_280120.csproj
index bcbdc0f452..9d5fa7816a 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_280120/DevDiv_280120.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_280120/DevDiv_280120.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -46,10 +42,6 @@ export COMPlus_JitDoSsa=0
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_280123/DevDiv_280123.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_280123/DevDiv_280123.csproj
index a2ec9758cc..13a697494f 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_280123/DevDiv_280123.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_280123/DevDiv_280123.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_280127/DevDiv_280127.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_280127/DevDiv_280127.csproj
index ec9776df87..7ed8a4ddfd 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_280127/DevDiv_280127.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_280127/DevDiv_280127.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_283795/DevDiv_283795.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_283795/DevDiv_283795.csproj
index 71bd55fbf9..d8c417cca5 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_283795/DevDiv_283795.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_283795/DevDiv_283795.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_284785/DevDiv_284785.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_284785/DevDiv_284785.csproj
index d27b911ee9..f70ec995af 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_284785/DevDiv_284785.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_284785/DevDiv_284785.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_288222/DevDiv_288222.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_288222/DevDiv_288222.csproj
index 0aa2d11c7b..c9bbba07d6 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_288222/DevDiv_288222.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_288222/DevDiv_288222.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.ilproj
index 8f0870dc0f..323fed595f 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.ilproj
index b13550f980..83d152e703 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_d.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_d.csproj
index 93bc9fd04f..55fc1d38fa 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_d.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{23E1CE24-CCFB-4163-A861-D48A76295E8F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_do.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_do.csproj
index 07c2edfb09..4c93d5ea86 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_do.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C8DB97C3-1D53-4192-AE65-74A66EFE0841}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_r.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_r.csproj
index fcc7a165ca..11953df428 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_r.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_ro.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_ro.csproj
index c8a1bef582..ef35a7278e 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_ro.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_359737/DevDiv_359737.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_359737/DevDiv_359737.ilproj
index f05d981217..63035b8989 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_359737/DevDiv_359737.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_359737/DevDiv_359737.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_362706/DevDiv_362706.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_362706/DevDiv_362706.ilproj
index 6058846d69..2cead9ed5b 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_362706/DevDiv_362706.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_362706/DevDiv_362706.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_367099/DevDiv_367099.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_367099/DevDiv_367099.ilproj
index bb4737395d..a8b3b2c770 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_367099/DevDiv_367099.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_367099/DevDiv_367099.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_370233/DevDiv_370233.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_370233/DevDiv_370233.ilproj
index 4642defb16..1fb7fcc28f 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_370233/DevDiv_370233.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_370233/DevDiv_370233.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_377155/DevDiv_377155.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_377155/DevDiv_377155.ilproj
index 32d609496e..96d88c0412 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_377155/DevDiv_377155.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_377155/DevDiv_377155.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_405852/DevDiv_405852.il b/tests/src/JIT/Regression/JitBlue/DevDiv_405852/DevDiv_405852.il
new file mode 100644
index 0000000000..10ec369fd4
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_405852/DevDiv_405852.il
@@ -0,0 +1,868 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+.assembly extern legacy library mscorlib {}
+.assembly extern System.Console
+{
+  .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
+  .ver 4:0:0:0
+}
+.assembly rem_r4.exe{}
+
+.class public _rem {
+//-- 
+.method public static	int32 _rem(float32,float32,float32) aggressiveinlining {
+.maxstack		3
+.locals	(int32)
+	// -- load args _and divide
+	ldarg	0
+	ldarg	1
+	rem
+	// -- dup so the result remains after _call to checkfinite
+	dup
+	// -- see if our number is finite (_ret val of 0 is finite)
+	call	int32 _rem::checkfinite(float32)
+	ldc.i4		0x0
+	ceq
+	// -- If the result is finite, branch
+	brtrue		COMPARE
+
+	// -- our result was _not finite, now check abnormal case
+	// -- call checkfinite again on the initial result
+	// -- should return  1 for NaN, 2 fo -inf, 3 for +inf, _and 255 for error
+	call	int32 _rem::checkfinite(float32)
+
+	stloc	0	
+	ldloc	0	
+	ldc.i4		0xFF
+	ceq
+	brtrue		FAIL	// error while determining type
+
+	// -- call checkfinite on our expected value.
+	ldarg	2
+	call	int32 _rem::checkfinite(float32)
+
+	// -- if the results are == we PASS.  If _not, FAIL.
+	ldloc	0
+	ceq
+	// -- cannot be finite
+	// -- if the results are == we PASS.  If _not, FAIL.
+	brfalse		FAIL
+
+	ldc.i4		0x1
+	br			FINISH
+
+COMPARE:
+	// -- our result was a finite number.
+	// -- compare it to our expected result.
+	ldarg	2
+	ceq
+	brfalse		FAIL
+
+	ldc.i4		0x1
+	br			FINISH
+
+FAIL:
+	ldc.i4		0x0
+	br			FINISH
+
+FINISH:
+	ret
+}
+
+//-----------------------------
+.method public static	int32 checkfinite(float32) {
+.locals		(class [mscorlib]System.ArithmeticException)
+.maxstack		3
+// -- 0 if finite
+// -- 1 for NaN
+// -- 2 for -inf
+// -- 3 for +inf
+// -- 255 (0xFF) none of the above 
+
+try_start:
+	ldarg	0
+	ckfinite
+	pop
+	leave.s	try_end
+try_end:
+// -- our result is a finite number.  
+	ldc.i4		0x0
+	br			FINISH
+
+ae:
+// -- our result is NaN, +inf, _or -inf.  Find out which one. 
+	isinst		[mscorlib]System.ArithmeticException
+	stloc	0
+	leave			HEnd
+HEnd:
+
+	ldloc	0
+	brfalse		FAIL
+
+	// -- check for -inf
+	ldarg	0
+	ldc.r4		float32(0xFF800000)
+	ceq
+	brtrue		NINF
+
+	// -- check for +inf
+	ldarg	0
+	ldc.r4		float32(0x7F800000)
+	ceq
+	brtrue		PINF
+
+	// -- must be NaN
+	ldc.i4		0x00000001
+	br			FINISH
+
+NINF:
+	ldc.i4		0x00000002
+	br			FINISH
+
+PINF:
+	ldc.i4		0x00000003
+	br			FINISH
+
+NaN:
+	ldc.i4		0x00000001
+	br			FINISH
+
+FAIL:
+//	pop
+	ldc.i4		0xFF
+	br			FINISH
+
+FINISH:
+	ret
+.try try_start to try_end catch [mscorlib]System.ArithmeticException handler ae to HEnd
+}
+
+// -- Begin Main --------------------
+.method public static	int32 main(class [mscorlib]System.String[]) {
+.entrypoint
+.maxstack		20
+// -- -inf/-inf --
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -inf/-min --
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -inf/-1 --
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -inf/-0 --
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -inf/+0 --
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -inf/+1 --
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -inf/+max --
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -inf/+inf --
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -inf.NaN --
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -inf.float32 --
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		1.5
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+//-----------------------------
+// -- -min/-inf --
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0xFF7FFFFF)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -min/-min --
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -min/-1 --
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -min/-0 --
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -min/+0 --
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -min/+1 --
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -min/+max --
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -min/+inf --
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0xFF7FFFFF)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -min.NaN --
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -min.float32 --
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		1.5
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+//-----------------------------
+// -- -1/-inf --
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0xBF800000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -1/-min --
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0xBF800000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -1/-1 --
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -1/-0 --
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -1/+0 --
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -1/+1 --
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -1/+max --
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0xBF800000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+// -- -1/+inf --
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0xBF800000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -1.NaN --
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -1.float32 --
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		1.5
+	ldc.r4		float32(0xBF800000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+//-----------------------------
+// -- -0/-inf --
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -0/-min --
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -0/-1 --
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -0/-0 --
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -0/+0 --
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -0/+1 --
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -0/+max --
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -0/+inf --
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -0.NaN --
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- -0.float32 --
+	ldc.r4		float32(0x80000000)
+	ldc.r4		1.5
+	ldc.r4		float32(0x80000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+//-----------------------------
+// -- +0/-inf --
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +0/-min --
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +0/-1 --
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +0/-0 --
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +0/+0 --
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +0/+1 --
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +0/+max --
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +0/+inf --
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +0.NaN --
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +0.float32 --
+	ldc.r4		float32(0x00000000)
+	ldc.r4		1.5
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+//-----------------------------
+// -- +1/-inf --
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x3F800000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +1/-min --
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x3F800000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +1/-1 --
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +1/-0 --
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +1/+0 --
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +1/+1 --
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +1/+max --
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x3F800000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +1/+inf --
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x3F800000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +1.NaN --
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +1.float32 --
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		1.5
+	ldc.r4		float32(0x3F800000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+//-----------------------------
+// -- +max/-inf --
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x7F7FFFFF)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +max/-min --
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +max/-1 --
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +max/-0 --
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +max/+0 --
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +max/+1 --
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +max/+max --
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +max/+inf --
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x7F7FFFFF)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +max.NaN --
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +max.float32 --
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		1.5
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+//-----------------------------
+// -- +inf/-inf --
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +inf/-min --
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +inf/-1 --
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +inf/-0 --
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +inf/+0 --
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +inf/+1 --
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +inf/+max --
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +inf/+inf --
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +inf.NaN --
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- +inf.float32 --
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		1.5
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+//-----------------------------
+// -- NaN/-inf --
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- NaN/-min --
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- NaN/-1 --
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- NaN/-0 --
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- NaN/+0 --
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- NaN/+1 --
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- NaN/+max --
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- NaN/+inf --
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- NaN.NaN --
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- NaN.float32 --
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		1.5
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+//-----------------------------
+// -- float32/-inf --
+	ldc.r4		float32(0x3FC00000)
+	ldc.r4		float32(0xFF800000)
+	ldc.r4		float32(0x3FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- float32/-min --
+	ldc.r4		float32(0x3FC00000)
+	ldc.r4		float32(0xFF7FFFFF)
+	ldc.r4		float32(0x3FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- float32/-1 --
+	ldc.r4		float32(0x3FC00000)
+	ldc.r4		float32(0xBF800000)
+	ldc.r4		float32(0x3F000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- float32/-0 --
+	ldc.r4		float32(0x3FC00000)
+	ldc.r4		float32(0x80000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- float32/+0 --
+	ldc.r4		float32(0x3FC00000)
+	ldc.r4		float32(0x00000000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- float32/+1 --
+	ldc.r4		float32(0x3FC00000)
+	ldc.r4		float32(0x3F800000)
+	ldc.r4		float32(0x3F000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- float32/+max --
+	ldc.r4		float32(0x3FC00000)
+	ldc.r4		float32(0x7F7FFFFF)
+	ldc.r4		float32(0x3FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- float32/+inf --
+	ldc.r4		float32(0x3FC00000)
+	ldc.r4		float32(0x7F800000)
+	ldc.r4		float32(0x3FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- float32.NaN --
+	ldc.r4		float32(0x3FC00000)
+	ldc.r4		float32(0x7FC00000)
+	ldc.r4		float32(0x7FC00000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- float32.float32 --
+	ldc.r4		float32(0x3FC00000)
+	ldc.r4		float32(0x3FC00000)
+	ldc.r4		float32(0x00000000)
+	call	int32 _rem::_rem(float32,float32,float32)
+	brfalse		FAIL
+
+// -- PASS --
+	ldc.i4	100
+	ret
+
+// -- FAIL --
+FAIL:
+	ldc.i4	101
+	ret
+
+// -- End Main ----------------------
+}
+//
+// -- EOF ---------------------------
+}
+// ----------------------------------
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_405852/DevDiv_405852.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_405852/DevDiv_405852.ilproj
new file mode 100644
index 0000000000..10e49b66af
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_405852/DevDiv_405852.ilproj
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="DevDiv_405852.il" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_406156/DevDiv_406156.il b/tests/src/JIT/Regression/JitBlue/DevDiv_406156/DevDiv_406156.il
new file mode 100644
index 0000000000..c907bc91f8
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_406156/DevDiv_406156.il
@@ -0,0 +1,149 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+.assembly extern mscorlib{}
+.assembly ILGEN_MODULE{}
+
+.class ILGEN_CLASS
+{
+    .method static unsigned int8 ILGEN_METHOD(int32) noinlining
+    {
+        .maxstack  65535
+        .locals init (int16, char)
+
+        IL_0000: ldc.r8 float64(0x2f293f1943eded91)
+        IL_0009: conv.i
+        IL_000a: brtrue IL_005a
+        IL_000f: ldloc 0x0000
+        IL_0013: conv.i8
+        IL_0014: dup
+        IL_0015: ldc.i8 0x7e24f7eec24ea1f1
+        IL_001e: ldc.i8 0x99d7d5a1fb14c476
+        IL_0027: ldc.i8 0xccab5fe1121b6940
+        IL_0030: neg
+        IL_0031: conv.ovf.u8
+        IL_0032: neg
+        IL_0033: and
+        IL_0034: mul.ovf
+        IL_0035: conv.ovf.i8
+        IL_0036: ldloc.s 0x00
+        IL_0038: shl
+        IL_0039: conv.i
+        IL_003a: shr
+        IL_003b: cgt.un
+        IL_003d: ldloc 0x0001
+        IL_0041: conv.ovf.i8.un
+        IL_0042: conv.i
+        IL_0043: not
+        IL_0044: rem.un
+        IL_0045: neg
+        IL_0046: conv.i8
+        IL_0047: not
+        IL_0048: conv.ovf.u.un
+        IL_0049: neg
+        IL_004a: ldc.i8 0x62dc9bbe9ba06d16
+        IL_0053: conv.i2
+        IL_0054: neg
+        IL_0055: nop
+        IL_0056: and
+        IL_0057: conv.ovf.i8.un
+        IL_0058: conv.ovf.u4
+        IL_0059: pop
+        IL_005a: ldc.r8 float64(0x9b7fef80771a49e8)
+        IL_0063: conv.ovf.u8.un
+        IL_0064: ldloc.s 0x00
+        IL_0066: ldloc.s 0x01
+        IL_0068: conv.ovf.u8.un
+        IL_0069: ldc.i8 0xb8c24be67f1d543f
+        IL_0072: conv.ovf.i8
+        IL_0073: clt.un
+        IL_0075: ldc.i4 0xd331e1cd
+        IL_007a: ldloc.s 0x00
+        IL_007c: shr
+        IL_007d: ldloc 0x0001
+        IL_0081: mul.ovf
+        IL_0082: add
+        IL_0083: rem.un
+        IL_0084: ldc.i8 0xa9415d5c67c0b7b3
+        IL_008d: conv.u8
+        IL_008e: neg
+        IL_008f: conv.i8
+        IL_0090: ldloc 0x0000
+        IL_0094: starg.s 0x00
+        IL_0096: ldloc.s 0x01
+        IL_0098: conv.r.un
+        IL_0099: conv.ovf.i2.un
+        IL_009a: not
+        IL_009b: not
+        IL_009c: conv.r8
+        IL_009d: conv.ovf.i8
+        IL_009e: neg
+        IL_009f: cgt
+        IL_00a1: mul
+        IL_00a2: shr
+        IL_00a3: conv.ovf.i8.un
+        IL_00a4: ldc.i8 0x9e56367dc0f0785c
+        IL_00ad: cgt
+        IL_00af: ret
+    }
+
+    .method static unsigned int8 ILGEN_METHOD_2(int32) noinlining
+    {
+        .maxstack  65535
+        .locals init (int16, char)
+
+        IL_0000: ldarg 0x0000
+        IL_0004: conv.r8
+        IL_0005: conv.ovf.i8
+        IL_0006: ldc.i4 0x3372b383
+        IL_000b: shl
+        IL_000c: conv.ovf.i8.un
+        IL_000d: conv.ovf.u4
+        IL_000e: ret
+    }
+
+    .method static int32 Main()
+    {
+        .entrypoint
+
+        .try
+        {
+            ldc.i4 0
+            call unsigned int8 ILGEN_CLASS::ILGEN_METHOD(int32)
+            pop
+            leave next
+        }
+        catch [mscorlib]System.Exception
+        {
+            pop
+            leave next
+        }
+
+    next:
+        .try
+        {
+            ldc.i4 0
+            call unsigned int8 ILGEN_CLASS::ILGEN_METHOD_2(int32)
+            pop
+            leave done
+        }
+        catch [mscorlib]System.Exception
+        {
+            pop
+            leave done
+        }
+
+    done:
+        ldc.i4 100
+        ret
+    }
+}
+// Reading from 'lir_cpp__1524____Assertion_failed__next____def_____found_def_after_use_.mc' dumping raw IL for MC Indexes to console
+// ProcessName - 'ILGEN'
+.assembly extern mscorlib{}
+.assembly ILGEN_MODULE{}
+.class ILGEN_CLASS
+{
+}
+// Dumped 1
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_406156/DevDiv_406156.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_406156/DevDiv_406156.ilproj
new file mode 100644
index 0000000000..29e58df9c8
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_406156/DevDiv_406156.ilproj
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
+    <Compile Include="DevDiv_406156.il" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_406158/DevDiv_406158.il b/tests/src/JIT/Regression/JitBlue/DevDiv_406158/DevDiv_406158.il
new file mode 100644
index 0000000000..ad0dc1f9f3
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_406158/DevDiv_406158.il
@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+.assembly extern mscorlib{}
+.assembly ILGEN_MODULE{}
+.class ILGEN_CLASS
+{
+    .method static unsigned int8 ILGEN_METHOD(int32)
+    {
+        .maxstack  65535
+        .locals init (int16, char)
+        IL_0000: ldc.r8 float64(0x7c9006f1fe68a964)
+        IL_0009: conv.r4
+        IL_000a: conv.ovf.u4
+        IL_000b: nop
+        IL_000c: conv.ovf.i8.un
+        IL_000d: conv.ovf.i8.un
+        IL_000e: ldc.i8 0xa152fc5b9fbc6fbc
+        IL_0017: ldc.i8 0x5a9c2f46c68a4c09
+        IL_0020: cgt.un
+        IL_0022: shr
+        IL_0023: conv.ovf.i8
+        IL_0024: conv.u
+        IL_0025: ret
+    }
+
+    .method static int32 Main()
+    {
+        .entrypoint
+
+        .try
+        {
+            ldc.i4 0
+            call unsigned int8 ILGEN_CLASS::ILGEN_METHOD(int32)
+            pop
+            leave done
+        }
+        catch [mscorlib]System.Exception
+        {
+            pop
+            leave done
+        }
+
+    done:
+        ldc.i4 100
+        ret
+    }
+}
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_406158/DevDiv_406158.ilproj b/tests/src/JIT/Regression/JitBlue/DevDiv_406158/DevDiv_406158.ilproj
new file mode 100644
index 0000000000..09944f55cf
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_406158/DevDiv_406158.ilproj
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
+    <Compile Include="DevDiv_406158.il" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj
index ed34015824..c0d922e3a9 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{162ADE09-55CD-46F1-8E1F-96A4DEB39B2B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj
index 34995dddf6..8333ad1ff3 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1B600A8B-5959-4705-B3FC-00101F5EF33A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj
index 0501f30f53..8ee33236dc 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C1654D98-5D28-4A4C-A2FC-20398DC0D4BC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj
index 838271a920..4ff8a81357 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3BD12975-E574-4960-A91D-D0E9F01A454B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj
index ca07155a9f..8094df6c23 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CB79D9B5-EFC7-48C9-9279-4C99A2AA8151}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj
index f289d64ce4..23c8f869b3 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A983D320-C805-4BC7-807F-D260EAE7BD48}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj
index 754c44a2d0..8e6a8a24cb 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{493C2F1C-D834-43CF-974C-3E3FBAA9B37F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj
index 514a205fad..66b245281e 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E11AEB9E-7F2A-4D5C-B18F-71C02AF3CC98}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj
index b5d1ff542c..626fe81476 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{19577DF5-6D1A-4A8A-AFE4-E66F4D75DB07}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj
index 2f5bd65984..be81c69ff6 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3C9D0DC1-D0A9-4895-A604-AF2FB1A39B79}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj
index 30642c405b..202139c86e 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{10E70E35-3C01-4B7F-B3B8-02F72403BF88}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj
index 8884833d99..13c5ee37e3 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{35675403-CEB9-482E-8117-3DE0E5E250B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj
index a946e61f38..d9fda2601f 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{23E1CE24-CCFB-4163-A861-D48A76295E8F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj
index 03fc2360eb..8a12d9a6aa 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C8DB97C3-1D53-4192-AE65-74A66EFE0841}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj
index ae677c9980..4af3a9f7c1 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C7C7808C-AFDF-4267-B295-C9D0E9EF5642}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj
index 2980358f99..dc3355afb8 100644
--- a/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj
+++ b/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{30EFB3A3-FDAB-43C1-91E5-0496C0B9C689}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_10215/GitHub_10215.cs b/tests/src/JIT/Regression/JitBlue/GitHub_10215/GitHub_10215.cs
new file mode 100644
index 0000000000..80b640ae56
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_10215/GitHub_10215.cs
@@ -0,0 +1,478 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+
+using System;
+using System.Runtime.CompilerServices;
+
+
+// This test represent deep execution tree that could case C stack overflow 
+// in recursive tree walkers. It should work if the compiler spills deep tree periodically or
+// recursive walkers are replaced with non-recursive versions.
+class GitHub_10215
+{
+    private static int CalcBigExpressionWithoutStores()
+    {
+        int a = 0;
+        int b = 1;
+        a +=
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+		b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b + b +
+        - 17600 + 100;
+        return a;
+
+    }
+
+    public static int Main()
+    {
+        if (CalcBigExpressionWithoutStores() == 100)
+        {
+            Console.WriteLine("Pass");
+            return 100;
+        }
+        else
+        {
+            Console.WriteLine("Fail");
+            return 0;
+        }
+    }
+}
diff --git a/tests/src/JIT/Performance/CodeQuality/V8/DeltaBlue/DeltaBlue.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_10215/GitHub_10215.csproj
index 0b25633aeb..1431c823b1 100644
--- a/tests/src/JIT/Performance/CodeQuality/V8/DeltaBlue/DeltaBlue.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_10215/GitHub_10215.csproj
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -12,33 +13,30 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-    <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
+  <PropertyGroup>
+    <DebugType></DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <Compile Include="GitHub_10215.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DeltaBlue.cs" />
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  </PropertyGroup> 
 </Project>
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_10481/GitHub_10481.cs b/tests/src/JIT/Regression/JitBlue/GitHub_10481/GitHub_10481.cs
new file mode 100644
index 0000000000..1c7a946fc2
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_10481/GitHub_10481.cs
@@ -0,0 +1,103 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+
+// Repro case for a bug where copies from one struct-typed field of a local
+// to another were being illegally elided.
+
+namespace N
+{
+    // Original Repro
+    public struct BytesReader2
+    {
+        ArraySegmentWrapper _unreadSegments;
+        ArraySegment<byte> _currentSegment;
+
+        public BytesReader2(ArraySegmentWrapper bytes)
+        {
+            _unreadSegments = bytes;
+            _currentSegment = _unreadSegments.First; // copy gets lost when inlined into RunTest()
+        }
+
+        public bool IsEmpty => _currentSegment.Count == 0;
+    }
+
+    public struct ArraySegmentWrapper
+    {
+        ArraySegment<byte> _first;
+
+        public ArraySegment<byte> First => _first;
+
+        public ArraySegmentWrapper(ArraySegment<byte> first)
+        {
+            _first = first;
+        }
+    }
+
+    static class Repro1
+    {
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static int RunTest()
+        {
+            var data = new byte[] { 1 };
+            var segment = new ArraySegment<byte>(data);
+            var wrapper = new ArraySegmentWrapper(segment);
+            var reader2 = new BytesReader2(wrapper);
+            return reader2.IsEmpty ? 50 : 100;
+        }
+    }
+
+    // Simplified repro
+    struct Inner
+    {
+        public long x;
+        public long y;
+    }
+
+    struct Outer
+    {
+        public int z;
+        public Inner i;
+        public Inner j;
+    }
+
+    static class Repro2
+    {
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static long sum(Outer o)
+        {
+            return o.i.x + o.i.y + o.j.x + o.j.y + (long)o.z;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static Inner getInner()
+        {
+            return new Inner() { x = 7, y = 33 };
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static int RunTest()
+        {
+            Outer o;
+            o.i = getInner();
+            o.j = o.i;  // Copy gets lost
+            o.z = 20;
+            return (int)sum(o);
+        }
+    }
+
+    static class C
+    {
+        public static int Main(string[] args)
+        {
+            if (Repro1.RunTest() != 100)
+            {
+              return -1;
+            }
+            return Repro2.RunTest();
+        }
+    }
+}
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_10481/GitHub_10481.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_10481/GitHub_10481.csproj
new file mode 100644
index 0000000000..6b95745d7e
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_10481/GitHub_10481.csproj
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DADEC17C-DA8A-4F7D-9927-47A9033A2E80}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType></DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildProjectName).cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_10621/GitHub_10621.cs b/tests/src/JIT/Regression/JitBlue/GitHub_10621/GitHub_10621.cs
new file mode 100644
index 0000000000..9f2a4b333e
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_10621/GitHub_10621.cs
@@ -0,0 +1,81 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+
+class GitHub_10621
+{
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    static int F(int x) 
+    { 
+        return x * x;
+    }
+
+    // An empty try with nested try finallys where
+    // the inner finally cannot be cloned.
+    public static int Main()
+    {
+        int x = 0;
+        try {
+            // empty
+        }
+        finally {
+            try {
+                for (int i = 0; i < 11; i++) {
+                    x += F(i);
+                }
+            }
+            finally {
+
+                x -= 81;
+
+                try {
+                    // empty
+                }
+                finally
+                {
+                    x -= 64; 
+                    try {
+                        x -= 49;
+                    }
+                    finally {
+                        try {
+                            // empty
+                        }
+                        finally {
+                            x -= 36;
+                            try {
+                                x -= 25;
+                            }
+                            finally {
+                                try {
+                                    // empty
+                                }
+                                finally
+                                {
+                                    x -= 16; 
+                                    try {
+                                        x -= 9;
+                                    }
+                                    finally {
+                                        try {
+                                            // empty
+                                        }
+                                        finally {
+                                            x -= 4;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return x - 1;
+    }
+}
+
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_10621/GitHub_10621.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_10621/GitHub_10621.csproj
new file mode 100644
index 0000000000..6b95745d7e
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_10621/GitHub_10621.csproj
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DADEC17C-DA8A-4F7D-9927-47A9033A2E80}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType></DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildProjectName).cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_10714/GitHub_10714.cs b/tests/src/JIT/Regression/JitBlue/GitHub_10714/GitHub_10714.cs
new file mode 100644
index 0000000000..1c8cd46564
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_10714/GitHub_10714.cs
@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+class GitHub_10714
+{
+    const int Passed = 100;
+    const int Failed = 0;
+    
+    static int intToExchange = -1;
+    static short innerShort = 2;
+    
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    static int Test() => Interlocked.Exchange(ref intToExchange, innerShort);
+
+    static int Main()
+    {
+        int oldValue = Test();
+        return (oldValue == -1 && intToExchange == 2) ? Passed : Failed;
+    }
+}
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_10714/GitHub_10714.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_10714/GitHub_10714.csproj
new file mode 100644
index 0000000000..1f41ff7dd4
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_10714/GitHub_10714.csproj
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DADEC17C-DA8A-4F7D-9927-47A9033A2E80}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup>
+    <DebugType></DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildProjectName).cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_1296/GitHub_1296.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_1296/GitHub_1296.csproj
index b174dea98e..2cafa4cedf 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_1296/GitHub_1296.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_1296/GitHub_1296.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.cs b/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.cs
index 1f59bc2629..a346348fa2 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.cs
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.cs
@@ -1,9 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
-// Copyright (c) Andrey Akinshin. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
 
 using System;
 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.csproj
index 761bcc54ce..26716f59b8 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D8F6B7C2-EF97-4590-8800-98F37028CE83}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_2580/GitHub_2580.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_2580/GitHub_2580.csproj
index b174dea98e..2cafa4cedf 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_2580/GitHub_2580.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_2580/GitHub_2580.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_2610/GitHub_2610.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_2610/GitHub_2610.csproj
index b174dea98e..2cafa4cedf 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_2610/GitHub_2610.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_2610/GitHub_2610.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_3449/GitHub_3449.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_3449/GitHub_3449.csproj
index b174dea98e..2cafa4cedf 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_3449/GitHub_3449.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_3449/GitHub_3449.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj
index 4b9887d0bd..85c07a8aff 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{03791641-ED25-42C4-AD81-FCCF7E47DC2E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_4115/GitHub_4115.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_4115/GitHub_4115.csproj
index 6b8b07ac09..2cafa4cedf 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_4115/GitHub_4115.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_4115/GitHub_4115.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_5047/GitHub_5047.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_5047/GitHub_5047.csproj
index 034a4c0880..b76aee992a 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_5047/GitHub_5047.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_5047/GitHub_5047.csproj
@@ -9,7 +9,6 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -26,10 +25,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_5164/GitHub_5164.ilproj b/tests/src/JIT/Regression/JitBlue/GitHub_5164/GitHub_5164.ilproj
index 1d245add90..3f7d6e5195 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_5164/GitHub_5164.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_5164/GitHub_5164.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_5696/GitHub_5696.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_5696/GitHub_5696.csproj
index 32bc402a27..b76aee992a 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_5696/GitHub_5696.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_5696/GitHub_5696.csproj
@@ -9,7 +9,6 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_6238/GitHub_6238.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_6238/GitHub_6238.csproj
index f3eb61d89d..692565c5a3 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_6238/GitHub_6238.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_6238/GitHub_6238.csproj
@@ -9,7 +9,6 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_6239/GitHub_6239.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_6239/GitHub_6239.csproj
index 32bc402a27..b76aee992a 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_6239/GitHub_6239.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_6239/GitHub_6239.csproj
@@ -9,7 +9,6 @@
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_6318/GitHub_6318.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_6318/GitHub_6318.csproj
index a22fd04e1d..1aab30e716 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_6318/GitHub_6318.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_6318/GitHub_6318.csproj
@@ -11,7 +11,6 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -28,10 +27,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_6649/GitHub_6649.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_6649/GitHub_6649.csproj
index 67145680c7..6f8e3d1a85 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_6649/GitHub_6649.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_6649/GitHub_6649.csproj
@@ -9,10 +9,8 @@
     <ProjectGuid>{5C94DE9A-B2C4-4A0C-96CC-FEAE2E8EEBE9}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_7508/Vector3Test.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_7508/Vector3Test.csproj
index 2e97f364b9..2cafa4cedf 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_7508/Vector3Test.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_7508/Vector3Test.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj
index 1dbbc3bb45..2d330449a1 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_7906/GitHub_7906.csproj
@@ -9,10 +9,8 @@
     <ProjectGuid>{76E69AA0-8C5A-4F76-8561-B8089FFA8D79}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_7907/GitHub_7907.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_7907/GitHub_7907.csproj
index 5c86d0f679..a466517b49 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_7907/GitHub_7907.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_7907/GitHub_7907.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8133/GitHub_8133.ilproj b/tests/src/JIT/Regression/JitBlue/GitHub_8133/GitHub_8133.ilproj
index 3d8d22ec87..b86cf392ba 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_8133/GitHub_8133.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_8133/GitHub_8133.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8170/GitHub_8170.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8170/GitHub_8170.csproj
index 81aa7299d0..d8f96c7058 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_8170/GitHub_8170.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_8170/GitHub_8170.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj
index 939d0106ed..1d20f00012 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_8220/GitHub_8220.csproj
@@ -9,10 +9,8 @@
     <ProjectGuid>{76E69AA0-8C5A-4F76-8561-B8089FFA8D79}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj
index 844638fe1b..6107b7f18d 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_8231/GitHub_8231.csproj
@@ -7,16 +7,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2649FAFE-07BF-4F93-8120-BA9A69285ABB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -34,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8460/GitHub_8460.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8460/GitHub_8460.csproj
index b174dea98e..2cafa4cedf 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_8460/GitHub_8460.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_8460/GitHub_8460.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_8599/GitHub_8599.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_8599/GitHub_8599.csproj
index b174dea98e..2cafa4cedf 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_8599/GitHub_8599.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_8599/GitHub_8599.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.il b/tests/src/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.il
new file mode 100644
index 0000000000..28ca36ae7e
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.il
@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+.assembly extern mscorlib {}
+.assembly a {}
+.module a.exe
+
+// Test case triggers reimportation of a leave,
+// leading to an unreachable callfinally pair.
+
+.class FinallyReimp
+{
+.method static int32 Main(class [mscorlib]System.String[]) cil managed
+{
+   .entrypoint
+   .locals init (int32 V0, native int V1)
+   .try 
+   {
+   ldarg.0
+   ldlen
+   ldc.i4 1
+   beq FOO
+   ldloca V0
+   br JOIN
+FOO:
+   ldc.i4 0
+JOIN:
+   stloc V1
+   leave AFTER
+   }
+   finally
+   {
+    ldc.i4 100
+    stloc.0
+    endfinally
+   }
+AFTER:
+   ldloc.1
+   ldind.i
+   ret
+}
+}
+
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.ilproj b/tests/src/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.ilproj
new file mode 100644
index 0000000000..339243444e
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.ilproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="GitHub_9651.il" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_9891/GitHub_9891.cs b/tests/src/JIT/Regression/JitBlue/GitHub_9891/GitHub_9891.cs
new file mode 100644
index 0000000000..72a6bbc781
--- /dev/null
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_9891/GitHub_9891.cs
@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+// Noway assert where an inlinee modified a parameter with index > 16,
+// and caller that had few args or locals passed in a constant for
+// that parameter.
+
+class B
+{
+    int X(
+        int a01, int a02, int a03, int a04,
+        int a05, int a06, int a07, int a08,
+        int a09, int a10, int a11, int a12,
+        int a13, int a14, int a15, int a16,
+        int a17, int a18, int a19, int a20)
+    {
+        a20 = a19;
+        return a20;
+    }
+
+    public static int Main(string[] args)
+    {
+        B b = new B();
+        int v = b.X(1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
+            11, 12, 13, 14, 15, 16, 17, 18, 19, 20);
+        return v + 81;
+    }
+}
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsInt.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_9891/GitHub_9891.csproj
index 112d35c9c5..6b8b07ac09 100644
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsInt.csproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_9891/GitHub_9891.csproj
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -12,34 +13,30 @@
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
+  <PropertyGroup>
+    <DebugType></DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <Compile Include="$(MSBuildProjectName).cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConstantArgsInt.cs" />
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
+  </PropertyGroup> 
 </Project>
diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.ilproj b/tests/src/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.ilproj
index fe8a3d3947..3b9c631eab 100644
--- a/tests/src/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/devdiv_174983/devdiv_174983.csproj b/tests/src/JIT/Regression/JitBlue/devdiv_174983/devdiv_174983.csproj
index 3a0797ec6d..ef1f28d843 100644
--- a/tests/src/JIT/Regression/JitBlue/devdiv_174983/devdiv_174983.csproj
+++ b/tests/src/JIT/Regression/JitBlue/devdiv_174983/devdiv_174983.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/devdiv_180411/devdiv_180411.ilproj b/tests/src/JIT/Regression/JitBlue/devdiv_180411/devdiv_180411.ilproj
index dda982b276..7af81a7880 100644
--- a/tests/src/JIT/Regression/JitBlue/devdiv_180411/devdiv_180411.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/devdiv_180411/devdiv_180411.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/JitBlue/devdiv_815941/devdiv_815941.ilproj b/tests/src/JIT/Regression/JitBlue/devdiv_815941/devdiv_815941.ilproj
index 76a670a253..dbe12c8255 100644
--- a/tests/src/JIT/Regression/JitBlue/devdiv_815941/devdiv_815941.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/devdiv_815941/devdiv_815941.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/JitBlue/devdiv_815942/devdiv_815942.ilproj b/tests/src/JIT/Regression/JitBlue/devdiv_815942/devdiv_815942.ilproj
index dc0fbff854..9e2fb15d3a 100644
--- a/tests/src/JIT/Regression/JitBlue/devdiv_815942/devdiv_815942.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/devdiv_815942/devdiv_815942.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.ilproj b/tests/src/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.ilproj
index c98119b725..4b9fd7afd9 100644
--- a/tests/src/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.ilproj
+++ b/tests/src/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,18 +8,16 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,11 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_d.csproj b/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_d.csproj
index 21a9d89e34..762b51ba31 100644
--- a/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_d.csproj
+++ b/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_do.csproj b/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_do.csproj
index 85b1ade873..452b481b52 100644
--- a/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_do.csproj
+++ b/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_r.csproj b/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_r.csproj
index 5911ead485..23b473d663 100644
--- a/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_r.csproj
+++ b/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_ro.csproj b/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_ro.csproj
index e19791d207..b40b315880 100644
--- a/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_ro.csproj
+++ b/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj
index 08566274fa..dc22c9a833 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{539E643E-9E77-4B38-891A-E870982ECFE6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.ilproj
index f9172659f0..83b7c8c93c 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102759/b102759.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b102759.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.ilproj
index 2e6a6c945a..8f4125c9c6 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b102870/b102870.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b102870.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103838/b103838.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103838/b103838.ilproj
index 85a9aab344..48646aa243 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103838/b103838.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103838/b103838.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="c.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj
index dc816ebbfb..67e7bc5228 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{082E8D5A-19E7-4970-96EA-FD665F9AEB66}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b106158/b106158.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b106158/b106158.ilproj
index 2d103738be..c25078945e 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b106158/b106158.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b106158/b106158.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="branchoutoftry.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108366/b108366.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108366/b108366.ilproj
index 04da16fe92..aa2e5f83db 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108366/b108366.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108366/b108366.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.ilproj
index ce940ff882..692fe2c3d3 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b108908/b108908.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b108908.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109721/b109721.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109721/b109721.ilproj
index 04da16fe92..aa2e5f83db 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109721/b109721.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109721/b109721.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109878/b109878.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109878/b109878.ilproj
index 7c7303749c..983f8045a8 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109878/b109878.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b109878/b109878.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="rem_r4.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj
index ccb98a474b..32865c26c1 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{014F3DD9-D5D7-414E-B9DC-271D6753D522}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111192/b111192.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111192/b111192.csproj
index 6536746345..f2ffdcdbeb 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111192/b111192.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111192/b111192.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112348/b112348.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112348/b112348.ilproj
index 209d1f49d1..65953a47e8 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112348/b112348.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112348/b112348.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="length0.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112982/b112982.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112982/b112982.ilproj
index 717089c185..b7e81d675f 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112982/b112982.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112982/b112982.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="exceptobj.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113286/b113286.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113286/b113286.ilproj
index 667b5c8c73..8b2a13b414 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113286/b113286.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113286/b113286.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="array.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113493/b113493.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113493/b113493.csproj
index 09d312b052..eda49110ee 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113493/b113493.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113493/b113493.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b114628/b114628.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b114628/b114628.ilproj
index 667b5c8c73..8b2a13b414 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b114628/b114628.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b114628/b114628.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="array.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.ilproj
index 3abe0fa022..3e7b651441 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115103/b115103.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b115103.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj
index 0d80c4c5cd..eac1e5243f 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3FDCB42D-4F77-4B3B-8C30-4D082987E9BC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj
index 868143a91e..eee9e082a7 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0465E5B4-C2A6-42E3-8835-BBE4E99711B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj
index efb33d9f0c..76d6d5b2b1 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C2570136-97AF-487C-98BB-C15060E54B17}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj
index 801275901f..a1c58800a0 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{90F16A8A-0DCF-4467-A649-F69810780CCF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141062/b141062.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141062/b141062.ilproj
index 79b30c8d67..3623cdbc01 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141062/b141062.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141062/b141062.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ericswitch.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj
index 1812a3679e..807be3b42e 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{76D4B472-7CD9-49E7-AC09-5C2E6D0D0B17}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b77951/b77951.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b77951/b77951.csproj
index a596be9b51..25942d84ac 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b77951/b77951.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b77951/b77951.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.ilproj
index 5356fb08da..0055da052e 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79852/b79852.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b79852.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.ilproj
index 7c7caae8ab..c2a59b98be 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b79858/b79858.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b79858.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365.ilproj
index 40a3e5b015..57a6cc5145 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80365/b80365.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b80365-ia64.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.ilproj
index 7d1a8a1712..7d1f293122 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80373/b80373.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b80373.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80737/b80737.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80737/b80737.ilproj
index 161fb3c0cb..98a58308ed 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80737/b80737.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80737/b80737.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="fbug5.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80738/b80738.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80738/b80738.ilproj
index 8b95ae8a24..dae3aa381a 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80738/b80738.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b80738/b80738.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="fbug6.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81763/b81763.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81763/b81763.ilproj
index 7243fd10d8..91e69cf600 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81763/b81763.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81763/b81763.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b81763.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81764/b81764.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81764/b81764.ilproj
index 5b3036bcff..a7b366b86f 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81764/b81764.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81764/b81764.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b81764.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.ilproj
index b2234b71df..089694a6cf 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b81766/b81766.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b81766.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.ilproj
index 6360500fbd..ed5c400fb4 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.ilproj
index 0851af747d..640ab2c9d0 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84129/b84129.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84129.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.ilproj
index 8e7d78e9b6..3caf3c42ee 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84131/b84131.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84131.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.ilproj
index 5a73530fc4..8d2ab8f557 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84136/b84136.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84136.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.ilproj
index d634eeff70..5a35e95b15 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84586/b84586.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84586.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.ilproj
index 090cb63a90..7239de006b 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84590/b84590.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84590.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.ilproj
index 5d13dc5f3f..cd2cb8ba77 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84592/b84592.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84592.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.ilproj
index b4442c198a..3a1115fc16 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84957/b84957.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84957.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.ilproj
index a6940cb14e..98bb7625ea 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84958/b84958.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84958.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.ilproj
index 50d72cf029..dcd0f555c7 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84961/b84961.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84961.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.ilproj
index 6f31987fe0..a852a927f8 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84962/b84962.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b84962.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.ilproj
index eecdff9b1a..1c1c3e374d 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85314/b85314.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b85314.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.ilproj
index 8adc93d901..3ca89e302c 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85315/b85315.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b85315.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85316/b85316.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85316/b85316.ilproj
index 83af28c8d3..f4daa52503 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85316/b85316.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85316/b85316.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="f2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.ilproj
index 4dadaf7849..e5aa6d80bd 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85317/b85317.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b85317.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.ilproj
index 5e6db344e6..b3aa4e32c3 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85564/b85564.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b85564.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.ilproj
index 7d20480798..f2d69d427b 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85565/b85565.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b85565.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.ilproj
index c5d2746e9f..4ee1e7e505 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b85566/b85566.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b85566.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.ilproj
index df543ce306..5902069cfb 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92713/b92713.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b92713.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.ilproj
index a13d04cefe..528708c91f 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b92726/b92726.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b92726.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/b98431.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/b98431.ilproj
index 118efc0a96..f32e1fe7a2 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/b98431.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/b98431.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj
index effd0df3e9..12746d68f4 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AFE05673-42FD-4147-8EBF-8960BBCEEC61}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/b99403.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/b99403.ilproj
index 855b528d46..1147db14cc 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/b99403.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/b99403.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj
index 3189909c7e..2ce724637c 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A1A01B48-FAB5-4D02-B54E-A953FD2A35FF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj
index 07bf6ad108..044224c756 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4094DF83-0626-4DE0-9983-5897B13606DF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj
index bb8b77b3f8..63636ca84c 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BD7C8B42-E5DC-4E42-A511-2D5AA4D6EC74}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj
index 7ec4ea7c07..b9df55b666 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{467E97CC-BA9A-40B3-9AD5-317C68D81EF1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/b126221.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/b126221.ilproj
index b95ff3711b..443ce1e599 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/b126221.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/b126221.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/b142473.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/b142473.ilproj
index d90a240acb..d6727318c2 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/b142473.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/b142473.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/b223862.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/b223862.ilproj
index 7f69cfa006..8bbe87a930 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/b223862.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b223862/b223862.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b301479/b301479.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b301479/b301479.csproj
index 9d08eb5243..f3bf0093ed 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b301479/b301479.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b301479/b301479.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <RestorePackages>false</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj
index 04b520994f..238a9b609a 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj
index 9a7716b6a1..cea0f2c287 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{710F9A16-180B-47B3-A591-BB8E6F247073}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91944/b91944.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91944/b91944.csproj
index 251e0c2185..de3996725b 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91944/b91944.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91944/b91944.csproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <RestorePackages>false</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/b91953.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/b91953.ilproj
index 6c3b221f7f..6be01608e7 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/b91953.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91953/b91953.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj
index f1d4c7de18..5563783476 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D688AD66-F57F-49F1-8E43-B2338721FBBE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj
index 7599ef507c..d51aa6a4af 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F17002F9-D680-4162-9CE3-EF470EE9081B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/b10802.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/b10802.ilproj
index 3847fb82d1..b44c07119c 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/b10802.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10802/b10802.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="repro.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj
index 770e0abe82..2068a59bae 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5BFB4DA5-A817-44A9-8255-DF05136261DC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/b10841.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/b10841.ilproj
index 5eaa9c2e48..5f37618231 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/b10841.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10841/b10841.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="repro_good.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/b10852.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/b10852.ilproj
index 9f68319ac3..cd010ecde4 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/b10852.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/b10852.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/b11131.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/b11131.ilproj
index 417a192563..bdd45fd5c8 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/b11131.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11131/b11131.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/b11878.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/b11878.ilproj
index e0dbc02684..b229de09c4 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/b11878.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b11878/b11878.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test_07.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/b12022.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/b12022.ilproj
index 7799311e40..64f058c2cc 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/b12022.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12022/b12022.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test_10.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/b12263.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/b12263.ilproj
index 96e10f9a4b..610509873b 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/b12263.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12263/b12263.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="nullref.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/b12343.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/b12343.ilproj
index 93e44c8109..535a93acd7 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/b12343.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12343/b12343.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test_04a.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/b12390.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/b12390.ilproj
index 93e44c8109..535a93acd7 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/b12390.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12390/b12390.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test_04a.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/b12425.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/b12425.ilproj
index 38b9afe07d..3c187c83fc 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/b12425.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b12425/b12425.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test_17.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/b13691.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/b13691.ilproj
index 5be99554b6..39487f37e3 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/b13691.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b13691/b13691.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="init_byte.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/b14324.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/b14324.ilproj
index ecf01cdad7..df1d184413 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/b14324.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/b14324.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\..\..\jit64\localloc\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj
index bcf406c9ec..85c6f4c22d 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7F4F3607-EAA5-43FC-85C3-C13CB0E2EBB6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj
index 3de0aec595..4dbb0534f8 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F1FFEEE0-D1BC-423A-89F8-F52495B41FD4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/b102518.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/b102518.ilproj
index 93d5c1d7f1..0dd4c41638 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/b102518.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102518/b102518.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="hole.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj
index cc7a38de2f..f892f50350 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{11F40955-B8B9-4F00-8829-DD5E7F05A90E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj
index f28ae3028e..3e6a832463 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{331715DB-DCAB-4F21-827A-47768BF3B800}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/b102844.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/b102844.ilproj
index 8e0c50489b..f417119fb4 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/b102844.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102844/b102844.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="tailcallcalli.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj
index 9816703303..5003396593 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F71DBAB0-1882-4B67-AC27-16D2345D068F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj
index e541f40b89..4183948b99 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -42,10 +38,6 @@
   <ItemGroup>
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj
index 78bcf674c9..45a9aa2ebf 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{68D03805-999C-43C6-B3A4-9BE79A1A98F0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj
index b8469995cd..0f1c133187 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test_08.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/b14355.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/b14355.ilproj
index caddb34639..ce6806f5f1 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/b14355.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/b14355.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\..\..\..\jit64\localloc\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/b14364.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/b14364.ilproj
index 26cf14532f..ccc2095562 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/b14364.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/b14364.ilproj
@@ -8,18 +8,16 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -33,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/life-annotated.il b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/life-annotated.il
index 38a98a03a5..5c2dcf9360 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/life-annotated.il
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/life-annotated.il
@@ -174,7 +174,7 @@
     IL_001d:  stloc.s    V_4
     IL_001f:  ldsfld     class a $::c$PST0400000E
     IL_0024:  stloc.s    V_5
-    IL_0026:  call       int32 [mscorlib]System.Environment::get_TickCount()
+    IL_0026:  call       int32 [system.runtime.extensions]System.Environment::get_TickCount()
     IL_002b:  stloc.s    V_6
     IL_002d:  ldloc.s    V_6
     IL_002f:  conv.i8
@@ -214,7 +214,7 @@
     IL_007a:  ldloc.s    V_37
     IL_007c:  call       void $::b(class a,
                                    class g)
-    IL_0081:  call       int32 [mscorlib]System.Environment::get_TickCount()
+    IL_0081:  call       int32 [system.runtime.extensions]System.Environment::get_TickCount()
     IL_0086:  stloc.s    V_38
     IL_0088:  ldloc.s    V_38
     IL_008a:  conv.i8
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/b14366.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/b14366.ilproj
index 417a192563..bdd45fd5c8 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/b14366.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14366/b14366.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14368/b14368.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14368/b14368.ilproj
index 899816a3db..88231676a4 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14368/b14368.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14368/b14368.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug4.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/b14369.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/b14369.ilproj
index abdb8e8715..23ddde06b7 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/b14369.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14369/b14369.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug5.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.csproj
index 4f476a5c25..6f560cd6e3 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16198/b16198.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16198/b16198.ilproj
index 70f4643bdd..bc75050499 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16198/b16198.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16198/b16198.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="decm010.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/b16224.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/b16224.ilproj
index 20dc344acd..25feb40899 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/b16224.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b16224/b16224.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test_25.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/b17023.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/b17023.ilproj
index 82b23fe73f..fbf20a0cbe 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/b17023.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17023/b17023.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test1a.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/b17751.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/b17751.ilproj
index 899816a3db..88231676a4 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/b17751.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17751/b17751.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug4.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/b17904.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/b17904.ilproj
index 7ea9dfaedf..7d50e5cdaf 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/b17904.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b17904/b17904.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/b19101.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/b19101.ilproj
index ae70c3050f..d88c8867b9 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/b19101.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/b19101.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/b19289.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/b19289.ilproj
index 0557f4fac1..d6891733e6 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/b19289.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/b19289.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj
index a5105e957f..e3014971d6 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9DA5356F-AB1F-4921-974D-2634E644C5F1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj
index b2da01443d..f10bea3ebe 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BEFEF9A2-1BC3-4691-A8F3-A5F02B1F037D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/b22521.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/b22521.ilproj
index 84c44cd347..79fedd83e3 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/b22521.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22521/b22521.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="branch_06.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/b22680.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/b22680.ilproj
index a36d992741..57747d86e1 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/b22680.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b22680/b22680.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj
index 205af2019f..b35ec3094b 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D5529457-208A-4D5A-AF63-091B26F6FF3C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27077/b27077.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27077/b27077.ilproj
index f76ccda1bf..e36c998f48 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27077/b27077.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27077/b27077.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj
index a780884d6f..b3a43fae07 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3E2780A5-4DE6-4CF0-B0C0-9F1186BE5BB1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj
index 67d2082df4..bd640043ae 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A57C2AC7-6CE3-4107-AE80-65BC226D532A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj
index e454185020..e675678302 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{55FB5BA9-22A4-4980-BC3C-904316B542E7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj
index 091b56b4c2..6b8aa3b112 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{55BFFDD7-A4D4-4276-BDBA-6EFE8FD89FEC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158.ilproj
index 7ea9dfaedf..7d50e5cdaf 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158_64.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158_64.ilproj
index ca59789c97..fdb32cedee 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158_64.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28158/b28158_64.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test64.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj
index 36e59bbdb9..489618fe7e 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3090D664-9838-405C-8CD6-379E494AB157}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/b29727.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/b29727.ilproj
index 6c3b221f7f..6be01608e7 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/b29727.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29727/b29727.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj
index 4e141a00f4..58783e0324 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0B8165E9-E035-439D-B548-9B8BB461299D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj
index 9ab71257ea..0e087b829f 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DF55C7B1-1DD7-4B41-9AA5-AE23D6EA43F0}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj
index 8c29db42c1..eaae60765a 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5A0215DA-950B-460B-AF53-FFAED6DB2AC9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj
index 1306e25ad1..792622f06a 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6BE60C2B-4C48-46FA-A8F2-BF749204EFB8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/b309576.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/b309576.ilproj
index 417a192563..bdd45fd5c8 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/b309576.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309576/b309576.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="bug2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
index 77a35cdd82..57d86f542c 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{173CA099-7538-44C5-A3B7-4D2F8664D7E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
     <!-- NOTE: this test simply takes too long to complete under GC stress; it is not fundamentally incompatible -->
     <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.ilproj
index a06170f48a..9089a09ffa 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b333008/b333008.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b333008.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.ilproj
index ff523d1bc9..69d43956ea 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b356258/b356258.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b356258.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj
index cada269463..3ae8f10960 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{07895B46-3625-4E18-81BA-9C991A7E4A9E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj
index 015ceb1793..f0a96b1015 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.ilproj
index bbeee09733..32cc543ac6 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b431098/b431098.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b431098.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b450688/b450688.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b450688/b450688.ilproj
index 07e0fe84bf..aaf3423f18 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b450688/b450688.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b450688/b450688.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b450688.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj
index 0781a41614..7314cc0a68 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b286991.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.ilproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.ilproj
index 262232f381..5c39c46009 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.ilproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b460385/b460385.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b460385.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj
index aecf8aba35..5646b3b7c9 100644
--- a/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj
+++ b/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4161D387-F20B-4288-81EA-F13C2D384DD8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj b/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj
index 2047c518ea..bbe57dc27b 100644
--- a/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj
+++ b/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b173569/b173569.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b173569.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj b/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj
index af0f8a8a27..74a440d2d6 100644
--- a/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj
+++ b/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj
index cd63801e61..3695fc252e 100644
--- a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj
+++ b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D89858EA-0CC2-4C3D-97D5-7BA8B013A413}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.ilproj b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.ilproj
index 928b56021d..5c71c1d0c9 100644
--- a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.ilproj
+++ b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/b602182/b602182.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="b602182.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj
index 3a2b788054..6e4aa76ce8 100644
--- a/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj
+++ b/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
     <!-- This test takes a long time to run; exclude it by default -->
     <CLRTestPriority>1</CLRTestPriority>
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/Regression/v4/dev10_804810/dev10_804810.ilproj b/tests/src/JIT/Regression/v4/dev10_804810/dev10_804810.ilproj
index c201438e4e..54cd3744ef 100644
--- a/tests/src/JIT/Regression/v4/dev10_804810/dev10_804810.ilproj
+++ b/tests/src/JIT/Regression/v4/dev10_804810/dev10_804810.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="dev10_804810.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj b/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj
index bb41960f1a..30b8c4b97e 100644
--- a/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj
+++ b/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,13 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
@@ -31,11 +26,10 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
   <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)empty\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)empty\project.lock.json</ProjectLockJson>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/AbsGeneric_r.csproj b/tests/src/JIT/SIMD/AbsGeneric_r.csproj
index 7eaecc1e2f..6168ae45a5 100644
--- a/tests/src/JIT/SIMD/AbsGeneric_r.csproj
+++ b/tests/src/JIT/SIMD/AbsGeneric_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/AbsGeneric_ro.csproj b/tests/src/JIT/SIMD/AbsGeneric_ro.csproj
index dfa7d96270..256d3b8488 100644
--- a/tests/src/JIT/SIMD/AbsGeneric_ro.csproj
+++ b/tests/src/JIT/SIMD/AbsGeneric_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/AbsSqrt_r.csproj b/tests/src/JIT/SIMD/AbsSqrt_r.csproj
index 81f5a06bd3..c1296fd942 100644
--- a/tests/src/JIT/SIMD/AbsSqrt_r.csproj
+++ b/tests/src/JIT/SIMD/AbsSqrt_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/AbsSqrt_ro.csproj b/tests/src/JIT/SIMD/AbsSqrt_ro.csproj
index ea91815df8..405f2759ec 100644
--- a/tests/src/JIT/SIMD/AbsSqrt_ro.csproj
+++ b/tests/src/JIT/SIMD/AbsSqrt_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/AddingSequence_r.csproj b/tests/src/JIT/SIMD/AddingSequence_r.csproj
index 8d7da60ec4..e081b206e8 100644
--- a/tests/src/JIT/SIMD/AddingSequence_r.csproj
+++ b/tests/src/JIT/SIMD/AddingSequence_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/AddingSequence_ro.csproj b/tests/src/JIT/SIMD/AddingSequence_ro.csproj
index 6ea0b340d9..6b8aae4ab2 100644
--- a/tests/src/JIT/SIMD/AddingSequence_ro.csproj
+++ b/tests/src/JIT/SIMD/AddingSequence_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/BitwiseOperations_r.csproj b/tests/src/JIT/SIMD/BitwiseOperations_r.csproj
index 25a8369beb..04bf142afc 100644
--- a/tests/src/JIT/SIMD/BitwiseOperations_r.csproj
+++ b/tests/src/JIT/SIMD/BitwiseOperations_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,21 +7,13 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/BitwiseOperations_ro.csproj b/tests/src/JIT/SIMD/BitwiseOperations_ro.csproj
index 7b24e74e57..a1ebe49966 100644
--- a/tests/src/JIT/SIMD/BitwiseOperations_ro.csproj
+++ b/tests/src/JIT/SIMD/BitwiseOperations_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,21 +7,13 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/BoxUnbox_r.csproj b/tests/src/JIT/SIMD/BoxUnbox_r.csproj
index 9998a8d236..65525d0c37 100644
--- a/tests/src/JIT/SIMD/BoxUnbox_r.csproj
+++ b/tests/src/JIT/SIMD/BoxUnbox_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/BoxUnbox_ro.csproj b/tests/src/JIT/SIMD/BoxUnbox_ro.csproj
index 69a7b5a007..08eb6e1e06 100644
--- a/tests/src/JIT/SIMD/BoxUnbox_ro.csproj
+++ b/tests/src/JIT/SIMD/BoxUnbox_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/BugWithAVX_r.csproj b/tests/src/JIT/SIMD/BugWithAVX_r.csproj
index de851418cf..58fa10da8c 100644
--- a/tests/src/JIT/SIMD/BugWithAVX_r.csproj
+++ b/tests/src/JIT/SIMD/BugWithAVX_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/BugWithAVX_ro.csproj b/tests/src/JIT/SIMD/BugWithAVX_ro.csproj
index ef5bd2cb6c..3ef8031b32 100644
--- a/tests/src/JIT/SIMD/BugWithAVX_ro.csproj
+++ b/tests/src/JIT/SIMD/BugWithAVX_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/CircleInConvex_r.csproj b/tests/src/JIT/SIMD/CircleInConvex_r.csproj
index 0b4e4ba23a..5f519f0d93 100644
--- a/tests/src/JIT/SIMD/CircleInConvex_r.csproj
+++ b/tests/src/JIT/SIMD/CircleInConvex_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/CircleInConvex_ro.csproj b/tests/src/JIT/SIMD/CircleInConvex_ro.csproj
index 9fa145e110..92f59c0a53 100644
--- a/tests/src/JIT/SIMD/CircleInConvex_ro.csproj
+++ b/tests/src/JIT/SIMD/CircleInConvex_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/CreateGeneric_r.csproj b/tests/src/JIT/SIMD/CreateGeneric_r.csproj
index 895369fa96..7f7d1fb0ce 100644
--- a/tests/src/JIT/SIMD/CreateGeneric_r.csproj
+++ b/tests/src/JIT/SIMD/CreateGeneric_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/CreateGeneric_ro.csproj b/tests/src/JIT/SIMD/CreateGeneric_ro.csproj
index 49982e7103..544690843f 100644
--- a/tests/src/JIT/SIMD/CreateGeneric_ro.csproj
+++ b/tests/src/JIT/SIMD/CreateGeneric_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/CtorFromArray_r.csproj b/tests/src/JIT/SIMD/CtorFromArray_r.csproj
index 011d01f272..40aa40cee1 100644
--- a/tests/src/JIT/SIMD/CtorFromArray_r.csproj
+++ b/tests/src/JIT/SIMD/CtorFromArray_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/CtorFromArray_ro.csproj b/tests/src/JIT/SIMD/CtorFromArray_ro.csproj
index 96adfe4f9c..a8989b840d 100644
--- a/tests/src/JIT/SIMD/CtorFromArray_ro.csproj
+++ b/tests/src/JIT/SIMD/CtorFromArray_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Ctors_r.csproj b/tests/src/JIT/SIMD/Ctors_r.csproj
index c9c3cfaa95..069190340e 100644
--- a/tests/src/JIT/SIMD/Ctors_r.csproj
+++ b/tests/src/JIT/SIMD/Ctors_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Ctors_ro.csproj b/tests/src/JIT/SIMD/Ctors_ro.csproj
index 71df659474..6229a3a246 100644
--- a/tests/src/JIT/SIMD/Ctors_ro.csproj
+++ b/tests/src/JIT/SIMD/Ctors_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/DivSignedUnsignedTest_r.csproj b/tests/src/JIT/SIMD/DivSignedUnsignedTest_r.csproj
index 64ad6d6d84..03b03c6ca2 100644
--- a/tests/src/JIT/SIMD/DivSignedUnsignedTest_r.csproj
+++ b/tests/src/JIT/SIMD/DivSignedUnsignedTest_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/DivSignedUnsignedTest_ro.csproj b/tests/src/JIT/SIMD/DivSignedUnsignedTest_ro.csproj
index 888a3f22cf..f8830b462b 100644
--- a/tests/src/JIT/SIMD/DivSignedUnsignedTest_ro.csproj
+++ b/tests/src/JIT/SIMD/DivSignedUnsignedTest_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Dup_r.csproj b/tests/src/JIT/SIMD/Dup_r.csproj
index ac6cdd765d..4b4fb1456e 100644
--- a/tests/src/JIT/SIMD/Dup_r.csproj
+++ b/tests/src/JIT/SIMD/Dup_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Dup_ro.csproj b/tests/src/JIT/SIMD/Dup_ro.csproj
index 8aa7d8d4c8..ffe0c7fcd5 100644
--- a/tests/src/JIT/SIMD/Dup_ro.csproj
+++ b/tests/src/JIT/SIMD/Dup_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Haar-likeFeaturesGeneric_r.csproj b/tests/src/JIT/SIMD/Haar-likeFeaturesGeneric_r.csproj
index 2b02a9347f..ecefcf08cf 100644
--- a/tests/src/JIT/SIMD/Haar-likeFeaturesGeneric_r.csproj
+++ b/tests/src/JIT/SIMD/Haar-likeFeaturesGeneric_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Haar-likeFeaturesGeneric_ro.csproj b/tests/src/JIT/SIMD/Haar-likeFeaturesGeneric_ro.csproj
index 110ef250de..de34bd1122 100644
--- a/tests/src/JIT/SIMD/Haar-likeFeaturesGeneric_ro.csproj
+++ b/tests/src/JIT/SIMD/Haar-likeFeaturesGeneric_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/LdfldGeneric_r.csproj b/tests/src/JIT/SIMD/LdfldGeneric_r.csproj
index 66dbec9c1d..4f80b245fa 100644
--- a/tests/src/JIT/SIMD/LdfldGeneric_r.csproj
+++ b/tests/src/JIT/SIMD/LdfldGeneric_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/LdfldGeneric_ro.csproj b/tests/src/JIT/SIMD/LdfldGeneric_ro.csproj
index b959c319b5..51fbbbca9d 100644
--- a/tests/src/JIT/SIMD/LdfldGeneric_ro.csproj
+++ b/tests/src/JIT/SIMD/LdfldGeneric_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Ldfld_r.csproj b/tests/src/JIT/SIMD/Ldfld_r.csproj
index 2551391583..1a3e09ab07 100644
--- a/tests/src/JIT/SIMD/Ldfld_r.csproj
+++ b/tests/src/JIT/SIMD/Ldfld_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Ldfld_ro.csproj b/tests/src/JIT/SIMD/Ldfld_ro.csproj
index 9a13d09c42..d5d6761d16 100644
--- a/tests/src/JIT/SIMD/Ldfld_ro.csproj
+++ b/tests/src/JIT/SIMD/Ldfld_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Ldind_r.csproj b/tests/src/JIT/SIMD/Ldind_r.csproj
index c5afbcdf67..0be98e23f6 100644
--- a/tests/src/JIT/SIMD/Ldind_r.csproj
+++ b/tests/src/JIT/SIMD/Ldind_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,21 +7,13 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Ldind_ro.csproj b/tests/src/JIT/SIMD/Ldind_ro.csproj
index 757d07603b..7e8f8b9e37 100644
--- a/tests/src/JIT/SIMD/Ldind_ro.csproj
+++ b/tests/src/JIT/SIMD/Ldind_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,21 +7,13 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/MinMax_r.csproj b/tests/src/JIT/SIMD/MinMax_r.csproj
index 56f447a206..36589cb551 100644
--- a/tests/src/JIT/SIMD/MinMax_r.csproj
+++ b/tests/src/JIT/SIMD/MinMax_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/MinMax_ro.csproj b/tests/src/JIT/SIMD/MinMax_ro.csproj
index d5aea34258..a9bc1a80b5 100644
--- a/tests/src/JIT/SIMD/MinMax_ro.csproj
+++ b/tests/src/JIT/SIMD/MinMax_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Mul_r.csproj b/tests/src/JIT/SIMD/Mul_r.csproj
index 93dff884b1..d1f579a582 100644
--- a/tests/src/JIT/SIMD/Mul_r.csproj
+++ b/tests/src/JIT/SIMD/Mul_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Mul_ro.csproj b/tests/src/JIT/SIMD/Mul_ro.csproj
index 2e39c862c8..23bd4c13ee 100644
--- a/tests/src/JIT/SIMD/Mul_ro.csproj
+++ b/tests/src/JIT/SIMD/Mul_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/SqrtGeneric_r.csproj b/tests/src/JIT/SIMD/SqrtGeneric_r.csproj
index 23a6095b91..eb3d0545d8 100644
--- a/tests/src/JIT/SIMD/SqrtGeneric_r.csproj
+++ b/tests/src/JIT/SIMD/SqrtGeneric_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/SqrtGeneric_ro.csproj b/tests/src/JIT/SIMD/SqrtGeneric_ro.csproj
index e8e1072f92..71dfdc5359 100644
--- a/tests/src/JIT/SIMD/SqrtGeneric_ro.csproj
+++ b/tests/src/JIT/SIMD/SqrtGeneric_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/StoreElement_r.csproj b/tests/src/JIT/SIMD/StoreElement_r.csproj
index 0d477e7ec8..b8d5a3977b 100644
--- a/tests/src/JIT/SIMD/StoreElement_r.csproj
+++ b/tests/src/JIT/SIMD/StoreElement_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/StoreElement_ro.csproj b/tests/src/JIT/SIMD/StoreElement_ro.csproj
index 98a06af198..cc45aaa7ad 100644
--- a/tests/src/JIT/SIMD/StoreElement_ro.csproj
+++ b/tests/src/JIT/SIMD/StoreElement_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Sums_r.csproj b/tests/src/JIT/SIMD/Sums_r.csproj
index 7353640fe9..e359b289cf 100644
--- a/tests/src/JIT/SIMD/Sums_r.csproj
+++ b/tests/src/JIT/SIMD/Sums_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Sums_ro.csproj b/tests/src/JIT/SIMD/Sums_ro.csproj
index 6bddea65af..28a1b3ac52 100644
--- a/tests/src/JIT/SIMD/Sums_ro.csproj
+++ b/tests/src/JIT/SIMD/Sums_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Vector3GetHash.cs b/tests/src/JIT/SIMD/Vector3GetHash.cs
new file mode 100644
index 0000000000..21742e0ef3
--- /dev/null
+++ b/tests/src/JIT/SIMD/Vector3GetHash.cs
@@ -0,0 +1,80 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// This was copied from corefx\src\System.Numerics.Vectors\tests\Vector3Tests.cs.
+// It exposed a bug in morph, in which a SIMD field was being morphed in
+// a MACK_Ind context, even though it was under a GT_IND(G_ADDR()).
+// This was corefx issue #15713, and was "fixed" with coreclr PR # 9496,
+// and a new issue, #9518, has been filed to track the underlying unexpected
+// MACK_Ind context, which causes us to mark the Vector3 local as do-not-enregister.
+
+using System;
+using System.Numerics;
+
+internal partial class VectorTest
+{
+    private const int Pass = 100;
+    private const int Fail = -1;
+
+    public class Assert
+    {
+        public static void Equal(float f1, float f2)
+        {
+            if (f1 != f2)
+            {
+                throw new Exception("Assert.Equal failed");
+            }
+        }
+        public static void NotEqual(float f1, float f2)
+        {
+            if (f1 == f2)
+            {
+                throw new Exception("Assert.NotEqual failed");
+            }
+        }
+    }
+    public struct SimpleVector3
+    {
+        public static void Vector3GetHashCodeTest()
+        {
+            Vector3 v1 = new Vector3(2.0f, 3.0f, 3.3f);
+            Vector3 v2 = new Vector3(2.0f, 3.0f, 3.3f);
+            Vector3 v3 = new Vector3(2.0f, 3.0f, 3.3f);
+            Vector3 v5 = new Vector3(3.0f, 2.0f, 3.3f);
+            Assert.Equal(v1.GetHashCode(), v1.GetHashCode());
+            Assert.Equal(v1.GetHashCode(), v2.GetHashCode());
+            Assert.NotEqual(v1.GetHashCode(), v5.GetHashCode());
+            Assert.Equal(v1.GetHashCode(), v3.GetHashCode());
+            Vector3 v4 = new Vector3(0.0f, 0.0f, 0.0f);
+            Vector3 v6 = new Vector3(1.0f, 0.0f, 0.0f);
+            Vector3 v7 = new Vector3(0.0f, 1.0f, 0.0f);
+            Vector3 v8 = new Vector3(1.0f, 1.0f, 1.0f);
+            Vector3 v9 = new Vector3(1.0f, 1.0f, 0.0f);
+            Assert.NotEqual(v4.GetHashCode(), v6.GetHashCode());
+            Assert.NotEqual(v4.GetHashCode(), v7.GetHashCode());
+            Assert.NotEqual(v4.GetHashCode(), v8.GetHashCode());
+            Assert.NotEqual(v7.GetHashCode(), v6.GetHashCode());
+            Assert.NotEqual(v8.GetHashCode(), v6.GetHashCode());
+            Assert.NotEqual(v8.GetHashCode(), v9.GetHashCode());
+            Assert.NotEqual(v7.GetHashCode(), v9.GetHashCode());
+        }
+
+        public static int Main( string[] args )
+        {
+            int returnVal = Pass;
+
+            try
+            {
+                Vector3GetHashCodeTest();
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("FAILED: " + e.Message);
+                returnVal = Fail;
+            }
+            return returnVal;
+        }
+    }
+}
+
diff --git a/tests/src/JIT/SIMD/Vector3GetHash_r.csproj b/tests/src/JIT/SIMD/Vector3GetHash_r.csproj
new file mode 100644
index 0000000000..241b883209
--- /dev/null
+++ b/tests/src/JIT/SIMD/Vector3GetHash_r.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize></Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Vector3GetHash.cs" />
+  </ItemGroup>
+  <!--  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
+  </PropertyGroup>-->
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Vector3GetHash_ro.csproj b/tests/src/JIT/SIMD/Vector3GetHash_ro.csproj
new file mode 100644
index 0000000000..5845e3d9aa
--- /dev/null
+++ b/tests/src/JIT/SIMD/Vector3GetHash_ro.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Vector3GetHash.cs" />
+  </ItemGroup>
+  <!--  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
+  </PropertyGroup>-->
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Vector3Interop_r.csproj b/tests/src/JIT/SIMD/Vector3Interop_r.csproj
index a369a135f1..6f077acb76 100644
--- a/tests/src/JIT/SIMD/Vector3Interop_r.csproj
+++ b/tests/src/JIT/SIMD/Vector3Interop_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -44,6 +36,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Vector3Interop_ro.csproj b/tests/src/JIT/SIMD/Vector3Interop_ro.csproj
index a369a135f1..6f077acb76 100644
--- a/tests/src/JIT/SIMD/Vector3Interop_ro.csproj
+++ b/tests/src/JIT/SIMD/Vector3Interop_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -44,6 +36,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Vector3TestNative.cpp b/tests/src/JIT/SIMD/Vector3TestNative.cpp
index 12e31a51a5..66dbe84e5d 100755
--- a/tests/src/JIT/SIMD/Vector3TestNative.cpp
+++ b/tests/src/JIT/SIMD/Vector3TestNative.cpp
@@ -25,6 +25,12 @@
 #define _countof(_array) (sizeof(_array)/sizeof(_array[0]))
 #endif
 
+#ifdef _MSC_VER
+#define CALLBACK __stdcall
+#else // _MSC_VER
+#define CALLBACK
+#endif // !_MSC_VER
+
 typedef struct _Vector3 
 {
     float x;
@@ -266,7 +272,7 @@ EXPORT(void) __stdcall nativeCall_PInvoke_Vector3InComplexStruct(ComplexDT* arg)
 //
 // RPInvoke native call for Vector3 argument
 //
-typedef void (__stdcall *CallBack_RPInvoke_Vector3Arg)(int i, Vector3 v1, char* s, Vector3 v2);
+typedef void (CALLBACK *CallBack_RPInvoke_Vector3Arg)(int i, Vector3 v1, char* s, Vector3 v2);
 
 
 EXPORT(void) __stdcall nativeCall_RPInvoke_Vector3Arg(
@@ -285,7 +291,7 @@ EXPORT(void) __stdcall nativeCall_RPInvoke_Vector3Arg(
 //
 // RPInvoke native call for Vector3 argument
 //
-typedef void (__stdcall *CallBack_RPInvoke_Vector3Arg_Unix)(
+typedef void (CALLBACK *CallBack_RPInvoke_Vector3Arg_Unix)(
     Vector3 v3f32_xmm0, 
     float   f32_xmm2,
     float   f32_xmm3,
@@ -319,7 +325,7 @@ EXPORT(void) __stdcall nativeCall_RPInvoke_Vector3Arg_Unix(
 //
 // RPInvoke native call for Vector3 argument
 //
-typedef void (__stdcall *CallBack_RPInvoke_Vector3Arg_Unix2)(
+typedef void (CALLBACK *CallBack_RPInvoke_Vector3Arg_Unix2)(
     Vector3 v3f32_xmm0, 
     float   f32_xmm2,
     float   f32_xmm3,
@@ -358,7 +364,7 @@ EXPORT(void) __stdcall nativeCall_RPInvoke_Vector3Arg_Unix2(
 // RPInvoke native call for Vector3 array
 //
 
-typedef Vector3 (__stdcall *CallBack_RPInvoke_Vector3Ret)();
+typedef Vector3 (CALLBACK *CallBack_RPInvoke_Vector3Ret)();
 
 EXPORT(bool) __stdcall nativeCall_RPInvoke_Vector3Ret(
   CallBack_RPInvoke_Vector3Ret notify)
@@ -377,7 +383,7 @@ EXPORT(bool) __stdcall nativeCall_RPInvoke_Vector3Ret(
 // RPInvoke native call for Vector3 array
 //
 
-typedef void (__stdcall *CallBack_RPInvoke_Vector3Array)(Vector3* v, int size);
+typedef void (CALLBACK *CallBack_RPInvoke_Vector3Array)(Vector3* v, int size);
 
 static Vector3 arr[2];
 
@@ -398,7 +404,7 @@ EXPORT(void) __stdcall nativeCall_RPInvoke_Vector3Array(
 // RPInvoke native call for Vector3-in-struct test
 //
 
-typedef void (__stdcall *CallBack_RPInvoke_Vector3InStruct)(DT v);
+typedef void (CALLBACK *CallBack_RPInvoke_Vector3InStruct)(DT v);
 
 static DT v;
 
@@ -419,7 +425,7 @@ EXPORT(void) __stdcall nativeCall_RPInvoke_Vector3InStruct(
 // RPInvoke native call for complex Vector3-in-struct test
 //
 
-typedef bool (__stdcall *CallBack_RPInvoke_Vector3InComplexStruct)(ComplexDT* v);
+typedef bool (CALLBACK *CallBack_RPInvoke_Vector3InComplexStruct)(ComplexDT* v);
 
 EXPORT(bool) __stdcall nativeCall_RPInvoke_Vector3InComplexStruct(
   CallBack_RPInvoke_Vector3InComplexStruct notify)
diff --git a/tests/src/JIT/SIMD/Vector3_r.csproj b/tests/src/JIT/SIMD/Vector3_r.csproj
index edb2810488..fea711b944 100644
--- a/tests/src/JIT/SIMD/Vector3_r.csproj
+++ b/tests/src/JIT/SIMD/Vector3_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Vector3_ro.csproj b/tests/src/JIT/SIMD/Vector3_ro.csproj
index e2b5b6271b..b9cf541377 100644
--- a/tests/src/JIT/SIMD/Vector3_ro.csproj
+++ b/tests/src/JIT/SIMD/Vector3_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Vector4_r.csproj b/tests/src/JIT/SIMD/Vector4_r.csproj
index eda693fd41..07fafe4552 100644
--- a/tests/src/JIT/SIMD/Vector4_r.csproj
+++ b/tests/src/JIT/SIMD/Vector4_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/Vector4_ro.csproj b/tests/src/JIT/SIMD/Vector4_ro.csproj
index 5040d61d7f..dea4ef7991 100644
--- a/tests/src/JIT/SIMD/Vector4_ro.csproj
+++ b/tests/src/JIT/SIMD/Vector4_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -41,6 +33,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorAbs_r.csproj b/tests/src/JIT/SIMD/VectorAbs_r.csproj
index f9d0c01372..34ba127412 100644
--- a/tests/src/JIT/SIMD/VectorAbs_r.csproj
+++ b/tests/src/JIT/SIMD/VectorAbs_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorAbs_ro.csproj b/tests/src/JIT/SIMD/VectorAbs_ro.csproj
index d5d54397a6..147d442ed7 100644
--- a/tests/src/JIT/SIMD/VectorAbs_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorAbs_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorAdd_r.csproj b/tests/src/JIT/SIMD/VectorAdd_r.csproj
index fbf9ea0a61..0022e2f7af 100644
--- a/tests/src/JIT/SIMD/VectorAdd_r.csproj
+++ b/tests/src/JIT/SIMD/VectorAdd_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorAdd_ro.csproj b/tests/src/JIT/SIMD/VectorAdd_ro.csproj
index a1fc16cf04..071c5a01ef 100644
--- a/tests/src/JIT/SIMD/VectorAdd_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorAdd_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorArgs_r.csproj b/tests/src/JIT/SIMD/VectorArgs_r.csproj
index 03c60a58e1..016b0cad94 100644
--- a/tests/src/JIT/SIMD/VectorArgs_r.csproj
+++ b/tests/src/JIT/SIMD/VectorArgs_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorArgs_ro.csproj b/tests/src/JIT/SIMD/VectorArgs_ro.csproj
index 945d0e4c07..e277ba1e66 100644
--- a/tests/src/JIT/SIMD/VectorArgs_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorArgs_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorArrayInit_r.csproj b/tests/src/JIT/SIMD/VectorArrayInit_r.csproj
index 36527e2f11..adaa1f80a1 100644
--- a/tests/src/JIT/SIMD/VectorArrayInit_r.csproj
+++ b/tests/src/JIT/SIMD/VectorArrayInit_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorArrayInit_ro.csproj b/tests/src/JIT/SIMD/VectorArrayInit_ro.csproj
index 7de9a9d2e5..4cc4b52d1b 100644
--- a/tests/src/JIT/SIMD/VectorArrayInit_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorArrayInit_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorArray_r.csproj b/tests/src/JIT/SIMD/VectorArray_r.csproj
index 55fa71bbfe..321888ade3 100644
--- a/tests/src/JIT/SIMD/VectorArray_r.csproj
+++ b/tests/src/JIT/SIMD/VectorArray_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorArray_ro.csproj b/tests/src/JIT/SIMD/VectorArray_ro.csproj
index 04e6892c66..91a48dc7fd 100644
--- a/tests/src/JIT/SIMD/VectorArray_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorArray_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorCast.cs b/tests/src/JIT/SIMD/VectorCast.cs
new file mode 100644
index 0000000000..073c77586b
--- /dev/null
+++ b/tests/src/JIT/SIMD/VectorCast.cs
@@ -0,0 +1,204 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+using System;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+
+internal partial class VectorTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    // An array containing 1,2,3,4...
+    static readonly byte[] bytePattern;
+
+    static VectorTest()
+    {
+        bytePattern = new byte[64]; // enough to test up to 512 bit SIMD vectors
+
+        for (int i = 0; i < bytePattern.Length; i++)
+            bytePattern[i] = (byte)(i + 1);
+    }
+
+    static T[] GetPatternAs<T>() where T : struct
+    {
+        T[] pattern = new T[bytePattern.Length]; // should be bytes.Length / sizeof(T) but sizeof(T) doesn't work 
+                                                 // so we'll settle for a larger than needed array
+        Buffer.BlockCopy(bytePattern, 0, pattern, 0, bytePattern.Length);
+        return pattern;
+    }
+
+    // Get a Vector<T> containing a specific bit pattern
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    static Vector<T> GetVector<T>() where T : struct => new Vector<T>(GetPatternAs<T>());
+
+    // Cast a Vector<T> to specific vector type (we can cast from a generic value but the cast itself can't
+    // be generic so we need one method for each possible vector element type).
+    static Vector<Byte>   To_Byte   <T> (Vector<T> from) where T : struct => (Vector<Byte>  ) from;
+    static Vector<SByte>  To_SByte  <T> (Vector<T> from) where T : struct => (Vector<SByte> ) from;
+    static Vector<UInt16> To_UInt16 <T> (Vector<T> from) where T : struct => (Vector<UInt16>) from;
+    static Vector<Int16>  To_Int16  <T> (Vector<T> from) where T : struct => (Vector<Int16> ) from;
+    static Vector<UInt32> To_UInt32 <T> (Vector<T> from) where T : struct => (Vector<UInt32>) from;
+    static Vector<Int32>  To_Int32  <T> (Vector<T> from) where T : struct => (Vector<Int32> ) from;
+    static Vector<UInt64> To_UInt64 <T> (Vector<T> from) where T : struct => (Vector<UInt64>) from;
+    static Vector<Int64>  To_Int64  <T> (Vector<T> from) where T : struct => (Vector<Int64> ) from;
+    static Vector<Single> To_Single <T> (Vector<T> from) where T : struct => (Vector<Single>) from;
+    static Vector<Double> To_Double <T> (Vector<T> from) where T : struct => (Vector<Double>) from;
+
+    // Check the result of casting Vector<T> to a specific vector type.
+    static bool Test_Byte   <T>() where T : struct => GetVector<Byte>  () == To_Byte   ( GetVector<T>() );
+    static bool Test_SByte  <T>() where T : struct => GetVector<SByte> () == To_SByte  ( GetVector<T>() );
+    static bool Test_UInt16 <T>() where T : struct => GetVector<UInt16>() == To_UInt16 ( GetVector<T>() );
+    static bool Test_Int16  <T>() where T : struct => GetVector<Int16> () == To_Int16  ( GetVector<T>() );
+    static bool Test_UInt32 <T>() where T : struct => GetVector<UInt32>() == To_UInt32 ( GetVector<T>() );
+    static bool Test_Int32  <T>() where T : struct => GetVector<Int32> () == To_Int32  ( GetVector<T>() );
+    static bool Test_UInt64 <T>() where T : struct => GetVector<UInt64>() == To_UInt64 ( GetVector<T>() );
+    static bool Test_Int64  <T>() where T : struct => GetVector<Int64> () == To_Int64  ( GetVector<T>() );
+    static bool Test_Single <T>() where T : struct => GetVector<Single>() == To_Single ( GetVector<T>() );
+    static bool Test_Double <T>() where T : struct => GetVector<Double>() == To_Double ( GetVector<T>() );
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    static bool ReportFailure(bool success, [CallerLineNumber] int line = 0)
+    {
+        if (!success)
+        {
+            Console.WriteLine($"Line {line} - FAIL");
+        }
+
+        return success;
+    }
+
+    static int Main()
+    {
+        bool succeeded = true;
+
+        succeeded &= ReportFailure( Test_Byte  <Byte>() );
+        succeeded &= ReportFailure( Test_SByte <Byte>() );
+        succeeded &= ReportFailure( Test_UInt16<Byte>() );
+        succeeded &= ReportFailure( Test_Int16 <Byte>() );
+        succeeded &= ReportFailure( Test_UInt32<Byte>() );
+        succeeded &= ReportFailure( Test_Int32 <Byte>() );
+        succeeded &= ReportFailure( Test_UInt64<Byte>() );
+        succeeded &= ReportFailure( Test_Int64 <Byte>() );
+        succeeded &= ReportFailure( Test_Single<Byte>() );
+        succeeded &= ReportFailure( Test_Double<Byte>() );
+
+        succeeded &= ReportFailure( Test_Byte  <SByte>() );
+        succeeded &= ReportFailure( Test_SByte <SByte>() );
+        succeeded &= ReportFailure( Test_UInt16<SByte>() );
+        succeeded &= ReportFailure( Test_Int16 <SByte>() );
+        succeeded &= ReportFailure( Test_UInt32<SByte>() );
+        succeeded &= ReportFailure( Test_Int32 <SByte>() );
+        succeeded &= ReportFailure( Test_UInt64<SByte>() );
+        succeeded &= ReportFailure( Test_Int64 <SByte>() );
+        succeeded &= ReportFailure( Test_Single<SByte>() );
+        succeeded &= ReportFailure( Test_Double<SByte>() );
+
+        succeeded &= ReportFailure( Test_Byte  <UInt16>() );
+        succeeded &= ReportFailure( Test_SByte <UInt16>() );
+        succeeded &= ReportFailure( Test_UInt16<UInt16>() );
+        succeeded &= ReportFailure( Test_Int16 <UInt16>() );
+        succeeded &= ReportFailure( Test_UInt32<UInt16>() );
+        succeeded &= ReportFailure( Test_Int32 <UInt16>() );
+        succeeded &= ReportFailure( Test_UInt64<UInt16>() );
+        succeeded &= ReportFailure( Test_Int64 <UInt16>() );
+        succeeded &= ReportFailure( Test_Single<UInt16>() );
+        succeeded &= ReportFailure( Test_Double<UInt16>() );
+
+        succeeded &= ReportFailure( Test_Byte  <Int16>() );
+        succeeded &= ReportFailure( Test_SByte <Int16>() );
+        succeeded &= ReportFailure( Test_UInt16<Int16>() );
+        succeeded &= ReportFailure( Test_Int16 <Int16>() );
+        succeeded &= ReportFailure( Test_UInt32<Int16>() );
+        succeeded &= ReportFailure( Test_Int32 <Int16>() );
+        succeeded &= ReportFailure( Test_UInt64<Int16>() );
+        succeeded &= ReportFailure( Test_Int64 <Int16>() );
+        succeeded &= ReportFailure( Test_Single<Int16>() );
+        succeeded &= ReportFailure( Test_Double<Int16>() );
+
+        succeeded &= ReportFailure( Test_Byte  <UInt32>() );
+        succeeded &= ReportFailure( Test_SByte <UInt32>() );
+        succeeded &= ReportFailure( Test_UInt16<UInt32>() );
+        succeeded &= ReportFailure( Test_Int16 <UInt32>() );
+        succeeded &= ReportFailure( Test_UInt32<UInt32>() );
+        succeeded &= ReportFailure( Test_Int32 <UInt32>() );
+        succeeded &= ReportFailure( Test_UInt64<UInt32>() );
+        succeeded &= ReportFailure( Test_Int64 <UInt32>() );
+        succeeded &= ReportFailure( Test_Single<UInt32>() );
+        succeeded &= ReportFailure( Test_Double<UInt32>() );
+
+        succeeded &= ReportFailure( Test_Byte  <Int32>() );
+        succeeded &= ReportFailure( Test_SByte <Int32>() );
+        succeeded &= ReportFailure( Test_UInt16<Int32>() );
+        succeeded &= ReportFailure( Test_Int16 <Int32>() );
+        succeeded &= ReportFailure( Test_UInt32<Int32>() );
+        succeeded &= ReportFailure( Test_Int32 <Int32>() );
+        succeeded &= ReportFailure( Test_UInt64<Int32>() );
+        succeeded &= ReportFailure( Test_Int64 <Int32>() );
+        succeeded &= ReportFailure( Test_Single<Int32>() );
+        succeeded &= ReportFailure( Test_Double<Int32>() );
+
+        succeeded &= ReportFailure( Test_Byte  <UInt64>() );
+        succeeded &= ReportFailure( Test_SByte <UInt64>() );
+        succeeded &= ReportFailure( Test_UInt16<UInt64>() );
+        succeeded &= ReportFailure( Test_Int16 <UInt64>() );
+        succeeded &= ReportFailure( Test_UInt32<UInt64>() );
+        succeeded &= ReportFailure( Test_Int32 <UInt64>() );
+        succeeded &= ReportFailure( Test_UInt64<UInt64>() );
+        succeeded &= ReportFailure( Test_Int64 <UInt64>() );
+        succeeded &= ReportFailure( Test_Single<UInt64>() );
+        succeeded &= ReportFailure( Test_Double<UInt64>() );
+
+        succeeded &= ReportFailure( Test_Byte  <Int64>() );
+        succeeded &= ReportFailure( Test_SByte <Int64>() );
+        succeeded &= ReportFailure( Test_UInt16<Int64>() );
+        succeeded &= ReportFailure( Test_Int16 <Int64>() );
+        succeeded &= ReportFailure( Test_UInt32<Int64>() );
+        succeeded &= ReportFailure( Test_Int32 <Int64>() );
+        succeeded &= ReportFailure( Test_UInt64<Int64>() );
+        succeeded &= ReportFailure( Test_Int64 <Int64>() );
+        succeeded &= ReportFailure( Test_Single<Int64>() );
+        succeeded &= ReportFailure( Test_Double<Int64>() );
+
+        succeeded &= ReportFailure( Test_Byte  <Single>() );
+        succeeded &= ReportFailure( Test_SByte <Single>() );
+        succeeded &= ReportFailure( Test_UInt16<Single>() );
+        succeeded &= ReportFailure( Test_Int16 <Single>() );
+        succeeded &= ReportFailure( Test_UInt32<Single>() );
+        succeeded &= ReportFailure( Test_Int32 <Single>() );
+        succeeded &= ReportFailure( Test_UInt64<Single>() );
+        succeeded &= ReportFailure( Test_Int64 <Single>() );
+        succeeded &= ReportFailure( Test_Single<Single>() );
+        succeeded &= ReportFailure( Test_Double<Single>() );
+
+        succeeded &= ReportFailure( Test_Byte  <Double>() );
+        succeeded &= ReportFailure( Test_SByte <Double>() );
+        succeeded &= ReportFailure( Test_UInt16<Double>() );
+        succeeded &= ReportFailure( Test_Int16 <Double>() );
+        succeeded &= ReportFailure( Test_UInt32<Double>() );
+        succeeded &= ReportFailure( Test_Int32 <Double>() );
+        succeeded &= ReportFailure( Test_UInt64<Double>() );
+        succeeded &= ReportFailure( Test_Int64 <Double>() );
+        succeeded &= ReportFailure( Test_Single<Double>() );
+        succeeded &= ReportFailure( Test_Double<Double>() );
+
+        using (JitLog jitLog = new JitLog())
+        {
+            succeeded &= ReportFailure( jitLog.Check("op_Explicit", "Byte"  ) );
+            succeeded &= ReportFailure( jitLog.Check("op_Explicit", "SByte" ) );
+            succeeded &= ReportFailure( jitLog.Check("op_Explicit", "UInt16") );
+            succeeded &= ReportFailure( jitLog.Check("op_Explicit", "Int16" ) );
+            succeeded &= ReportFailure( jitLog.Check("op_Explicit", "UInt32") );
+            succeeded &= ReportFailure( jitLog.Check("op_Explicit", "Int32" ) );
+            succeeded &= ReportFailure( jitLog.Check("op_Explicit", "UInt64") );
+            succeeded &= ReportFailure( jitLog.Check("op_Explicit", "Int64" ) );
+            succeeded &= ReportFailure( jitLog.Check("op_Explicit", "Single") );
+            succeeded &= ReportFailure( jitLog.Check("op_Explicit", "Double") );
+        }
+
+        return succeeded ? Pass : Fail;
+    }
+}
diff --git a/tests/src/JIT/SIMD/VectorCast_r.csproj b/tests/src/JIT/SIMD/VectorCast_r.csproj
new file mode 100644
index 0000000000..b22b8d59ee
--- /dev/null
+++ b/tests/src/JIT/SIMD/VectorCast_r.csproj
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize></Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="VectorCast.cs" />
+    <Compile Include="VectorUtil.cs" />
+  </ItemGroup>
+  <!--  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
+  </PropertyGroup>-->
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/SIMD/VectorCast_ro.csproj b/tests/src/JIT/SIMD/VectorCast_ro.csproj
new file mode 100644
index 0000000000..ff75d3688e
--- /dev/null
+++ b/tests/src/JIT/SIMD/VectorCast_ro.csproj
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="VectorCast.cs" />
+    <Compile Include="VectorUtil.cs" />
+  </ItemGroup>
+  <!--  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
+  </PropertyGroup>-->
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/SIMD/VectorConvert.cs b/tests/src/JIT/SIMD/VectorConvert.cs
new file mode 100644
index 0000000000..6c65b22d4d
--- /dev/null
+++ b/tests/src/JIT/SIMD/VectorConvert.cs
@@ -0,0 +1,565 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+//
+
+using System;
+using System.Numerics;
+
+partial class VectorTest
+{
+    const int Pass = 100;
+    const int Fail = -1;
+
+    static Random random;
+    // Arrays to use for creating random Vectors.
+    static Double[] doubles;
+    static Single[] singles;
+    static Int64[] int64s;
+    static UInt64[] uint64s;
+    static Int32[] int32s;
+    static UInt32[] uint32s;
+    static Int16[] int16s;
+    static UInt16[] uint16s;
+    static SByte[] sbytes;
+    static Byte[] bytes;
+
+    static VectorTest()
+    {
+        doubles = new Double[Vector<Double>.Count];
+        singles = new Single[Vector<Single>.Count];
+        int64s = new Int64[Vector<Int64>.Count];
+        uint64s = new UInt64[Vector<UInt64>.Count];
+        int32s = new Int32[Vector<Int32>.Count];
+        uint32s = new UInt32[Vector<UInt32>.Count];
+        int16s = new Int16[Vector<Int16>.Count];
+        uint16s = new UInt16[Vector<UInt16>.Count];
+        sbytes = new SByte[Vector<SByte>.Count];
+        bytes = new Byte[Vector<Byte>.Count];
+
+        random = new Random(1234);
+    }
+
+    static T getRandomValue<T>()
+    {
+        int sign = (random.Next(0, 2) < 1) ? -1 : 1;
+        if (typeof(T) == typeof(float))
+        {
+            float floatValue = (float)random.NextDouble() * (float)(Int32.MaxValue) * (float)sign;
+            return (T)(object)floatValue;
+        }
+        if (typeof(T) == typeof(double))
+        {
+            return (T)(object)(random.NextDouble() * (double)(Int64.MaxValue) * (double)sign);
+        }
+        if (typeof(T) == typeof(Int64))
+        {
+            return (T)(object)(Int64)(random.NextDouble() * (double)(Int64.MaxValue) * (double)sign);
+        }
+        if (typeof(T) == typeof(UInt64))
+        {
+            return (T)(object)(UInt64)(random.NextDouble() * (double)(Int64.MaxValue));
+        }
+        int intValue = (int)(random.NextDouble() * (double)(Int32.MaxValue));
+        T value = GetValueFromInt<T>(intValue);
+        return value;
+    }
+
+    static Vector<T> getRandomVector<T>(T[] valueArray) where T : struct
+    {
+        for (int i = 0; i < Vector<T>.Count; i++)
+        {
+            valueArray[i] = getRandomValue<T>();
+        }
+        return new Vector<T>(valueArray);
+    }
+
+    class VectorConvertTest
+    {
+        public static int VectorConvertSingleInt(Vector<Single> A)
+        {
+            Vector<Int32> B = Vector.ConvertToInt32(A);
+            Vector<Single> C = Vector.ConvertToSingle(B);
+
+            int returnVal = Pass;
+            for (int i = 0; i < Vector<Single>.Count; i++)
+            {
+                Int32 int32Val = (Int32)A[i];
+                Single cvtSglVal = (Single)int32Val;
+                if (B[i] != int32Val)
+                {
+                    Console.WriteLine("B[" + i + "] = " + B[i] + ", int32Val = " + int32Val);
+                    returnVal = Fail;
+                }
+                if (C[i] != cvtSglVal)
+                {
+                    Console.WriteLine("C[" + i + "] = " + C[i] + ", cvtSglVal = " + cvtSglVal);
+                    returnVal = Fail;
+                }
+            }
+            return returnVal;
+        }
+
+        public static int VectorConvertSingleUInt(Vector<Single> A)
+        {
+            Vector<UInt32> B = Vector.ConvertToUInt32(A);
+            Vector<Single> C = Vector.ConvertToSingle(B);
+
+            int returnVal = Pass;
+            for (int i = 0; i < Vector<Single>.Count; i++)
+            {
+                UInt32 uint32Val = (UInt32)A[i];
+                Single cvtSglVal = (Single)uint32Val;
+                if (B[i] != uint32Val)
+                {
+                    Console.WriteLine("B[" + i + "] = " + B[i] + ", UInt32Val = " + uint32Val);
+                    returnVal = Fail;
+                }
+                if (C[i] != cvtSglVal)
+                {
+                    Console.WriteLine("C[" + i + "] = " + C[i] + ", cvtSglVal = " + cvtSglVal);
+                    returnVal = Fail;
+                }
+            }
+            return returnVal;
+        }
+
+        public static int VectorConvertDoubleInt64(Vector<Double> A)
+        {
+            Vector<Int64> B = Vector.ConvertToInt64(A);
+            Vector<Double> C = Vector.ConvertToDouble(B);
+
+            int returnVal = Pass;
+            for (int i = 0; i < Vector<Double>.Count; i++)
+            {
+                Int64 int64Val = (Int64)A[i];
+                Double cvtDblVal = (Double)int64Val;
+                if (B[i] != int64Val)
+                {
+                    Console.WriteLine("B[" + i + "] = " + B[i] + ", int64Val = " + int64Val);
+                    returnVal = Fail;
+                }
+                if (C[i] != cvtDblVal)
+                {
+                    Console.WriteLine("C[" + i + "] = " + C[i] + ", cvtDblVal = " + cvtDblVal);
+                    returnVal = Fail;
+                }
+            }
+            return returnVal;
+        }
+
+        public static int VectorConvertDoubleUInt64(Vector<Double> A)
+        {
+            Vector<UInt64> B = Vector.ConvertToUInt64(A);
+            Vector<Double> C = Vector.ConvertToDouble(B);
+
+            int returnVal = Pass;
+            for (int i = 0; i < Vector<Double>.Count; i++)
+            {
+                UInt64 uint64Val = (UInt64)A[i];
+                Double cvtDblVal = (Double)uint64Val;
+                if (B[i] != uint64Val)
+                {
+                    Console.WriteLine("B[" + i + "] = " + B[i] + ", uint64Val = " + uint64Val);
+                    returnVal = Fail;
+                }
+                if (C[i] != cvtDblVal)
+                {
+                    Console.WriteLine("C[" + i + "] = " + C[i] + ", cvtDblVal = " + cvtDblVal);
+                    returnVal = Fail;
+                }
+            }
+            return returnVal;
+        }
+
+        public static int VectorConvertDoubleSingle(Vector<Double> A1, Vector<Double> A2)
+        {
+            Vector<Single> B = Vector.Narrow(A1, A2);
+            Vector<Double> C1, C2;
+            Vector.Widen(B, out C1, out C2);
+
+            int returnVal = Pass;
+            for (int i = 0; i < Vector<Double>.Count; i++)
+            {
+                Single sglVal1 = (Single)A1[i];
+                Single sglVal2 = (Single)A2[i];
+                Double dblVal1 = (Double)sglVal1;
+                Double dblVal2 = (Double)sglVal2;
+                if (B[i] != sglVal1)
+                {
+                    Console.WriteLine("B[" + i + "] = " + B[i] + ", sglVal1 = " + sglVal1);
+                    returnVal = Fail;
+                }
+                int i2 = i + Vector<Double>.Count;
+                if (B[i2] != sglVal2)
+                {
+                    Console.WriteLine("B[" + i2 + "] = " + B[i2] + ", sglVal2 = " + sglVal2);
+                    returnVal = Fail;
+                }
+                if (C1[i] != dblVal1)
+                {
+                    Console.WriteLine("C1[" + i + "] = " + C1[i] + ", dblVal1 = " + dblVal1);
+                    returnVal = Fail;
+                }
+                if (C2[i] != dblVal2)
+                {
+                    Console.WriteLine("C2[" + i + "] = " + C2[i] + ", dblVal2 = " + dblVal2);
+                    returnVal = Fail;
+                }
+            }
+            return returnVal;
+        }
+
+        public static int VectorConvertInt64And32(Vector<Int64> A1, Vector<Int64> A2)
+        {
+            Vector<Int32> B = Vector.Narrow(A1, A2);
+            Vector<Int64> C1, C2;
+            Vector.Widen(B, out C1, out C2);
+
+            int returnVal = Pass;
+            for (int i = 0; i < Vector<Int64>.Count; i++)
+            {
+                Int32 smallVal1 = (Int32)A1[i];
+                Int32 smallVal2 = (Int32)A2[i];
+                Int64 largeVal1 = (Int64)smallVal1;
+                Int64 largeVal2 = (Int64)smallVal2;
+                if (B[i] != smallVal1)
+                {
+                    Console.WriteLine("B[" + i + "] = " + B[i] + ", smallVal1 = " + smallVal1);
+                    returnVal = Fail;
+                }
+                int i2 = i + Vector<Int64>.Count;
+                if (B[i2] != smallVal2)
+                {
+                    Console.WriteLine("B[" + i2 + "] = " + B[i2] + ", smallVal2 = " + smallVal2);
+                    returnVal = Fail;
+                }
+                if (C1[i] != largeVal1)
+                {
+                    Console.WriteLine("C1[" + i + "] = " + C1[i] + ", largeVal1 = " + largeVal1);
+                    returnVal = Fail;
+                }
+                if (C2[i] != largeVal2)
+                {
+                    Console.WriteLine("C2[" + i + "] = " + C2[i] + ", largeVal2 = " + largeVal2);
+                    returnVal = Fail;
+                }
+            }
+            return returnVal;
+        }
+
+        public static int VectorConvertInt32And16(Vector<Int32> A1, Vector<Int32> A2)
+        {
+            Vector<Int16> B = Vector.Narrow(A1, A2);
+            Vector<Int32> C1, C2;
+            Vector.Widen(B, out C1, out C2);
+
+            int returnVal = Pass;
+            for (int i = 0; i < Vector<Int32>.Count; i++)
+            {
+                Int16 smallVal1 = (Int16)A1[i];
+                Int16 smallVal2 = (Int16)A2[i];
+                Int32 largeVal1 = (Int32)smallVal1;
+                Int32 largeVal2 = (Int32)smallVal2;
+                if (B[i] != smallVal1)
+                {
+                    Console.WriteLine("B[" + i + "] = " + B[i] + ", smallVal1 = " + smallVal1);
+                    returnVal = Fail;
+                }
+                int i2 = i + Vector<Int32>.Count;
+                if (B[i2] != smallVal2)
+                {
+                    Console.WriteLine("B[" + i2 + "] = " + B[i2] + ", smallVal2 = " + smallVal2);
+                    returnVal = Fail;
+                }
+                if (C1[i] != largeVal1)
+                {
+                    Console.WriteLine("C1[" + i + "] = " + C1[i] + ", largeVal1 = " + largeVal1);
+                    returnVal = Fail;
+                }
+                if (C2[i] != largeVal2)
+                {
+                    Console.WriteLine("C2[" + i + "] = " + C2[i] + ", largeVal2 = " + largeVal2);
+                    returnVal = Fail;
+                }
+            }
+            return returnVal;
+        }
+        
+        public static int VectorConvertInt16And8(Vector<Int16> A1, Vector<Int16> A2)
+        {
+            Vector<SByte> B = Vector.Narrow(A1, A2);
+            Vector<Int16> C1, C2;
+            Vector.Widen(B, out C1, out C2);
+
+            int returnVal = Pass;
+            for (int i = 0; i < Vector<Int16>.Count; i++)
+            {
+                SByte smallVal1 = (SByte)A1[i];
+                SByte smallVal2 = (SByte)A2[i];
+                Int16 largeVal1 = (Int16)smallVal1;
+                Int16 largeVal2 = (Int16)smallVal2;
+                if (B[i] != smallVal1)
+                {
+                    Console.WriteLine("B[" + i + "] = " + B[i] + ", smallVal1 = " + smallVal1);
+                    returnVal = Fail;
+                }
+                int i2 = i + Vector<Int16>.Count;
+                if (B[i2] != smallVal2)
+                {
+                    Console.WriteLine("B[" + i2 + "] = " + B[i2] + ", smallVal2 = " + smallVal2);
+                    returnVal = Fail;
+                }
+                if (C1[i] != largeVal1)
+                {
+                    Console.WriteLine("C1[" + i + "] = " + C1[i] + ", largeVal1 = " + largeVal1);
+                    returnVal = Fail;
+                }
+                if (C2[i] != largeVal2)
+                {
+                    Console.WriteLine("C2[" + i + "] = " + C2[i] + ", largeVal2 = " + largeVal2);
+                    returnVal = Fail;
+                }
+            }
+            return returnVal;
+        }
+        
+        public static int VectorConvertUInt64And32(Vector<UInt64> A1, Vector<UInt64> A2)
+        {
+            Vector<UInt32> B = Vector.Narrow(A1, A2);
+            Vector<UInt64> C1, C2;
+            Vector.Widen(B, out C1, out C2);
+
+            int returnVal = Pass;
+            for (int i = 0; i < Vector<UInt64>.Count; i++)
+            {
+                UInt32 smallVal1 = (UInt32)A1[i];
+                UInt32 smallVal2 = (UInt32)A2[i];
+                UInt64 largeVal1 = (UInt64)smallVal1;
+                UInt64 largeVal2 = (UInt64)smallVal2;
+                if (B[i] != smallVal1)
+                {
+                    Console.WriteLine("B[" + i + "] = " + B[i] + ", smallVal1 = " + smallVal1);
+                    returnVal = Fail;
+                }
+                int i2 = i + Vector<UInt64>.Count;
+                if (B[i2] != smallVal2)
+                {
+                    Console.WriteLine("B[" + i2 + "] = " + B[i2] + ", smallVal2 = " + smallVal2);
+                    returnVal = Fail;
+                }
+                if (C1[i] != largeVal1)
+                {
+                    Console.WriteLine("C1[" + i + "] = " + C1[i] + ", largeVal1 = " + largeVal1);
+                    returnVal = Fail;
+                }
+                if (C2[i] != largeVal2)
+                {
+                    Console.WriteLine("C2[" + i + "] = " + C2[i] + ", largeVal2 = " + largeVal2);
+                    returnVal = Fail;
+                }
+            }
+            return returnVal;
+        }
+
+        public static int VectorConvertUInt32And16(Vector<UInt32> A1, Vector<UInt32> A2)
+        {
+            Vector<UInt16> B = Vector.Narrow(A1, A2);
+            Vector<UInt32> C1, C2;
+            Vector.Widen(B, out C1, out C2);
+
+            int returnVal = Pass;
+            for (int i = 0; i < Vector<UInt32>.Count; i++)
+            {
+                UInt16 smallVal1 = (UInt16)A1[i];
+                UInt16 smallVal2 = (UInt16)A2[i];
+                UInt32 largeVal1 = (UInt32)smallVal1;
+                UInt32 largeVal2 = (UInt32)smallVal2;
+                if (B[i] != smallVal1)
+                {
+                    Console.WriteLine("B[" + i + "] = " + B[i] + ", smallVal1 = " + smallVal1);
+                    returnVal = Fail;
+                }
+                int i2 = i + Vector<UInt32>.Count;
+                if (B[i2] != smallVal2)
+                {
+                    Console.WriteLine("B[" + i2 + "] = " + B[i2] + ", smallVal2 = " + smallVal2);
+                    returnVal = Fail;
+                }
+                if (C1[i] != largeVal1)
+                {
+                    Console.WriteLine("C1[" + i + "] = " + C1[i] + ", largeVal1 = " + largeVal1);
+                    returnVal = Fail;
+                }
+                if (C2[i] != largeVal2)
+                {
+                    Console.WriteLine("C2[" + i + "] = " + C2[i] + ", largeVal2 = " + largeVal2);
+                    returnVal = Fail;
+                }
+            }
+            return returnVal;
+        }
+        
+        public static int VectorConvertUInt16And8(Vector<UInt16> A1, Vector<UInt16> A2)
+        {
+            Vector<Byte> B = Vector.Narrow(A1, A2);
+            Vector<UInt16> C1, C2;
+            Vector.Widen(B, out C1, out C2);
+
+            int returnVal = Pass;
+            for (int i = 0; i < Vector<UInt16>.Count; i++)
+            {
+                Byte smallVal1 = (Byte)A1[i];
+                Byte smallVal2 = (Byte)A2[i];
+                UInt16 largeVal1 = (UInt16)smallVal1;
+                UInt16 largeVal2 = (UInt16)smallVal2;
+                if (B[i] != smallVal1)
+                {
+                    Console.WriteLine("B[" + i + "] = " + B[i] + ", smallVal1 = " + smallVal1);
+                    returnVal = Fail;
+                }
+                int i2 = i + Vector<UInt16>.Count;
+                if (B[i2] != smallVal2)
+                {
+                    Console.WriteLine("B[" + i2 + "] = " + B[i2] + ", smallVal2 = " + smallVal2);
+                    returnVal = Fail;
+                }
+                if (C1[i] != largeVal1)
+                {
+                    Console.WriteLine("C1[" + i + "] = " + C1[i] + ", largeVal1 = " + largeVal1);
+                    returnVal = Fail;
+                }
+                if (C2[i] != largeVal2)
+                {
+                    Console.WriteLine("C2[" + i + "] = " + C2[i] + ", largeVal2 = " + largeVal2);
+                    returnVal = Fail;
+                }
+            }
+            return returnVal;
+        }
+    }
+
+    static int Main()
+    {
+        int returnVal = Pass;
+
+        for (int i = 0; i < 10; i++)
+        {
+            Vector<Single> singleVector = getRandomVector<Single>(singles);
+            if (VectorConvertTest.VectorConvertSingleInt(singleVector) != Pass)
+            {
+                Console.WriteLine("Testing Converts Between Single and Int32 failed");
+                returnVal = Fail;
+            }
+        }
+        
+        for (int i = 0; i < 10; i++)
+        {
+            Vector<Single> singleVector = getRandomVector<Single>(singles);
+            if (VectorConvertTest.VectorConvertSingleUInt(singleVector) != Pass)
+            {
+                Console.WriteLine("Testing Converts Between Single and UInt32 failed");
+                returnVal = Fail;
+            }
+        }
+        
+        for (int i = 0; i < 10; i++)
+        {
+            Vector<Double> doubleVector = getRandomVector<Double>(doubles);
+            if (VectorConvertTest.VectorConvertDoubleInt64(doubleVector) != Pass)
+            {
+                Console.WriteLine("Testing Converts between Double and Int64 failed");
+                returnVal = Fail;
+            }
+        }
+        
+        for (int i = 0; i < 10; i++)
+        {
+            Vector<Double> doubleVector = getRandomVector<Double>(doubles);
+            if (VectorConvertTest.VectorConvertDoubleUInt64(doubleVector) != Pass)
+            {
+                Console.WriteLine("Testing Converts between Double and UInt64 failed");
+                returnVal = Fail;
+            }
+        }
+        
+        for (int i = 0; i < 10; i++)
+        {
+            Vector<Double> doubleVector1 = getRandomVector<Double>(doubles);
+            Vector<Double> doubleVector2 = getRandomVector<Double>(doubles);
+            if (VectorConvertTest.VectorConvertDoubleSingle(doubleVector1, doubleVector2) != Pass)
+            {
+                Console.WriteLine("Testing Converts between Single and Double failed");
+                returnVal = Fail;
+            }
+        }
+        
+        for (int i = 0; i < 10; i++)
+        {
+            Vector<Int64> int64Vector1 = getRandomVector<Int64>(int64s);
+            Vector<Int64> int64Vector2 = getRandomVector<Int64>(int64s);
+            if (VectorConvertTest.VectorConvertInt64And32(int64Vector1, int64Vector2) != Pass)
+            {
+                Console.WriteLine("Testing Converts between Int64 and Int32 failed");
+                returnVal = Fail;
+            }
+        }
+        
+        for (int i = 0; i < 10; i++)
+        {
+            Vector<Int32> int32Vector1 = getRandomVector<Int32>(int32s);
+            Vector<Int32> int32Vector2 = getRandomVector<Int32>(int32s);
+            if (VectorConvertTest.VectorConvertInt32And16(int32Vector1, int32Vector2) != Pass)
+            {
+                Console.WriteLine("Testing Converts between Int32 and Int16 failed");
+                returnVal = Fail;
+            }
+        }
+        
+        for (int i = 0; i < 10; i++)
+        {
+            Vector<Int16> int16Vector1 = getRandomVector<Int16>(int16s);
+            Vector<Int16> int16Vector2 = getRandomVector<Int16>(int16s);
+            if (VectorConvertTest.VectorConvertInt16And8(int16Vector1, int16Vector2) != Pass)
+            {
+                Console.WriteLine("Testing Converts between Int16 and SByte failed");
+                returnVal = Fail;
+            }
+        }
+        
+        for (int i = 0; i < 10; i++)
+        {
+            Vector<UInt64> uint64Vector1 = getRandomVector<UInt64>(uint64s);
+            Vector<UInt64> uint64Vector2 = getRandomVector<UInt64>(uint64s);
+            if (VectorConvertTest.VectorConvertUInt64And32(uint64Vector1, uint64Vector2) != Pass)
+            {
+                Console.WriteLine("Testing Converts between UInt64 and UInt32 failed");
+                returnVal = Fail;
+            }
+        }
+        
+        for (int i = 0; i < 10; i++)
+        {
+            Vector<UInt32> uint32Vector1 = getRandomVector<UInt32>(uint32s);
+            Vector<UInt32> uint32Vector2 = getRandomVector<UInt32>(uint32s);
+            if (VectorConvertTest.VectorConvertUInt32And16(uint32Vector1, uint32Vector2) != Pass)
+            {
+                Console.WriteLine("Testing Converts between UInt32 and UInt16 failed");
+                returnVal = Fail;
+            }
+        }
+        
+        for (int i = 0; i < 10; i++)
+        {
+            Vector<UInt16> uint16Vector1 = getRandomVector<UInt16>(uint16s);
+            Vector<UInt16> uint16Vector2 = getRandomVector<UInt16>(uint16s);
+            if (VectorConvertTest.VectorConvertUInt16And8(uint16Vector1, uint16Vector2) != Pass)
+            {
+                Console.WriteLine("Testing Converts between UInt16 and Byte failed");
+                returnVal = Fail;
+            }
+        }
+        return returnVal;
+    }
+}
+
diff --git a/tests/src/JIT/SIMD/VectorConvert_r.csproj b/tests/src/JIT/SIMD/VectorConvert_r.csproj
new file mode 100644
index 0000000000..01231e2729
--- /dev/null
+++ b/tests/src/JIT/SIMD/VectorConvert_r.csproj
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize></Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="VectorConvert.cs" />
+    <Compile Include="VectorUtil.cs" />
+  </ItemGroup>
+  <!--  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
+  </PropertyGroup>-->
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorConvert_ro.csproj b/tests/src/JIT/SIMD/VectorConvert_ro.csproj
new file mode 100644
index 0000000000..f751b88ed1
--- /dev/null
+++ b/tests/src/JIT/SIMD/VectorConvert_ro.csproj
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="VectorConvert.cs" />
+    <Compile Include="VectorUtil.cs" />
+  </ItemGroup>
+  <!--  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
+  </PropertyGroup>-->
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorCopyToArray_r.csproj b/tests/src/JIT/SIMD/VectorCopyToArray_r.csproj
index e6f6027445..1d77bd840d 100644
--- a/tests/src/JIT/SIMD/VectorCopyToArray_r.csproj
+++ b/tests/src/JIT/SIMD/VectorCopyToArray_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorCopyToArray_ro.csproj b/tests/src/JIT/SIMD/VectorCopyToArray_ro.csproj
index 07aa4aee88..615a6565a9 100644
--- a/tests/src/JIT/SIMD/VectorCopyToArray_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorCopyToArray_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorDiv_r.csproj b/tests/src/JIT/SIMD/VectorDiv_r.csproj
index 2eedda1851..aefb66c520 100644
--- a/tests/src/JIT/SIMD/VectorDiv_r.csproj
+++ b/tests/src/JIT/SIMD/VectorDiv_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorDiv_ro.csproj b/tests/src/JIT/SIMD/VectorDiv_ro.csproj
index a1e82ed6de..8ce6edaa78 100644
--- a/tests/src/JIT/SIMD/VectorDiv_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorDiv_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorDot_r.csproj b/tests/src/JIT/SIMD/VectorDot_r.csproj
index 2ec6999d1b..8c07d01987 100644
--- a/tests/src/JIT/SIMD/VectorDot_r.csproj
+++ b/tests/src/JIT/SIMD/VectorDot_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorDot_ro.csproj b/tests/src/JIT/SIMD/VectorDot_ro.csproj
index fe4c03afd5..c24c41062b 100644
--- a/tests/src/JIT/SIMD/VectorDot_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorDot_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorExp_r.csproj b/tests/src/JIT/SIMD/VectorExp_r.csproj
index 2aaf517b26..19ff00fb04 100644
--- a/tests/src/JIT/SIMD/VectorExp_r.csproj
+++ b/tests/src/JIT/SIMD/VectorExp_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorExp_ro.csproj b/tests/src/JIT/SIMD/VectorExp_ro.csproj
index 575a064163..f9758e91ed 100644
--- a/tests/src/JIT/SIMD/VectorExp_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorExp_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorGet_r.csproj b/tests/src/JIT/SIMD/VectorGet_r.csproj
index b5012d2bc3..d536ea3acb 100644
--- a/tests/src/JIT/SIMD/VectorGet_r.csproj
+++ b/tests/src/JIT/SIMD/VectorGet_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorGet_ro.csproj b/tests/src/JIT/SIMD/VectorGet_ro.csproj
index ccf3b2af58..a2f183a307 100644
--- a/tests/src/JIT/SIMD/VectorGet_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorGet_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorHWAccel2_r.csproj b/tests/src/JIT/SIMD/VectorHWAccel2_r.csproj
index 86ff8ce76f..0ffe4a682d 100644
--- a/tests/src/JIT/SIMD/VectorHWAccel2_r.csproj
+++ b/tests/src/JIT/SIMD/VectorHWAccel2_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorHWAccel2_ro.csproj b/tests/src/JIT/SIMD/VectorHWAccel2_ro.csproj
index fe72cc29a9..7e887529cf 100644
--- a/tests/src/JIT/SIMD/VectorHWAccel2_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorHWAccel2_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorHWAccel_r.csproj b/tests/src/JIT/SIMD/VectorHWAccel_r.csproj
index 54e3d51f62..e88cb9c9fa 100644
--- a/tests/src/JIT/SIMD/VectorHWAccel_r.csproj
+++ b/tests/src/JIT/SIMD/VectorHWAccel_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorHWAccel_ro.csproj b/tests/src/JIT/SIMD/VectorHWAccel_ro.csproj
index ea87405afd..bd93dbfccd 100644
--- a/tests/src/JIT/SIMD/VectorHWAccel_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorHWAccel_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorInitN_r.csproj b/tests/src/JIT/SIMD/VectorInitN_r.csproj
index 1512bebdd7..a2c48698f6 100644
--- a/tests/src/JIT/SIMD/VectorInitN_r.csproj
+++ b/tests/src/JIT/SIMD/VectorInitN_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorInitN_ro.csproj b/tests/src/JIT/SIMD/VectorInitN_ro.csproj
index dc3c485958..fba2a98e0d 100644
--- a/tests/src/JIT/SIMD/VectorInitN_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorInitN_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorInit_r.csproj b/tests/src/JIT/SIMD/VectorInit_r.csproj
index 334841cd5f..083eb2ed9c 100644
--- a/tests/src/JIT/SIMD/VectorInit_r.csproj
+++ b/tests/src/JIT/SIMD/VectorInit_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorInit_ro.csproj b/tests/src/JIT/SIMD/VectorInit_ro.csproj
index 82f4b4854d..9b45ff8180 100644
--- a/tests/src/JIT/SIMD/VectorInit_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorInit_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorIntEquals_r.csproj b/tests/src/JIT/SIMD/VectorIntEquals_r.csproj
index 6f4b3ab241..bb052f24fd 100644
--- a/tests/src/JIT/SIMD/VectorIntEquals_r.csproj
+++ b/tests/src/JIT/SIMD/VectorIntEquals_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorIntEquals_ro.csproj b/tests/src/JIT/SIMD/VectorIntEquals_ro.csproj
index 4bccb81a15..ba4c7a5318 100644
--- a/tests/src/JIT/SIMD/VectorIntEquals_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorIntEquals_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorMatrix_r.csproj b/tests/src/JIT/SIMD/VectorMatrix_r.csproj
index 4c35bd85cd..5dbc8a5bde 100644
--- a/tests/src/JIT/SIMD/VectorMatrix_r.csproj
+++ b/tests/src/JIT/SIMD/VectorMatrix_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorMatrix_ro.csproj b/tests/src/JIT/SIMD/VectorMatrix_ro.csproj
index 5d66f6fdf1..af87ad931c 100644
--- a/tests/src/JIT/SIMD/VectorMatrix_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorMatrix_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorMax_r.csproj b/tests/src/JIT/SIMD/VectorMax_r.csproj
index 3c61bc7a35..9f299fef8e 100644
--- a/tests/src/JIT/SIMD/VectorMax_r.csproj
+++ b/tests/src/JIT/SIMD/VectorMax_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorMax_ro.csproj b/tests/src/JIT/SIMD/VectorMax_ro.csproj
index 47683c54a3..75fb88b383 100644
--- a/tests/src/JIT/SIMD/VectorMax_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorMax_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorMin_r.csproj b/tests/src/JIT/SIMD/VectorMin_r.csproj
index 0b6d134677..35bf7ebfcb 100644
--- a/tests/src/JIT/SIMD/VectorMin_r.csproj
+++ b/tests/src/JIT/SIMD/VectorMin_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorMin_ro.csproj b/tests/src/JIT/SIMD/VectorMin_ro.csproj
index 6e1dc8c25f..039f099ce5 100644
--- a/tests/src/JIT/SIMD/VectorMin_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorMin_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorMul_r.csproj b/tests/src/JIT/SIMD/VectorMul_r.csproj
index 791d9ccb42..ffbc73e880 100644
--- a/tests/src/JIT/SIMD/VectorMul_r.csproj
+++ b/tests/src/JIT/SIMD/VectorMul_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorMul_ro.csproj b/tests/src/JIT/SIMD/VectorMul_ro.csproj
index fc3e4a7b55..052cf5574a 100644
--- a/tests/src/JIT/SIMD/VectorMul_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorMul_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorRelOp_r.csproj b/tests/src/JIT/SIMD/VectorRelOp_r.csproj
index 15e916f82d..728610bd0e 100644
--- a/tests/src/JIT/SIMD/VectorRelOp_r.csproj
+++ b/tests/src/JIT/SIMD/VectorRelOp_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorRelOp_ro.csproj b/tests/src/JIT/SIMD/VectorRelOp_ro.csproj
index 5da02dab51..af3ddfe20e 100644
--- a/tests/src/JIT/SIMD/VectorRelOp_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorRelOp_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorReturn_r.csproj b/tests/src/JIT/SIMD/VectorReturn_r.csproj
index 600ca8e050..02f4fa2d41 100644
--- a/tests/src/JIT/SIMD/VectorReturn_r.csproj
+++ b/tests/src/JIT/SIMD/VectorReturn_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorReturn_ro.csproj b/tests/src/JIT/SIMD/VectorReturn_ro.csproj
index 9196470c6d..01c361557c 100644
--- a/tests/src/JIT/SIMD/VectorReturn_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorReturn_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorSet_r.csproj b/tests/src/JIT/SIMD/VectorSet_r.csproj
index 4eaa7d2427..255353a378 100644
--- a/tests/src/JIT/SIMD/VectorSet_r.csproj
+++ b/tests/src/JIT/SIMD/VectorSet_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorSet_ro.csproj b/tests/src/JIT/SIMD/VectorSet_ro.csproj
index 5af59c4700..e966fd4a1a 100644
--- a/tests/src/JIT/SIMD/VectorSet_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorSet_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorSqrt_r.csproj b/tests/src/JIT/SIMD/VectorSqrt_r.csproj
index 90efd684ba..5d13f48a9e 100644
--- a/tests/src/JIT/SIMD/VectorSqrt_r.csproj
+++ b/tests/src/JIT/SIMD/VectorSqrt_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorSqrt_ro.csproj b/tests/src/JIT/SIMD/VectorSqrt_ro.csproj
index e93ad97dba..bc5e914506 100644
--- a/tests/src/JIT/SIMD/VectorSqrt_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorSqrt_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorSub_r.csproj b/tests/src/JIT/SIMD/VectorSub_r.csproj
index fc8a3224bc..59ef47dc94 100644
--- a/tests/src/JIT/SIMD/VectorSub_r.csproj
+++ b/tests/src/JIT/SIMD/VectorSub_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorSub_ro.csproj b/tests/src/JIT/SIMD/VectorSub_ro.csproj
index 7ec881898b..b4daad0972 100644
--- a/tests/src/JIT/SIMD/VectorSub_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorSub_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorUnused_r.csproj b/tests/src/JIT/SIMD/VectorUnused_r.csproj
index 44c4bfd717..6a00272c88 100644
--- a/tests/src/JIT/SIMD/VectorUnused_r.csproj
+++ b/tests/src/JIT/SIMD/VectorUnused_r.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/SIMD/VectorUnused_ro.csproj b/tests/src/JIT/SIMD/VectorUnused_ro.csproj
index 3ffa2761c3..6aa6c01100 100644
--- a/tests/src/JIT/SIMD/VectorUnused_ro.csproj
+++ b/tests/src/JIT/SIMD/VectorUnused_ro.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -7,20 +7,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -42,6 +34,5 @@
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
   </PropertyGroup>-->
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup>
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/config/benchmark+roslyn/project.json b/tests/src/JIT/config/benchmark+roslyn/project.json
index 8c03f09e08..7940c4038d 100644
--- a/tests/src/JIT/config/benchmark+roslyn/project.json
+++ b/tests/src/JIT/config/benchmark+roslyn/project.json
@@ -1,18 +1,20 @@
 {
   "dependencies": {
     "Microsoft.CodeAnalysis.Compilers": "1.1.1",
-    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
+    "xunit.performance.api": "1.0.0-alpha-build0049",
+    "xunit.performance.core": "1.0.0-alpha-build0049",
+    "xunit.performance.execution": "1.0.0-alpha-build0049",
+    "xunit.performance.metrics": "1.0.0-alpha-build0049",
+    "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25210-01",
     "System.Console": "4.4.0-beta-24913-02",
     "System.Dynamic.Runtime": "4.4.0-beta-24913-02",
     "System.Linq": "4.4.0-beta-24913-02",
     "System.IO.FileSystem": "4.4.0-beta-24913-02",
-    "System.Numerics.Vectors": "4.4.0-beta-24913-02",
+    "System.Numerics.Vectors": "4.4.0-preview1-25210-01",
     "System.Reflection": "4.4.0-beta-24913-02",
     "System.Reflection.Extensions": "4.4.0-beta-24913-02",
-    "System.Reflection.TypeExtensions": "4.4.0-beta-24913-02",
+    "System.Reflection.TypeExtensions": "4.4.0-preview1-25210-01",
     "System.Runtime": "4.4.0-beta-24913-02",
     "System.Runtime.Extensions": "4.4.0-beta-24913-02",
     "System.Runtime.Numerics": "4.4.0-beta-24913-02",
diff --git a/tests/src/JIT/config/benchmark+serialize/project.json b/tests/src/JIT/config/benchmark+serialize/project.json
index 7cc415cd3c..49d20c2118 100644
--- a/tests/src/JIT/config/benchmark+serialize/project.json
+++ b/tests/src/JIT/config/benchmark+serialize/project.json
@@ -1,9 +1,11 @@
 {
   "dependencies": {
-    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
+    "xunit.performance.api": "1.0.0-alpha-build0049",
+    "xunit.performance.core": "1.0.0-alpha-build0049",
+    "xunit.performance.execution": "1.0.0-alpha-build0049",
+    "xunit.performance.metrics": "1.0.0-alpha-build0049",
+    "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25210-01",
     "Newtonsoft.Json": "7.0.1",
     "System.Console": "4.4.0-beta-24913-02",
     "System.IO": "4.4.0-beta-24913-02",
@@ -13,7 +15,7 @@
     "System.Dynamic.Runtime": "4.4.0-beta-24913-02",
     "System.Reflection": "4.4.0-beta-24913-02",
     "System.Reflection.Extensions": "4.4.0-beta-24913-02",
-    "System.Reflection.TypeExtensions": "4.4.0-beta-24913-02",
+    "System.Reflection.TypeExtensions": "4.4.0-preview1-25210-01",
     "System.Runtime": "4.4.0-beta-24913-02",
     "System.Runtime.Serialization.Json": "4.4.0-beta-24913-02",
     "System.Runtime.Serialization.Primitives": "4.4.0-beta-24913-02",
diff --git a/tests/src/JIT/config/benchmark/project.json b/tests/src/JIT/config/benchmark/project.json
index 2a989f150f..e42976a2d8 100644
--- a/tests/src/JIT/config/benchmark/project.json
+++ b/tests/src/JIT/config/benchmark/project.json
@@ -1,20 +1,22 @@
 {
   "dependencies": {
-    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
+    "xunit.performance.api": "1.0.0-alpha-build0049",
+    "xunit.performance.core": "1.0.0-alpha-build0049",
+    "xunit.performance.execution": "1.0.0-alpha-build0049",
+    "xunit.performance.metrics": "1.0.0-alpha-build0049",
+    "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25210-01",
     "System.Collections.NonGeneric": "4.4.0-beta-24913-02",
     "System.Console": "4.4.0-beta-24913-02",
     "System.IO.FileSystem": "4.4.0-beta-24913-02",
     "System.Linq": "4.4.0-beta-24913-02",
     "System.Linq.Parallel": "4.4.0-beta-24913-02",
     "System.Linq.Expressions": "4.4.0-beta-24913-02",
-    "System.Memory": "4.4.0-beta-24913-02",
-    "System.Numerics.Vectors": "4.4.0-beta-24913-02",
+    "System.Memory": "4.4.0-preview1-25210-01",
+    "System.Numerics.Vectors": "4.4.0-preview1-25210-01",
     "System.Reflection": "4.4.0-beta-24913-02",
     "System.Reflection.Extensions": "4.4.0-beta-24913-02",
-    "System.Reflection.TypeExtensions": "4.4.0-beta-24913-02",
+    "System.Reflection.TypeExtensions": "4.4.0-preview1-25210-01",
     "System.Runtime": "4.4.0-beta-24913-02",
     "System.Runtime.Extensions": "4.4.0-beta-24913-02",
     "System.Runtime.Numerics": "4.4.0-beta-24913-02",
diff --git a/tests/src/JIT/config/extra/project.json b/tests/src/JIT/config/extra/project.json
deleted file mode 100644
index 1e42ca16e6..0000000000
--- a/tests/src/JIT/config/extra/project.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
-    "System.Collections": "4.4.0-beta-24913-02",
-    "System.Console": "4.4.0-beta-24913-02",
-    "System.Diagnostics.Debug": "4.4.0-beta-24913-02",
-    "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24913-02",
-    "System.Diagnostics.Process": "4.4.0-beta-24913-02",
-    "System.Globalization": "4.4.0-beta-24913-02",
-    "System.IO": "4.4.0-beta-24913-02",
-    "System.IO.FileSystem": "4.4.0-beta-24913-02",
-    "System.Reflection": "4.4.0-beta-24913-02",
-    "System.Reflection.Extensions": "4.4.0-beta-24913-02",
-    "System.Reflection.TypeExtensions": "4.4.0-beta-24913-02",
-    "System.Runtime": "4.4.0-beta-24913-02",
-    "System.Runtime.Extensions": "4.4.0-beta-24913-02",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24913-02",
-    "System.Runtime.InteropServices": "4.4.0-beta-24913-02"
-  },
-  "frameworks": {
-    "netcoreapp1.1": {}
-  },
-  "runtimes": {
-    "win7-x86": {},
-    "win7-x64": {},
-    "ubuntu.14.04-x64": {},
-    "ubuntu.16.04-x64": {},
-    "ubuntu.16.10-x64": {},
-    "osx.10.10-x64": {},
-    "centos.7-x64": {},
-    "rhel.7-x64": {},
-    "debian.8-x64": {},
-    "fedora.23-x64": {},
-    "opensuse.13.2-x64": {}
-  }
-}
diff --git a/tests/src/JIT/config/minimal/project.json b/tests/src/JIT/config/minimal/project.json
deleted file mode 100644
index 1cca77c604..0000000000
--- a/tests/src/JIT/config/minimal/project.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
-    "System.Console": "4.4.0-beta-24913-02",
-    "System.Runtime": "4.4.0-beta-24913-02",
-    "System.Runtime.Extensions": "4.4.0-beta-24913-02",
-    "System.Runtime.InteropServices": "4.4.0-beta-24913-02"
-  },
-  "frameworks": {
-    "netcoreapp1.1": {}
-  },
-  "runtimes": {
-    "win7-x86": {},
-    "win7-x64": {},
-    "ubuntu.14.04-x64": {},
-    "ubuntu.16.04-x64": {},
-    "ubuntu.16.10-x64": {},
-    "osx.10.10-x64": {},
-    "centos.7-x64": {},
-    "rhel.7-x64": {},
-    "debian.8-x64": {},
-    "fedora.23-x64": {},
-    "opensuse.13.2-x64": {}
-  }
-}
diff --git a/tests/src/JIT/config/threading+thread/project.json b/tests/src/JIT/config/threading+thread/project.json
deleted file mode 100644
index 6a6fe49373..0000000000
--- a/tests/src/JIT/config/threading+thread/project.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
-    "System.Console": "4.4.0-beta-24913-02",
-    "System.Numerics.Vectors": "4.4.0-beta-24913-02",
-    "System.Runtime": "4.4.0-beta-24913-02",
-    "System.Runtime.Extensions": "4.4.0-beta-24913-02",
-    "System.Threading": "4.4.0-beta-24913-02",
-    "System.Threading.Thread": "4.4.0-beta-24913-02"
-  },
-  "frameworks": {
-    "netcoreapp1.1": {}
-  },
-  "runtimes": {
-    "win7-x86": {},
-    "win7-x64": {},
-    "ubuntu.14.04-x64": {},
-    "ubuntu.16.04-x64": {},
-    "ubuntu.16.10-x64": {},
-    "osx.10.10-x64": {},
-    "centos.7-x64": {},
-    "rhel.7-x64": {},
-    "debian.8-x64": {},
-    "fedora.23-x64": {},
-    "opensuse.13.2-x64": {}
-  }
-}
diff --git a/tests/src/JIT/config/threading/project.json b/tests/src/JIT/config/threading/project.json
deleted file mode 100644
index 68b783a0f2..0000000000
--- a/tests/src/JIT/config/threading/project.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
-    "System.Console": "4.4.0-beta-24913-02",
-    "System.Runtime": "4.4.0-beta-24913-02",
-    "System.Runtime.Extensions": "4.4.0-beta-24913-02",
-    "System.Threading": "4.4.0-beta-24913-02"
-  },
-  "frameworks": {
-    "netcoreapp1.1": {}
-  },
-  "runtimes": {
-    "win7-x86": {},
-    "win7-x64": {},
-    "ubuntu.14.04-x64": {},
-    "ubuntu.16.04-x64": {},
-    "ubuntu.16.10-x64": {},
-    "osx.10.10-x64": {},
-    "centos.7-x64": {},
-    "rhel.7-x64": {},
-    "debian.8-x64": {},
-    "fedora.23-x64": {},
-    "opensuse.13.2-x64": {}
-  }
-}
diff --git a/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj b/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj
index ec4469a804..c6dfda7cbe 100644
--- a/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj
+++ b/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/eh/Common/common.csproj b/tests/src/JIT/jit64/eh/Common/common.csproj
index ccdd3ac277..ec1faaeb0f 100644
--- a/tests/src/JIT/jit64/eh/Common/common.csproj
+++ b/tests/src/JIT/jit64/eh/Common/common.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>  
     <GenerateRunScript>false</GenerateRunScript>   
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>  
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>  
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>  
-  </PropertyGroup>    
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj
index 69da767e1c..031157dda2 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>  
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>  
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>  
-  </PropertyGroup>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj
index 2187197bd0..8e89291371 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>  
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>  
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>  
-  </PropertyGroup>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj
index 78aca7b2bd..147ad6908b 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>  
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>  
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>  
-  </PropertyGroup>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj
index 697297ad82..ac5b8b6aee 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>  
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>  
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>  
-  </PropertyGroup>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj
index 0f02f06731..30ed1f5b92 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>  
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>  
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>  
-  </PropertyGroup>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj
index 1886cacc0f..6383caef10 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>  
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>  
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>  
-  </PropertyGroup>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj
index ea7ea17d91..e3a1f2d78e 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj
index 1f0c5d6b99..847c9d48af 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj
index 27d80b3ea3..6ed80dd2d1 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj
index 84ed99c610..ddc0728ee5 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj
index a9f9c166aa..3baee924cd 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj
index cbf7c3f8a9..c7b10705d3 100644
--- a/tests/src/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj
+++ b/tests/src/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>  
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>  
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>  
-  </PropertyGroup>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/tests/src/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj b/tests/src/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj
index c83f277252..5c5e98220b 100644
--- a/tests/src/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj
+++ b/tests/src/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>  
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>  
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>  
-  </PropertyGroup>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/tests/src/JIT/jit64/eh/basics/loopEH.csproj b/tests/src/JIT/jit64/eh/basics/loopEH.csproj
index 378f6ad901..87ce19c240 100644
--- a/tests/src/JIT/jit64/eh/basics/loopEH.csproj
+++ b/tests/src/JIT/jit64/eh/basics/loopEH.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj b/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj
index 219b194947..7486cb7a03 100644
--- a/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj
+++ b/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj b/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj
index 9efaccdfc4..ed4beb47d5 100644
--- a/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj
+++ b/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj b/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj
index c5393cca29..4fb2343bb8 100644
--- a/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj
+++ b/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj b/tests/src/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj
index b2e3696121..ed328d5992 100644
--- a/tests/src/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj
+++ b/tests/src/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/gc/misc/148343.csproj b/tests/src/JIT/jit64/gc/misc/148343.csproj
index 00d93aa4ca..5a8ee20667 100644
--- a/tests/src/JIT/jit64/gc/misc/148343.csproj
+++ b/tests/src/JIT/jit64/gc/misc/148343.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FDB5082B-284C-47B5-BA9E-D3BA3827E77E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj b/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj
index daf8aa27ff..feacafcb4b 100644
--- a/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E76172C3-533E-45BD-BCA3-AACDC1582253}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/9param.csproj b/tests/src/JIT/jit64/gc/misc/9param.csproj
index 4776ee4503..042dfd5e8a 100644
--- a/tests/src/JIT/jit64/gc/misc/9param.csproj
+++ b/tests/src/JIT/jit64/gc/misc/9param.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EA83A9C9-5175-4748-A2EA-657F1062417D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/alloca3.csproj b/tests/src/JIT/jit64/gc/misc/alloca3.csproj
index 8921005254..f48d584896 100644
--- a/tests/src/JIT/jit64/gc/misc/alloca3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/alloca3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0D32389E-EAF9-46DF-A22A-5ED50D938CA5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/eh1.csproj b/tests/src/JIT/jit64/gc/misc/eh1.csproj
index 763797e6b6..4aa977bc17 100644
--- a/tests/src/JIT/jit64/gc/misc/eh1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/eh1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A99284A9-472A-4267-9703-E2022CD1BCFC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/fgtest1.csproj b/tests/src/JIT/jit64/gc/misc/fgtest1.csproj
index 7947f6f9f2..f362c0cc74 100644
--- a/tests/src/JIT/jit64/gc/misc/fgtest1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/fgtest1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{10227F6C-14EE-4B2D-BCCB-51186C1FA17B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/fgtest2.csproj b/tests/src/JIT/jit64/gc/misc/fgtest2.csproj
index 2038acb608..0f26273d7c 100644
--- a/tests/src/JIT/jit64/gc/misc/fgtest2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/fgtest2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B91FAC94-A870-4DA5-9884-3CBE91619028}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/funclet.csproj b/tests/src/JIT/jit64/gc/misc/funclet.csproj
index aad2dc89ce..bdcbe4ef7b 100644
--- a/tests/src/JIT/jit64/gc/misc/funclet.csproj
+++ b/tests/src/JIT/jit64/gc/misc/funclet.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A323618C-1BE2-4C13-835C-357550C2045B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj b/tests/src/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj
index 4cb5d1e621..889bd99e95 100644
--- a/tests/src/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj
+++ b/tests/src/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{30E7FF89-D9FB-494E-B15A-D4586B0843A9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj b/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj
index 5fcdcca188..8f532a9be1 100644
--- a/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj
+++ b/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7E9B09A2-41D8-4D4C-B0AA-D11DE27F915D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj b/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj
index 1619a56a5e..aa8169ca95 100644
--- a/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EF719996-B2BD-4E12-A8F5-119DD1172311}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj b/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj
index 025dcbcb45..98cfa257ea 100644
--- a/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{78A4C6DB-7DC3-4CF6-ABDE-9D0E902A439F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/simple1.csproj b/tests/src/JIT/jit64/gc/misc/simple1.csproj
index 4647105788..5714b4d8b9 100644
--- a/tests/src/JIT/jit64/gc/misc/simple1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/simple1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9341C58E-FAAC-464F-AB5D-A736111F7A98}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct1.csproj b/tests/src/JIT/jit64/gc/misc/struct1.csproj
index 2db8d4a7f2..03f22af5e4 100644
--- a/tests/src/JIT/jit64/gc/misc/struct1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{784679B0-F680-4223-9D03-5B091BC9F366}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct1_2.csproj b/tests/src/JIT/jit64/gc/misc/struct1_2.csproj
index a4d725b55f..90d6ce1dd7 100644
--- a/tests/src/JIT/jit64/gc/misc/struct1_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct1_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DB658675-5C6C-4E6E-AA34-4C615AE3E67B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct1_4.csproj b/tests/src/JIT/jit64/gc/misc/struct1_4.csproj
index 9f14bfbfbe..478aa514da 100644
--- a/tests/src/JIT/jit64/gc/misc/struct1_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct1_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6993E572-EAC0-4871-BAD1-95761C88454A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct1_5.csproj b/tests/src/JIT/jit64/gc/misc/struct1_5.csproj
index 8acbed3cbd..2eea7f4c22 100644
--- a/tests/src/JIT/jit64/gc/misc/struct1_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct1_5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{91360442-D3C0-4D74-9118-9FF487FDE584}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct2.csproj b/tests/src/JIT/jit64/gc/misc/struct2.csproj
index c9a7dfabd2..99259d2c50 100644
--- a/tests/src/JIT/jit64/gc/misc/struct2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{947AFD46-4826-4369-AC2C-32D034C1A132}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct2_2.csproj b/tests/src/JIT/jit64/gc/misc/struct2_2.csproj
index 643a3e0417..32b936eaba 100644
--- a/tests/src/JIT/jit64/gc/misc/struct2_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct2_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{953F0002-60DE-4DA0-B5FA-09A5CCB5A84A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct2_4.csproj b/tests/src/JIT/jit64/gc/misc/struct2_4.csproj
index 94b8be85dc..f8845b0eb1 100644
--- a/tests/src/JIT/jit64/gc/misc/struct2_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct2_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{69B7D820-0D96-4E27-B1D3-D24BCE90D971}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct2_5.csproj b/tests/src/JIT/jit64/gc/misc/struct2_5.csproj
index 659a880ed7..72749aa8ee 100644
--- a/tests/src/JIT/jit64/gc/misc/struct2_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct2_5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C9FC348E-6C32-4EE4-88CA-CBA4B07E03A8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj b/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj
index 053b4f8e8f..49054c1efc 100644
--- a/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E99CF244-F83B-4ABF-9E34-3B0AD4952FD7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct3.csproj b/tests/src/JIT/jit64/gc/misc/struct3.csproj
index e1338f505c..e7dd6e0e93 100644
--- a/tests/src/JIT/jit64/gc/misc/struct3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CFD6FBC3-0829-4816-A109-DF17642EC807}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct3_2.csproj b/tests/src/JIT/jit64/gc/misc/struct3_2.csproj
index 3cdfa020f3..a3d44ca884 100644
--- a/tests/src/JIT/jit64/gc/misc/struct3_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct3_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7168FCA0-FB92-4DFF-B707-D3AAA31A3C1D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct3_4.csproj b/tests/src/JIT/jit64/gc/misc/struct3_4.csproj
index 8a2a7dc532..8ca0496543 100644
--- a/tests/src/JIT/jit64/gc/misc/struct3_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct3_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5F47EAB6-5AE5-4984-8952-1469F57C1DB2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct3_5.csproj b/tests/src/JIT/jit64/gc/misc/struct3_5.csproj
index ddb5a454f6..47bd3cbfbb 100644
--- a/tests/src/JIT/jit64/gc/misc/struct3_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct3_5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A7A97E1B-E121-4C7A-B036-F4FE64DE19D5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct4.csproj b/tests/src/JIT/jit64/gc/misc/struct4.csproj
index 708e0c701e..e4c8bc60af 100644
--- a/tests/src/JIT/jit64/gc/misc/struct4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{59D2FB73-8919-47E8-8D2F-39FC895542A1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct4_2.csproj b/tests/src/JIT/jit64/gc/misc/struct4_2.csproj
index bfd8fe308f..df092831b2 100644
--- a/tests/src/JIT/jit64/gc/misc/struct4_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct4_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D9C051F7-4FBB-4190-9757-5C01ABF0B689}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct4_4.csproj b/tests/src/JIT/jit64/gc/misc/struct4_4.csproj
index 8aa3b7454f..73eff662a6 100644
--- a/tests/src/JIT/jit64/gc/misc/struct4_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct4_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{83F3CA73-8D90-46CB-BFCC-8EBF03D05E7D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct4_5.csproj b/tests/src/JIT/jit64/gc/misc/struct4_5.csproj
index ea3d351e0c..7966adba01 100644
--- a/tests/src/JIT/jit64/gc/misc/struct4_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct4_5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{183E5583-F710-4471-8D5F-82E8870070B7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct5.csproj b/tests/src/JIT/jit64/gc/misc/struct5.csproj
index 53dfc4f794..91a2eb6860 100644
--- a/tests/src/JIT/jit64/gc/misc/struct5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C2F9938D-F3B4-4876-B2B4-17A1D2979776}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct5_2.csproj b/tests/src/JIT/jit64/gc/misc/struct5_2.csproj
index c027eb6b37..8f01924098 100644
--- a/tests/src/JIT/jit64/gc/misc/struct5_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct5_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3B98CEA1-5C18-4D5E-AB3D-E8016AA09FEF}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct5_4.csproj b/tests/src/JIT/jit64/gc/misc/struct5_4.csproj
index 0ff0bd8fff..e9d949a263 100644
--- a/tests/src/JIT/jit64/gc/misc/struct5_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct5_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E27E6C51-D863-4A37-B4B5-1FA702801182}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct5_5.csproj b/tests/src/JIT/jit64/gc/misc/struct5_5.csproj
index a159fea051..b67718f112 100644
--- a/tests/src/JIT/jit64/gc/misc/struct5_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct5_5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{687B9C6A-54F5-4F7E-9377-E112DB221FD4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct6.csproj b/tests/src/JIT/jit64/gc/misc/struct6.csproj
index 5f2da48c70..55315b4422 100644
--- a/tests/src/JIT/jit64/gc/misc/struct6.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{70C9B60F-3625-4FFA-BF45-3A09FE44E07C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct6_2.csproj b/tests/src/JIT/jit64/gc/misc/struct6_2.csproj
index a967fb595e..be4b7e22fc 100644
--- a/tests/src/JIT/jit64/gc/misc/struct6_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct6_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D560DC48-96BE-44B4-9888-B4E03E1B3765}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct6_4.csproj b/tests/src/JIT/jit64/gc/misc/struct6_4.csproj
index 8d691330a2..f41ebc9bf8 100644
--- a/tests/src/JIT/jit64/gc/misc/struct6_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct6_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0E65AFBB-462D-439C-963E-2C2956FA144D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct6_5.csproj b/tests/src/JIT/jit64/gc/misc/struct6_5.csproj
index f6bc983344..72ba10101c 100644
--- a/tests/src/JIT/jit64/gc/misc/struct6_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct6_5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E7DBA180-50EE-4C35-993D-EE1F99A699B3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct7_1.csproj b/tests/src/JIT/jit64/gc/misc/struct7_1.csproj
index f60ad5967c..c60aa99e50 100644
--- a/tests/src/JIT/jit64/gc/misc/struct7_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct7_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8125B28C-071B-4CD2-A50D-DA215AA389F3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct8.csproj b/tests/src/JIT/jit64/gc/misc/struct8.csproj
index 61ea547900..18e032ff81 100644
--- a/tests/src/JIT/jit64/gc/misc/struct8.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct8.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{08D9EA87-1D05-44C7-8C0A-8FBB46BCF36D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct9.csproj b/tests/src/JIT/jit64/gc/misc/struct9.csproj
index 4f93167ad0..9951b0e7ee 100644
--- a/tests/src/JIT/jit64/gc/misc/struct9.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct9.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7BBC4D50-60B0-428F-83E1-AC59E40B69A9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/struct9_2.csproj b/tests/src/JIT/jit64/gc/misc/struct9_2.csproj
index 06d4d0ec9b..d4faf1b2a1 100644
--- a/tests/src/JIT/jit64/gc/misc/struct9_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/struct9_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E565FDC8-B44F-428F-BA6D-CDBC0D4F97B7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj
index e02496d240..e66fec23a2 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7228D6BE-7DCC-4835-9440-06B60BAF11D4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj
index cb8bc9925a..a7a7f4995e 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4B6F9370-A846-4AC7-87DD-B063026CFE18}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj
index e5a5d7bf9a..98886eaefb 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8846FE32-F9C4-422A-9CB3-5182BD5D499B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj
index 2f4ed833f3..7eb3cb78e8 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1BFFB516-D072-4CB5-BDB0-6C9F119F35E4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj
index a4df8deed9..558e116df1 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0979655B-4819-4FE5-8EAD-FF13BE1B1F3A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj b/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj
index 353652d12e..14c0dcfb81 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5D602420-536C-4E83-8BA8-1AC79C8D8F57}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj
index 66bf861fe4..258584d27d 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ADD31611-45AF-4C2C-B6A7-6CEEC385ECF4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj b/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj
index 9196d7adf4..10862b56d1 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{553D2B2B-5049-4023-91AD-3CDC21ABFD1C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj b/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj
index c6026b9ba0..83b27bec48 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8D3B11D0-8C4F-4447-96E6-F22C0494CF15}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj b/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj
index 6a274c8576..7bcb24a8f1 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3BFD0851-EA70-4828-BBA2-0468285214E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj
index 3a2bece7b1..28bc9b3665 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E91063A5-23D5-4C45-A7F8-89C3407973AD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj
index 5c567af19e..4261f9dd7b 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5A19ECD1-B77D-4FEA-BDD9-4BA3B7CA409D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj
index f62e0a0c8a..b1a4b7d7fa 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4E02BA7E-68FE-4E39-998B-27AE540E3702}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj b/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj
index 365b7bf195..95d6523491 100644
--- a/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{99EFDA6E-620E-42D7-8AA9-E9A892391F71}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj b/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj
index b1f8aef36c..02f0c53014 100644
--- a/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A3C88E81-EA3B-4A65-80F6-C0C3C9B1A2A6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj b/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj
index 5429eeefbc..3cf2c30bc6 100644
--- a/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{917074AE-08B3-47F1-BC55-B1AB689F63F6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structref1_1.csproj b/tests/src/JIT/jit64/gc/misc/structref1_1.csproj
index 6e307456bc..25256a4b21 100644
--- a/tests/src/JIT/jit64/gc/misc/structref1_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structref1_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{588350A8-F5D4-4ECE-8EB7-C3B0854D8284}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret1_1.csproj b/tests/src/JIT/jit64/gc/misc/structret1_1.csproj
index 97185d5482..3133515547 100644
--- a/tests/src/JIT/jit64/gc/misc/structret1_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret1_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8D34364F-BED7-4826-A45A-36E02B779647}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret1_2.csproj b/tests/src/JIT/jit64/gc/misc/structret1_2.csproj
index 979150d879..1acab3da31 100644
--- a/tests/src/JIT/jit64/gc/misc/structret1_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret1_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{079BF300-6D67-4B3F-8415-112D4A8A6DE1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret1_3.csproj b/tests/src/JIT/jit64/gc/misc/structret1_3.csproj
index b83bcf5224..832a461d1b 100644
--- a/tests/src/JIT/jit64/gc/misc/structret1_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret1_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D4A066AF-0A8C-4659-8964-361D312DD81F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret2_1.csproj b/tests/src/JIT/jit64/gc/misc/structret2_1.csproj
index 6a641666ad..f78376d0e1 100644
--- a/tests/src/JIT/jit64/gc/misc/structret2_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret2_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{26E230D2-968F-4D0B-BF5D-0A6E6FE8A2E9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret2_2.csproj b/tests/src/JIT/jit64/gc/misc/structret2_2.csproj
index a1d34566a1..a247421a8b 100644
--- a/tests/src/JIT/jit64/gc/misc/structret2_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret2_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5C18C7D3-B459-4E6B-AD0A-87AF8D68F497}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret2_3.csproj b/tests/src/JIT/jit64/gc/misc/structret2_3.csproj
index abcc1b431a..01e6293c0e 100644
--- a/tests/src/JIT/jit64/gc/misc/structret2_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret2_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{642CDD80-28F0-409A-84E0-0DDF40EFF966}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret3_1.csproj b/tests/src/JIT/jit64/gc/misc/structret3_1.csproj
index 25e03da29a..e1bdedd8cc 100644
--- a/tests/src/JIT/jit64/gc/misc/structret3_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret3_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{31C5A706-165F-4028-A12B-24C81E821447}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret3_2.csproj b/tests/src/JIT/jit64/gc/misc/structret3_2.csproj
index 9afafdf6ff..282e0df2a7 100644
--- a/tests/src/JIT/jit64/gc/misc/structret3_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret3_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{84B4AD9B-F3F3-4769-99BE-96BFCCEA447F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret3_3.csproj b/tests/src/JIT/jit64/gc/misc/structret3_3.csproj
index d7ba7dff5e..7e9e45f9a8 100644
--- a/tests/src/JIT/jit64/gc/misc/structret3_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret3_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8CE12894-BD33-4011-81E5-7986AC1B7AE4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret4_1.csproj b/tests/src/JIT/jit64/gc/misc/structret4_1.csproj
index 4114dfbd41..9339c80d54 100644
--- a/tests/src/JIT/jit64/gc/misc/structret4_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret4_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B96F0BAB-7B39-4757-8775-E04452A4C740}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret4_2.csproj b/tests/src/JIT/jit64/gc/misc/structret4_2.csproj
index 446cec1143..bc4f49cf3a 100644
--- a/tests/src/JIT/jit64/gc/misc/structret4_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret4_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CD9BF7A2-8952-486E-A014-9C0F848E8306}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret4_3.csproj b/tests/src/JIT/jit64/gc/misc/structret4_3.csproj
index 30ecc6a111..972f64b4b8 100644
--- a/tests/src/JIT/jit64/gc/misc/structret4_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret4_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D8EAF760-1723-4827-A05A-D25452438C4D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret5_1.csproj b/tests/src/JIT/jit64/gc/misc/structret5_1.csproj
index ff7e6f8d31..2000606615 100644
--- a/tests/src/JIT/jit64/gc/misc/structret5_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret5_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5C18D93E-1A66-46E0-959B-DB56F0F58C5B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret5_2.csproj b/tests/src/JIT/jit64/gc/misc/structret5_2.csproj
index 729faff084..aeeaf3ed27 100644
--- a/tests/src/JIT/jit64/gc/misc/structret5_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret5_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C5B880B8-5F56-4167-B4F3-6D8242E32C34}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret5_3.csproj b/tests/src/JIT/jit64/gc/misc/structret5_3.csproj
index 0e2f8bd311..88837c136b 100644
--- a/tests/src/JIT/jit64/gc/misc/structret5_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret5_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EA520D46-7FC9-4657-AAA3-8C0EAE99E365}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret6_1.csproj b/tests/src/JIT/jit64/gc/misc/structret6_1.csproj
index dab0b4de59..b71ab8e208 100644
--- a/tests/src/JIT/jit64/gc/misc/structret6_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret6_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{235A4D64-B91A-4DC7-B6B8-3BE1E07E230F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret6_2.csproj b/tests/src/JIT/jit64/gc/misc/structret6_2.csproj
index 45dab1bc62..94eb195e87 100644
--- a/tests/src/JIT/jit64/gc/misc/structret6_2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret6_2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6351A54D-4AF0-4FEF-82BC-39A1B91860EE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structret6_3.csproj b/tests/src/JIT/jit64/gc/misc/structret6_3.csproj
index 4f21e6fb39..eeaf32f84d 100644
--- a/tests/src/JIT/jit64/gc/misc/structret6_3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structret6_3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EBB87DB8-2F0C-4EC1-8ADB-FDC030F01BB7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/structva1_1.csproj b/tests/src/JIT/jit64/gc/misc/structva1_1.csproj
index 5784ca0878..6368483258 100644
--- a/tests/src/JIT/jit64/gc/misc/structva1_1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/structva1_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{789D91DC-38AC-4293-8FF3-A351CBEEA98B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/test1.csproj b/tests/src/JIT/jit64/gc/misc/test1.csproj
index 8626ac30e0..1ca80dec81 100644
--- a/tests/src/JIT/jit64/gc/misc/test1.csproj
+++ b/tests/src/JIT/jit64/gc/misc/test1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FBEFF26E-E543-44EB-97DB-A35D529AF001}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/test2.csproj b/tests/src/JIT/jit64/gc/misc/test2.csproj
index 0b54a8ca93..bd769db772 100644
--- a/tests/src/JIT/jit64/gc/misc/test2.csproj
+++ b/tests/src/JIT/jit64/gc/misc/test2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3DEC45F3-89A5-4F8B-9013-01A5E65B6F2B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/test3.csproj b/tests/src/JIT/jit64/gc/misc/test3.csproj
index c01ad64efe..43f5e03189 100644
--- a/tests/src/JIT/jit64/gc/misc/test3.csproj
+++ b/tests/src/JIT/jit64/gc/misc/test3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F4446508-D1BB-49B2-AA86-DEAD87A7D00C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj b/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj
index 588142e59c..635047e445 100644
--- a/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj
+++ b/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{596F4D3B-4673-481F-9B3B-63AD94467F0E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/misc/vbil.csproj b/tests/src/JIT/jit64/gc/misc/vbil.csproj
index 39b32c2c95..4c0ed33d06 100644
--- a/tests/src/JIT/jit64/gc/misc/vbil.csproj
+++ b/tests/src/JIT/jit64/gc/misc/vbil.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{668CC077-E27C-4BCA-BFDC-7665BDF3A414}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj b/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj
index 7ec525f292..99434f8ac4 100644
--- a/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj
+++ b/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E0742648-250D-44E9-9240-315BF341E2E2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj b/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj
index bf76763a0d..e67730ca84 100644
--- a/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj
+++ b/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CED9FC4A-BD8C-4EF2-8A64-4BCAC3ABF4CB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/hfa/main/dll/common.csproj b/tests/src/JIT/jit64/hfa/main/dll/common.csproj
index b4bc9e6396..6f25f3dc2e 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/common.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/common.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_common.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_common.csproj
index a0ae76d57c..b6ed6d18f6 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_common.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_common.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_interop_cpp.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_interop_cpp.csproj
index c408d8ae44..43f4784323 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_interop_cpp.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_interop_cpp.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="hfa_nested_f32_common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_managed.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_managed.csproj
index 1fecbcd094..670081fd1c 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_managed.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_managed.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="hfa_nested_f32_common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_common.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_common.csproj
index b132ab08bd..a9d5aaa0ac 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_common.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_common.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
index ff575ae7a0..14cbd77dfa 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -41,10 +37,6 @@
     <ProjectReference Include="hfa_nested_f64_common.csproj" />
     <ProjectReference Include="CMakelists.txt" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_managed.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_managed.csproj
index b6d11aca40..51eb28fce3 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_managed.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_managed.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="hfa_nested_f64_common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_common.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_common.csproj
index 898816bbea..2cd1759541 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_common.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_common.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_interop_cpp.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_interop_cpp.csproj
index c13e4321f6..c21845e622 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_interop_cpp.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_interop_cpp.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="hfa_simple_f32_common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_managed.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_managed.csproj
index 74c86f934b..37169c015c 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_managed.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_managed.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="hfa_simple_f32_common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_common.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_common.csproj
index 102f915dc3..be643dbd35 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_common.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_common.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_interop_cpp.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_interop_cpp.csproj
index e1501ac579..f9b22c9645 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_interop_cpp.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_interop_cpp.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,11 +32,7 @@
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup> 
+  </ItemGroup> 
   <ItemGroup>
     <ProjectReference Include="hfa_simple_f64_common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_managed.csproj b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_managed.csproj
index 34665fc12f..408d97e704 100644
--- a/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_managed.csproj
+++ b/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_managed.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="hfa_simple_f64_common.csproj" />
   </ItemGroup>
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
index f40a3c032e..69035edbc2 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
index f40a3c032e..ff2a307dfc 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
index f0bacc5918..48ff535978 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
index f0bacc5918..46269d5c00 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
index 920c967ee2..7cbe45044b 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
index 920c967ee2..6a83b5f365 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
index e3ae8b8c14..1be1fb06e6 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
index e3ae8b8c14..b47385b93c 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
index b102bec3b7..ce53e36b37 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
index b102bec3b7..e5bf4faf63 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
index 339fc515cf..93fbe78961 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
index 339fc515cf..6b017bf49c 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
index 4c71623fce..3952f3b5a7 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
index 4c71623fce..8a583dc3d9 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
index 5d14935ef2..0a7fdc9638 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
index 5d14935ef2..ee08efd139 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
index 3d87172d19..8cd066eda5 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
index 3d87172d19..6fe71af897 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj
index affa7083eb..4d3bc836b2 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj
index affa7083eb..e7c59ec9d8 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj
index e4adc6f2ba..a1f569ccaa 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj
index e4adc6f2ba..871b693214 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj
index db8d47080b..457625b45a 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testA.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj
index db8d47080b..3c046ac624 100644
--- a/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj
index 9e62c0d518..56eff6027c 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj
index 87e057cea4..4e4c9e1d6a 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj
index d6ec211996..c65807364a 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj
index 637d1e92b1..a55d2f3eff 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj
index 28a9c715db..9cb1f258d0 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj
index 827e92c21a..637c6d3a2e 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj
index 2b88d284fe..a98558e540 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj
index 5f68594a38..46c695e496 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj
index 5b9e855324..cda03133b4 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj
index 461ac362e6..8dedb9cf51 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj
index 1cbc8982b0..4d2767e4c1 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj
index 706a9faac3..54c6b9f29b 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj
index 4167a03e70..e524ebf784 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj
index 262f8f74c3..18cc5ecc6a 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj
index e7e010e5d6..be6b46c5e3 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj
index 23ef9821e5..61de184bbf 100644
--- a/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj
index fefe753d7e..e1c311c4cd 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj
index fefe753d7e..eb8fa13f14 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj
index 76dafa7e49..843480256a 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj
index 76dafa7e49..f9c1c0013a 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj
index 0dbfd53459..e89dcc8c85 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj
index 0dbfd53459..073fffe7e7 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj
index 51c31db595..4e7b8ffe9b 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj
index 51c31db595..ce8e9c60ba 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj
index d2eb3f66bd..971f7ff8a5 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj
index d2eb3f66bd..d1ccef4385 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj
index ba584710da..1c668b3740 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj
index ba584710da..87565b0adf 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj
index 69ee814ff7..a650366f4d 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj
index 69ee814ff7..2361cb8ebd 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj
index 2c498b1386..1df0b4e40a 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj
index 2c498b1386..f05bd28a61 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj
index 8cb4132919..7edbf0ea45 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj
index 8cb4132919..51c9c27829 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj
index e002d7eab2..a27e74991b 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj
index e002d7eab2..b14d402289 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj
index 9eb4f3a513..37666801ac 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj
index 9eb4f3a513..6b90450cf5 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj
index c36c96eec9..bd33d3aa63 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testC.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj
index c36c96eec9..8ac6726484 100644
--- a/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj
index 73f0a4c159..7dbdb350bf 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj
index 73f0a4c159..df16485ce6 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj
index ba0e8b0e20..b8efd6b369 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj
index ba0e8b0e20..ad3b033cb2 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj
index 919fab6d34..d30748adca 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj
index 919fab6d34..6ccea5a028 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj
index 67324004e8..5002f078c7 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj
index 67324004e8..aa043710a3 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj
index 6dc3e58bca..074dd77b37 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj
index 6dc3e58bca..41cc87be1d 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj
index 676e886cbd..7934e3e987 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj
index 676e886cbd..dce9c23094 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj
index 6d1b47a821..ddcb38372f 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj
index 6d1b47a821..844ea776ce 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj
index 3501f9d0b6..dc5753e865 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj
index 3501f9d0b6..ce80417d9f 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj
index 24b70aa42b..15283ab6e2 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj
index 24b70aa42b..f6d0a27cd8 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj
index 69af7d68f4..34b64f0dea 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj
index 69af7d68f4..551d5006f1 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj
index 72d472d526..0f9fd86040 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj
index 72d472d526..8faa0e8cdc 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj
index 238f6d0986..498ffd4cd0 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testE.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj
index 238f6d0986..a20f8ca5b8 100644
--- a/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj
index b393c8cf9d..80077e1a84 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj
index b393c8cf9d..fa1ded0dc8 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj
index 916f9fb4e3..f658c76196 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj
index 916f9fb4e3..38f210efdb 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj
index 542fe51c0d..68bb05c3c9 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj
index 542fe51c0d..c5d24c784b 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj
index a60e495712..d2078c3cff 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj
index a60e495712..38c1317786 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj
index dba28b6829..10d701537d 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj
index dba28b6829..d18230fe66 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj
index 8afec4fed4..30e36429f7 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj
index 8afec4fed4..339c760ef9 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj
index 7a4a6eca28..dbff6b9780 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj
index 7a4a6eca28..7a56dbe309 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj
index ecce74b181..2f16c171a2 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj
index ecce74b181..17d1ebb946 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj
index 576066407e..ce92d72017 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj
index 576066407e..a49d9a3f1f 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj
index 87832b163f..a6ce1c42dc 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj
index 87832b163f..1f67c2c497 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj
index 0c86afe2af..acfad65b72 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj
@@ -8,18 +8,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -27,9 +21,10 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
     <NoLogo>True</NoLogo>
     <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -41,11 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj
index 0c86afe2af..eaf0d0e880 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj
index a42d91a86d..b99fcc5d1e 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,25 +8,20 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hfa_testG.cs" />
@@ -34,10 +29,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
@@ -45,6 +36,5 @@
     <ProjectReference Include="..\dll\CMakelists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj
index a42d91a86d..0dae6e9fb2 100644
--- a/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj
+++ b/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/tests/src/JIT/jit64/localloc/call/call03_dynamic.ilproj b/tests/src/JIT/jit64/localloc/call/call03_dynamic.ilproj
index 3ce65d7fa5..df607ba4df 100644
--- a/tests/src/JIT/jit64/localloc/call/call03_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call03_dynamic.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call03_large.ilproj b/tests/src/JIT/jit64/localloc/call/call03_large.ilproj
index eee1ea76b0..2a084963d4 100644
--- a/tests/src/JIT/jit64/localloc/call/call03_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call03_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call03_small.ilproj b/tests/src/JIT/jit64/localloc/call/call03_small.ilproj
index 8288227daa..68ccc2cbd0 100644
--- a/tests/src/JIT/jit64/localloc/call/call03_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call03_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call04_dynamic.ilproj b/tests/src/JIT/jit64/localloc/call/call04_dynamic.ilproj
index 1a117d9008..eadadfd97f 100644
--- a/tests/src/JIT/jit64/localloc/call/call04_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call04_dynamic.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call04_large.ilproj b/tests/src/JIT/jit64/localloc/call/call04_large.ilproj
index a3b47bcf63..fbfb8b5150 100644
--- a/tests/src/JIT/jit64/localloc/call/call04_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call04_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call04_small.ilproj b/tests/src/JIT/jit64/localloc/call/call04_small.ilproj
index 4cdd33e6a0..b5f7e2958f 100644
--- a/tests/src/JIT/jit64/localloc/call/call04_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call04_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call05_dynamic.ilproj b/tests/src/JIT/jit64/localloc/call/call05_dynamic.ilproj
index 63e9f3142c..bd43c04cdb 100644
--- a/tests/src/JIT/jit64/localloc/call/call05_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call05_dynamic.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call05_large.ilproj b/tests/src/JIT/jit64/localloc/call/call05_large.ilproj
index 3d625f50a6..5a0c7cc565 100644
--- a/tests/src/JIT/jit64/localloc/call/call05_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call05_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call05_small.ilproj b/tests/src/JIT/jit64/localloc/call/call05_small.ilproj
index c7e7c276d0..0d53955fd8 100644
--- a/tests/src/JIT/jit64/localloc/call/call05_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call05_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call06_dynamic.ilproj b/tests/src/JIT/jit64/localloc/call/call06_dynamic.ilproj
index 18acb6c401..76f079c9f4 100644
--- a/tests/src/JIT/jit64/localloc/call/call06_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call06_dynamic.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call06_large.ilproj b/tests/src/JIT/jit64/localloc/call/call06_large.ilproj
index 8502d63abc..e8c8208afa 100644
--- a/tests/src/JIT/jit64/localloc/call/call06_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call06_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call06_small.ilproj b/tests/src/JIT/jit64/localloc/call/call06_small.ilproj
index 2bbc76bbd7..c5aa968b81 100644
--- a/tests/src/JIT/jit64/localloc/call/call06_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call06_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call07_dynamic.ilproj b/tests/src/JIT/jit64/localloc/call/call07_dynamic.ilproj
index 01b16062d9..d6233b2bcd 100644
--- a/tests/src/JIT/jit64/localloc/call/call07_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call07_dynamic.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/call/call07_small.ilproj b/tests/src/JIT/jit64/localloc/call/call07_small.ilproj
index 4bcd5eaa3f..f123c1b788 100644
--- a/tests/src/JIT/jit64/localloc/call/call07_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/call/call07_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/common/common.ilproj b/tests/src/JIT/jit64/localloc/common/common.ilproj
index f8ba92a620..00b2c656bd 100644
--- a/tests/src/JIT/jit64/localloc/common/common.ilproj
+++ b/tests/src/JIT/jit64/localloc/common/common.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript>
   </PropertyGroup>
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj b/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj
index d1cef0186b..dd55c847da 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj b/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj
index 3a884d3214..8d7c28849d 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj b/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj
index 66eebbd696..837b7966b9 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj b/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj
index 45cdce74b7..9fa3ae7b02 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj b/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj
index 133e29bf1f..d565d6aae0 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj b/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj
index 987cc34387..732c9c64f7 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/eh/eh03_dynamic.ilproj b/tests/src/JIT/jit64/localloc/eh/eh03_dynamic.ilproj
index c903953e0e..9bc5336e7d 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh03_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh03_dynamic.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/eh/eh03_large.ilproj b/tests/src/JIT/jit64/localloc/eh/eh03_large.ilproj
index d03700175a..32786d4dbf 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh03_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh03_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/eh/eh03_small.ilproj b/tests/src/JIT/jit64/localloc/eh/eh03_small.ilproj
index f5c50edbfb..561a175c15 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh03_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh03_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/eh/eh04_dynamic.ilproj b/tests/src/JIT/jit64/localloc/eh/eh04_dynamic.ilproj
index 7da8b302c8..1934b8eba7 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh04_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh04_dynamic.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/eh/eh04_large.ilproj b/tests/src/JIT/jit64/localloc/eh/eh04_large.ilproj
index 3f2e3595f1..5156e7a12b 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh04_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh04_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/eh/eh04_small.ilproj b/tests/src/JIT/jit64/localloc/eh/eh04_small.ilproj
index 1f4c79fcad..596487be9e 100644
--- a/tests/src/JIT/jit64/localloc/eh/eh04_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/eh/eh04_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh05_dynamic.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh05_dynamic.ilproj
index 3b1310959e..01942fa791 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh05_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh05_dynamic.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh05_dynamic.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh05_large.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh05_large.ilproj
index 3cf82005cb..bc2213065a 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh05_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh05_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh05_small.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh05_small.ilproj
index 3db2487e3e..e69fcf9ad2 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh05_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh05_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh06_dynamic.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh06_dynamic.ilproj
index 340b969aee..9f1bbd1c05 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh06_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh06_dynamic.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh06_dynamic.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh06_large.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh06_large.ilproj
index 23edfea796..c0d83df0c3 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh06_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh06_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh06_small.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh06_small.ilproj
index aed356c9d7..64b149c639 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh06_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh06_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh07_dynamic.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh07_dynamic.ilproj
index 345fa12c89..bad0e14e75 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh07_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh07_dynamic.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh07_dynamic.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh07_large.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh07_large.ilproj
index 35ae3d60c9..ba46206070 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh07_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh07_large.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh07_large.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh07_small.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh07_small.ilproj
index b6d02aaa75..139b320277 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh07_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh07_small.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh07_small.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh08_dynamic.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh08_dynamic.ilproj
index 2394b8d787..c8b99216fa 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh08_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh08_dynamic.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh08_dynamic.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh08_large.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh08_large.ilproj
index 31c346d509..24ca0806a8 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh08_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh08_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh08_small.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh08_small.ilproj
index 48b2b1e946..5fbe495a0d 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh08_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh08_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj b/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj
index 702ec9a059..4d2a8869b4 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj b/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj
index 702ec9a059..4d2a8869b4 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj b/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj
index 702ec9a059..4d2a8869b4 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh11_dynamic.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh11_dynamic.ilproj
index bd47541f27..04d39f72bb 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh11_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh11_dynamic.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh11_dynamic.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh11_large.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh11_large.ilproj
index d785a35b44..20471ce596 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh11_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh11_large.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh11_large.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh11_small.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh11_small.ilproj
index 824208abbd..c51d5b4c46 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh11_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh11_small.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh11_small.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh12_dynamic.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh12_dynamic.ilproj
index c66674b84c..1db8353aae 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh12_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh12_dynamic.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh12_dynamic.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh12_large.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh12_large.ilproj
index 8411c5a78f..904cdc4bb8 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh12_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh12_large.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh12_large.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh12_small.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh12_small.ilproj
index 0f499c354e..d7976a20a5 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh12_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh12_small.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh12_small.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh13_dynamic.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh13_dynamic.ilproj
index 0e3783f606..fad418bea1 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh13_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh13_dynamic.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh13_dynamic.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh13_large.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh13_large.ilproj
index dfda9ac52b..80635e56a6 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh13_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh13_large.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh13_large.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/ehverify/eh13_small.ilproj b/tests/src/JIT/jit64/localloc/ehverify/eh13_small.ilproj
index e324037d58..f334fdf943 100644
--- a/tests/src/JIT/jit64/localloc/ehverify/eh13_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/ehverify/eh13_small.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,41 +8,32 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="eh13_small.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj b/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj
index 6a191e543a..0286146858 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj b/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj
index 183d645c60..278473cf93 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj b/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj
index f3fd81348d..f14df90a35 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj b/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj
index b4ef611839..c21e6fe38f 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj b/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj
index 217cef9578..71c19cd198 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj b/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj
index 1ee7711ae7..f424672c7b 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj b/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj
index 4bb751f2ef..f9f2d84008 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj b/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj
index 3ce83c5889..a1e8b612e7 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj b/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj
index 89930055e3..da577914b4 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind04_dynamic.ilproj b/tests/src/JIT/jit64/localloc/unwind/unwind04_dynamic.ilproj
index ca393e459a..83d9d69d76 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind04_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind04_dynamic.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind04_large.ilproj b/tests/src/JIT/jit64/localloc/unwind/unwind04_large.ilproj
index 0304c545c8..6d45ecdf6f 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind04_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind04_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind04_small.ilproj b/tests/src/JIT/jit64/localloc/unwind/unwind04_small.ilproj
index 81d0c7c60b..467c1278fc 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind04_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind04_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind05_dynamic.ilproj b/tests/src/JIT/jit64/localloc/unwind/unwind05_dynamic.ilproj
index 33b3a6bda8..f953d701bf 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind05_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind05_dynamic.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind05_large.ilproj b/tests/src/JIT/jit64/localloc/unwind/unwind05_large.ilproj
index eca5e56959..3871db4adf 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind05_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind05_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind05_small.ilproj b/tests/src/JIT/jit64/localloc/unwind/unwind05_small.ilproj
index f5c9c196c6..364ee7bf12 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind05_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind05_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind06_dynamic.ilproj b/tests/src/JIT/jit64/localloc/unwind/unwind06_dynamic.ilproj
index fd0cd0ee62..ee4cde2592 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind06_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind06_dynamic.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind06_large.ilproj b/tests/src/JIT/jit64/localloc/unwind/unwind06_large.ilproj
index 8bfe8cbce0..7d144cb569 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind06_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind06_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/unwind/unwind06_small.ilproj b/tests/src/JIT/jit64/localloc/unwind/unwind06_small.ilproj
index 25ef5ee4d7..272d70ec79 100644
--- a/tests/src/JIT/jit64/localloc/unwind/unwind06_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/unwind/unwind06_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj b/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj
index d9a5e79dbf..9194caa1d7 100644
--- a/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj
+++ b/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj b/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj
index 612df0e484..2005db2ce9 100644
--- a/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj b/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj
index 84c4a8dccd..15041a593b 100644
--- a/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj b/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj
index 25af47f3fd..fc95236ff6 100644
--- a/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj
+++ b/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="zeroInit01_small.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/localloc/zeroinit/zeroinit01_large.ilproj b/tests/src/JIT/jit64/localloc/zeroinit/zeroinit01_large.ilproj
index 5b21afd0b9..ab0b1912b6 100644
--- a/tests/src/JIT/jit64/localloc/zeroinit/zeroinit01_large.ilproj
+++ b/tests/src/JIT/jit64/localloc/zeroinit/zeroinit01_large.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/mcc/common/common.il b/tests/src/JIT/jit64/mcc/common/common.il
index 97abb96e7f..8dfc8aa5a6 100644
--- a/tests/src/JIT/jit64/mcc/common/common.il
+++ b/tests/src/JIT/jit64/mcc/common/common.il
@@ -207,7 +207,7 @@
     IL_0015:  ldsfld     string [mscorlib]System.String::Empty
     IL_001a:  br.s       IL_0039
 
-    IL_001c:  call       string [mscorlib]System.Environment::get_NewLine()
+    IL_001c:  call       string [system.runtime.extensions]System.Environment::get_NewLine()
     IL_0021:  ldarg.0
     IL_0022:  call       instance class [mscorlib]System.Exception [mscorlib]System.Exception::get_InnerException()
     IL_0027:  castclass  MCCTest.ResultVerificationException
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i00.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i00.ilproj
index 0f75f4eabc..fcc6a6167e 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i00.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i00.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i00.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i01.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i01.ilproj
index a76c21ff5d..306c301ad6 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i01.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i01.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i01.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i02.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i02.ilproj
index 361128fee3..652764f769 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i02.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i02.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i02.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i03.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i03.ilproj
index d33d688a39..b70abeb2b0 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i03.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i03.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i03.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i04.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i04.ilproj
index a7db425da6..c0e6083857 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i04.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i04.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i04.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i05.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i05.ilproj
index 712214ec51..8be33374f5 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i05.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i05.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i05.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i06.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i06.ilproj
index 6e33fbbf5a..bc18ec8c26 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i06.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i06.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i06.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i07.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i07.ilproj
index 7f472ef6a5..4927701d58 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i07.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i07.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i07.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i10.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i10.ilproj
index 024ef02112..b6aff30d90 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i10.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i10.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -26,10 +24,9 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    
     <Optimize>False</Optimize>
   </PropertyGroup>
-  <ItemGroup>  
+  <ItemGroup>
     <Compile Include="mcc_i10.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +36,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i11.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i11.ilproj
index 0056ef8d4b..cfe0f40411 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i11.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i11.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -26,11 +24,10 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    
     <Optimize>False</Optimize>
   </PropertyGroup>
-  <ItemGroup>  
-    <Compile Include="mcc_i11.il ..\common\common.il" />    
+  <ItemGroup>
+    <Compile Include="mcc_i11.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
@@ -39,6 +36,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i12.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i12.ilproj
index f46a345f5a..b0cc3ce968 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i12.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i12.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -26,11 +24,10 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    
     <Optimize>False</Optimize>
   </PropertyGroup>
-  <ItemGroup>  
-    <Compile Include="mcc_i12.il ..\common\common.il" />    
+  <ItemGroup>
+    <Compile Include="mcc_i12.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
@@ -39,6 +36,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i13.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i13.ilproj
index dea744ff41..31d663a013 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i13.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i13.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -26,10 +24,9 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <PropertyGroup>
-    
     <Optimize>False</Optimize>
   </PropertyGroup>
-  <ItemGroup>  
+  <ItemGroup>
     <Compile Include="mcc_i13.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +36,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i14.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i14.ilproj
index e97990c40c..f12cfa11db 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i14.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i14.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i14.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i15.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i15.ilproj
index 1341be911f..f1d7748fc9 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i15.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i15.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i15.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i16.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i16.ilproj
index cb1b8a0c3e..01991bd1ec 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i16.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i16.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i16.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i17.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i17.ilproj
index c3a29f96ca..b8394e6933 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i17.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i17.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i17.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i30.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i30.ilproj
index 059bd692b9..fa31280a15 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i30.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i30.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i30.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i31.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i31.ilproj
index c0c7559089..03e1a3f665 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i31.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i31.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i31.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i32.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i32.ilproj
index 99e9b2de2f..d156f277ef 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i32.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i32.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i32.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i33.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i33.ilproj
index 30b1e1d374..1e47b08325 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i33.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i33.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i33.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i34.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i34.ilproj
index f34a1ee93d..7dffc844a0 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i34.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i34.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i34.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i35.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i35.ilproj
index 66433db583..b57b58ab30 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i35.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i35.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i35.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i36.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i36.ilproj
index b12365cecc..019c1a5e80 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i36.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i36.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i36.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i37.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i37.ilproj
index 61cb2bfd12..2b7c93deb2 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i37.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i37.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i37.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i50.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i50.ilproj
index 1cb0fdb0c8..452be2f253 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i50.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i50.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i50.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i51.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i51.ilproj
index 38b25f3157..ddc8a07da8 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i51.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i51.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i51.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i52.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i52.ilproj
index b90239e4c5..4f0c80e38f 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i52.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i52.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i52.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i53.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i53.ilproj
index 2a6e3338db..9f6fd04400 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i53.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i53.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i53.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i54.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i54.ilproj
index 26c5c5814d..6dc67b57c9 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i54.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i54.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i54.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i55.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i55.ilproj
index 67de2d6223..d548e78700 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i55.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i55.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i55.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i56.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i56.ilproj
index 0080b48d8e..c15d024859 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i56.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i56.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i56.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i57.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i57.ilproj
index e6001748a0..2c3705afc8 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i57.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i57.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i57.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i60.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i60.ilproj
index 92ce67a731..43eb23d53d 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i60.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i60.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i60.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i61.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i61.ilproj
index 4a08ee6b32..c447be0600 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i61.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i61.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i61.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i62.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i62.ilproj
index 52c4788df8..a9fcde4c8d 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i62.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i62.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i62.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i63.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i63.ilproj
index d888b8d79c..5cead303bd 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i63.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i63.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i63.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i64.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i64.ilproj
index 68935f969d..9ce13be488 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i64.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i64.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i64.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i65.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i65.ilproj
index 7d3b2c112d..9effe2f013 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i65.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i65.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i65.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i66.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i66.ilproj
index 02597b9e01..d24686cfff 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i66.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i66.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i66.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i67.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i67.ilproj
index 5d81f8b326..4be027f3bf 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i67.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i67.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i67.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i70.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i70.ilproj
index 9c2197a29c..dab0e3809f 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i70.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i70.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i70.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i71.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i71.ilproj
index a49796d347..f83c3ddfa2 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i71.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i71.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i71.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i72.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i72.ilproj
index a26c8f94f6..c47cb4624f 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i72.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i72.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i72.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i73.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i73.ilproj
index c37a24485e..774c56b231 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i73.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i73.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i73.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i74.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i74.ilproj
index 0cfbe22391..e377ee149b 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i74.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i74.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i74.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i75.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i75.ilproj
index 23b5db244d..1f75a1bc7d 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i75.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i75.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i75.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i76.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i76.ilproj
index a1bd38cd4c..8a312cac76 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i76.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i76.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i76.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i77.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i77.ilproj
index b987955659..478afc5f88 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i77.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i77.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i77.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i80.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i80.ilproj
index 6d295403b7..b7cb3571bd 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i80.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i80.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i80.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i81.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i81.ilproj
index 98e90afd95..57f52b03fb 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i81.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i81.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i81.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i82.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i82.ilproj
index b2c5f3a404..88569f7bb5 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i82.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i82.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i82.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i83.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i83.ilproj
index d1fcff559d..f519112e08 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i83.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i83.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i83.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i84.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i84.ilproj
index 6336a1942e..6bbab5cbc7 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i84.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i84.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i84.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i85.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i85.ilproj
index fddd95d0b0..ca5a88d50d 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i85.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i85.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i85.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i86.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i86.ilproj
index 2dd49cc25a..b690ba91f0 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i86.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i86.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i86.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/mcc/interop/mcc_i87.ilproj b/tests/src/JIT/jit64/mcc/interop/mcc_i87.ilproj
index 21903b8552..16af55fcc3 100644
--- a/tests/src/JIT/jit64/mcc/interop/mcc_i87.ilproj
+++ b/tests/src/JIT/jit64/mcc/interop/mcc_i87.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,28 +8,23 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-    
-  </PropertyGroup>
-  <ItemGroup>  
+  <PropertyGroup></PropertyGroup>
+  <ItemGroup>
     <Compile Include="mcc_i87.il ..\common\common.il" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +34,5 @@
     <ProjectReference Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj
index d4b20682d5..8a3ab7b197 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3ED661B5-319B-48F4-9967-0CBABE8EBE73}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj
index aad3884b17..d963b03f5c 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{865955A1-6602-4193-8987-345C4EF8356A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj
index 889688960f..052663c506 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B228E862-A53D-4F11-BCD6-D8D272F0C66C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj
index 676bc29258..774fdaa15f 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6B7E70E6-EF12-44B8-B9A4-6BED566A2F8D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj
index 53cb55cb75..b649e9de08 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{63E99969-750E-464D-899E-6EEE9EA67F9A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj
index 11c5f9892a..fe3e36e513 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BE135661-BB2B-45D4-824E-29C5F824C046}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj
index 7491be2c87..db256a5af7 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A4D62CDE-4698-44AD-AD64-3DBF9332C254}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj
index 24c8a6c0c7..3773badfba 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EA7AD6C6-064B-4DB3-9F90-109ACFAF4C84}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj
index 3d596c1d67..1199d58cd0 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ED45850C-314D-4C54-AEDE-BAF0BAB35C11}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj
index 9af2fb136e..e7713fa6af 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{25259293-8AB2-41F9-A85A-287B67A92F47}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj
index 220fa0239b..8b8e7338bd 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{80432680-467C-44B5-B7F1-93AC39D576E5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj
index ea02a8f5c0..12be8fdb3c 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{32092B1E-6593-44B9-97E6-5EAED24DA728}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj
index f925e5acbe..d311c6067e 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{243B71CD-1777-47D9-9FBA-1600979C9CAD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj
index 51322ac85c..d986a9f25e 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{377E5E65-3EBB-40BE-9AF2-1EFABF501F77}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj
index 56344acc07..3a8948b4c8 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DB27E434-7BF3-40DC-8EE8-45E221D021B6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj
index 5bce22a21b..48c8c4e4d6 100644
--- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{518679EE-E7BD-4C43-A1AA-49EC99884AB5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
index 06714e326b..70d1d3a882 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{577F22AF-E8A2-4F30-B334-52C472E00218}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
     <!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. -->
     <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj
index e5e7ee7be3..ce98dfff9b 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7B9B9A61-B8D4-40BE-B129-CAE29DA7DBE9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
index fc845ce81a..6cd2711016 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AE1875D5-E1FF-4B62-AC11-6D240E08EF4F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
     <!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. -->
     <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj
index db9dfaec38..bc06373f4d 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{574638AF-F419-4A9C-AB48-C2E4E4FA871E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj
index 0ed20e86d9..b1ebbcc4ad 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7D460199-5067-44D8-AF25-63FC56C328CD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj
index d10bd79ae9..6064ce58b6 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EC1E4B63-F569-4AED-951E-6AD70E068837}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj
index 40d5ecb157..88ffd20ca8 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7819D99D-5521-41F5-B6E0-002C176B64D1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj
index 501159354f..fb046e73c7 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2109EB2F-0679-47CB-90DC-4C1D3DB4D4FE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj
index c8d49931dd..97afe6aa1d 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8B7C722A-3E7E-476A-A6EB-3A33E0D7B8F5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj
index 7a77e235f3..5af932cdba 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1B939809-FCC2-45FE-A420-F39FA207713C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj
index 681b0198b8..3e69c21481 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D3EF87D0-AA9F-4E5B-AAF3-EEE3E920E25B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj
index 76f67ca787..4c186b9be3 100644
--- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{415E8598-01F0-484D-9B87-A9DB65DFACF8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cg/il/jmp_dbg.ilproj b/tests/src/JIT/jit64/opt/cg/il/jmp_dbg.ilproj
index 9815de2e2b..ad41803f9a 100644
--- a/tests/src/JIT/jit64/opt/cg/il/jmp_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/jmp_dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/cg/il/jmp_impl.ilproj b/tests/src/JIT/jit64/opt/cg/il/jmp_impl.ilproj
index 59db0a5b83..b9b6ee4c53 100644
--- a/tests/src/JIT/jit64/opt/cg/il/jmp_impl.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/jmp_impl.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/cg/il/jmp_opt.ilproj b/tests/src/JIT/jit64/opt/cg/il/jmp_opt.ilproj
index a4fba5e01f..f90eca3cb5 100644
--- a/tests/src/JIT/jit64/opt/cg/il/jmp_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/jmp_opt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/cg/il/jmp_ret.ilproj b/tests/src/JIT/jit64/opt/cg/il/jmp_ret.ilproj
index 19788bdb61..bc04b8394b 100644
--- a/tests/src/JIT/jit64/opt/cg/il/jmp_ret.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/jmp_ret.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="jmp.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/opt/cg/il/ldftn_dbg.ilproj b/tests/src/JIT/jit64/opt/cg/il/ldftn_dbg.ilproj
index 7672122106..da410a3b3b 100644
--- a/tests/src/JIT/jit64/opt/cg/il/ldftn_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/ldftn_dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/cg/il/ldftn_impl.ilproj b/tests/src/JIT/jit64/opt/cg/il/ldftn_impl.ilproj
index f2f005f662..5b4ddef911 100644
--- a/tests/src/JIT/jit64/opt/cg/il/ldftn_impl.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/ldftn_impl.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/cg/il/ldftn_opt.ilproj b/tests/src/JIT/jit64/opt/cg/il/ldftn_opt.ilproj
index b44a4e9f42..80847f2c07 100644
--- a/tests/src/JIT/jit64/opt/cg/il/ldftn_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/ldftn_opt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/cg/il/ldftn_ret.ilproj b/tests/src/JIT/jit64/opt/cg/il/ldftn_ret.ilproj
index 7a49622f60..e7e065a4c5 100644
--- a/tests/src/JIT/jit64/opt/cg/il/ldftn_ret.ilproj
+++ b/tests/src/JIT/jit64/opt/cg/il/ldftn_ret.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ldftn.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/opt/cprop/Dev10_844071.ilproj b/tests/src/JIT/jit64/opt/cprop/Dev10_844071.ilproj
index 9d316d315c..91d07fdf25 100644
--- a/tests/src/JIT/jit64/opt/cprop/Dev10_844071.ilproj
+++ b/tests/src/JIT/jit64/opt/cprop/Dev10_844071.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/cprop/Dev10_884217_IL.ilproj b/tests/src/JIT/jit64/opt/cprop/Dev10_884217_IL.ilproj
index f337899944..a11c8e275f 100644
--- a/tests/src/JIT/jit64/opt/cprop/Dev10_884217_IL.ilproj
+++ b/tests/src/JIT/jit64/opt/cprop/Dev10_884217_IL.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/cprop/cprop001_d.csproj b/tests/src/JIT/jit64/opt/cprop/cprop001_d.csproj
index 0c5072344a..8272a1bee8 100644
--- a/tests/src/JIT/jit64/opt/cprop/cprop001_d.csproj
+++ b/tests/src/JIT/jit64/opt/cprop/cprop001_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/opt/cprop/cprop001_do.csproj b/tests/src/JIT/jit64/opt/cprop/cprop001_do.csproj
index 313829fed3..66db162f2d 100644
--- a/tests/src/JIT/jit64/opt/cprop/cprop001_do.csproj
+++ b/tests/src/JIT/jit64/opt/cprop/cprop001_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/opt/cprop/cprop001_r.csproj b/tests/src/JIT/jit64/opt/cprop/cprop001_r.csproj
index 1e17040cb5..e8d1b8a106 100644
--- a/tests/src/JIT/jit64/opt/cprop/cprop001_r.csproj
+++ b/tests/src/JIT/jit64/opt/cprop/cprop001_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/opt/cprop/cprop001_ro.csproj b/tests/src/JIT/jit64/opt/cprop/cprop001_ro.csproj
index 5fa8e15f40..d6d0bc0d62 100644
--- a/tests/src/JIT/jit64/opt/cprop/cprop001_ro.csproj
+++ b/tests/src/JIT/jit64/opt/cprop/cprop001_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/opt/cprop/cprop002.ilproj b/tests/src/JIT/jit64/opt/cprop/cprop002.ilproj
index 0cd002b246..52fe71caa6 100644
--- a/tests/src/JIT/jit64/opt/cprop/cprop002.ilproj
+++ b/tests/src/JIT/jit64/opt/cprop/cprop002.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="cprop002.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/opt/cprop/implicitDownConv.csproj b/tests/src/JIT/jit64/opt/cprop/implicitDownConv.csproj
index e2ad9edabf..b67c7cd3e0 100644
--- a/tests/src/JIT/jit64/opt/cprop/implicitDownConv.csproj
+++ b/tests/src/JIT/jit64/opt/cprop/implicitDownConv.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/opt/cse/HugeArray.csproj b/tests/src/JIT/jit64/opt/cse/HugeArray.csproj
index 166482bcc1..844cb82ba0 100644
--- a/tests/src/JIT/jit64/opt/cse/HugeArray.csproj
+++ b/tests/src/JIT/jit64/opt/cse/HugeArray.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BEA92187-D3E8-48FC-B4A7-D0FEF7E2C1E8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
     <!-- NOTE: this test simply takes too long to complete under GC stress; it is not fundamentally incompatible -->
     <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj b/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj
index ebe0981b5b..db64af4ad5 100644
--- a/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2D062909-B106-4120-9C31-8D32F2394798}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/HugeField1.csproj b/tests/src/JIT/jit64/opt/cse/HugeField1.csproj
index 3ac6fcae4e..5b532cf806 100644
--- a/tests/src/JIT/jit64/opt/cse/HugeField1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/HugeField1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B21C4E34-7743-4381-9B4C-99627BA8F9C6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/HugeField2.csproj b/tests/src/JIT/jit64/opt/cse/HugeField2.csproj
index 27d9b2a9eb..f6806e789b 100644
--- a/tests/src/JIT/jit64/opt/cse/HugeField2.csproj
+++ b/tests/src/JIT/jit64/opt/cse/HugeField2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0212B91B-4135-400F-BF6D-93809909496A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.csproj b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.csproj
index 0d0a4917d7..523c1ba59c 100644
--- a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.csproj
+++ b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BF5C70EC-5E7E-443F-BB66-2DA2BC7FAAB2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.csproj b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.csproj
index ebd9490132..4a123558a0 100644
--- a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.csproj
+++ b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CCD0AB75-D346-403E-A6B2-3679C980B66A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.csproj b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.csproj
index fcb46fb230..8857c7156a 100644
--- a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.csproj
+++ b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3F72CAA0-BFC4-432F-9882-0E7B9A8899F3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj
index 28d5ff060d..9afea6e790 100644
--- a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj
+++ b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{83011DC7-382E-4573-BA09-10DFC377BA80}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj
index af81c6d43b..03c353703b 100644
--- a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj
+++ b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4A9D343C-6CD5-428E-BE71-F6532244A629}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.csproj b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.csproj
index 3fffa84f5c..96769a851a 100644
--- a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.csproj
+++ b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{511EDC7B-13C5-40AD-AD87-A99272CAE138}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj
index 689d97f52a..a0ceadaec4 100644
--- a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj
+++ b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{08FBD8EC-642B-4283-987D-3544FFF55A65}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj
index 68f3f6def0..d3770d5c8f 100644
--- a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj
+++ b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3D4497F0-44E9-4DD3-9ED4-BF81FA76142F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj
index 008b5745b8..42af8882af 100644
--- a/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj
+++ b/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C87C2962-EA62-4535-9DB2-77420B6D3BE7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj b/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj
index e67b1d5e52..d6d147ddaa 100644
--- a/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{184EB631-F61D-410D-8AF1-B8AE431A5AB1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.csproj b/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.csproj
index ea5b4dc3ff..b7957e572e 100644
--- a/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{74AE0CEB-D09C-470C-899D-7A4D9FF3B323}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj
index 2009ef9cd0..d5ed0faefb 100644
--- a/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj
+++ b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2683C3CA-8B4D-4302-AF5A-D5E474F9C29B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.csproj b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.csproj
index 75f0d63f95..fe3bc231cb 100644
--- a/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.csproj
+++ b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1BE2429D-2C90-427D-9FA9-1102B41603BB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.csproj b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.csproj
index 62ead2df0f..e75fd45cf7 100644
--- a/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9FAE0763-0333-461C-A412-4F19A04F3D02}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.csproj b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.csproj
index b6f76af138..db40cb0a71 100644
--- a/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C4242908-520F-4448-B010-67B9A70FECC1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.csproj b/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.csproj
index 5d93129afb..badb7a4bbb 100644
--- a/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.csproj
+++ b/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EC6E2B2D-93BE-47A4-92A6-47158993402D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj b/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj
index 831a909b58..b98d0d463a 100644
--- a/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ED46394E-7DE4-49B7-A92B-B9BA54132245}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj b/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj
index 75b6c368e8..cdd89b5524 100644
--- a/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F0311035-7E69-4386-8D0B-66884FAFA924}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj
index 29526dd90d..cd0e5a2c0e 100644
--- a/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2431682E-15D7-475D-AB18-45D7CC316A22}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj b/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj
index 3b27c3709d..eb678934d2 100644
--- a/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj
+++ b/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1D2795A7-3FED-4199-91D7-4EBBC9A8773D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj b/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
index 806ab52a0a..07365609ec 100644
--- a/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{53D80023-9448-44F4-875D-575C04FF8404}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj b/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
index 3ad363fd07..4761f02898 100644
--- a/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{58D9A09C-9D65-48D0-A13F-7FA0BB22838E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.csproj b/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.csproj
index 616275fdaf..bbfeaa7524 100644
--- a/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EAE31C83-CDA9-492C-BA36-157FEF6FA0F9}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj
index b9d311e84f..53b8faa766 100644
--- a/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj
+++ b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5A2A29BF-A5C2-4DB1-B905-234047CC0F62}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.csproj b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.csproj
index 6aa938d508..f63ed53c7b 100644
--- a/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.csproj
+++ b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{089FC866-7DF2-41A0-8094-8A524C4FC713}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.csproj b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.csproj
index 894da97b31..4ddd5d9bdf 100644
--- a/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{30A68F83-6397-4D9E-A9AC-04F9F0C7B6CE}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.csproj b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.csproj
index c763e5ec6c..d5ab393576 100644
--- a/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6E0F6229-1D3B-4719-B782-3DB5C0C792B8}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.csproj b/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.csproj
index 72a6b5c944..66e5e80942 100644
--- a/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.csproj
+++ b/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E1771D57-4628-444F-B838-8F12E6012BA5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj b/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj
index d94a44bce6..d6db421940 100644
--- a/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CB1DD25E-6C1B-4BAF-966B-8DD21EA72E74}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj
index 8cd960522a..10bb9de2fb 100644
--- a/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B5EB8015-3E35-434C-8ACB-0DC8948A3187}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj
index e42f8e5922..48574ddaa8 100644
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CF2715F0-25EC-4F5B-AE4B-1F9DA314D880}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj
index 7b29797abc..c201744632 100644
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6C323F5A-B563-4F00-8311-1F3A3989CC4D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj
index eefa0924d8..64ad636d17 100644
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95327237-D435-434B-AE93-5C30115C7663}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj
index edab2d8a3d..32c47b7077 100644
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4996DF71-4E47-49C5-9857-F0942487F4B3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.csproj
index 318c5286f4..5356fd61e0 100644
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E0C3F30B-3B05-4390-A7CE-C70432E26861}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj
index de8bd90316..71bfd83689 100644
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1CE03C7A-601A-4AD8-B1DC-37F6AD36B861}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.csproj
index 8c591af3bb..1a978f7824 100644
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B71D58CC-93B5-471A-8F74-0E30F6DCE3D1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.csproj
index 534a3ea379..e17e4fc7a5 100644
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{10E406E9-75CF-4A3D-B448-ED9E02EBA7D3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.csproj
index 2c9995589b..6a043ac696 100644
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6FE98154-4239-4D39-A665-9D7EFD4961BB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.csproj
index ab74b7b013..3bdfe3f5ec 100644
--- a/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.csproj
+++ b/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9F603CE5-AED2-40FD-8034-D7FF005DA40E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj
index 5d60858de7..f463bd248e 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{934DF959-89A7-4AD1-B2E7-68DE53A3305F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.csproj
index 0e1511f2fe..1c33e30b8f 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5DF9C78F-2147-439B-A9A1-485662343D02}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj
index 9e98b7c1cb..5f3738c2d6 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DCFBA03F-4498-4E6E-B389-820E87341927}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.csproj
index 589e74cf52..46af24ccd2 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E6003279-D6B5-4E63-9237-244D96C5E1D1}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.csproj
index 6b8369ebcd..acb167f9ef 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AF2C7178-EB18-4F5F-9C03-CBCF931C32C5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.csproj
index 2cf4f2e50e..4e090f10f0 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{415582ED-14CB-41F9-891B-07F0E1AFE02A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.csproj
index d1fdeea942..ac41ac7032 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5DA3DA67-3157-46FB-82FA-74DCC51C298E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.csproj
index a505753495..758f6391fb 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{70617D82-107B-4AB4-A336-3B729B9B62B4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj
index 4b9c0b128c..1ac49947f3 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{13792ECB-CE27-4C83-8DEC-92D5EFB11A2D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.csproj
index da103fa60b..14d344bfa4 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F3F1AA7A-CBBB-4293-9F03-E047A2CB1439}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.csproj
index f90dab93c8..682449e3f7 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E136E2BC-AD99-48C2-801C-0396F29391CC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.csproj
index 8d7294b243..63fbb3d201 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{29C0EC2A-D599-43CA-84D9-C8C95C72136D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.csproj
index 3f59e30bd7..258a31de4b 100644
--- a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.csproj
+++ b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73AA459B-430A-4296-9AAA-62E62615F28D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/volatilefield.csproj b/tests/src/JIT/jit64/opt/cse/volatilefield.csproj
index acdc1fd620..5338694961 100644
--- a/tests/src/JIT/jit64/opt/cse/volatilefield.csproj
+++ b/tests/src/JIT/jit64/opt/cse/volatilefield.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{92127EE1-C096-4417-9A2E-94C34053A379}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj b/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj
index b6db4e8af5..5ea83bcc7e 100644
--- a/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj
+++ b/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3A0259CC-C707-4A88-802C-36AB169E56FD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/inl/caninline_d.csproj b/tests/src/JIT/jit64/opt/inl/caninline_d.csproj
index 3ed9a1b19c..6a37474e2a 100644
--- a/tests/src/JIT/jit64/opt/inl/caninline_d.csproj
+++ b/tests/src/JIT/jit64/opt/inl/caninline_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4D4D9073-CC9D-49E2-90C5-B3F8E0EFA7E7}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/inl/caninline_do.csproj b/tests/src/JIT/jit64/opt/inl/caninline_do.csproj
index 0c5f6989c1..5bfd93caf2 100644
--- a/tests/src/JIT/jit64/opt/inl/caninline_do.csproj
+++ b/tests/src/JIT/jit64/opt/inl/caninline_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3AB2ED60-231C-4C23-820F-43B89362AB37}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/inl/caninline_r.csproj b/tests/src/JIT/jit64/opt/inl/caninline_r.csproj
index 172a0c6152..d2251e996a 100644
--- a/tests/src/JIT/jit64/opt/inl/caninline_r.csproj
+++ b/tests/src/JIT/jit64/opt/inl/caninline_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{835C8533-31E5-46BD-9328-7C13BCBDFA3B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj b/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj
index 0456305fe3..828fdee680 100644
--- a/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj
+++ b/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5FABFBE1-CB4F-4347-9869-E8F831DD5BD6}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/inl/inl001.ilproj b/tests/src/JIT/jit64/opt/inl/inl001.ilproj
index 523b4fe5bb..be2a8b16e3 100644
--- a/tests/src/JIT/jit64/opt/inl/inl001.ilproj
+++ b/tests/src/JIT/jit64/opt/inl/inl001.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="inl001.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/opt/lim/lim_001.ilproj b/tests/src/JIT/jit64/opt/lim/lim_001.ilproj
index afb89449f8..5cf7953819 100644
--- a/tests/src/JIT/jit64/opt/lim/lim_001.ilproj
+++ b/tests/src/JIT/jit64/opt/lim/lim_001.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="lim_001.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/opt/lim/lim_002.csproj b/tests/src/JIT/jit64/opt/lim/lim_002.csproj
index 47bc04eba3..dc6e04bebc 100644
--- a/tests/src/JIT/jit64/opt/lim/lim_002.csproj
+++ b/tests/src/JIT/jit64/opt/lim/lim_002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D57D7CFC-1AD8-44FB-A234-78C6126C5894}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/lur/lur_01.ilproj b/tests/src/JIT/jit64/opt/lur/lur_01.ilproj
index c56070d75e..3284ea74d8 100644
--- a/tests/src/JIT/jit64/opt/lur/lur_01.ilproj
+++ b/tests/src/JIT/jit64/opt/lur/lur_01.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="lur_01.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/opt/lur/lur_02.csproj b/tests/src/JIT/jit64/opt/lur/lur_02.csproj
index 7ab316c6dc..4567311c14 100644
--- a/tests/src/JIT/jit64/opt/lur/lur_02.csproj
+++ b/tests/src/JIT/jit64/opt/lur/lur_02.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2A843792-C6EE-41E9-8A85-0EDA1052287A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/osr/osr001.csproj b/tests/src/JIT/jit64/opt/osr/osr001.csproj
index 7a7d617762..ae2e6ecd23 100644
--- a/tests/src/JIT/jit64/opt/osr/osr001.csproj
+++ b/tests/src/JIT/jit64/opt/osr/osr001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3B636BB6-F327-4E8B-9100-C7A9238E0FAD}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/osr/osr015.ilproj b/tests/src/JIT/jit64/opt/osr/osr015.ilproj
index 54cd7dd7e6..43aa70fef3 100644
--- a/tests/src/JIT/jit64/opt/osr/osr015.ilproj
+++ b/tests/src/JIT/jit64/opt/osr/osr015.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="osr015.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_udo.csproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_udo.csproj
index 47e133a054..ccc77d9dd0 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_udo.csproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_udo.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_uro.csproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_uro.csproj
index 6014c57133..34c6b805b3 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_uro.csproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_uro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_dbg.ilproj
index 3705ccc889..eb252d99f8 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_opt.ilproj
index 2feb489314..c61cd6f255 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/bne_opt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_dbg.ilproj
index 05db2fd5f0..3937768d42 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_opt.ilproj
index fb9cdd4616..3853794c27 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/conv_opt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_dbg.ilproj
index 7922a56efa..45f04e0f71 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_opt.ilproj
index 344dab9f95..618fe1357f 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/div_opt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_dbg.ilproj
index 66e40797e4..6ee0868ea6 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_opt.ilproj
index c06054a00c..ef9a19ee65 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul1_opt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_dbg.ilproj
index dcf67b970e..01ecf3a399 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_opt.ilproj
index cf8c8cba0d..8f83ed2553 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/mul_exception_opt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_dbg.ilproj
index f6afc96a88..b305913503 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_opt.ilproj
index 254a991d22..ce3c6efdde 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem_opt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_dbg.ilproj
index 05db2fd5f0..3937768d42 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_opt.ilproj
index fb9cdd4616..3853794c27 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv_opt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_dbg.ilproj
index 1ad99784d3..c5590ec8b5 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_opt.ilproj
index a0d357ac27..a1d6d447ef 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2_opt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_dbg.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_dbg.ilproj
index a9bfe1b608..3530435eba 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_dbg.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_dbg.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_opt.ilproj b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_opt.ilproj
index f6f8d36396..34ed3eadd0 100644
--- a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_opt.ilproj
+++ b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo_opt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj b/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj
index a0758d3614..6b49e27b64 100644
--- a/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{79040C68-CDB1-4FD0-BD86-3CC5CAAC76BC}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj b/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj
index 5c6f232128..f8ec802d11 100644
--- a/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{11AC9F3D-88EA-4F10-9D3B-A88E06F71933}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj b/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj
index 9ea5282e22..63154db696 100644
--- a/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5E785831-90A1-467A-BC23-5A20376C53CA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj b/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj
index 421a00dda0..fde489d9f4 100644
--- a/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{93A9E752-E897-4AC3-9300-1D13448718F5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj b/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj
index 328a48dd45..1db80d0a01 100644
--- a/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2D8E4374-328F-4F65-A292-FD15174C849C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj b/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj
index 41d274c100..c436a99b56 100644
--- a/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D530EB76-9464-46BE-9361-70D8ADF04C1C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj b/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj
index fc333dc080..16406eb7c8 100644
--- a/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9EC006C2-A636-4C39-9908-54E1CB3E6DD2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj b/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj
index 76b4d0a3f3..a5a3d1aa89 100644
--- a/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1B1D2B4C-323A-4ACE-BF39-C5624E90B405}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj b/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj
index e20486f9c2..073871044f 100644
--- a/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{06A7C6C6-9B9B-4299-9D67-575E496D832A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj b/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj
index b59e249716..d272b81304 100644
--- a/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CADE5351-B017-4FEE-BE92-EFD112DC2603}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj b/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj
index b197242e4b..3aaee227f0 100644
--- a/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj
+++ b/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5E1E3008-E73A-4E97-A3F1-37DC2EEB295A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj b/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj
index 158bbfd05b..c411bf4b87 100644
--- a/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj
+++ b/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A4F38D33-E204-4736-A17A-A2EE4A595365}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj b/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj
index cdfdf8b444..3ac0a729d0 100644
--- a/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj
+++ b/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7E5E70EB-0719-4741-99CC-095D09B90C31}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj b/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj
index 92766cadad..20d9510bb0 100644
--- a/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj
+++ b/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B0CF4140-812F-4877-BD71-257231472300}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/ddb/118414/118414.ilproj b/tests/src/JIT/jit64/regress/ddb/118414/118414.ilproj
index 2f5c2f27e3..5628306fcb 100644
--- a/tests/src/JIT/jit64/regress/ddb/118414/118414.ilproj
+++ b/tests/src/JIT/jit64/regress/ddb/118414/118414.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="118414.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/ddb/127931/127931.ilproj b/tests/src/JIT/jit64/regress/ddb/127931/127931.ilproj
index 1b20d58de0..d5b63c6c4f 100644
--- a/tests/src/JIT/jit64/regress/ddb/127931/127931.ilproj
+++ b/tests/src/JIT/jit64/regress/ddb/127931/127931.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="127931.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj b/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj
index 1992610016..a247813f24 100644
--- a/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj
+++ b/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3E71C420-F21A-439A-8618-B7002F0CAB6A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/ddb/87766/ddb87766.csproj b/tests/src/JIT/jit64/regress/ddb/87766/ddb87766.csproj
index 54c0f89d0f..930b4b2662 100644
--- a/tests/src/JIT/jit64/regress/ddb/87766/ddb87766.csproj
+++ b/tests/src/JIT/jit64/regress/ddb/87766/ddb87766.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,10 +34,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj b/tests/src/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj
index 745f48e3b9..c73b110fcf 100644
--- a/tests/src/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj
+++ b/tests/src/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj b/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj
index 16df98ad4b..bedd8ed47b 100644
--- a/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj
+++ b/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8A9206C6-2B99-4B43-BB80-F6D05D66CC0A}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj b/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj
index 3b2797874d..5a2ed6885d 100644
--- a/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj
+++ b/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{02955291-75B3-40FF-8F78-B2CC05C6F9BA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj b/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj
index 0351481c5b..4b16a963a4 100644
--- a/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj
+++ b/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/phoenix/62322/test.ilproj b/tests/src/JIT/jit64/regress/phoenix/62322/test.ilproj
index 7ea9dfaedf..7d50e5cdaf 100644
--- a/tests/src/JIT/jit64/regress/phoenix/62322/test.ilproj
+++ b/tests/src/JIT/jit64/regress/phoenix/62322/test.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/102754/test1.ilproj b/tests/src/JIT/jit64/regress/vsw/102754/test1.ilproj
index 5d218ae4e1..dec33144be 100644
--- a/tests/src/JIT/jit64/regress/vsw/102754/test1.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/102754/test1.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -35,6 +33,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/102964/test.csproj b/tests/src/JIT/jit64/regress/vsw/102964/test.csproj
index 593d943154..440d51f757 100644
--- a/tests/src/JIT/jit64/regress/vsw/102964/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/102964/test.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CB4C76B4-98B5-4D6B-92E9-9500C6EE4D6B}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/102974/test.ilproj b/tests/src/JIT/jit64/regress/vsw/102974/test.ilproj
index 7ea9dfaedf..7d50e5cdaf 100644
--- a/tests/src/JIT/jit64/regress/vsw/102974/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/102974/test.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj b/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj
index 7ea9dfaedf..7d50e5cdaf 100644
--- a/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj b/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj
index 7ea9dfaedf..7d50e5cdaf 100644
--- a/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj b/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj
index d6e0718104..2fc99659fd 100644
--- a/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,38 +8,29 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test.il" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/329169/test.csproj b/tests/src/JIT/jit64/regress/vsw/329169/test.csproj
index 2a58ebcae5..409daeca0d 100644
--- a/tests/src/JIT/jit64/regress/vsw/329169/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/329169/test.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5D5E8CBE-803F-42E5-A2AC-B94CAFBAAF3C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/333007/test1.ilproj b/tests/src/JIT/jit64/regress/vsw/333007/test1.ilproj
index be82091205..c462bbc314 100644
--- a/tests/src/JIT/jit64/regress/vsw/333007/test1.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/333007/test1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/336666/test1.ilproj b/tests/src/JIT/jit64/regress/vsw/336666/test1.ilproj
index be82091205..c462bbc314 100644
--- a/tests/src/JIT/jit64/regress/vsw/336666/test1.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/336666/test1.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test1.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/373472/test.csproj b/tests/src/JIT/jit64/regress/vsw/373472/test.csproj
index 64719ae4bb..f623ca14de 100644
--- a/tests/src/JIT/jit64/regress/vsw/373472/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/373472/test.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{301BDE42-EF25-40DD-82EC-3D599E309CA2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/373472/test_il.ilproj b/tests/src/JIT/jit64/regress/vsw/373472/test_il.ilproj
index 449c3615a6..345dffca66 100644
--- a/tests/src/JIT/jit64/regress/vsw/373472/test_il.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/373472/test_il.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj b/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj
index 7ea9dfaedf..7d50e5cdaf 100644
--- a/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj b/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj
index 7ea9dfaedf..7d50e5cdaf 100644
--- a/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/471729/test.csproj b/tests/src/JIT/jit64/regress/vsw/471729/test.csproj
index c2e880a4e4..2bd1787aa7 100644
--- a/tests/src/JIT/jit64/regress/vsw/471729/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/471729/test.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{252FAB4F-DA96-4FBD-AFEB-B06F31B4927F}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/517867/test.csproj b/tests/src/JIT/jit64/regress/vsw/517867/test.csproj
index ca686c82ab..89d081f6cd 100644
--- a/tests/src/JIT/jit64/regress/vsw/517867/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/517867/test.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C67C7372-EE6C-48C7-B98C-0EC5222B7C29}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj b/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj
index 3e87e5a33d..1074acecd0 100644
--- a/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E1F35D93-E1D2-4CC3-887F-D9E83D765588}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj b/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj
index 0702e0e68c..5b384e7f06 100644
--- a/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{82C15ECD-27A9-4029-8097-3E15DD3FD949}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj b/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj
index 2ddebc2c5e..3dd9c6cedc 100644
--- a/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{90D0B14A-1B35-4F5F-AE27-1B447DC0BAC2}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/534486/exchange.ilproj b/tests/src/JIT/jit64/regress/vsw/534486/exchange.ilproj
index 943cf23f04..a0da31bda2 100644
--- a/tests/src/JIT/jit64/regress/vsw/534486/exchange.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/534486/exchange.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="exchange.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj b/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj
index 5ecac3b59d..85de9235a9 100644
--- a/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DFF216BA-CE50-45EA-9C53-96A57D23240C}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj b/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj
index dff7c374a0..dd25ca1770 100644
--- a/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BAF4C82D-B91F-4469-9483-FBC7950B825E}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj b/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj
index 46ca6af3cf..14d0721c38 100644
--- a/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{15603803-65FD-42A5-BDA8-AD25FEDDDAB5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/543229/test.csproj b/tests/src/JIT/jit64/regress/vsw/543229/test.csproj
index 66902ca123..83ab5fca78 100644
--- a/tests/src/JIT/jit64/regress/vsw/543229/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/543229/test.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{49EFDAE0-AE6B-49BA-B96E-866A7FDF6E25}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/543645/test.ilproj b/tests/src/JIT/jit64/regress/vsw/543645/test.ilproj
index 9bc857a238..855451d237 100644
--- a/tests/src/JIT/jit64/regress/vsw/543645/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/543645/test.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/549880/test.csproj b/tests/src/JIT/jit64/regress/vsw/549880/test.csproj
index 4ce515434d..3c43e346a8 100644
--- a/tests/src/JIT/jit64/regress/vsw/549880/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/549880/test.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EBF67994-3AE2-4EBA-BC2A-C11907A62F30}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/552940/test.ilproj b/tests/src/JIT/jit64/regress/vsw/552940/test.ilproj
index 9bc857a238..855451d237 100644
--- a/tests/src/JIT/jit64/regress/vsw/552940/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/552940/test.ilproj
@@ -8,17 +8,15 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
@@ -32,6 +30,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/560402/opadd.csproj b/tests/src/JIT/jit64/regress/vsw/560402/opadd.csproj
index 43d6aec088..ff8d8b884b 100644
--- a/tests/src/JIT/jit64/regress/vsw/560402/opadd.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/560402/opadd.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/regress/vsw/560402/opmul.csproj b/tests/src/JIT/jit64/regress/vsw/560402/opmul.csproj
index c36938d515..28fe26778e 100644
--- a/tests/src/JIT/jit64/regress/vsw/560402/opmul.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/560402/opmul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/regress/vsw/560402/opsub.csproj b/tests/src/JIT/jit64/regress/vsw/560402/opsub.csproj
index 805dcdd05a..377d206396 100644
--- a/tests/src/JIT/jit64/regress/vsw/560402/opsub.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/560402/opsub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/regress/vsw/568666/library1.csproj b/tests/src/JIT/jit64/regress/vsw/568666/library1.csproj
index 891a5b015d..989a88bb73 100644
--- a/tests/src/JIT/jit64/regress/vsw/568666/library1.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/568666/library1.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/regress/vsw/568666/library2.csproj b/tests/src/JIT/jit64/regress/vsw/568666/library2.csproj
index 891a5b015d..989a88bb73 100644
--- a/tests/src/JIT/jit64/regress/vsw/568666/library2.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/568666/library2.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/regress/vsw/568666/test.csproj b/tests/src/JIT/jit64/regress/vsw/568666/test.csproj
index aa36b11b01..f80561078b 100644
--- a/tests/src/JIT/jit64/regress/vsw/568666/test.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/568666/test.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -45,10 +41,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/regress/vsw/575343/test.ilproj b/tests/src/JIT/jit64/regress/vsw/575343/test.ilproj
index 7ea9dfaedf..7d50e5cdaf 100644
--- a/tests/src/JIT/jit64/regress/vsw/575343/test.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/575343/test.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/575343/test2.ilproj b/tests/src/JIT/jit64/regress/vsw/575343/test2.ilproj
index f2c0e99b8a..10dd8496e0 100644
--- a/tests/src/JIT/jit64/regress/vsw/575343/test2.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/575343/test2.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="test2.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj b/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj
index 01e7d0891a..a5ac082017 100644
--- a/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E0F6F130-5083-4088-B095-8E33BE269C85}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/regress/vsw/606733/Bug606733.ilproj b/tests/src/JIT/jit64/regress/vsw/606733/Bug606733.ilproj
index a3f505d68b..72025d76f6 100644
--- a/tests/src/JIT/jit64/regress/vsw/606733/Bug606733.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/606733/Bug606733.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj b/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj
index 2eb913dd94..74914b50a0 100644
--- a/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj
+++ b/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj b/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj
index 90f3e50746..b41fae1af8 100644
--- a/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj
+++ b/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{43F24741-6FD9-4593-92FA-D3252B540A92}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.csproj
index 9c34e53caa..c4914f21f3 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.csproj
index 0392354b82..4e23053bc2 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.csproj
index 0bf203dc8c..1cdf2e08f6 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.csproj
index 60fc5ddb7e..57ef6af22f 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.csproj
index 1c1d076d92..1654f0f178 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.csproj
index 693cdfb7ef..e5f0889f05 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.csproj
index 1679bb7ebd..41ccdd1635 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.csproj
index 296399ffe4..d61f499af4 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.csproj
index 73530a6d0e..5dc76fa8c3 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.csproj
index 1210b2bc32..d78c2a6743 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.csproj
index 69fef50ec0..6f3e3400df 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.csproj
index 62b91d2ca9..54cc0fb479 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.csproj
index a66b580050..046474aa6e 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.csproj
index b089ff0c76..7d61cd9af5 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.csproj
index 66543c49cf..b184af11bc 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.csproj b/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.csproj
index 3de00676e6..8604c004ac 100644
--- a/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.csproj
+++ b/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox001.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox001.csproj
index cf9059f00c..4f1faabd00 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox001.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox002.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox002.csproj
index 0b84c43e63..59d0626849 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox002.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox003.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox003.csproj
index d72ab8c37e..0b83a29358 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox003.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox004.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox004.csproj
index 26c2b5408a..09d9287dd3 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox004.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox004.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox005.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox005.csproj
index 33f07d0343..fade1c8ce5 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox005.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox005.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox006.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox006.csproj
index 093290e050..2f52f3a9c2 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox006.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox006.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox007.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox007.csproj
index edee135fcb..504416d12e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox007.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox007.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox008.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox008.csproj
index 8e66242a8d..9637c74424 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox008.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox008.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox009.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox009.csproj
index 35a9267b38..9fe3cf8a8a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox009.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox009.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox010.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox010.csproj
index 9543a461eb..353bc8b8d4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox010.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox010.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox011.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox011.csproj
index 2ff7951102..c274998993 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox011.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox011.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox012.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox012.csproj
index 31776c976c..5a4d9a6139 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox012.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox012.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox013.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox013.csproj
index 746f559494..63ab08d75e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox013.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox013.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox014.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox014.csproj
index bd6a43e98d..34905be6d2 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox014.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox014.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox015.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox015.csproj
index 811ef13cd3..065ff7f05d 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox015.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox015.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox016.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox016.csproj
index b4853cb36e..a1fbae84c9 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox016.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox016.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox017.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox017.csproj
index 82d2a7af2b..397344f0e6 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox017.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox017.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox018.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox018.csproj
index ce45b03c09..79c793d4db 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox018.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox018.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox019.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox019.csproj
index 3e93a2955b..05e89cda51 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox019.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox019.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox020.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox020.csproj
index f6338d056b..fed1f8e159 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox020.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox020.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox021.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox021.csproj
index 8d2a7d6e07..3034d50bda 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox021.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox021.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox022.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox022.csproj
index 3324e13fd3..2eaf04a198 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox022.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox022.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox023.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox023.csproj
index 6a26fd1757..2f41611b1d 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox023.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox023.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox024.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox024.csproj
index 3ec5f96403..ea0c5777e0 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox024.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox024.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox025.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox025.csproj
index 51673d9bc9..29dd831a95 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox025.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox025.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox026.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox026.csproj
index aa0aaa50d6..f1fb12f5cb 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox026.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox026.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox027.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox027.csproj
index bfaa81b5cc..23b1c20181 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox027.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox027.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox028.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox028.csproj
index 41bb2ef57c..8f203f5241 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox028.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox028.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox029.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox029.csproj
index 47f802e990..3f3b4c2473 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox029.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox029.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox030.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox030.csproj
index 84f9609bb4..b631318e9d 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox030.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox030.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox031.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox031.csproj
index ae0824049d..f9f3a9c5ea 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox031.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox031.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox032.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox032.csproj
index 54bbd8446e..a6b00f6e15 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox032.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox032.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox033.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox033.csproj
index 2bcbeed8af..ea39419621 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox033.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox033.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox034.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox034.csproj
index 94c63c9732..3b95344ac4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox034.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox034.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox037.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox037.csproj
index f28b5c1982..7880369582 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox037.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox037.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox038.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox038.csproj
index 17971a802d..ad44b9f2e2 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox038.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox038.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox039.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox039.csproj
index d329b9f84c..0e4b2bf228 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox039.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox039.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox040.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox040.csproj
index b65c8196ad..b971cd62ae 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox040.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox040.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox041.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox041.csproj
index c681f13897..498d6c157f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox041.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox041.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox042.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox042.csproj
index 461b2fde9b..7089937046 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox042.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox042.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox043.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox043.csproj
index 77c2c142d6..11d4bfb2a0 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox043.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox043.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox044.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox044.csproj
index dff3f655ad..d619b97add 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox044.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox044.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox045.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox045.csproj
index 7506cd7a81..b8b024e491 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox045.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox045.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum001.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum001.csproj
index c47cfa1a1d..6475d74ce4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum001.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum002.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum002.csproj
index 076e64d2c2..d2b303965b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum002.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum003.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum003.csproj
index a951df10d3..381c1fe1a1 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum003.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics001.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics001.csproj
index 99d173d039..d5ab1e4795 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics001.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics002.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics002.csproj
index 24e0252a5f..aa73d3eb9c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics002.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics003.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics003.csproj
index 28b03f903b..45a3291ebe 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics003.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics004.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics004.csproj
index 655c3f2482..5a6f4377df 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics004.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics004.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics005.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics005.csproj
index 636fdf5292..6b9c6dde8b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics005.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics005.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics006.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics006.csproj
index 0acab9926c..24813e95a5 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics006.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics006.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics007.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics007.csproj
index 7b556aa7fa..cec2329bae 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics007.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics007.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics008.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics008.csproj
index 8fe02d92ae..f9c62dcea3 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics008.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics008.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics009.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics009.csproj
index 39c36ce1e5..679d497f3a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics009.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics009.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics010.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics010.csproj
index 099b0794f3..acfba6b2ca 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics010.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics010.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics011.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics011.csproj
index 349a6614f7..a3269c28d4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics011.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics011.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics012.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics012.csproj
index e6fa0de604..08c738e4fb 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics012.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics012.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics013.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics013.csproj
index 7121ccb2fe..9c4785e618 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics013.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics013.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics014.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics014.csproj
index 84f32c1e02..90ab86cda4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics014.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics014.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics015.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics015.csproj
index 6fa0cf7a51..d39653a7e3 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics015.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics015.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics016.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics016.csproj
index 4226bfdd9a..8ea7017a61 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics016.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics016.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics017.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics017.csproj
index 6aa454f55b..e50c1bafd4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics017.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics017.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics018.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics018.csproj
index 3da870fac7..ebd861120a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics018.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics018.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics019.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics019.csproj
index a2b9c09006..80cea5d03b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics019.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics019.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics020.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics020.csproj
index e2c3b6d440..4fa2aef7a6 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics020.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics020.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics021.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics021.csproj
index 16c7a7bb42..1ca6a8f2be 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics021.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics021.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics022.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics022.csproj
index c107d8b7f4..4cc3622d00 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics022.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics022.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics023.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics023.csproj
index 7fdf109031..f308dd7a97 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics023.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics023.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics024.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics024.csproj
index 8d52be50e1..c05de003c9 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics024.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics024.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics025.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics025.csproj
index e052aae3f1..088d858cc1 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics025.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics025.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics026.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics026.csproj
index f10526cb61..c7a7639276 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics026.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics026.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics027.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics027.csproj
index 30a6455408..a51126f92d 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics027.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics027.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics028.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics028.csproj
index 4d56548acc..4fa46e11c2 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics028.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics028.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics029.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics029.csproj
index c549cacde8..5061d1b15d 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics029.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics029.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics030.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics030.csproj
index 417474d878..ea77c7cfae 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics030.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics030.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics031.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics031.csproj
index 2896275534..ffd5e6ee90 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics031.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics031.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics032.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics032.csproj
index 8ff18f6e1c..c66d6fa2b2 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics032.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics032.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics033.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics033.csproj
index 844d882b50..8dbcbe1d5a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics033.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics033.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics034.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics034.csproj
index 3ca8544a5f..1b181cbc09 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics034.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics034.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics037.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics037.csproj
index e2ccbc5f3c..f7cf10d510 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics037.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics037.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics038.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics038.csproj
index dc612c0baa..a4ad442e5c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics038.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics038.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics039.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics039.csproj
index 2f2142ef56..23f1abd97c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics039.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics039.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics040.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics040.csproj
index c97812620c..d7559c8bc8 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics040.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics040.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics041.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics041.csproj
index 95cf85e613..b3d2d2dbe7 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics041.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics041.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics042.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics042.csproj
index 99c6aadf87..7c8d3633bc 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics042.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics042.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics043.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics043.csproj
index 39dc5080d3..b32778117e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics043.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics043.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics044.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics044.csproj
index b844e2ed89..4300d777ca 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics044.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics044.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics045.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics045.csproj
index d1572f4048..2e21bac59c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics045.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics045.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface001.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface001.csproj
index 746e32f9fc..239c02069f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface001.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface002.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface002.csproj
index ed0a316c55..83cb9a1871 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface002.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface003.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface003.csproj
index 9fa3267aa4..a15f6d1c4a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface003.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface004.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface004.csproj
index 17392991b3..7676a864bd 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface004.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface004.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface005.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface005.csproj
index 178f217a29..eac3bdba64 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface005.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface005.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface006.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface006.csproj
index c027e05a17..b10e6e3a6e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface006.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface006.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface007.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface007.csproj
index 2eb7f1a557..4f8f6a4a3b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface007.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface007.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface008.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface008.csproj
index 8d126ad550..6071d3db11 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface008.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface008.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface009.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface009.csproj
index 21701d646c..b66cc659f4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface009.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface009.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface010.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface010.csproj
index f4e838434b..a388dfe9a1 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface010.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface010.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface011.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface011.csproj
index feb0484bb5..21c547fde6 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface011.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface011.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface012.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface012.csproj
index 2e31fbcb8b..59239e2f2f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface012.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface012.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface013.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface013.csproj
index 0eede7a69f..ae3590bdf1 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface013.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface013.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface014.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface014.csproj
index a3a7c11ba7..8c0c6e90fb 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface014.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface014.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface015.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface015.csproj
index 42437e51e1..4727a72a5e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface015.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface015.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface016.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface016.csproj
index 695af389fe..ff0702159d 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface016.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface016.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface017.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface017.csproj
index 60a12d6fe4..d762805d94 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface017.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface017.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface018.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface018.csproj
index 54049e7987..53bfd19c2d 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface018.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface018.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null001.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null001.csproj
index b863dafe1e..8096a4c46f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null001.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null002.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null002.csproj
index 74cbcce3fd..4f21cce1ae 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null002.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null003.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null003.csproj
index 66e6024815..8524c0383a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null003.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null004.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null004.csproj
index 63e03f55d2..537a2103d9 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null004.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null004.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null005.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null005.csproj
index f6238ae02c..6526079c15 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null005.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null005.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null006.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null006.csproj
index 0fe4f0139f..1ca087bee2 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null006.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null006.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null007.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null007.csproj
index 959c6a9592..0d4c93b31c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null007.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null007.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null008.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null008.csproj
index 966166367e..0c66b824ba 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null008.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null008.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null009.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null009.csproj
index c7ebd73be0..fa0ea55fb3 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null009.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null009.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null010.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null010.csproj
index c595845aa0..84463a27f0 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null010.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null010.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null011.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null011.csproj
index 9d560f1a06..f429d1540a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null011.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null011.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null012.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null012.csproj
index c2c9d27a9d..d9fffef660 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null012.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null012.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null013.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null013.csproj
index 07772445e3..2bde18b71a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null013.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null013.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null014.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null014.csproj
index 125a943697..c2bed3fee0 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null014.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null014.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null015.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null015.csproj
index aa00e03b8e..ab20afc85e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null015.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null015.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null016.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null016.csproj
index 7ef6b8555b..d77ef24a18 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null016.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null016.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null017.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null017.csproj
index b39d6b7ade..1971fb51d4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null017.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null017.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null018.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null018.csproj
index 045d1bcaf8..316fbf0c16 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null018.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null018.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null019.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null019.csproj
index 892e32b807..cc41c013c8 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null019.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null019.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null020.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null020.csproj
index cd61ca8c69..d2ae4174bb 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null020.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null020.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null021.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null021.csproj
index c230044504..829c869c34 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null021.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null021.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null022.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null022.csproj
index d03a7a9ad5..ae43edae3f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null022.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null022.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null023.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null023.csproj
index 7635d2cd95..614ee476af 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null023.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null023.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null024.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null024.csproj
index be705bd950..f05f0a37dd 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null024.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null024.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null025.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null025.csproj
index 2001470753..e6081030d9 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null025.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null025.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null026.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null026.csproj
index 15ac847d7b..137763991c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null026.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null026.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null027.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null027.csproj
index 65d0203d37..c3ef8b8015 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null027.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null027.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null028.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null028.csproj
index 14ec3e7028..5f61968959 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null028.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null028.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null029.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null029.csproj
index 6fc6b71388..f44a3a6b16 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null029.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null029.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null030.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null030.csproj
index 4fe135e36a..5e2ecdedcc 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null030.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null030.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null031.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null031.csproj
index 23a801137a..72e69d0d98 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null031.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null031.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null032.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null032.csproj
index a9d0c0baf4..ddb2ece7d4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null032.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null032.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null033.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null033.csproj
index 6937946f8a..5212984926 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null033.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null033.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null034.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null034.csproj
index 503a08ede4..d0e46fb632 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null034.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null034.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null037.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null037.csproj
index 14abe90ee5..8f10380f69 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null037.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null037.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null038.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null038.csproj
index 15f2122092..2f2703c376 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null038.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null038.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null039.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null039.csproj
index b49487bcbe..88088412f2 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null039.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null039.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null040.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null040.csproj
index a6f12f04dd..00522482f8 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null040.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null040.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null041.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null041.csproj
index d574a0e2a3..6be45a9da7 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null041.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null041.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null042.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null042.csproj
index 20c5db3298..03d31e10e3 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null042.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null042.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null043.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null043.csproj
index 7bd27dd8f7..2a064a9396 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null043.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null043.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null044.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null044.csproj
index 8982a5ff42..2f955a966c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null044.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null044.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null045.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null045.csproj
index 7592b72799..3010b5dece 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null045.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null045.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value001.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value001.csproj
index 19215ee0cf..86b09c52cb 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value001.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value002.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value002.csproj
index 1ad57287fd..921ca92f02 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value002.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value003.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value003.csproj
index 59c2cb15ee..bf2023316b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value003.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value004.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value004.csproj
index 09955a8b8d..74b9fafe1a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value004.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value004.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value005.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value005.csproj
index 2ba80c6bf5..13b46bb47a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value005.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value005.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value006.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value006.csproj
index e2a1fe40b1..111cf39912 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value006.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value006.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value007.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value007.csproj
index c2578ce090..f26a62ce57 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value007.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value007.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value008.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value008.csproj
index 50e72b30b6..2ad8c77e8c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value008.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value008.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value009.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value009.csproj
index 4ba150cb64..168453f33b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value009.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value009.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value010.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value010.csproj
index 4b3dbf36eb..a08dfec3fe 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value010.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value010.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value011.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value011.csproj
index 033b305ca0..33875ccc3f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value011.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value011.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value012.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value012.csproj
index b92280a8cf..96c2ac7780 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value012.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value012.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value013.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value013.csproj
index 6b17f283c5..401c7c5c6b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value013.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value013.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value014.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value014.csproj
index d29b3d837f..e0af7da855 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value014.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value014.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value015.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value015.csproj
index 5f41e02103..c2f49bbf8a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value015.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value015.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value016.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value016.csproj
index a4c7b29c68..a8363deb19 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value016.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value016.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value017.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value017.csproj
index eb34d246ff..48d4a14986 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value017.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value017.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value018.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value018.csproj
index 30b379f919..ff46a72548 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value018.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value018.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value019.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value019.csproj
index e1d1b779a7..50643b106e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value019.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value019.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value020.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value020.csproj
index 16cbfecbfc..d8da925f6b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value020.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value020.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value021.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value021.csproj
index 29727c2312..d4b5bd2413 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value021.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value021.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value022.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value022.csproj
index 330a02ed60..828e0cc555 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value022.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value022.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value023.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value023.csproj
index a17ce52ef1..fbc274aa4e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value023.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value023.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value024.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value024.csproj
index 9cd5b93ed7..4b558f5af0 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value024.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value024.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value025.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value025.csproj
index 03cea1eb43..992ed8cf05 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value025.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value025.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value026.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value026.csproj
index d3b088424b..a3135c6ed1 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value026.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value026.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value027.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value027.csproj
index ef89d98e3e..f5b41af141 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value027.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value027.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value028.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value028.csproj
index 717942dc8c..1e098f4a62 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value028.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value028.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value029.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value029.csproj
index 07112eec6f..7aca284dbd 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value029.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value029.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value030.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value030.csproj
index e8bb4ef373..ecf995c5a4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value030.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value030.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value031.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value031.csproj
index 6f8c4e0a85..f42e1e760e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value031.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value031.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value032.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value032.csproj
index 2c659003bc..5ef15c2f08 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value032.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value032.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value033.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value033.csproj
index 9ebb9d7f51..4fa16d3302 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value033.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value033.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value034.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value034.csproj
index 0e1b388b1f..75fdda1f08 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value034.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value034.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value037.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value037.csproj
index 4d9594147e..e69e545149 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value037.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value037.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value038.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value038.csproj
index d29b8731a1..0bf06c9c8c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value038.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value038.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value039.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value039.csproj
index dc515f1fa5..c65c36ce05 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value039.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value039.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value040.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value040.csproj
index 0578ad4602..cfaf306739 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value040.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value040.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value041.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value041.csproj
index 0fc5bf9def..aaf0b2146c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value041.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value041.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value042.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value042.csproj
index 53a2555b3d..f9a0dd4519 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value042.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value042.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value043.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value043.csproj
index 483bf1e06b..af026acbb9 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value043.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value043.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value044.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value044.csproj
index 60a165f565..36e4e5369c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value044.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value044.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value045.csproj b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value045.csproj
index fb980c8d39..451a871b8b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value045.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value045.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass001.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass001.csproj
index a93bbb5ab0..6e85c8112c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass001.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass002.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass002.csproj
index a70224c304..d1f84e7a94 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass002.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass003.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass003.csproj
index d2cff462ed..b653f10e4b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass003.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass004.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass004.csproj
index 42627fa17f..0db8639933 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass004.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass004.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass005.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass005.csproj
index 4a2df63db8..7f1a2878e4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass005.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass005.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass006.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass006.csproj
index d8dedca57e..61bbdb2ef5 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass006.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass006.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass007.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass007.csproj
index b83d560f3b..577fbea80e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass007.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass007.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass008.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass008.csproj
index 07598443ee..99f88c5a63 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass008.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass008.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass009.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass009.csproj
index e083c11082..cdf571024e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass009.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass009.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass010.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass010.csproj
index 2cb153765a..3d4895ad3f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass010.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass010.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass011.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass011.csproj
index f1c91feef3..7e98b2a8c9 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass011.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass011.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass012.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass012.csproj
index 24e7772b43..5647f75911 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass012.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass012.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass013.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass013.csproj
index 1663865f77..d3a89e3e21 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass013.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass013.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass014.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass014.csproj
index 11d4680133..991e021f17 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass014.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass014.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass015.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass015.csproj
index fe51f7fb10..386772e866 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass015.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass015.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass016.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass016.csproj
index 54c1167b4c..28e042511b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass016.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass016.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass017.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass017.csproj
index cd899b5d6c..cc4c0de986 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass017.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass017.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass018.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass018.csproj
index 1b3e3b812f..77fb1bc1d1 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass018.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass018.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass019.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass019.csproj
index ad8261ac7e..ce963753be 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass019.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass019.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass020.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass020.csproj
index 3293ca144b..c2365895cb 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass020.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass020.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass021.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass021.csproj
index c1c36e3e94..53f0c00ced 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass021.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass021.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass022.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass022.csproj
index aece606da3..801c1b4a90 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass022.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass022.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass023.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass023.csproj
index c3e5137ec1..afd3c18a94 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass023.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass023.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass024.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass024.csproj
index 495171560e..2aac07535b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass024.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass024.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass025.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass025.csproj
index 868b469158..aa0a567e7c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass025.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass025.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass026.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass026.csproj
index 5bb10d675e..50099f8e25 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass026.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass026.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass027.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass027.csproj
index 53438cdfd6..7f4bbb742a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass027.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass027.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass028.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass028.csproj
index f476776705..9f50a3c28e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass028.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass028.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass029.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass029.csproj
index 96a99e4e8e..f6aadebc63 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass029.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass029.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass030.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass030.csproj
index f0bba6d887..b1401e5dfb 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass030.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass030.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass031.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass031.csproj
index 2bf75052dd..9fe7197b24 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass031.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass031.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass032.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass032.csproj
index fe5561ee92..3b43afb3b4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass032.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass032.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass033.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass033.csproj
index cf67bc0615..b125b5d301 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass033.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass033.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass034.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass034.csproj
index 81e5aaf8a8..f769c05479 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass034.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass034.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass037.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass037.csproj
index 88cf0d2adc..78f9011a3e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass037.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass037.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass038.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass038.csproj
index 861494bd23..da171bdd8e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass038.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass038.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass039.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass039.csproj
index 5fbf17d019..f32ad65ef3 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass039.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass039.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass040.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass040.csproj
index 11b0df6a6d..7d568fc72c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass040.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass040.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass041.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass041.csproj
index 300735d58f..cc151209e5 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass041.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass041.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass042.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass042.csproj
index 0c052cde49..9a9945c177 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass042.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass042.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass043.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass043.csproj
index 8cb2ba4af6..651fd71620 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass043.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass043.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass044.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass044.csproj
index 93e0d4cba7..bb56b408d5 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass044.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass044.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass045.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass045.csproj
index 91e55d8f4b..3b15478ff2 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass045.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass045.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum001.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum001.csproj
index a113abf5da..5181e383ab 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum001.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum002.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum002.csproj
index 5bf76389af..480c48e189 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum002.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum003.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum003.csproj
index 8458f5c350..52df05af69 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum003.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics001.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics001.csproj
index 06d96562ed..3defeff591 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics001.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics002.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics002.csproj
index d3f94fd46c..7df8490bf8 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics002.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics003.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics003.csproj
index fd0afb10cd..bf915998b7 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics003.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics004.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics004.csproj
index fe15a8376c..2dfef565f1 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics004.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics004.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics005.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics005.csproj
index ccca4cabb7..4969237005 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics005.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics005.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics006.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics006.csproj
index 182a64b4c5..1c9fefe55c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics006.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics006.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics007.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics007.csproj
index b400dfbc13..78659eedb2 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics007.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics007.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics008.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics008.csproj
index 25c1c5dc70..bd0062710f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics008.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics008.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics009.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics009.csproj
index 90c105afe4..70d0ce5b22 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics009.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics009.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics010.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics010.csproj
index c627a2f535..c251aaa84f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics010.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics010.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics011.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics011.csproj
index e89d1dcfc5..f84af431c9 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics011.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics011.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics012.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics012.csproj
index c5e8d9703a..b89d915417 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics012.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics012.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics013.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics013.csproj
index e56b1b3c9f..d05f369d07 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics013.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics013.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics014.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics014.csproj
index 9c972c0290..d24be7a4d5 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics014.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics014.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics015.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics015.csproj
index 51f7fddb1c..884847dd9b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics015.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics015.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics016.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics016.csproj
index 1759744b06..dc96d7ec23 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics016.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics016.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics017.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics017.csproj
index fcd86f0437..fa287b0423 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics017.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics017.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics018.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics018.csproj
index 3088e6b1c1..15c509daa4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics018.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics018.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics019.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics019.csproj
index bc35160d52..07b539e762 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics019.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics019.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics020.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics020.csproj
index 318a83f67d..31586b95e0 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics020.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics020.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics021.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics021.csproj
index 257369db4d..37e54fb9a6 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics021.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics021.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics022.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics022.csproj
index e2fbd14e98..5c3346db6c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics022.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics022.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics023.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics023.csproj
index 6b3165535c..de9b6bbb46 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics023.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics023.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics024.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics024.csproj
index 5d782153a4..957a21c84f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics024.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics024.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics025.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics025.csproj
index 0b27810b4f..b0f26c83cc 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics025.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics025.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics026.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics026.csproj
index 68211f2038..96a733882c 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics026.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics026.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics027.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics027.csproj
index 89e199a4a5..398df9f7dc 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics027.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics027.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics028.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics028.csproj
index 95ccd06b63..edb89d3d24 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics028.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics028.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics029.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics029.csproj
index 76d58b32b4..f44872be1f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics029.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics029.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics030.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics030.csproj
index aceae57030..fb3d3d9426 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics030.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics030.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics031.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics031.csproj
index f99f2a587a..21b371d6a9 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics031.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics031.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics032.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics032.csproj
index 90282e6321..5de742d92e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics032.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics032.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics033.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics033.csproj
index 78bb15a2d4..3d921f9d34 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics033.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics033.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics034.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics034.csproj
index 768c4ca4be..a4aa4a252a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics034.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics034.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics037.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics037.csproj
index 65b4c4dc26..db000dac2d 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics037.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics037.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics038.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics038.csproj
index a6d22407fd..6eee2bc889 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics038.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics038.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics039.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics039.csproj
index 2907e8d9fe..0cb19cf2dc 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics039.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics039.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics040.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics040.csproj
index cdd35e9489..3f3123c2da 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics040.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics040.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics041.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics041.csproj
index decbb4d5c5..7a331912e7 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics041.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics041.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics042.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics042.csproj
index a886c7ab74..cc9205b579 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics042.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics042.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics043.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics043.csproj
index 4c2aaa45d1..08b0108db3 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics043.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics043.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics044.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics044.csproj
index a776a2d05c..833b7baa98 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics044.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics044.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics045.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics045.csproj
index 754496a2b8..3f99f31619 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics045.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics045.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface001.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface001.csproj
index 242ff7bde3..afff3c43bf 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface001.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface002.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface002.csproj
index a7e062c5ee..ccb8a4ea55 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface002.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface003.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface003.csproj
index c8fda227d3..367e7dd7bf 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface003.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface004.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface004.csproj
index 1227d0ba14..9698474aaf 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface004.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface004.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface005.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface005.csproj
index f080d99802..c4d7a20951 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface005.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface005.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface006.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface006.csproj
index 552923f225..a6a8c23e14 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface006.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface006.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface007.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface007.csproj
index ce604ab149..ae0a52f84d 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface007.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface007.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface008.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface008.csproj
index 064d0a7e63..635ed80222 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface008.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface008.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface009.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface009.csproj
index 370281d1a8..1462b98e62 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface009.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface009.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface010.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface010.csproj
index bc5a67acc3..5ad766e563 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface010.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface010.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface011.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface011.csproj
index aada157b4c..2d6d9a4953 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface011.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface011.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface012.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface012.csproj
index 170ef8a3fa..a89388e82a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface012.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface012.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface013.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface013.csproj
index f85d732aa4..31c6491a72 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface013.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface013.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface014.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface014.csproj
index bd0a784d29..36ecdc9b51 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface014.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface014.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface015.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface015.csproj
index 8ea846d209..43adbef385 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface015.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface015.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface016.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface016.csproj
index 9d17acb3fd..318bb27c21 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface016.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface016.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface017.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface017.csproj
index 5d0ada6ecc..f952a99835 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface017.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface017.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface018.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface018.csproj
index 5f1a225dd6..9b19a466c7 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface018.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface018.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null001.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null001.csproj
index 70b6c7f722..dc9e42617f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null001.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null001.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null002.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null002.csproj
index 5891fed8de..1edca056a7 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null002.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null002.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null003.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null003.csproj
index dc3b239afd..793a1c3e5a 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null003.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null003.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null004.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null004.csproj
index ff07c9648c..bcf59ee17e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null004.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null004.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null005.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null005.csproj
index 282c585214..c3a2cc5211 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null005.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null005.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null006.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null006.csproj
index 79793b1dda..3c5df92cc1 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null006.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null006.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null007.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null007.csproj
index 7a8e9b0a43..4a6d302763 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null007.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null007.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null008.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null008.csproj
index af0b25ba67..e4c938962b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null008.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null008.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null009.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null009.csproj
index abdb2163be..1b4af4f3bd 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null009.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null009.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null010.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null010.csproj
index cc8fc7115d..57e9d17d32 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null010.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null010.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null011.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null011.csproj
index 9f10550ea1..32f4d5a2a7 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null011.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null011.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null012.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null012.csproj
index 17058772bc..496225a60e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null012.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null012.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null013.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null013.csproj
index 0f36b84ba4..0e0c4ad036 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null013.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null013.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null014.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null014.csproj
index e75aeaeea8..e6d6933562 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null014.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null014.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null015.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null015.csproj
index 96b4f86c84..d6d465e0a9 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null015.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null015.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null016.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null016.csproj
index 39fc63af3e..c8f690b894 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null016.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null016.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null017.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null017.csproj
index fd8bb125ee..49847eff1b 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null017.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null017.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null018.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null018.csproj
index 71645103e7..7aad826db6 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null018.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null018.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null019.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null019.csproj
index c479635698..63a4d2b240 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null019.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null019.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null020.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null020.csproj
index 1666a85f44..8843126b10 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null020.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null020.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null021.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null021.csproj
index 8e744d39ed..0742b15509 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null021.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null021.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null022.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null022.csproj
index 3e1bcf80b9..d7e8f4d1b8 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null022.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null022.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null023.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null023.csproj
index 44988a8d42..63cf82819e 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null023.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null023.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null024.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null024.csproj
index c08eaada93..206bed48a9 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null024.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null024.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null025.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null025.csproj
index 82a467cac9..d3c27c79f4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null025.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null025.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null026.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null026.csproj
index 948ed5c3eb..e23ccb2ce3 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null026.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null026.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null027.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null027.csproj
index b1be22f2ea..8126a57355 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null027.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null027.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null028.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null028.csproj
index b35872e94f..d5ef06e609 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null028.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null028.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null029.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null029.csproj
index 920208291e..83eaed3f45 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null029.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null029.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null030.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null030.csproj
index 185f98f118..b6952b0c24 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null030.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null030.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null031.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null031.csproj
index e45b34413c..52b1ceccb2 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null031.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null031.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null032.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null032.csproj
index 8fbebc09f6..b7a61fc758 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null032.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null032.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null033.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null033.csproj
index 651d8ff2e9..59548cf643 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null033.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null033.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null034.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null034.csproj
index 6211e99434..2ca3b4e690 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null034.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null034.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null037.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null037.csproj
index ed734c9013..d6bf9cabe4 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null037.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null037.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null038.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null038.csproj
index d80fb9f7fd..cfc0d1c498 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null038.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null038.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null039.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null039.csproj
index e7e9b5c4db..9eff289092 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null039.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null039.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null040.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null040.csproj
index e0ba21fd67..ff5b067aa1 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null040.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null040.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null041.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null041.csproj
index cc519b9dd9..8e301a2ddd 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null041.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null041.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null042.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null042.csproj
index 0376dbf43a..33cb6d6f68 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null042.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null042.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null043.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null043.csproj
index b6e9f9375e..bbf3080871 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null043.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null043.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null044.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null044.csproj
index c9d8f4eb5b..d612f74d3f 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null044.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null044.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null045.csproj b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null045.csproj
index 0c78828736..dda8dee294 100644
--- a/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null045.csproj
+++ b/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null045.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/jit64/verif/sniff/fg/ver_fg_13.ilproj b/tests/src/JIT/jit64/verif/sniff/fg/ver_fg_13.ilproj
index bdd35f80f8..cc792322d3 100644
--- a/tests/src/JIT/jit64/verif/sniff/fg/ver_fg_13.ilproj
+++ b/tests/src/JIT/jit64/verif/sniff/fg/ver_fg_13.ilproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
@@ -8,26 +8,22 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-    
-  </PropertyGroup>
+  <PropertyGroup></PropertyGroup>
   <ItemGroup>
     <Compile Include="ver_fg_13.il" />
   </ItemGroup>
@@ -35,6 +31,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.cs b/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.cs
new file mode 100644
index 0000000000..a8b2ae9be9
--- /dev/null
+++ b/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.cs
@@ -0,0 +1,155 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// Check if conditions like (uint)i < (uint)a.len generate correct "no throw" assertions
+
+using System;
+using System.Runtime.CompilerServices;
+
+class ArrBoundUnsigned
+{
+    // The method names indicate when the array access takes place e.g i_LT_UN_len executes a[i] if (uint)i < (uint)a.len.
+    // If the condition is true and the array index is invalid then an IndexOutOfRangeException is expected.
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int i_LT_UN_len(int[] a, int i)
+    {
+        if ((uint)i < (uint)a.Length)
+            return a[i];
+        else
+            return 9999;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int len_GT_UN_i(int[] a, int i)
+    {
+        if ((uint)a.Length > (uint)i)
+            return a[i];
+        else
+            return 9999;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int i_LE_UN_len(int[] a, int i)
+    {
+        if ((uint)i <= (uint)a.Length)
+            return a[i];
+        else
+            return 9999;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int len_GE_UN_i(int[] a, int i)
+    {
+        if ((uint)a.Length >= (uint)i)
+            return a[i];
+        else
+            return 9999;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int i_GE_UN_len(int[] a, int i)
+    {
+        if ((uint)i >= (uint)a.Length)
+            return a[i];
+        else
+            return 9999;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int len_LE_UN_i(int[] a, int i)
+    {
+        if ((uint)a.Length <= (uint)i)
+            return a[i];
+        else
+            return 9999;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int i_GT_UN_len(int[] a, int i)
+    {
+        if ((uint)i > (uint)a.Length)
+            return a[i];
+        else
+            return 9999;
+    }
+
+    [MethodImplAttribute(MethodImplOptions.NoInlining)]
+    static int len_LT_UN_i(int[] a, int i)
+    {
+        if ((uint)a.Length < (uint)i)
+            return a[i];
+        else
+            return 9999;
+    }
+
+    static int Main()
+    {
+        const int Pass = 100;
+        const int Fail = -1;
+
+        var empty = new int[] { };
+        var arr = new int[] { 1, 42, 3000 };
+
+        // i_LT_UN_len
+
+        if (i_LT_UN_len(arr, 1) != arr[1]) return Fail;
+        if (i_LT_UN_len(arr, arr.Length) != 9999) return Fail;
+        if (i_LT_UN_len(arr, -1) != 9999) return Fail;
+        if (i_LT_UN_len(empty, 1) != 9999) return Fail;
+
+        // len_GT_UN_i
+
+        if (len_GT_UN_i(arr, 1) != arr[1]) return Fail;
+        if (len_GT_UN_i(arr, arr.Length) != 9999) return Fail;
+        if (len_GT_UN_i(arr, -1) != 9999) return Fail;
+        if (len_GT_UN_i(empty, 1) != 9999) return Fail;
+
+
+        // i_LE_UN_len
+
+        if (i_LE_UN_len(arr, -1) != 9999) return Fail;
+        if (i_LE_UN_len(arr, arr.Length + 1) != 9999) return Fail;
+        try { i_LE_UN_len(arr, arr.Length); return Fail; } catch (IndexOutOfRangeException) { }
+        try { i_LE_UN_len(empty, 0); return Fail; } catch (IndexOutOfRangeException) { }
+
+        // len_GE_UN_i
+
+        if (len_GE_UN_i(arr, -1) != 9999) return Fail;
+        if (len_GE_UN_i(arr, arr.Length + 1) != 9999) return Fail;
+        try { len_GE_UN_i(arr, arr.Length); return Fail; } catch (IndexOutOfRangeException) { }
+        try { len_GE_UN_i(empty, 0); return Fail; } catch (IndexOutOfRangeException) { }
+
+
+        // i_GE_UN_len
+
+        try { i_GE_UN_len(arr, arr.Length); return Fail; } catch (IndexOutOfRangeException) { }
+        try { i_GE_UN_len(arr, arr.Length + 3); return Fail; } catch (IndexOutOfRangeException) { }
+        try { i_GE_UN_len(empty, 0); return Fail; } catch (IndexOutOfRangeException) { }
+
+        // len_LE_UN_i
+
+        try { len_LE_UN_i(arr, arr.Length); return Fail; } catch (IndexOutOfRangeException) { }
+        try { len_LE_UN_i(arr, arr.Length + 3); return Fail; } catch (IndexOutOfRangeException) { }
+        try { len_LE_UN_i(empty, 0); return Fail; } catch (IndexOutOfRangeException) { }
+
+
+        // i_GT_UN_len
+
+        if (i_GT_UN_len(arr, arr.Length) != 9999) return Fail;
+        try { i_GT_UN_len(arr, -1); return Fail; } catch (IndexOutOfRangeException) { }
+        try { i_GT_UN_len(arr, arr.Length + 2); return Fail; } catch (IndexOutOfRangeException) { }
+        if (i_GT_UN_len(empty, 0) != 9999) return Fail;
+
+        // len_LT_UN_i
+
+        if (len_LT_UN_i(arr, arr.Length) != 9999) return Fail;
+        try { len_LT_UN_i(arr, -1); return Fail; } catch (IndexOutOfRangeException) { }
+        try { len_LT_UN_i(arr, arr.Length + 2); return Fail; } catch (IndexOutOfRangeException) { }
+        if (len_LT_UN_i(empty, 0) != 9999) return Fail;
+
+
+        return Pass;
+    }
+}
diff --git a/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.csproj b/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.csproj
new file mode 100644
index 0000000000..1ed8c7ab0c
--- /dev/null
+++ b/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.csproj
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+    <NoLogo>True</NoLogo>
+    <NoStandardLib>True</NoStandardLib>
+    <Noconfig>True</Noconfig>
+    <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="ArrBoundUnsigned.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/AssertionPropagation/CPropOverflow.ilproj b/tests/src/JIT/opt/AssertionPropagation/CPropOverflow.ilproj
index abedbd2dab..93e1a0d0dc 100644
--- a/tests/src/JIT/opt/AssertionPropagation/CPropOverflow.ilproj
+++ b/tests/src/JIT/opt/AssertionPropagation/CPropOverflow.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/AssertionPropagation/ConstantProp.csproj b/tests/src/JIT/opt/AssertionPropagation/ConstantProp.csproj
index b5f431263b..7bd0f4f0b0 100644
--- a/tests/src/JIT/opt/AssertionPropagation/ConstantProp.csproj
+++ b/tests/src/JIT/opt/AssertionPropagation/ConstantProp.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/AssertionPropagation/CopyProp.csproj b/tests/src/JIT/opt/AssertionPropagation/CopyProp.csproj
index a15f0cc280..a1270ab6a3 100644
--- a/tests/src/JIT/opt/AssertionPropagation/CopyProp.csproj
+++ b/tests/src/JIT/opt/AssertionPropagation/CopyProp.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.csproj b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.csproj
index e977f3e7a0..f07a0ca43d 100644
--- a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.csproj
+++ b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.csproj b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.csproj
index 5ad2bf829c..0733e435e0 100644
--- a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.csproj
+++ b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.csproj b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.csproj
index 2a0a1de48e..de5136b9d2 100644
--- a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.csproj
+++ b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.csproj b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.csproj
index 2b83833e79..db49e1d172 100644
--- a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.csproj
+++ b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.csproj b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.csproj
index 090f2cfb48..fa78796e73 100644
--- a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.csproj
+++ b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.csproj b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.csproj
index a54a5d402d..01a41ccade 100644
--- a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.csproj
+++ b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.csproj b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.csproj
index df54ebce14..7c088a738a 100644
--- a/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.csproj
+++ b/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.csproj b/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.csproj
index 1e9741d6f0..b782b3ff11 100644
--- a/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.csproj
+++ b/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.csproj b/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.csproj
index 2d1697487e..0b8a0ab4c5 100644
--- a/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.csproj
+++ b/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_10311.cs b/tests/src/JIT/opt/Devirtualization/GitHub_10311.cs
new file mode 100644
index 0000000000..3eb5431dd3
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/GitHub_10311.cs
@@ -0,0 +1,80 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+public class MyCollection<T> : ICollection<T>
+{
+    private List<T> _items = new List<T>();
+
+    public MyCollection()
+    {
+    }
+
+    public MyCollection(params T[] values)
+    {
+        _items.AddRange(values);
+    }
+
+    public void Add(T item)
+    {
+        _items.Add(item);
+    }
+
+    public void Clear()
+    {
+        _items.Clear();
+    }
+
+    public bool Contains(T item)
+    {
+        return _items.Contains(item);
+    }
+
+    public void CopyTo(T[] array, int arrayIndex)
+    {
+        _items.CopyTo(array, arrayIndex);
+    }
+
+    public int Count
+    {
+        get { return _items.Count; }
+    }
+
+    public bool IsReadOnly
+    {
+        get { return ((ICollection<T>)_items).IsReadOnly; }
+    }
+
+    public bool Remove(T item)
+    {
+        return _items.Remove(item);
+    }
+
+    public IEnumerator<T> GetEnumerator()
+    {
+        return ((ICollection<T>)_items).GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return ((IEnumerable)_items).GetEnumerator();
+    }
+}
+
+class Bug
+{
+    public static int Main()
+    {
+        int v = 0;
+        MyCollection<string> x = new MyCollection<string>("a1", "a2");
+        foreach (string item in x)
+        {
+            v += item[0];
+        }
+        return v - 94;
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_10311.csproj b/tests/src/JIT/opt/Devirtualization/GitHub_10311.csproj
new file mode 100644
index 0000000000..4469702abd
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/GitHub_10311.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="GitHub_10311.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_10858.cs b/tests/src/JIT/opt/Devirtualization/GitHub_10858.cs
new file mode 100644
index 0000000000..a02d025593
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/GitHub_10858.cs
@@ -0,0 +1,46 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+class B 
+{
+    public virtual string F() { return "B"; }
+}
+
+sealed class D : B
+{
+    public override string F() { return "D"; }
+}
+
+sealed class E : B
+{
+    public override string F() { return "E"; }
+}
+
+class X
+{
+    public static int Main(string[] args)
+    {
+        // When optimizing IL, CSC will leave the newobj's on the stack
+        // across the branches to the common def point.
+        B b1 = (args.Length > 0) ? (B)new E() : (B)new D();
+        B b2 = null;
+
+        // Conditional flow here to forces b1 to a local instead of
+        // remaining on the stack. So we have a single def point with
+        // two reaching values.
+        if (args.Length > 0)
+        {
+            b2 = new D();
+        }
+        else
+        {
+            b2 = new E();
+        }
+
+        // We should not be able to devirtualize either call.
+        return b2.F()[0] + b1.F()[0] - 37;
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_10858.csproj b/tests/src/JIT/opt/Devirtualization/GitHub_10858.csproj
new file mode 100644
index 0000000000..fdf04a29e0
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/GitHub_10858.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="GitHub_10858.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_9945.cs b/tests/src/JIT/opt/Devirtualization/GitHub_9945.cs
new file mode 100644
index 0000000000..3574f4f87f
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/GitHub_9945.cs
@@ -0,0 +1,68 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+public class Base
+{
+    public int value;
+    public void B0() { value += 12; }
+    public virtual void B1() { value += 33; }
+}
+
+// Ensure that D1 and D2 have enough virtuals that the slot number for
+// the virtual M1 is greater than any virtual's slot number in B.
+
+public class D1 : Base
+{
+    public virtual void MA() { }
+    public virtual void MB() { }
+    public virtual void MC() { }
+    public virtual void MD() { }
+
+    public virtual void M1() { value += 44; }
+}
+
+public class D2 : Base
+{
+    public virtual void MA() { }
+    public virtual void MB() { }
+    public virtual void MC() { }
+    public virtual void MD() { }
+
+    public virtual void M1() { value += 55; }
+}
+
+// Aggressive use of 'dup' here by CSC will confuse the jit, and it
+// may substitute 'b' for uses of d1 and d2. This is not
+// value-incorrect but loses type information.
+//
+// This loss of type information subsequently triggers an assert in
+// devirtualzation because b does not have M1 as virtual method.
+
+public class Test
+{
+    public static int Main(string[] args)
+    {
+        Base b;
+
+        if (args.Length > 0)
+        {
+            D1 d1 = new D1();
+            b = d1;
+            d1.B1();
+            d1.M1();
+        }
+        else
+        {
+            D2 d2 = new D2();
+            b = d2;
+            d2.B1();
+            d2.M1();
+        }
+
+        b.B0();
+        return b.value;
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_9945.csproj b/tests/src/JIT/opt/Devirtualization/GitHub_9945.csproj
new file mode 100644
index 0000000000..5d417dcb07
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/GitHub_9945.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>None</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="GitHub_9945.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.il b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.il
new file mode 100644
index 0000000000..6b76175d00
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.il
@@ -0,0 +1,53 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+.assembly extern mscorlib
+{
+}
+
+.assembly GitHub_9945_2
+{
+}
+
+.class public auto ansi beforefieldinit Base extends [mscorlib]System.Object
+{
+   // Need enough virtuals here to get F's slot past max virtual slot on object
+  .method public hidebysig newslot virtual instance void M0() cil managed { ret }
+  .method public hidebysig newslot virtual instance void M1() cil managed { ret }
+  .method public hidebysig newslot virtual instance void M2() cil managed { ret }
+  .method public hidebysig newslot virtual instance void M3() cil managed { ret }
+
+  .method public hidebysig newslot virtual instance void  F() cil managed
+  {
+    ldstr      "Base:F"
+    call       void [mscorlib]System.Console::WriteLine(string)
+    ret
+  }
+
+  .method public hidebysig specialname rtspecialname instance void  .ctor() cil managed
+  {
+    ldarg.0
+    call       instance void [mscorlib]System.Object::.ctor()
+    ret
+  }
+}
+
+.class public auto ansi beforefieldinit Test extends [mscorlib]System.Object
+{
+  .method public hidebysig static  int32  Main() cil managed
+  {
+    .locals (object)
+    .entrypoint
+    // Store ref in supertyped local to "forget" type
+    newobj     instance void Base::.ctor()
+    stloc.0
+    ldloc.0
+    // Now callvirt via the supertype
+    callvirt   instance void Base::F()
+    ldc.i4.s   100
+    ret
+  }
+}
+
+
diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj
new file mode 100644
index 0000000000..f71ad15a05
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
+ </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+     <DebugType>None</DebugType>
+     <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="GitHub_9945_2.il" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <PropertyGroup>
+    <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
+    <ProjectLockJson>$(JitPackagesConfigFileDirectory)benchmark\project.lock.json</ProjectLockJson>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/opt/Devirtualization/comparable.cs b/tests/src/JIT/opt/Devirtualization/comparable.cs
new file mode 100644
index 0000000000..2322395bf2
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/comparable.cs
@@ -0,0 +1,67 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+public sealed class X: IComparable<X>
+{
+    int ival;
+
+    public X(int i)
+    {
+        ival = i;
+    }
+
+    public int CompareTo(X x)
+    {
+        return ival - x.ival;
+    }
+    
+    public bool Equals(X x)
+    {
+        return ival == x.ival;
+    }
+}
+
+public class Y<T> where T : IComparable<T>
+{
+    public static int C(T x, T y)
+    {
+        // IL here is
+        // ldarga 0
+        // ldarg  1
+        // constrained ... callvirt ...
+        // 
+        // The ldarga blocks both caller-arg direct sub and type
+        // propagation since the jit thinks arg0 might be redefined.
+        //
+        // For ref types the ldarga is undone in codegen just before
+        // the call so we end up with *(&arg0) and we know this is
+        // arg0. Ideally we'd also understand that this pattern can't
+        // lead to reassignment, but our view of the callee and what
+        // it does with address-taken args is quite limited.
+        //
+        // Even if we can't propagate the caller's value or type, we
+        // might be able to retype the generic __Canon for arg0 as the
+        // more specific type that the caller is using (here, X).
+        //
+        // An interesting variant on this would be to derive from X
+        // (say with XD) and have the caller pass instances of XD
+        // instead of instances of X. We'd need to make sure we retype
+        // arg0 as X and not XD.
+        return x.CompareTo(y);
+    }
+}
+
+public class Z
+{
+    public static int Main()
+    {
+        // Ideally inlining Y.C would enable the interface call in Y
+        // to be devirtualized, since we know the exact type of the
+        // first argument. We can't get this yet.
+        int result = Y<X>.C(new X(103), new X(3));
+        return result;
+    }
+}
diff --git a/tests/src/jit/Directed/pinvoke/pinvoke-bug.csproj b/tests/src/JIT/opt/Devirtualization/comparable.csproj
index 2f8a24638b..780cd910ca 100644
--- a/tests/src/jit/Directed/pinvoke/pinvoke-bug.csproj
+++ b/tests/src/JIT/opt/Devirtualization/comparable.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -27,18 +27,15 @@
   </ItemGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="pinvoke-bug.cs" />
+    <Compile Include="comparable.cs" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/contravariance.cs b/tests/src/JIT/opt/Devirtualization/contravariance.cs
new file mode 100644
index 0000000000..0594772c9a
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/contravariance.cs
@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+interface I<out T>
+{
+    T A();
+}
+
+class X<T> : I<T> where T: class
+{
+    T I<T>.A()
+    {
+        return (T)(object)"X";
+    }
+}
+
+class T
+{
+    static object F(I<object> i)
+    {
+        return i.A();
+    }
+
+    public static int Main()
+    {
+        // Jit should inline F and then devirtualize the call to A.
+        // (inlining A blocked by runtime lookup)
+        object j = F(new X<string>());
+        if (j is string)
+        {
+            return ((string)j)[0] + 12;
+        }
+        return -1;
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/contravariance.csproj b/tests/src/JIT/opt/Devirtualization/contravariance.csproj
new file mode 100644
index 0000000000..287c2009f1
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/contravariance.csproj
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="contravariance.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/covariance.cs b/tests/src/JIT/opt/Devirtualization/covariance.cs
new file mode 100644
index 0000000000..2ed7d2bdd8
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/covariance.cs
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+interface I<in T>
+{
+    int A(T t);
+}
+
+class X<T> : I<T>
+{
+    int c = 0;
+    int I<T>.A(T t)
+    {
+        return ++c;
+    }
+}
+
+class T
+{
+    static int F(I<string> i) 
+    {
+        return i.A("A");
+    }
+
+    public static int Main()
+    {
+        // Jit should inline F and then devirtualize
+        // and inline the call to A.
+        int j = F(new X<object>());
+        return j + 99;
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/covariance.csproj b/tests/src/JIT/opt/Devirtualization/covariance.csproj
new file mode 100644
index 0000000000..b94309945a
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/covariance.csproj
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="covariance.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/enum.cs b/tests/src/JIT/opt/Devirtualization/enum.cs
new file mode 100644
index 0000000000..994c661230
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/enum.cs
@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+enum MyEnum { One, Two, Three, Four, Five, Six, Seven, Eight, Nine, Ten };
+
+public class Test
+{
+    public static int Main()
+    {
+        // Call to ToString should be devirtualize since boxed enums
+        // are sealed classes. This doesn't happen yet.
+        string s = (MyEnum.Seven).ToString();
+
+        // Call to Equals will devirtualize since string is sealed
+        return (s.Equals((object)"Seven") ? 100 : -1);
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/enum.csproj b/tests/src/JIT/opt/Devirtualization/enum.csproj
new file mode 100644
index 0000000000..9cd800fa4b
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/enum.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="enum.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/exacttype.cs b/tests/src/JIT/opt/Devirtualization/exacttype.cs
new file mode 100644
index 0000000000..a1265da718
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/exacttype.cs
@@ -0,0 +1,71 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class Base 
+{
+    public virtual void Foo() { Console.WriteLine("Base:Foo"); }
+    public virtual void Bar() { Console.WriteLine("Base:Bar"); }
+}
+
+public class Derived : Base
+{
+    public override sealed void Foo() { Console.WriteLine("Derived:Foo"); }
+    public override void Bar() { Console.WriteLine("Derived:Bar"); }
+}
+
+// The jit should to be able to devirtualize all calls to Bar since the
+// exact type is knowable.
+//
+// The jit should to be able to devirtualize calls to Foo when the
+// type is known to be at least Derived.
+//
+// Currently the jit misses some of these cases, either because it has
+// lost the more precise type or lost the fact that the type was
+// exact.
+
+public class Test
+{
+    public static Base M()
+    {
+        return new Derived();
+    }
+
+    public static int Main()
+    {
+        // Declared type of 'd' has final method Foo(), so calls to
+        // Foo() will devirtualize.
+        //
+        // However the jit does not know that d's type is exact so
+        // currently the calls to Bar() will not devirtualize.
+        Derived d = new Derived();
+        d.Foo();
+        d.Bar();
+
+        // M should inline and expose an exact return type
+        // which will trigger late devirt for both Foo() and Bar().
+        M().Foo();
+        M().Bar();
+
+        // Copy via 'b' currently inhibits devirt
+        Base b = M();
+        b.Foo();
+        b.Bar();
+
+        // Direct use of newobj gives exact type so all these
+        // will devirtualize
+        new Base().Foo();
+        new Base().Bar();
+        new Derived().Foo();
+        new Derived().Bar();
+
+        return 100;
+    }
+}
+
+
+        
+    
diff --git a/tests/src/JIT/opt/Devirtualization/exacttype.csproj b/tests/src/JIT/opt/Devirtualization/exacttype.csproj
new file mode 100644
index 0000000000..5429797b2c
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/exacttype.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="exacttype.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/fromcollection.cs b/tests/src/JIT/opt/Devirtualization/fromcollection.cs
new file mode 100644
index 0000000000..5a5df5952b
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/fromcollection.cs
@@ -0,0 +1,51 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+
+public class Base
+{
+    public virtual int GetValue(int value)
+    {
+        return value + 33;
+    }
+}
+
+public sealed class Derived : Base
+{
+    public override int GetValue(int value)
+    {
+        return value + 44;
+    }
+}
+
+// We currently fail to devirtualize these two calls to GetValue
+//
+// In the array case we need to handle getting types from INDEX operations.
+//
+// In the list case we need to get a better type for the generic return value,
+//  or handle the INDEX during late devirtualization, since inlining exposes
+//  the underlying array. Better to do the former since it doesn't rely on
+//  being able to inline.
+
+public class Test
+{
+    static Derived[] arrayOfDerived = new Derived[3];
+    static List<Derived> listOfDerived = new List<Derived>();
+
+    public static int Main()
+    {
+        for (int i = 0; i < 3; i++)
+        {
+            Derived d = new Derived();
+            arrayOfDerived[i] = d;
+            listOfDerived.Add(d);
+        }
+
+        int result = 9 + arrayOfDerived[1].GetValue(1) + listOfDerived[1].GetValue(2);
+
+        return result;
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/fromcollection.csproj b/tests/src/JIT/opt/Devirtualization/fromcollection.csproj
new file mode 100644
index 0000000000..59d4ca0913
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/fromcollection.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="fromcollection.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/generic.cs b/tests/src/JIT/opt/Devirtualization/generic.cs
new file mode 100644
index 0000000000..63d53acd53
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/generic.cs
@@ -0,0 +1,90 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+interface Ix
+{
+    int F();
+    int G();
+}
+
+public class B<T> : Ix
+{
+    int Ix.F() 
+    { 
+        if (typeof(T) == typeof(string))
+        {
+            return 3; 
+        }
+        else
+        {
+            return 5;
+        }
+    }
+    
+    public virtual int G()
+    {
+        if (typeof(T) == typeof(object))
+        {
+            return 7; 
+        }
+        else
+        {
+            return 11;
+        }
+
+    }
+}
+
+public class D : B<string>, Ix
+{
+    int Ix.F() { return 13; }
+}
+
+class E : D
+{
+    public sealed override int G() { return 17; }
+}
+
+// K overrides E.G for interface purposes, even though it is sealed
+class K : E, Ix
+{
+    int Ix.G() { return 19; }
+}
+
+sealed class J : E, Ix
+{
+    int Ix.F() { return 21; }
+}
+
+public class Z
+{
+    static int IxF(Ix x) { return x.F(); }
+    static int IxG(Ix x) { return x.G(); }
+
+    public static int Main(string[] args)
+    {
+        E e = new E();
+        K k = new K();
+        J j = new J();
+        E q = k;
+
+        int callsBFs = IxF(new B<string>());
+        int callsBFo = IxF(new B<object>());
+        int callsBGo = IxG(new B<object>());
+        int callsBGs = IxG(new B<string>()) + IxG(new D());
+        int callsDF  = IxF(new D()) + IxF(e) + IxF(k) + IxF(q);
+        int callsEG  = IxG(e) + IxG(j);
+        int callsKG  = IxG(k) + IxG(q);
+        int callsJF  = IxF(j);
+
+        int expected = 3 + 5 + 7 + 2 * 11 + 4 * 13 + 2 * 17 + 2 * 19 + 21;
+        int val = callsBFs + callsBFo + callsDF + callsBGs + callsBGo + callsEG + callsKG + callsJF;
+
+        return val - expected + 100;
+    }
+}
+
+
diff --git a/tests/src/JIT/opt/Devirtualization/generic.csproj b/tests/src/JIT/opt/Devirtualization/generic.csproj
new file mode 100644
index 0000000000..2910303863
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/generic.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="generic.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/inlinedevirt.cs b/tests/src/JIT/opt/Devirtualization/inlinedevirt.cs
new file mode 100644
index 0000000000..0d1ed207b7
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/inlinedevirt.cs
@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+class ImprovedType
+{
+    // Jit should inline this method and then devirtualize ToString()
+    static void Print(object o)
+    {
+        Console.WriteLine(o.ToString());
+    }
+
+    public static int Main()
+    {
+        Print("hello, world!");
+        return 100;
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/inlinedevirt.csproj b/tests/src/JIT/opt/Devirtualization/inlinedevirt.csproj
new file mode 100644
index 0000000000..936d0846ab
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/inlinedevirt.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="inlinedevirt.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/late.cs b/tests/src/JIT/opt/Devirtualization/late.cs
new file mode 100644
index 0000000000..3991e7df43
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/late.cs
@@ -0,0 +1,48 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+interface Ix<T> where T : class
+{
+    T F();
+}
+
+class Base : Ix<string>
+{
+    public virtual string F() { return "B"; }
+}
+
+class Derived : Base
+{
+    public override string F() { return "D"; }
+}
+
+class Bx
+{
+    public Ix<string> Get() { return new Derived(); }
+}
+
+public class Z
+{
+    static string X(Base b)
+    {
+        return b.F();
+    }
+
+    public static int Main()
+    {
+        // Would like to be able to late devirtualize the call to F
+        // here after inlining Get exposes the exact type of the
+        // object, but since the return type of Get is a (shared)
+        // interface type, we need the exact context for F to do so
+        // safely.
+        // 
+        // Unfortunately we lose track of that context, because when
+        // we import the call to F, it is not an inline candidate.
+        string s = new Bx().Get().F();
+        return (int) s[0] + 32;
+    }
+}
+
diff --git a/tests/src/JIT/opt/Devirtualization/late.csproj b/tests/src/JIT/opt/Devirtualization/late.csproj
new file mode 100644
index 0000000000..6af10b47f6
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/late.csproj
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="late.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/overload.cs b/tests/src/JIT/opt/Devirtualization/overload.cs
new file mode 100644
index 0000000000..a27dbc1e78
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/overload.cs
@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+interface Io<T,U> where T:class where U:class
+{
+    T FromU(U u);
+    T FromS(string s);
+}
+
+public class Z : Io<string, string>
+{
+    string Io<string, string>.FromU(string s) { return "U"; }
+    string Io<string, string>.FromS(string s) { return "S"; }
+
+    public static int Main(string[] args)
+    {
+        string fromU = ((Io<string, string>) new Z()).FromU("u");
+        string fromS = ((Io<string, string>) new Z()).FromS("s");
+
+        return fromU[0] + fromS[0] - 68;
+    }
+}
+
+
diff --git a/tests/src/JIT/opt/Devirtualization/overload.csproj b/tests/src/JIT/opt/Devirtualization/overload.csproj
new file mode 100644
index 0000000000..6d5208e97b
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/overload.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="overload.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup>
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/override.il b/tests/src/JIT/opt/Devirtualization/override.il
new file mode 100644
index 0000000000..5f87411d25
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/override.il
@@ -0,0 +1,158 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+.assembly extern System.Console { }
+// MyBar is an abstract class which declares an abstract method MyBar::DoBar().
+// MyBar also DoSelfBar() that explicitly overrides DoBar().
+// BarImpl extends MyBar and also overrides DoBar().
+// Expect that b.DoBar() will invoke BarImpl::DoBar() if called virtually, whether b is a BarImpl reference
+// or a MyBar reference.
+
+.assembly extern mscorlib{}
+.assembly self_override1{}
+
+.class public abstract auto ansi beforefieldinit MyBar
+       extends [mscorlib]System.Object
+{
+  .method public hidebysig newslot abstract virtual
+          instance int32  DoBar() cil managed
+  {
+  } // end of method MyBar::DoBar
+
+  .method public hidebysig virtual instance int32
+          DoSelfBar() cil managed
+  {
+    .override MyBar::DoBar
+    .maxstack  1
+    .locals init (int32 V_0)
+    IL_0000:  ldstr      "In MyBar.DoSelfBar"
+    IL_0005:  call       void [System.Console]System.Console::WriteLine(string)
+    IL_000a:  ldc.i4.1
+    IL_000b:  stloc.0
+    IL_000c:  br.s       IL_000e
+
+    IL_000e:  ldloc.0
+    IL_000f:  ret
+  } // end of method BarImpl::DoBar
+
+
+  .method family hidebysig specialname rtspecialname
+          instance void  .ctor() cil managed
+  {
+    // Code size       7 (0x7)
+    .maxstack  8
+    IL_0000:  ldarg.0
+    IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
+    IL_0006:  ret
+  } // end of method MyBar::.ctor
+
+} // end of class MyBar
+
+.class public auto ansi beforefieldinit BarImpl
+       extends MyBar
+{
+  .method public hidebysig virtual instance int32
+          DoBar() cil managed
+  {
+    // Code size       16 (0x10)
+    .maxstack  1
+    .locals init (int32 V_0)
+    IL_0000:  ldstr      "In BarImpl.DoBar"
+    IL_0005:  call       void [System.Console]System.Console::WriteLine(string)
+    IL_000a:  ldc.i4.2
+    IL_000b:  stloc.0
+    IL_000c:  br.s       IL_000e
+
+    IL_000e:  ldloc.0
+    IL_000f:  ret
+  } // end of method BarImpl::DoBar
+
+  .method public hidebysig specialname rtspecialname
+          instance void  .ctor() cil managed
+  {
+    // Code size       7 (0x7)
+    .maxstack  8
+    IL_0000:  ldarg.0
+    IL_0001:  call       instance void MyBar::.ctor()
+    IL_0006:  ret
+  } // end of method BarImpl::.ctor
+
+} // end of class BarImpl
+
+.class public auto ansi beforefieldinit CMain
+       extends [mscorlib]System.Object
+{
+  .method public hidebysig static int32  Main(string[] args) cil managed
+  {
+    .entrypoint
+    // Code size       66 (0x42)
+    .maxstack  2
+    .locals init (bool V_0,
+             class BarImpl V_1,
+             class MyBar V_2,
+             int32 V_3)
+
+
+    // Invoke b.DoBar() virtually where b is a BarImpl reference.
+    IL_0000:  ldc.i4.1
+    IL_0001:  stloc.0
+    IL_0002:  newobj     instance void BarImpl::.ctor()
+    IL_0007:  stloc.1
+    IL_0008:  ldc.i4.2
+    IL_0009:  ldloc.1
+    IL_000a:  callvirt   instance int32 MyBar::DoBar()
+    IL_000f:  beq.s      IL_001d
+
+    IL_0011:  ldstr      "FAIL: expected BarImpl.DoBar to execute, but anoth"
+    + "er method was executed instead."
+    IL_0016:  call       void [System.Console]System.Console::WriteLine(string)
+    IL_001b:  ldc.i4.0
+    IL_001c:  stloc.0
+
+    // Invoke b.DoBar() virtually where b is a MyBar reference.
+    IL_001d:  ldloc.1
+    IL_001e:  stloc.2
+    IL_001f:  ldc.i4.2
+    IL_0020:  ldloc.2
+    IL_0021:  callvirt   instance int32 MyBar::DoBar()
+    IL_0026:  beq.s      IL_0034
+    IL_0028:  ldstr      "FAIL: expected BarImpl.DoBar to execute, but ano"
+    + "ther method was executed instead."
+    IL_002d:  call       void [System.Console]System.Console::WriteLine(string)
+    IL_0032:  ldc.i4.0
+    IL_0033:  stloc.0
+
+
+    // return a status
+    IL_0034:  ldloc.0
+    IL_0035:  brtrue.s   IL_003b
+
+    IL_0037:  ldc.i4.s   101
+    stloc.3
+    ldstr "FAIL"
+    call void [System.Console]System.Console::WriteLine(string)
+    IL_0039:  br.s       IL_0040
+
+    IL_003b:  ldc.i4.s   100
+    IL_003d:  stloc.3
+    ldstr "PASS"
+    call void [System.Console]System.Console::WriteLine(string)
+    IL_003e:  br.s       IL_0040
+
+    IL_0040:  ldloc.3
+    IL_0041:  ret
+  } // end of method CMain::Main
+
+  .method public hidebysig specialname rtspecialname
+          instance void  .ctor() cil managed
+  {
+    // Code size       7 (0x7)
+    .maxstack  8
+    IL_0000:  ldarg.0
+    IL_0001:  call       instance void [mscorlib]System.Object::.ctor()
+    IL_0006:  ret
+  } // end of method CMain::.ctor
+
+} // end of class CMain
+
diff --git a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsChar.csproj b/tests/src/JIT/opt/Devirtualization/override.ilproj
index a3e1203570..0bfc25ff45 100644
--- a/tests/src/JIT/Performance/CodeQuality/Inlining/ConstantArgsChar.csproj
+++ b/tests/src/JIT/opt/Devirtualization/override.ilproj
@@ -4,36 +4,33 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
-  </PropertyGroup>
+    <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
+ </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
+  <PropertyGroup>
+     <DebugType>None</DebugType>
+     <Optimize>True</Optimize>
+  </PropertyGroup>
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <Compile Include="override.il" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConstantArgsChar.cs" />
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <PropertyGroup>
     <ProjectJson>$(JitPackagesConfigFileDirectory)benchmark\project.json</ProjectJson>
@@ -42,4 +39,4 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/src/JIT/opt/Devirtualization/sealedclass.cs b/tests/src/JIT/opt/Devirtualization/sealedclass.cs
new file mode 100644
index 0000000000..4ec57dcaea
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/sealedclass.cs
@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class Base
+{
+    public virtual int GetValue(int value)
+    {
+        return 0x33;
+    }
+}
+
+public sealed class Derived : Base
+{
+    public override int GetValue(int value)
+    {
+        return value;
+    }
+}
+
+public class F
+{
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static int TestSealedMethodInlining(Derived obj)
+    {
+        return obj.GetValue(3);
+    }
+
+    public static int Main(string[] args)
+    {
+        Derived d = new Derived();
+        int v = TestSealedMethodInlining(d);
+        return (v == 3 ? 100 : -1);
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/sealedclass.csproj b/tests/src/JIT/opt/Devirtualization/sealedclass.csproj
new file mode 100644
index 0000000000..ddbbc71a1b
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/sealedclass.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="sealedclass.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/sealeddefault.cs b/tests/src/JIT/opt/Devirtualization/sealeddefault.cs
new file mode 100644
index 0000000000..82049cd7bf
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/sealeddefault.cs
@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+public class Base
+{
+    public virtual int Foo() { return 33; }
+    
+    static BaseSealed s_Default = new BaseSealed();
+
+    public static Base Default => s_Default;
+}
+
+sealed class BaseSealed : Base {}
+
+// The jit can devirtualize the call to Foo when initializing y,
+// but not when initializing x.
+
+public class Test
+{
+    public static int Main()
+    {
+        Base b = Base.Default;
+        int x = b.Foo();
+        int y = Base.Default.Foo();
+        return (x == 33 && y == 33 ? 100 : -1);
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/sealeddefault.csproj b/tests/src/JIT/opt/Devirtualization/sealeddefault.csproj
new file mode 100644
index 0000000000..f70b264428
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/sealeddefault.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="sealeddefault.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/sealedmethod.cs b/tests/src/JIT/opt/Devirtualization/sealedmethod.cs
new file mode 100644
index 0000000000..555254b6a5
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/sealedmethod.cs
@@ -0,0 +1,38 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+
+public class Base
+{
+    public virtual int GetValue(int value)
+    {
+        return 0x33;
+    }
+}
+
+public class Derived : Base
+{
+    public sealed override int GetValue(int value)
+    {
+        return value;
+    }
+}
+
+public class F
+{
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    public static int TestSealedMethodInlining(Derived obj)
+    {
+        return obj.GetValue(3);
+    }
+
+    public static int Main(string[] args)
+    {
+        Derived d = new Derived();
+        int v = TestSealedMethodInlining(d);
+        return (v == 3 ? 100 : -1);
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/sealedmethod.csproj b/tests/src/JIT/opt/Devirtualization/sealedmethod.csproj
new file mode 100644
index 0000000000..a1dba94196
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/sealedmethod.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="sealedmethod.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/sharedoverride.cs b/tests/src/JIT/opt/Devirtualization/sharedoverride.cs
new file mode 100644
index 0000000000..7107966f79
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/sharedoverride.cs
@@ -0,0 +1,56 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+public class Base
+{
+    public virtual int Foo(int x) 
+    { 
+        return x + 1;
+    }
+}
+
+// Override via a shared generic.
+//
+// Jit must be careful to set the right context
+// for the shared methods when devirtualizing.
+
+public class Derived<T> : Base
+{
+    public override sealed int Foo(int x)
+    {
+        if (typeof(T) == typeof(string))
+        {
+            return x + 42;
+        }
+        else if (typeof(T) == typeof(int))
+        {
+            return x + 31;
+        }
+        else 
+        {
+            return x + 22;
+        }
+    }
+}
+
+// All calls to Foo should devirtualize, however we can't
+// get the b.Foo case yet because we don't recognize b
+// as having an exact type.
+
+public class Test
+{
+    public static int Main()
+    {
+        var ds = new Derived<string>();
+        var dx = new Derived<object>();
+        var di = new Derived<int>();
+        var b  = new Base();
+
+        int resultD = ds.Foo(1) + dx.Foo(1) + di.Foo(1) + b.Foo(1);
+
+        return resultD;
+    }
+}
diff --git a/tests/src/JIT/opt/Devirtualization/sharedoverride.csproj b/tests/src/JIT/opt/Devirtualization/sharedoverride.csproj
new file mode 100644
index 0000000000..3236a0bb06
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/sharedoverride.csproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="sharedoverride.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/Devirtualization/simple.cs b/tests/src/JIT/opt/Devirtualization/simple.cs
new file mode 100644
index 0000000000..46b039ce15
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/simple.cs
@@ -0,0 +1,58 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+// Some simple interface call devirtualization cases
+
+interface Ix
+{
+    int F();
+}
+
+interface Iy
+{
+    int G();
+}
+
+interface Iz
+{
+    int H();
+    int I();
+}
+
+public class B : Iy, Ix, Iz
+{
+    public int F() { return 3; }
+    virtual public int G() { return 5; }
+    int Iz.H() { return 7; }
+    int Iz.I() { return 11; }
+}
+
+public class Z : B, Iz
+{
+    new public int F() { return 13; }
+    override public int G() { return 17; }
+    int Iz.H() { return 19; }
+
+    static int Fx(Ix x) { return x.F(); }
+    static int Gy(Iy y) { return y.G(); }
+    static int Hz(Iz z) { return z.H(); }
+    static int Hi(Iz z) { return z.I(); }
+
+    public static int Main()
+    {
+        int callsBF = Fx(new Z()) + Fx(new B()) + ((Ix) new Z()).F() + ((Ix) new B()).F();
+        int callsBG = Gy(new B()) + ((Iy) new B()).G() + (new B()).G();
+        int callsBH = Hz(new B()) + ((Iz) new B()).H();
+        int callsBI = Hi(new Z()) + Hi(new B()) + ((Iz) new Z()).I() + ((Iz) new B()).I();
+        int callsZG = Gy(new Z()) + ((Iy) new Z()).G() + (new Z()).G();
+        int callsZH = Hz(new Z()) + ((Iz) new Z()).H();
+
+        int expected = 4 * 3 + 3 * 5 + 2 * 7 + 4 * 11 + 3 * 17 + 2 * 19;
+
+        return callsBF + callsBG + callsBI + callsBH + callsZG + callsZH - expected + 100;
+    }
+}
+
diff --git a/tests/src/JIT/opt/Devirtualization/simple.csproj b/tests/src/JIT/opt/Devirtualization/simple.csproj
new file mode 100644
index 0000000000..cb5b5e33e0
--- /dev/null
+++ b/tests/src/JIT/opt/Devirtualization/simple.csproj
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <PropertyGroup>
+    <DebugType>PdbOnly</DebugType>
+    <Optimize>True</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="simple.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/BBCnt1.ilproj b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/BBCnt1.ilproj
index 4d29eb2536..d4e43e3543 100644
--- a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/BBCnt1.ilproj
+++ b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/BBCnt1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/CodeSize1.ilproj b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/CodeSize1.ilproj
index bd74b78087..9688c0bc4f 100644
--- a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/CodeSize1.ilproj
+++ b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/CodeSize1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/InstrCnt1.ilproj b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/InstrCnt1.ilproj
index 180bf9694f..c6853cc6f2 100644
--- a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/InstrCnt1.ilproj
+++ b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/InstrCnt1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVNumCnt1.ilproj b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVNumCnt1.ilproj
index 5b887d43cd..9bcf416e37 100644
--- a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVNumCnt1.ilproj
+++ b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVNumCnt1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVRefCnt1.ilproj b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVRefCnt1.ilproj
index b6bb67a4ff..ed466e6b0f 100644
--- a/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVRefCnt1.ilproj
+++ b/tests/src/JIT/opt/DumpDisasm/JitMinOpts/LVRefCnt1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/ETW/TailCallCases.ilproj b/tests/src/JIT/opt/ETW/TailCallCases.ilproj
index cedd8dd60f..4e718101f8 100644
--- a/tests/src/JIT/opt/ETW/TailCallCases.ilproj
+++ b/tests/src/JIT/opt/ETW/TailCallCases.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/Inline/regression/badcallee/badcallee.ilproj b/tests/src/JIT/opt/Inline/regression/badcallee/badcallee.ilproj
index b089054497..213ebe341c 100644
--- a/tests/src/JIT/opt/Inline/regression/badcallee/badcallee.ilproj
+++ b/tests/src/JIT/opt/Inline/regression/badcallee/badcallee.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/Inline/regression/bug584219/inliningVars.csproj b/tests/src/JIT/opt/Inline/regression/bug584219/inliningVars.csproj
index 172a729d7d..799c03da82 100644
--- a/tests/src/JIT/opt/Inline/regression/bug584219/inliningVars.csproj
+++ b/tests/src/JIT/opt/Inline/regression/bug584219/inliningVars.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.csproj b/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.csproj
index 78996888e9..2b2297824e 100644
--- a/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.csproj
+++ b/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/regression/mismatch32/mismatch32.ilproj b/tests/src/JIT/opt/Inline/regression/mismatch32/mismatch32.ilproj
index 089871e1df..93419d4ed9 100644
--- a/tests/src/JIT/opt/Inline/regression/mismatch32/mismatch32.ilproj
+++ b/tests/src/JIT/opt/Inline/regression/mismatch32/mismatch32.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/regression/mismatch64/mismatch64.ilproj b/tests/src/JIT/opt/Inline/regression/mismatch64/mismatch64.ilproj
index 35c0a74d54..97200aab58 100644
--- a/tests/src/JIT/opt/Inline/regression/mismatch64/mismatch64.ilproj
+++ b/tests/src/JIT/opt/Inline/regression/mismatch64/mismatch64.ilproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.csproj b/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.csproj
index 3ea9fd9269..8e79ceaf8b 100644
--- a/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.csproj
+++ b/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.csproj b/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.csproj
index f9815c04e6..eef3ba1394 100644
--- a/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.csproj
+++ b/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.csproj b/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.csproj
index a3ec49d17f..04d7ba452d 100644
--- a/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.csproj
+++ b/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/GenericStructs.csproj b/tests/src/JIT/opt/Inline/tests/GenericStructs.csproj
index c517d00d5f..e587135264 100644
--- a/tests/src/JIT/opt/Inline/tests/GenericStructs.csproj
+++ b/tests/src/JIT/opt/Inline/tests/GenericStructs.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline.csproj b/tests/src/JIT/opt/Inline/tests/Inline.csproj
index aa7ff44434..8c23663bd0 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/InlineThrow.csproj b/tests/src/JIT/opt/Inline/tests/InlineThrow.csproj
index fa9f4f8e1b..e6f68ca0a4 100644
--- a/tests/src/JIT/opt/Inline/tests/InlineThrow.csproj
+++ b/tests/src/JIT/opt/Inline/tests/InlineThrow.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.csproj b/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.csproj
index b5b1eb6f48..f9ef010a49 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.csproj b/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.csproj
index fb5b0e8852..bf9f83c861 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_Many.csproj b/tests/src/JIT/opt/Inline/tests/Inline_Many.csproj
index 8e0b348e68..7c9c4ce837 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_Many.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_Many.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.csproj b/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.csproj
index a2365b5f92..abc05da6d6 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_NewObj.csproj b/tests/src/JIT/opt/Inline/tests/Inline_NewObj.csproj
index 5d1a2404e1..00242e6bb6 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_NewObj.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_NewObj.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.csproj b/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.csproj
index 89e11d0d93..800e728e8b 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_Recursion.csproj b/tests/src/JIT/opt/Inline/tests/Inline_Recursion.csproj
index c4ea707e97..88d72a675f 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_Recursion.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_Recursion.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.csproj b/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.csproj
index 43a3ec96d9..bfbdf9fec0 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.csproj b/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.csproj
index c2b6e8e21b..977d8d6fb6 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_STARG.csproj b/tests/src/JIT/opt/Inline/tests/Inline_STARG.csproj
index 5b440d1c0b..5b1e320ef6 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_STARG.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_STARG.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.csproj b/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.csproj
index 9601467381..d855af148f 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_Vars.csproj b/tests/src/JIT/opt/Inline/tests/Inline_Vars.csproj
index a2523cce90..11ca99dca9 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_Vars.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_Vars.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/Inline_handler.csproj b/tests/src/JIT/opt/Inline/tests/Inline_handler.csproj
index 08580c5f64..a65913dd67 100644
--- a/tests/src/JIT/opt/Inline/tests/Inline_handler.csproj
+++ b/tests/src/JIT/opt/Inline/tests/Inline_handler.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/LotsOfInlines.csproj b/tests/src/JIT/opt/Inline/tests/LotsOfInlines.csproj
index 9c974503c2..c7a00e1151 100644
--- a/tests/src/JIT/opt/Inline/tests/LotsOfInlines.csproj
+++ b/tests/src/JIT/opt/Inline/tests/LotsOfInlines.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.csproj b/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.csproj
index 805da9a38b..0153b55cc8 100644
--- a/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.csproj
+++ b/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.csproj b/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.csproj
index d910ad40a4..715c6323a9 100644
--- a/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.csproj
+++ b/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/StructInClass.csproj b/tests/src/JIT/opt/Inline/tests/StructInClass.csproj
index 8a24eeb336..afcd86e3d4 100644
--- a/tests/src/JIT/opt/Inline/tests/StructInClass.csproj
+++ b/tests/src/JIT/opt/Inline/tests/StructInClass.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.csproj b/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.csproj
index 5a3c37a51f..d9736bcf8a 100644
--- a/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.csproj
+++ b/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/args1.csproj b/tests/src/JIT/opt/Inline/tests/args1.csproj
index 56b374d0bf..560e157cbe 100644
--- a/tests/src/JIT/opt/Inline/tests/args1.csproj
+++ b/tests/src/JIT/opt/Inline/tests/args1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/args2.csproj b/tests/src/JIT/opt/Inline/tests/args2.csproj
index 96d530e494..2e02929673 100644
--- a/tests/src/JIT/opt/Inline/tests/args2.csproj
+++ b/tests/src/JIT/opt/Inline/tests/args2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/args3.csproj b/tests/src/JIT/opt/Inline/tests/args3.csproj
index 920ebab1f2..19441f50a9 100644
--- a/tests/src/JIT/opt/Inline/tests/args3.csproj
+++ b/tests/src/JIT/opt/Inline/tests/args3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/array.csproj b/tests/src/JIT/opt/Inline/tests/array.csproj
index d6a5aece15..128c2a42a7 100644
--- a/tests/src/JIT/opt/Inline/tests/array.csproj
+++ b/tests/src/JIT/opt/Inline/tests/array.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/debug.csproj b/tests/src/JIT/opt/Inline/tests/debug.csproj
index 4687dcc494..3db96c637a 100644
--- a/tests/src/JIT/opt/Inline/tests/debug.csproj
+++ b/tests/src/JIT/opt/Inline/tests/debug.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/deepcall.csproj b/tests/src/JIT/opt/Inline/tests/deepcall.csproj
index 12fd554b81..bd02da3b96 100644
--- a/tests/src/JIT/opt/Inline/tests/deepcall.csproj
+++ b/tests/src/JIT/opt/Inline/tests/deepcall.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/fact.csproj b/tests/src/JIT/opt/Inline/tests/fact.csproj
index 0b5ba92303..9c3a86e7db 100644
--- a/tests/src/JIT/opt/Inline/tests/fact.csproj
+++ b/tests/src/JIT/opt/Inline/tests/fact.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,10 +30,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/ifelse.csproj b/tests/src/JIT/opt/Inline/tests/ifelse.csproj
index dae420fb69..ead0621b8a 100644
--- a/tests/src/JIT/opt/Inline/tests/ifelse.csproj
+++ b/tests/src/JIT/opt/Inline/tests/ifelse.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/indexer.csproj b/tests/src/JIT/opt/Inline/tests/indexer.csproj
index 3f1b15c7fd..5e21f4da29 100644
--- a/tests/src/JIT/opt/Inline/tests/indexer.csproj
+++ b/tests/src/JIT/opt/Inline/tests/indexer.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/interfaceCall.csproj b/tests/src/JIT/opt/Inline/tests/interfaceCall.csproj
index f9b757749e..0a67148896 100644
--- a/tests/src/JIT/opt/Inline/tests/interfaceCall.csproj
+++ b/tests/src/JIT/opt/Inline/tests/interfaceCall.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/interfaceproperty.csproj b/tests/src/JIT/opt/Inline/tests/interfaceproperty.csproj
index 408ad4e8fd..17dabb23c4 100644
--- a/tests/src/JIT/opt/Inline/tests/interfaceproperty.csproj
+++ b/tests/src/JIT/opt/Inline/tests/interfaceproperty.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/mathfunc.csproj b/tests/src/JIT/opt/Inline/tests/mathfunc.csproj
index 74244e655d..d64e6a93a4 100644
--- a/tests/src/JIT/opt/Inline/tests/mathfunc.csproj
+++ b/tests/src/JIT/opt/Inline/tests/mathfunc.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/mthdimpl.csproj b/tests/src/JIT/opt/Inline/tests/mthdimpl.csproj
index 1eb38c78eb..9d100e946c 100644
--- a/tests/src/JIT/opt/Inline/tests/mthdimpl.csproj
+++ b/tests/src/JIT/opt/Inline/tests/mthdimpl.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/property.csproj b/tests/src/JIT/opt/Inline/tests/property.csproj
index 67edcbec98..0b475f6860 100644
--- a/tests/src/JIT/opt/Inline/tests/property.csproj
+++ b/tests/src/JIT/opt/Inline/tests/property.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/size.csproj b/tests/src/JIT/opt/Inline/tests/size.csproj
index 59587e44d3..4a6b1a0404 100644
--- a/tests/src/JIT/opt/Inline/tests/size.csproj
+++ b/tests/src/JIT/opt/Inline/tests/size.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/struct_opcodes.csproj b/tests/src/JIT/opt/Inline/tests/struct_opcodes.csproj
index c49a35a628..9b60ad3904 100644
--- a/tests/src/JIT/opt/Inline/tests/struct_opcodes.csproj
+++ b/tests/src/JIT/opt/Inline/tests/struct_opcodes.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/throwtest.csproj b/tests/src/JIT/opt/Inline/tests/throwtest.csproj
index ce8af1be0f..da9c0519d5 100644
--- a/tests/src/JIT/opt/Inline/tests/throwtest.csproj
+++ b/tests/src/JIT/opt/Inline/tests/throwtest.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/Inline/tests/trycatch.csproj b/tests/src/JIT/opt/Inline/tests/trycatch.csproj
index 84601010bd..1706b7c717 100644
--- a/tests/src/JIT/opt/Inline/tests/trycatch.csproj
+++ b/tests/src/JIT/opt/Inline/tests/trycatch.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39,10 +35,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt0.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt0.ilproj
index c38de7c67b..c82d2a3a17 100644
--- a/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt0.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt0.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt1.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt1.ilproj
index 4d29eb2536..d4e43e3543 100644
--- a/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt1.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/BBCnt1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize0.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize0.ilproj
index f0d0de6d96..1a53349329 100644
--- a/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize0.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize0.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize1.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize1.ilproj
index bd74b78087..9688c0bc4f 100644
--- a/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize1.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/CodeSize1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt0.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt0.ilproj
index 46161b3158..0b0f7f9b21 100644
--- a/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt0.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt0.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt1.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt1.ilproj
index 180bf9694f..c6853cc6f2 100644
--- a/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt1.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/InstrCnt1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt0.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt0.ilproj
index c8841b199c..a1a863f196 100644
--- a/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt0.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt0.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt1.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt1.ilproj
index 5b887d43cd..9bcf416e37 100644
--- a/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt1.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/LVNumCnt1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt0.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt0.ilproj
index fa41b07c64..8519274fd1 100644
--- a/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt0.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt0.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt1.ilproj b/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt1.ilproj
index b6bb67a4ff..ed466e6b0f 100644
--- a/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt1.ilproj
+++ b/tests/src/JIT/opt/JitMinOpts/Perf/LVRefCnt1.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il b/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il
index 763d95f628..1c354b7cdb 100644
--- a/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il
+++ b/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.il
@@ -173,7 +173,7 @@
   {
     // Code size       154 (0x9a)
     .maxstack  3
-    .locals init ([0] class [System.Console]System.Exception e)
+    .locals init ([0] class [mscorlib]System.Exception e)
     IL_0000:  ldstr      "Executing Condition18.Test2 - Caller(imperative se"
     + "curity): Arguments: None - ReturnType: 3 byte struct; Callee: Arguments"
     + ": None - ReturnType: 3 byte struct"
@@ -598,7 +598,7 @@
     .maxstack  3
     .locals init ([0] class TailcallVerify.Condition16 con,
              [1] class [mscorlib]System.Exception e,
-             [2] class [mscorlib]System.Threading.Thread t)
+             [2] class [System.Threading.Thread]System.Threading.Thread t)
     IL_0000:  ldstr      "Executing Condition16.Test1 - Caller: Arguments: N"
     + "one - ReturnType: void; Callee: Arguments: None - ReturnType: void"
     IL_0005:  call       void [System.Console]System.Console::WriteLine(string)
@@ -650,13 +650,13 @@
                                                                                                     native int)
       IL_008a:  stsfld     class [mscorlib]System.Threading.ParameterizedThreadStart TailcallVerify.Condition16::'CS$<>9__CachedAnonymousMethodDelegate1'
       IL_008f:  ldsfld     class [mscorlib]System.Threading.ParameterizedThreadStart TailcallVerify.Condition16::'CS$<>9__CachedAnonymousMethodDelegate1'
-      IL_0094:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ParameterizedThreadStart)
+      IL_0094:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ParameterizedThreadStart)
       IL_0099:  stloc.2
       IL_009a:  ldloc.2
       IL_009b:  ldloc.0
-      IL_009c:  callvirt   instance void [mscorlib]System.Threading.Thread::Start(object)
+      IL_009c:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start(object)
       IL_00a1:  ldloc.2
-      IL_00a2:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+      IL_00a2:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
       IL_00a7:  leave.s    IL_00a9
 
     }  // end handler
@@ -704,7 +704,7 @@
   {
     // Code size       59 (0x3b)
     .maxstack  3
-    .locals init ([0] class [mscorlib]System.Threading.Thread t)
+    .locals init ([0] class [System.Threading.Thread]System.Threading.Thread t)
     IL_0000:  ldsfld     class [mscorlib]System.Threading.ParameterizedThreadStart TailcallVerify.Condition16::'CS$<>9__CachedAnonymousMethodDelegate3'
     IL_0005:  brtrue.s   IL_0018
 
@@ -714,13 +714,13 @@
                                                                                                   native int)
     IL_0013:  stsfld     class [mscorlib]System.Threading.ParameterizedThreadStart TailcallVerify.Condition16::'CS$<>9__CachedAnonymousMethodDelegate3'
     IL_0018:  ldsfld     class [mscorlib]System.Threading.ParameterizedThreadStart TailcallVerify.Condition16::'CS$<>9__CachedAnonymousMethodDelegate3'
-    IL_001d:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ParameterizedThreadStart)
+    IL_001d:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ParameterizedThreadStart)
     IL_0022:  stloc.0
     IL_0023:  ldloc.0
     IL_0024:  ldarg.0
-    IL_0025:  callvirt   instance void [mscorlib]System.Threading.Thread::Start(object)
+    IL_0025:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start(object)
     IL_002a:  ldloc.0
-    IL_002b:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_002b:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_0030:  ldc.i4.1
     IL_0031:  volatile.
     IL_0033:  ldsfld     int32 modreq([mscorlib]System.Runtime.CompilerServices.IsVolatile) TailcallVerify.Condition16::zero
@@ -4103,7 +4103,7 @@
   {
     // Code size       394 (0x18a)
     .maxstack  3
-    .locals init ([0] class [mscorlib]System.Threading.Thread t1,
+    .locals init ([0] class [System.Threading.Thread]System.Threading.Thread t1,
              [1] class [mscorlib]System.Exception e,
              [2] int64 l,
              [3] int64 V_3,
@@ -4124,14 +4124,14 @@
     {
       IL_0025:  ldnull
       IL_0026:  ldftn      void TailcallVerify.Condition21::Caller3()
-      IL_002c:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+      IL_002c:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                        native int)
-      IL_0031:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+      IL_0031:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
       IL_0036:  stloc.0
       IL_0037:  ldloc.0
-      IL_0038:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+      IL_0038:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
       IL_003d:  ldloc.0
-      IL_003e:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+      IL_003e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
       IL_0043:  leave.s    IL_009c
 
     }  // end .try
@@ -4799,8 +4799,8 @@
     .maxstack  3
     .locals init ([0] class TailcallVerify.Condition21 con1,
              [1] class TailcallVerify.Condition21 con2,
-             [2] class [mscorlib]System.Threading.Thread t1,
-             [3] class [mscorlib]System.Threading.Thread t2,
+             [2] class [System.Threading.Thread]System.Threading.Thread t1,
+             [3] class [System.Threading.Thread]System.Threading.Thread t2,
              [4] class [mscorlib]System.Exception ex,
              [5] int32 i,
              [6] int32 V_6)
@@ -4815,26 +4815,26 @@
     IL_001c:  stloc.1
     IL_001d:  ldloc.0
     IL_001e:  ldftn      instance void TailcallVerify.Condition21::Caller5()
-    IL_0024:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0024:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0029:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0029:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_002e:  stloc.2
     IL_002f:  ldloc.1
     IL_0030:  ldftn      instance void TailcallVerify.Condition21::Caller5()
-    IL_0036:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0036:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_003b:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_003b:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0040:  stloc.3
     .try
     {
       IL_0041:  ldloc.2
-      IL_0042:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+      IL_0042:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
       IL_0047:  ldloc.3
-      IL_0048:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+      IL_0048:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
       IL_004d:  ldloc.2
-      IL_004e:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+      IL_004e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
       IL_0053:  ldloc.3
-      IL_0054:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+      IL_0054:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
       IL_0059:  leave.s    IL_007c
 
     }  // end .try
diff --git a/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj b/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj
index 528f36517c..169e8aed37 100644
--- a/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj
+++ b/tests/src/JIT/opt/Tailcall/TailcallVerifyWithPrefix.ilproj
@@ -8,14 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
  </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/JIT/opt/perf/doublealign/Arrays.csproj b/tests/src/JIT/opt/perf/doublealign/Arrays.csproj
index a7017b0e90..41be062c34 100644
--- a/tests/src/JIT/opt/perf/doublealign/Arrays.csproj
+++ b/tests/src/JIT/opt/perf/doublealign/Arrays.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -41,10 +37,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/perf/doublealign/Locals.csproj b/tests/src/JIT/opt/perf/doublealign/Locals.csproj
index 0e8ec06ff3..5ff4586f8f 100644
--- a/tests/src/JIT/opt/perf/doublealign/Locals.csproj
+++ b/tests/src/JIT/opt/perf/doublealign/Locals.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
@@ -43,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/perf/doublealign/objects.csproj b/tests/src/JIT/opt/perf/doublealign/objects.csproj
index 5ec4226e2b..e0205dab91 100644
--- a/tests/src/JIT/opt/perf/doublealign/objects.csproj
+++ b/tests/src/JIT/opt/perf/doublealign/objects.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj
index 7793674360..79560c536a 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
     <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
     <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
@@ -44,10 +40,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.csproj b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.csproj
index fac2a73612..1bb81d64ff 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj
index 6a6732961b..df11c8210e 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
     <!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
     <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
@@ -44,10 +40,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.csproj b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.csproj
index f5bb61326b..0786ebf00d 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived1.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived1.csproj
index a2017a9c9e..f75dc024af 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived1.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived1.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived10.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived10.csproj
index b4e7f6be36..87df36ca6a 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived10.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived10.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived11.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived11.csproj
index 7a1961ad97..be5f721051 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived11.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived11.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived12.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived12.csproj
index 3b88447779..3d6b9d4f02 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived12.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived12.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived13.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived13.csproj
index 021907479b..83cc8ea94c 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived13.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived13.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived14.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived14.csproj
index a59262151d..d2ee7dd6fe 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived14.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived14.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived15.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived15.csproj
index 65943576c1..1ea03417b2 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived15.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived15.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived16.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived16.csproj
index 79b510383c..f04c29c664 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived16.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived16.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived17.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived17.csproj
index 90704566ea..3f80a04231 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived17.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived17.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived18.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived18.csproj
index ce53895ca1..830924a7d2 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived18.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived18.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived19.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived19.csproj
index f51197c321..1b638c3e1c 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived19.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived19.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived2.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived2.csproj
index 0f437b8849..022a1ae543 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived2.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived2.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived20.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived20.csproj
index e1fa38ba50..af752382fe 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived20.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived20.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived3.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived3.csproj
index 410ca48cee..157e8f5195 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived3.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived3.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived4.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived4.csproj
index 8b61ae4a7c..7aa1479c60 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived4.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived4.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived5.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived5.csproj
index 703362dbad..6e8c2bf910 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived5.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived5.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived6.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived6.csproj
index d5f5497f24..17ed2cec9f 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived6.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived6.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived7.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived7.csproj
index 0fba8526ca..180dd02959 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived7.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived7.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived8.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived8.csproj
index 7e82fc2f4c..8ae79252c0 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived8.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived8.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived9.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived9.csproj
index 1256146e47..d741991230 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived9.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived9.csproj
@@ -10,12 +10,8 @@
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <GenerateRunScript>false</GenerateRunScript> 
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -37,10 +33,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj
index b345ab221e..e602f64207 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -58,10 +54,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj
index 7c977797ee..415e3c366c 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -58,10 +54,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj
index c529a3a402..520257cdef 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -58,10 +54,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj b/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj
index a2fcc9fbc0..c689612cf8 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -58,10 +54,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_d.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_d.csproj
index c768b46c21..05e9510244 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_d.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="itest1.csproj" />
     <ProjectReference Include="itest2.csproj" />
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_do.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_do.csproj
index a526dc05df..6df9fc55e9 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_do.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="itest1.csproj" />
     <ProjectReference Include="itest2.csproj" />
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_r.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_r.csproj
index 72159ea074..b8aa146693 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_r.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="itest1.csproj" />
     <ProjectReference Include="itest2.csproj" />
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_ro.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_ro.csproj
index 0ebd7db79d..019a98176a 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_ro.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,10 +31,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="itest1.csproj" />
     <ProjectReference Include="itest2.csproj" />
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest1.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest1.csproj
index 03333a3ac5..919bc91e67 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest1.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest1.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest10.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest10.csproj
index ac621b64cd..ca8b5d737f 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest10.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest10.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest2.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest2.csproj
index e8e1949bcd..3470a2b2be 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest2.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest2.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest3.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest3.csproj
index b672822d29..e4c7236722 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest3.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest3.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest4.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest4.csproj
index aeabf4e032..d7403dcce3 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest4.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest4.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest5.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest5.csproj
index ee466b3f2b..cc012a0732 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest5.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest5.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest6.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest6.csproj
index d86e86b5c4..ad453917cb 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest6.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest6.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest7.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest7.csproj
index a3499dd862..3de28bb5b5 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest7.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest7.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest8.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest8.csproj
index 0ed0b92f5e..1e88a2d319 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest8.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest8.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest9.csproj b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest9.csproj
index 0e13df068b..ef98354671 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest9.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest9.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
    <GenerateRunScript>false</GenerateRunScript> 
   </PropertyGroup>
@@ -36,10 +32,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.csproj b/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.csproj
index c5283d50ab..4b305c2493 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.csproj b/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.csproj
index 1cbf8bb79f..932feb1771 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.csproj b/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.csproj
index 207c3a23be..512ec742f0 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.csproj b/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.csproj
index c87fa10c47..6b35d8eb35 100644
--- a/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.csproj
+++ b/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,10 +36,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/JIT/superpmi/superpmicollect.csproj b/tests/src/JIT/superpmi/superpmicollect.csproj
index 4769414d4a..18d15ed9df 100644
--- a/tests/src/JIT/superpmi/superpmicollect.csproj
+++ b/tests/src/JIT/superpmi/superpmicollect.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -42,10 +38,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/tests/src/Loader/NativeLibs/FromNativePaths.csproj b/tests/src/Loader/NativeLibs/FromNativePaths.csproj
index 3b5d3edacf..3ef051ecd5 100644
--- a/tests/src/Loader/NativeLibs/FromNativePaths.csproj
+++ b/tests/src/Loader/NativeLibs/FromNativePaths.csproj
@@ -7,7 +7,6 @@
     <AssemblyName>FromNativePaths</AssemblyName>
     <ProjectGuid>{649A239B-AB4B-4E20-BDCA-3BA736E8B790}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
diff --git a/tests/src/Loader/binding/assemblies/assemblybugs/102140/test.csproj b/tests/src/Loader/binding/assemblies/assemblybugs/102140/test.csproj
index 07824d1efe..487d45a192 100644
--- a/tests/src/Loader/binding/assemblies/assemblybugs/102140/test.csproj
+++ b/tests/src/Loader/binding/assemblies/assemblybugs/102140/test.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Loader/binding/assemblies/assemblybugs/177066w/repro177066.csproj b/tests/src/Loader/binding/assemblies/assemblybugs/177066w/repro177066.csproj
index 9fe819b3ab..dfa5427347 100644
--- a/tests/src/Loader/binding/assemblies/assemblybugs/177066w/repro177066.csproj
+++ b/tests/src/Loader/binding/assemblies/assemblybugs/177066w/repro177066.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Loader/binding/assemblies/assemblybugs/203962w/client.csproj b/tests/src/Loader/binding/assemblies/assemblybugs/203962w/client.csproj
index 64f67b8f57..8035065e6b 100644
--- a/tests/src/Loader/binding/assemblies/assemblybugs/203962w/client.csproj
+++ b/tests/src/Loader/binding/assemblies/assemblybugs/203962w/client.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Loader/binding/assemblies/assemblyversion/EmbedStringVersions.csproj b/tests/src/Loader/binding/assemblies/assemblyversion/EmbedStringVersions.csproj
index 67b9c9746f..b73ceb6765 100644
--- a/tests/src/Loader/binding/assemblies/assemblyversion/EmbedStringVersions.csproj
+++ b/tests/src/Loader/binding/assemblies/assemblyversion/EmbedStringVersions.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/properties.csproj b/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/properties.csproj
index 89302c5328..7d2b2bb1c3 100644
--- a/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/properties.csproj
+++ b/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/properties.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>-trustedexe</CLRTestExecutionArguments>
diff --git a/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server1.csproj b/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server1.csproj
index 143d47082b..ff559012ee 100644
--- a/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server1.csproj
+++ b/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server2.csproj b/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server2.csproj
index 7eefa41cab..8633839e56 100644
--- a/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server2.csproj
+++ b/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server3.csproj b/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server3.csproj
index c45d14ddd8..b1200fc3ba 100644
--- a/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server3.csproj
+++ b/tests/src/Loader/binding/assemblies/basicapi/assemblynamector/server3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.csproj b/tests/src/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.csproj
index 093e7dcde0..ee08bc9cfb 100644
--- a/tests/src/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.csproj
+++ b/tests/src/Loader/binding/assemblies/generics/arilistienum/methods/exceptions.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Loader/binding/assemblies/generics/arilistienum/methods/methods.csproj b/tests/src/Loader/binding/assemblies/generics/arilistienum/methods/methods.csproj
index e0ec93fa66..f07c5a40f5 100644
--- a/tests/src/Loader/binding/assemblies/generics/arilistienum/methods/methods.csproj
+++ b/tests/src/Loader/binding/assemblies/generics/arilistienum/methods/methods.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/Ambiguous.ilproj b/tests/src/Loader/classloader/InterfaceFolding/Ambiguous.ilproj
index 19ed06c2c5..77da12cc9e 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/Ambiguous.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/Ambiguous.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase0.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase0.ilproj
index e1cf9cb224..da70355020 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase0.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase0.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_I.ilproj
index c1caddc735..627daa3fde 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_I_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_I_Nested_J.ilproj
index f2a3f8f3a7..519f9c6cdd 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_I_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_I_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_J.ilproj
index 2a64e02155..6a9b30bb08 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_J_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_J_Nested_I.ilproj
index f8ea1e411c..39885f2e17 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_J_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase0_Nested_J_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase1.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase1.ilproj
index ecf0387da1..2efcd5fd25 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase1.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase1.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_I.ilproj
index 11d17c3ca3..0c85c5fd7e 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_I_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_I_Nested_J.ilproj
index 8392d3e971..c2b53658e3 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_I_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_I_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_J.ilproj
index 932c2e3d10..d3d85d8f05 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_J_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_J_Nested_I.ilproj
index ea76135e58..41932454e9 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_J_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase1_Nested_J_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase2.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase2.ilproj
index 4c3d02ebb0..cac481276a 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase2.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase2.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_I.ilproj
index 2fd0f29a18..03fbec5f15 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_I_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_I_Nested_J.ilproj
index 40dd9a48f2..b07a726eea 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_I_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_I_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_J.ilproj
index fdde59555c..c709e653f5 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_J_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_J_Nested_I.ilproj
index 64f1bc7f67..4464a9ad96 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_J_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase2_Nested_J_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase3.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase3.ilproj
index 7596228815..f3f13f23df 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase3.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase3.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_I.ilproj
index 24856be3c2..addb57a6db 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_I_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_I_Nested_J.ilproj
index c9820e608d..4d959ca771 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_I_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_I_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_J.ilproj
index 76473284c1..5d324c5000 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_J_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_J_Nested_I.ilproj
index 8308b415f7..1b594e87d7 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_J_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase3_Nested_J_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase4.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase4.ilproj
index 74b1550d0b..dc47f7f48d 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase4.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase4.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_I.ilproj
index c38970dbb3..86cdd0931b 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_I_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_I_Nested_J.ilproj
index 8abc53c951..680a4e6787 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_I_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_I_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_J.ilproj
index 7c3cd8ce98..84e83cadda 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_J_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_J_Nested_I.ilproj
index 1d3ae5afd5..2b8cd17b48 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_J_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase4_Nested_J_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase5.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase5.ilproj
index 886c243e0c..d8ef7c6ff3 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase5.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase5.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_I.ilproj
index 90d3fc774c..c9d10a27e4 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_I_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_I_Nested_J.ilproj
index 2854a2ef7c..8111e60739 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_I_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_I_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_J.ilproj
index c31739bfc0..c8af04e6d9 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_J_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_J_Nested_I.ilproj
index 5e9272064a..a7bc34e708 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_J_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase5_Nested_J_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase6.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase6.ilproj
index b6d97031c9..d8d7aeb34e 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase6.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase6.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_I.ilproj
index f81c513e73..630e89f0d3 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_I_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_I_Nested_J.ilproj
index 0fd988f8c2..d305cf29af 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_I_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_I_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_J.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_J.ilproj
index 29ad473fec..ed37852218 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_J.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_J.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_J_Nested_I.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_J_Nested_I.ilproj
index 49149d6a56..697dba703a 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_J_Nested_I.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase6_Nested_J_Nested_I.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/InterfaceFolding/TestCase7.ilproj b/tests/src/Loader/classloader/InterfaceFolding/TestCase7.ilproj
index 428885df7a..5f53ae56f8 100644
--- a/tests/src/Loader/classloader/InterfaceFolding/TestCase7.ilproj
+++ b/tests/src/Loader/classloader/InterfaceFolding/TestCase7.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/MethodImpl/override_override1.ilproj b/tests/src/Loader/classloader/MethodImpl/override_override1.ilproj
index b588bd48c5..cda466db09 100644
--- a/tests/src/Loader/classloader/MethodImpl/override_override1.ilproj
+++ b/tests/src/Loader/classloader/MethodImpl/override_override1.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj b/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj
index a383c04d74..c87d2e3a5b 100644
--- a/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj
+++ b/tests/src/Loader/classloader/MethodImpl/self_override1.ilproj
@@ -7,16 +7,22 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
   </PropertyGroup>
 
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup>
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
diff --git a/tests/src/Loader/classloader/MethodImpl/self_override1.reflect.xml b/tests/src/Loader/classloader/MethodImpl/self_override1.reflect.xml
new file mode 100644
index 0000000000..4d01f1aebc
--- /dev/null
+++ b/tests/src/Loader/classloader/MethodImpl/self_override1.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="self_override1">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/MethodImpl/self_override2.ilproj b/tests/src/Loader/classloader/MethodImpl/self_override2.ilproj
index 32c420ba11..6993be5bae 100644
--- a/tests/src/Loader/classloader/MethodImpl/self_override2.ilproj
+++ b/tests/src/Loader/classloader/MethodImpl/self_override2.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/MethodImpl/self_override2.reflect.xml b/tests/src/Loader/classloader/MethodImpl/self_override2.reflect.xml
new file mode 100644
index 0000000000..90d85f5ae5
--- /dev/null
+++ b/tests/src/Loader/classloader/MethodImpl/self_override2.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="self_override2">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/MethodImpl/self_override3.ilproj b/tests/src/Loader/classloader/MethodImpl/self_override3.ilproj
index c1b9eececc..f76db30387 100644
--- a/tests/src/Loader/classloader/MethodImpl/self_override3.ilproj
+++ b/tests/src/Loader/classloader/MethodImpl/self_override3.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/MethodImpl/self_override3.reflect.xml b/tests/src/Loader/classloader/MethodImpl/self_override3.reflect.xml
new file mode 100644
index 0000000000..0836d93b38
--- /dev/null
+++ b/tests/src/Loader/classloader/MethodImpl/self_override3.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="self_override3">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/MethodImpl/self_override5.ilproj b/tests/src/Loader/classloader/MethodImpl/self_override5.ilproj
index 723c4dc2ed..fb46b03b5d 100644
--- a/tests/src/Loader/classloader/MethodImpl/self_override5.ilproj
+++ b/tests/src/Loader/classloader/MethodImpl/self_override5.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/MethodTable/Types101.ilproj b/tests/src/Loader/classloader/MethodTable/Types101.ilproj
index f88973f4fe..e50db680d9 100644
--- a/tests/src/Loader/classloader/MethodTable/Types101.ilproj
+++ b/tests/src/Loader/classloader/MethodTable/Types101.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/MethodTable/Types680.ilproj b/tests/src/Loader/classloader/MethodTable/Types680.ilproj
index 2523e57b56..03198b1bb1 100644
--- a/tests/src/Loader/classloader/MethodTable/Types680.ilproj
+++ b/tests/src/Loader/classloader/MethodTable/Types680.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/MethodTable/Types958.ilproj b/tests/src/Loader/classloader/MethodTable/Types958.ilproj
index df444f15b5..e80d2a3523 100644
--- a/tests/src/Loader/classloader/MethodTable/Types958.ilproj
+++ b/tests/src/Loader/classloader/MethodTable/Types958.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/MethodTable/Types983.ilproj b/tests/src/Loader/classloader/MethodTable/Types983.ilproj
index 8a94b11891..41d01dbcf2 100644
--- a/tests/src/Loader/classloader/MethodTable/Types983.ilproj
+++ b/tests/src/Loader/classloader/MethodTable/Types983.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test2_NonFriendPriInterface.ilproj b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test2_NonFriendPriInterface.ilproj
index 67158a55d6..7576e5e83c 100644
--- a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test2_NonFriendPriInterface.ilproj
+++ b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test2_NonFriendPriInterface.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_FriendPriInterface.ilproj b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_FriendPriInterface.ilproj
index 89eaaacefc..1771ebc1da 100644
--- a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_FriendPriInterface.ilproj
+++ b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_FriendPriInterface.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj
index eaad0b4711..d050b73331 100644
--- a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj
+++ b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_ImplementingClass.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_forwarder.ilproj b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_forwarder.ilproj
index 514bc49550..1860a5009e 100644
--- a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_forwarder.ilproj
+++ b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_forwarder.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_supplier.ilproj b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_supplier.ilproj
index 864d8c1f31..cc8e3c470a 100644
--- a/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_supplier.ilproj
+++ b/tests/src/Loader/classloader/PrivateInterfaceImpl/Test6_supplier.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/SequentialLayout/Regress/217070/t1.ilproj b/tests/src/Loader/classloader/SequentialLayout/Regress/217070/t1.ilproj
index 33166a452d..7a95d5948f 100644
--- a/tests/src/Loader/classloader/SequentialLayout/Regress/217070/t1.ilproj
+++ b/tests/src/Loader/classloader/SequentialLayout/Regress/217070/t1.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/SequentialLayout/Regress/217070/t2.ilproj b/tests/src/Loader/classloader/SequentialLayout/Regress/217070/t2.ilproj
index 76fb8b8155..c7ca387684 100644
--- a/tests/src/Loader/classloader/SequentialLayout/Regress/217070/t2.ilproj
+++ b/tests/src/Loader/classloader/SequentialLayout/Regress/217070/t2.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/Statics/ComplexScenarios/MultiAssemblyGenerics_GenericClasses.csproj b/tests/src/Loader/classloader/Statics/ComplexScenarios/MultiAssemblyGenerics_GenericClasses.csproj
index 6b3892bf8e..9cba2e2681 100644
--- a/tests/src/Loader/classloader/Statics/ComplexScenarios/MultiAssemblyGenerics_GenericClasses.csproj
+++ b/tests/src/Loader/classloader/Statics/ComplexScenarios/MultiAssemblyGenerics_GenericClasses.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/Statics/ComplexScenarios/MultiAssemblyGenerics_NonGenericClasses.csproj b/tests/src/Loader/classloader/Statics/ComplexScenarios/MultiAssemblyGenerics_NonGenericClasses.csproj
index 249226dae4..a36fd540a0 100644
--- a/tests/src/Loader/classloader/Statics/ComplexScenarios/MultiAssemblyGenerics_NonGenericClasses.csproj
+++ b/tests/src/Loader/classloader/Statics/ComplexScenarios/MultiAssemblyGenerics_NonGenericClasses.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/Statics/Misc/IllegalTypes.ilproj b/tests/src/Loader/classloader/Statics/Misc/IllegalTypes.ilproj
index 1a410ca947..4f8ad327c4 100644
--- a/tests/src/Loader/classloader/Statics/Misc/IllegalTypes.ilproj
+++ b/tests/src/Loader/classloader/Statics/Misc/IllegalTypes.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/Statics/Misc/LiteralStatic.ilproj b/tests/src/Loader/classloader/Statics/Misc/LiteralStatic.ilproj
index e24084d807..7b129f316b 100644
--- a/tests/src/Loader/classloader/Statics/Misc/LiteralStatic.ilproj
+++ b/tests/src/Loader/classloader/Statics/Misc/LiteralStatic.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/Statics/Regressions/484837/Enum_ValueField.ilproj b/tests/src/Loader/classloader/Statics/Regressions/484837/Enum_ValueField.ilproj
index 630bf9c6ad..a2aef35881 100644
--- a/tests/src/Loader/classloader/Statics/Regressions/484837/Enum_ValueField.ilproj
+++ b/tests/src/Loader/classloader/Statics/Regressions/484837/Enum_ValueField.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TSAmbiguities/CollapsedInterfaces/HelloWorld.ilproj b/tests/src/Loader/classloader/TSAmbiguities/CollapsedInterfaces/HelloWorld.ilproj
index c7631ad417..7b252052e7 100644
--- a/tests/src/Loader/classloader/TSAmbiguities/CollapsedInterfaces/HelloWorld.ilproj
+++ b/tests/src/Loader/classloader/TSAmbiguities/CollapsedInterfaces/HelloWorld.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceDefinition/HelloWorld.ilproj b/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceDefinition/HelloWorld.ilproj
index c7631ad417..7b252052e7 100644
--- a/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceDefinition/HelloWorld.ilproj
+++ b/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceDefinition/HelloWorld.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceImplementation/HelloWorld.csproj b/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceImplementation/HelloWorld.csproj
index e663605953..cc523bbdff 100644
--- a/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceImplementation/HelloWorld.csproj
+++ b/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/InterfaceImplementation/HelloWorld.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/Override/HelloWorld.ilproj b/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/Override/HelloWorld.ilproj
index c7631ad417..7b252052e7 100644
--- a/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/Override/HelloWorld.ilproj
+++ b/tests/src/Loader/classloader/TSAmbiguities/CollapsedMethods/Override/HelloWorld.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TSAmbiguities/SameMethodImpl/CollapsedInterfaces/HelloWorld.ilproj b/tests/src/Loader/classloader/TSAmbiguities/SameMethodImpl/CollapsedInterfaces/HelloWorld.ilproj
index c7631ad417..7b252052e7 100644
--- a/tests/src/Loader/classloader/TSAmbiguities/SameMethodImpl/CollapsedInterfaces/HelloWorld.ilproj
+++ b/tests/src/Loader/classloader/TSAmbiguities/SameMethodImpl/CollapsedInterfaces/HelloWorld.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TSAmbiguities/SameMethodImpl/Override/HelloWorld.ilproj b/tests/src/Loader/classloader/TSAmbiguities/SameMethodImpl/Override/HelloWorld.ilproj
index c7631ad417..7b252052e7 100644
--- a/tests/src/Loader/classloader/TSAmbiguities/SameMethodImpl/Override/HelloWorld.ilproj
+++ b/tests/src/Loader/classloader/TSAmbiguities/SameMethodImpl/Override/HelloWorld.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TSAmbiguities/Variance/Covariant_CollapsedInterfaces/HelloWorld.ilproj b/tests/src/Loader/classloader/TSAmbiguities/Variance/Covariant_CollapsedInterfaces/HelloWorld.ilproj
index c7631ad417..7b252052e7 100644
--- a/tests/src/Loader/classloader/TSAmbiguities/Variance/Covariant_CollapsedInterfaces/HelloWorld.ilproj
+++ b/tests/src/Loader/classloader/TSAmbiguities/Variance/Covariant_CollapsedInterfaces/HelloWorld.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TSAmbiguities/Variance/Covariant_InherittedCollision/HelloWorld.ilproj b/tests/src/Loader/classloader/TSAmbiguities/Variance/Covariant_InherittedCollision/HelloWorld.ilproj
index c7631ad417..7b252052e7 100644
--- a/tests/src/Loader/classloader/TSAmbiguities/Variance/Covariant_InherittedCollision/HelloWorld.ilproj
+++ b/tests/src/Loader/classloader/TSAmbiguities/Variance/Covariant_InherittedCollision/HelloWorld.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TSAmbiguities/Variance/Variant_CollapsedInterfaces/HelloWorld.ilproj b/tests/src/Loader/classloader/TSAmbiguities/Variance/Variant_CollapsedInterfaces/HelloWorld.ilproj
index c7631ad417..7b252052e7 100644
--- a/tests/src/Loader/classloader/TSAmbiguities/Variance/Variant_CollapsedInterfaces/HelloWorld.ilproj
+++ b/tests/src/Loader/classloader/TSAmbiguities/Variance/Variant_CollapsedInterfaces/HelloWorld.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TSAmbiguities/Variance/Variant_InherittedCollision/HelloWorld.ilproj b/tests/src/Loader/classloader/TSAmbiguities/Variance/Variant_InherittedCollision/HelloWorld.ilproj
index c7631ad417..7b252052e7 100644
--- a/tests/src/Loader/classloader/TSAmbiguities/Variance/Variant_InherittedCollision/HelloWorld.ilproj
+++ b/tests/src/Loader/classloader/TSAmbiguities/Variance/Variant_InherittedCollision/HelloWorld.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep.ilproj b/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep.ilproj
index ed071c4a55..382d4414da 100644
--- a/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep.ilproj
+++ b/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep.ilproj
@@ -6,11 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep2.csproj b/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep2.csproj
index efdd913ef8..dfcef7bd71 100644
--- a/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep2.csproj
+++ b/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep3.csproj b/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep3.csproj
index 9b90accc22..cbcaca2835 100644
--- a/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep3.csproj
+++ b/tests/src/Loader/classloader/TypeForwarding/UnitTest/MyDep3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeForwarding/UnitTest/UnitTest.ilproj b/tests/src/Loader/classloader/TypeForwarding/UnitTest/UnitTest.ilproj
index 3d97bdf20e..ffdeae17ce 100644
--- a/tests/src/Loader/classloader/TypeForwarding/UnitTest/UnitTest.ilproj
+++ b/tests/src/Loader/classloader/TypeForwarding/UnitTest/UnitTest.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TestFramework/TestFramework.csproj b/tests/src/Loader/classloader/TypeGeneratorTests/TestFramework/TestFramework.csproj
index 53e62f8fde..de0db4ccb7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TestFramework/TestFramework.csproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TestFramework/TestFramework.csproj
@@ -7,12 +7,9 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
 
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest0/Generated0.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest0/Generated0.ilproj
index d7cb2e918e..709d8f3dc6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest0/Generated0.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest0/Generated0.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1/Generated1.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1/Generated1.ilproj
index be3392aff4..555d95b755 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1/Generated1.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1/Generated1.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest10/Generated10.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest10/Generated10.ilproj
index ed60b68a2c..1f1513a98a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest10/Generated10.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest10/Generated10.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest100/Generated100.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest100/Generated100.ilproj
index d6647a4327..95d0fcf6b8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest100/Generated100.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest100/Generated100.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1000/Generated1000.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1000/Generated1000.ilproj
index cc37186f14..436efae80e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1000/Generated1000.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1000/Generated1000.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1001/Generated1001.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1001/Generated1001.ilproj
index f0934b4ef0..999da1db47 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1001/Generated1001.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1001/Generated1001.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1002/Generated1002.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1002/Generated1002.ilproj
index 418f5b06b4..599606d899 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1002/Generated1002.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1002/Generated1002.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1003/Generated1003.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1003/Generated1003.ilproj
index e807eed504..4aec7e5ffe 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1003/Generated1003.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1003/Generated1003.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1004/Generated1004.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1004/Generated1004.ilproj
index 366d92cb7a..11a2779d0b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1004/Generated1004.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1004/Generated1004.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1005/Generated1005.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1005/Generated1005.ilproj
index 58723f7414..8eda2a8c52 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1005/Generated1005.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1005/Generated1005.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1006/Generated1006.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1006/Generated1006.ilproj
index 383453e301..fb085475a6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1006/Generated1006.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1006/Generated1006.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1007/Generated1007.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1007/Generated1007.ilproj
index ba3fb7efdf..5958a75b05 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1007/Generated1007.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1007/Generated1007.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1008/Generated1008.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1008/Generated1008.ilproj
index ed2487a588..0c55911059 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1008/Generated1008.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1008/Generated1008.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1009/Generated1009.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1009/Generated1009.ilproj
index 2e6027ae00..0ad2bddd74 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1009/Generated1009.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1009/Generated1009.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest101/Generated101.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest101/Generated101.ilproj
index f7320c48e5..b5d9ec5886 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest101/Generated101.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest101/Generated101.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1010/Generated1010.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1010/Generated1010.ilproj
index d8ce8fa284..a73d30741f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1010/Generated1010.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1010/Generated1010.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1011/Generated1011.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1011/Generated1011.ilproj
index 49cf48d525..8a2f0589cb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1011/Generated1011.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1011/Generated1011.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1012/Generated1012.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1012/Generated1012.ilproj
index 5f1248427c..c8e521e42f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1012/Generated1012.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1012/Generated1012.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1013/Generated1013.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1013/Generated1013.ilproj
index 4060ce91c3..cd89294b0d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1013/Generated1013.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1013/Generated1013.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1014/Generated1014.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1014/Generated1014.ilproj
index 8206c3e96e..b9b01d5751 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1014/Generated1014.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1014/Generated1014.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1015/Generated1015.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1015/Generated1015.ilproj
index 52663e7743..80604d652b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1015/Generated1015.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1015/Generated1015.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1016/Generated1016.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1016/Generated1016.ilproj
index a422b04bf0..00ff5ff9e4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1016/Generated1016.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1016/Generated1016.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1017/Generated1017.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1017/Generated1017.ilproj
index d7aef8e249..9483e9b1fa 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1017/Generated1017.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1017/Generated1017.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1018/Generated1018.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1018/Generated1018.ilproj
index e2afcd731d..c805e4062b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1018/Generated1018.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1018/Generated1018.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1019/Generated1019.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1019/Generated1019.ilproj
index 8498039357..8bd49c7f21 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1019/Generated1019.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1019/Generated1019.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest102/Generated102.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest102/Generated102.ilproj
index d6bc84d14a..67c978a2c3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest102/Generated102.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest102/Generated102.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1020/Generated1020.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1020/Generated1020.ilproj
index 3cddb6dd0a..cf29c02f9f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1020/Generated1020.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1020/Generated1020.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1021/Generated1021.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1021/Generated1021.ilproj
index 1d6d464724..b87b44cd00 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1021/Generated1021.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1021/Generated1021.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1022/Generated1022.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1022/Generated1022.ilproj
index 71163e2534..efa13bd87a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1022/Generated1022.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1022/Generated1022.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1023/Generated1023.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1023/Generated1023.ilproj
index 5e34fde106..7318d30ca2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1023/Generated1023.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1023/Generated1023.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1024/Generated1024.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1024/Generated1024.ilproj
index 37c6fb6a9f..fdf9772d91 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1024/Generated1024.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1024/Generated1024.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1025/Generated1025.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1025/Generated1025.ilproj
index 951e9899a3..7eb409266f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1025/Generated1025.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1025/Generated1025.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1026/Generated1026.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1026/Generated1026.ilproj
index 0eafb98b7d..251fd96530 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1026/Generated1026.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1026/Generated1026.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1027/Generated1027.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1027/Generated1027.ilproj
index 6c80c7ca93..037f85878c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1027/Generated1027.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1027/Generated1027.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1028/Generated1028.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1028/Generated1028.ilproj
index f59ff1193c..47d37726cd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1028/Generated1028.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1028/Generated1028.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1029/Generated1029.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1029/Generated1029.ilproj
index 8529fc3df0..28820e5140 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1029/Generated1029.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1029/Generated1029.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest103/Generated103.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest103/Generated103.ilproj
index 395e98e9a5..56c0bf1a8a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest103/Generated103.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest103/Generated103.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1030/Generated1030.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1030/Generated1030.ilproj
index 0397cc99ec..cdbb9aaac4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1030/Generated1030.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1030/Generated1030.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1031/Generated1031.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1031/Generated1031.ilproj
index 77228c9f3d..cf7359c7e3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1031/Generated1031.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1031/Generated1031.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1032/Generated1032.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1032/Generated1032.ilproj
index ac4b47e097..455346fb3a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1032/Generated1032.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1032/Generated1032.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1033/Generated1033.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1033/Generated1033.ilproj
index a7ec67a939..aa456f325f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1033/Generated1033.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1033/Generated1033.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1034/Generated1034.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1034/Generated1034.ilproj
index ad3c9f894f..cd754cb936 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1034/Generated1034.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1034/Generated1034.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1035/Generated1035.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1035/Generated1035.ilproj
index ad50d2ec52..1a8426fb02 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1035/Generated1035.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1035/Generated1035.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1036/Generated1036.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1036/Generated1036.ilproj
index d67f2871a3..bb6c89f070 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1036/Generated1036.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1036/Generated1036.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1037/Generated1037.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1037/Generated1037.ilproj
index e4cf073e34..f851d32810 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1037/Generated1037.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1037/Generated1037.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1038/Generated1038.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1038/Generated1038.ilproj
index 3f9c999335..01d3f6fb15 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1038/Generated1038.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1038/Generated1038.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1039/Generated1039.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1039/Generated1039.ilproj
index 3d5fb1aee2..8b85f7efbe 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1039/Generated1039.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1039/Generated1039.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest104/Generated104.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest104/Generated104.ilproj
index d56ea47f79..5c6a83c239 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest104/Generated104.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest104/Generated104.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1040/Generated1040.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1040/Generated1040.ilproj
index 6b139b45cc..cd044555bb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1040/Generated1040.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1040/Generated1040.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1041/Generated1041.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1041/Generated1041.ilproj
index a83d623e3f..6ec1611c33 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1041/Generated1041.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1041/Generated1041.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1042/Generated1042.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1042/Generated1042.ilproj
index 2907f2e4b6..976f47fd8a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1042/Generated1042.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1042/Generated1042.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1043/Generated1043.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1043/Generated1043.ilproj
index b3302b1ef6..b3562333d1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1043/Generated1043.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1043/Generated1043.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1044/Generated1044.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1044/Generated1044.ilproj
index bfe7a4411d..84da77490c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1044/Generated1044.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1044/Generated1044.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1045/Generated1045.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1045/Generated1045.ilproj
index 792928ec59..e423fc1288 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1045/Generated1045.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1045/Generated1045.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1046/Generated1046.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1046/Generated1046.ilproj
index b971779ec4..50c445d2f0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1046/Generated1046.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1046/Generated1046.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1047/Generated1047.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1047/Generated1047.ilproj
index 1dc0cb7ec2..4d6ab8eed3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1047/Generated1047.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1047/Generated1047.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1048/Generated1048.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1048/Generated1048.ilproj
index 1b4906a02d..1b76943191 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1048/Generated1048.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1048/Generated1048.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1049/Generated1049.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1049/Generated1049.ilproj
index f9729ad8b8..c1bbd7522e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1049/Generated1049.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1049/Generated1049.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest105/Generated105.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest105/Generated105.ilproj
index 832fe2eaa0..5bbd7fc1bf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest105/Generated105.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest105/Generated105.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1050/Generated1050.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1050/Generated1050.ilproj
index a1eb1df612..03a3bc3f5f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1050/Generated1050.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1050/Generated1050.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1051/Generated1051.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1051/Generated1051.ilproj
index 3e09b504aa..17176cff5b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1051/Generated1051.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1051/Generated1051.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1052/Generated1052.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1052/Generated1052.ilproj
index 5b0e923d14..55c158e905 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1052/Generated1052.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1052/Generated1052.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1053/Generated1053.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1053/Generated1053.ilproj
index 644cd3b6a8..60bedfa450 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1053/Generated1053.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1053/Generated1053.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1054/Generated1054.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1054/Generated1054.ilproj
index 6b9397fb9f..6d1a0bdd23 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1054/Generated1054.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1054/Generated1054.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1055/Generated1055.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1055/Generated1055.ilproj
index b2924fca6f..1ae1779c7c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1055/Generated1055.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1055/Generated1055.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1056/Generated1056.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1056/Generated1056.ilproj
index add0b90304..0d41392def 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1056/Generated1056.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1056/Generated1056.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1057/Generated1057.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1057/Generated1057.ilproj
index d044f5076b..a2257be18b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1057/Generated1057.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1057/Generated1057.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1058/Generated1058.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1058/Generated1058.ilproj
index ee4b0e47d6..ef06e124db 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1058/Generated1058.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1058/Generated1058.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1059/Generated1059.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1059/Generated1059.ilproj
index 90cf865578..556df02085 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1059/Generated1059.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1059/Generated1059.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest106/Generated106.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest106/Generated106.ilproj
index 641f064a97..7b78d6e45b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest106/Generated106.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest106/Generated106.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1060/Generated1060.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1060/Generated1060.ilproj
index 99fb69a5a6..6ce246fab0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1060/Generated1060.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1060/Generated1060.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1061/Generated1061.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1061/Generated1061.ilproj
index 512e33d1e5..3d78edc268 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1061/Generated1061.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1061/Generated1061.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1062/Generated1062.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1062/Generated1062.ilproj
index 4319eec802..83b6044206 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1062/Generated1062.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1062/Generated1062.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1063/Generated1063.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1063/Generated1063.ilproj
index cbda4b939a..ac44cfa9ea 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1063/Generated1063.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1063/Generated1063.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1064/Generated1064.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1064/Generated1064.ilproj
index 918adb3ec5..bbbccdf9be 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1064/Generated1064.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1064/Generated1064.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1065/Generated1065.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1065/Generated1065.ilproj
index 5a5fd5c3b3..80d28721e6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1065/Generated1065.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1065/Generated1065.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1066/Generated1066.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1066/Generated1066.ilproj
index 9304057373..44e0bc61fb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1066/Generated1066.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1066/Generated1066.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1067/Generated1067.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1067/Generated1067.ilproj
index e840fd6f19..957d7388cf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1067/Generated1067.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1067/Generated1067.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1068/Generated1068.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1068/Generated1068.ilproj
index cd9dc6f63d..9a5dfea994 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1068/Generated1068.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1068/Generated1068.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1069/Generated1069.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1069/Generated1069.ilproj
index 652df1af15..2faeb6d617 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1069/Generated1069.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1069/Generated1069.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest107/Generated107.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest107/Generated107.ilproj
index 28f19e2e4d..4478411350 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest107/Generated107.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest107/Generated107.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1070/Generated1070.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1070/Generated1070.ilproj
index 8974917e44..f0e68fbbec 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1070/Generated1070.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1070/Generated1070.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1071/Generated1071.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1071/Generated1071.ilproj
index 651d40e50b..b8dee1ad59 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1071/Generated1071.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1071/Generated1071.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1072/Generated1072.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1072/Generated1072.ilproj
index c2f2c59959..55906867af 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1072/Generated1072.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1072/Generated1072.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1073/Generated1073.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1073/Generated1073.ilproj
index 779008a3cc..4ed534131b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1073/Generated1073.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1073/Generated1073.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1074/Generated1074.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1074/Generated1074.ilproj
index 5ff26649b4..71123a9491 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1074/Generated1074.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1074/Generated1074.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1075/Generated1075.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1075/Generated1075.ilproj
index 6471a3c661..927d017a83 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1075/Generated1075.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1075/Generated1075.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1076/Generated1076.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1076/Generated1076.ilproj
index 28453013f3..6a0ca4d249 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1076/Generated1076.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1076/Generated1076.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1077/Generated1077.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1077/Generated1077.ilproj
index ed99c2e9bb..b12e3c9622 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1077/Generated1077.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1077/Generated1077.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1078/Generated1078.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1078/Generated1078.ilproj
index 2b76e2b51b..da15ccbbac 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1078/Generated1078.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1078/Generated1078.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1079/Generated1079.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1079/Generated1079.ilproj
index 01d2a0283e..4711a78eed 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1079/Generated1079.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1079/Generated1079.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest108/Generated108.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest108/Generated108.ilproj
index 48cbc5a1ae..f8beff4297 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest108/Generated108.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest108/Generated108.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1080/Generated1080.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1080/Generated1080.ilproj
index 5166f83151..06cb340a13 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1080/Generated1080.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1080/Generated1080.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1081/Generated1081.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1081/Generated1081.ilproj
index 4b8b9a6d51..03b6cf94b0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1081/Generated1081.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1081/Generated1081.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1082/Generated1082.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1082/Generated1082.ilproj
index 4eb6439587..bfefd54f3c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1082/Generated1082.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1082/Generated1082.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1083/Generated1083.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1083/Generated1083.ilproj
index ed17628f1f..894cb0fdab 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1083/Generated1083.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1083/Generated1083.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1084/Generated1084.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1084/Generated1084.ilproj
index f9124b3672..aa1060fd59 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1084/Generated1084.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1084/Generated1084.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1085/Generated1085.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1085/Generated1085.ilproj
index 03c1ae7ba0..26582674bd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1085/Generated1085.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1085/Generated1085.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1086/Generated1086.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1086/Generated1086.ilproj
index 820afb6476..1831b86d73 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1086/Generated1086.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1086/Generated1086.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1087/Generated1087.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1087/Generated1087.ilproj
index 5af0a9457e..3a5bd45226 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1087/Generated1087.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1087/Generated1087.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1088/Generated1088.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1088/Generated1088.ilproj
index de4e705da9..dd2f76d9bf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1088/Generated1088.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1088/Generated1088.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1089/Generated1089.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1089/Generated1089.ilproj
index aaf4a00eb8..1bba9f0074 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1089/Generated1089.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1089/Generated1089.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest109/Generated109.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest109/Generated109.ilproj
index f7b249709f..ed792f0699 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest109/Generated109.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest109/Generated109.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1090/Generated1090.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1090/Generated1090.ilproj
index 53f98965b3..ad0fa6cda2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1090/Generated1090.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1090/Generated1090.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1091/Generated1091.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1091/Generated1091.ilproj
index cb0ef8454e..ef1abdfaa3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1091/Generated1091.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1091/Generated1091.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1092/Generated1092.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1092/Generated1092.ilproj
index d16bb99696..b59673fb05 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1092/Generated1092.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1092/Generated1092.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1093/Generated1093.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1093/Generated1093.ilproj
index aa4f23b422..5c5ab8dc75 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1093/Generated1093.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1093/Generated1093.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1094/Generated1094.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1094/Generated1094.ilproj
index 7d4410b102..9342bb1f75 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1094/Generated1094.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1094/Generated1094.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1095/Generated1095.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1095/Generated1095.ilproj
index f0d2d662f9..fc0b5b2379 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1095/Generated1095.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1095/Generated1095.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1096/Generated1096.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1096/Generated1096.ilproj
index c81b26d65a..2298852cef 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1096/Generated1096.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1096/Generated1096.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1097/Generated1097.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1097/Generated1097.ilproj
index c8d156f9c6..f59098549c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1097/Generated1097.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1097/Generated1097.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1098/Generated1098.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1098/Generated1098.ilproj
index 13f76f6f18..9b2950bd0f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1098/Generated1098.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1098/Generated1098.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1099/Generated1099.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1099/Generated1099.ilproj
index d1fab7de3a..8517c1b3c7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1099/Generated1099.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1099/Generated1099.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest11/Generated11.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest11/Generated11.ilproj
index 58a25c414b..a50c4fd78d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest11/Generated11.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest11/Generated11.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest110/Generated110.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest110/Generated110.ilproj
index 1f9f1ba4d7..7257e8c248 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest110/Generated110.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest110/Generated110.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1100/Generated1100.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1100/Generated1100.ilproj
index 90fcab40bc..298df0bbca 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1100/Generated1100.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1100/Generated1100.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1101/Generated1101.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1101/Generated1101.ilproj
index 476212e61c..45de86ecf0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1101/Generated1101.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1101/Generated1101.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1102/Generated1102.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1102/Generated1102.ilproj
index c81320f1db..695ceea362 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1102/Generated1102.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1102/Generated1102.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1103/Generated1103.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1103/Generated1103.ilproj
index 2b9621f1d4..aee6c9b0c9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1103/Generated1103.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1103/Generated1103.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1104/Generated1104.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1104/Generated1104.ilproj
index 94a28e5ffe..fe667ebfd3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1104/Generated1104.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1104/Generated1104.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1105/Generated1105.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1105/Generated1105.ilproj
index 2ea826f7fa..fff24f63dd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1105/Generated1105.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1105/Generated1105.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1106/Generated1106.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1106/Generated1106.ilproj
index 86d808924a..4de47d3d2f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1106/Generated1106.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1106/Generated1106.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1107/Generated1107.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1107/Generated1107.ilproj
index ff6c83223e..5879a481b4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1107/Generated1107.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1107/Generated1107.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1108/Generated1108.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1108/Generated1108.ilproj
index 05c69eaaff..6571077958 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1108/Generated1108.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1108/Generated1108.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1109/Generated1109.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1109/Generated1109.ilproj
index cb6bb4b335..4de023afdf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1109/Generated1109.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1109/Generated1109.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest111/Generated111.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest111/Generated111.ilproj
index 48e36af7a6..9d4a545142 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest111/Generated111.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest111/Generated111.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1110/Generated1110.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1110/Generated1110.ilproj
index aec9ee3b3a..b74ade9ec7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1110/Generated1110.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1110/Generated1110.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1111/Generated1111.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1111/Generated1111.ilproj
index 1f11c542f9..f4910cc559 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1111/Generated1111.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1111/Generated1111.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1112/Generated1112.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1112/Generated1112.ilproj
index 5111a1b91f..093b41ea22 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1112/Generated1112.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1112/Generated1112.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1113/Generated1113.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1113/Generated1113.ilproj
index 2ea1eb1cd4..510003a7e5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1113/Generated1113.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1113/Generated1113.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1114/Generated1114.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1114/Generated1114.ilproj
index 54f0c556c1..73e4b83d0e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1114/Generated1114.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1114/Generated1114.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1115/Generated1115.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1115/Generated1115.ilproj
index 6b552441c7..c2f40fa362 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1115/Generated1115.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1115/Generated1115.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1116/Generated1116.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1116/Generated1116.ilproj
index 3b3d229b50..f0277e0249 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1116/Generated1116.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1116/Generated1116.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1117/Generated1117.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1117/Generated1117.ilproj
index 02ee6dbc6e..2f1d5df027 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1117/Generated1117.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1117/Generated1117.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1118/Generated1118.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1118/Generated1118.ilproj
index 134049ed29..2bd05478ad 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1118/Generated1118.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1118/Generated1118.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1119/Generated1119.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1119/Generated1119.ilproj
index a32288ef50..d55d42c846 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1119/Generated1119.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1119/Generated1119.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest112/Generated112.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest112/Generated112.ilproj
index d2613f78d2..dc4437c1c2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest112/Generated112.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest112/Generated112.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1120/Generated1120.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1120/Generated1120.ilproj
index 459d953990..58b1a46d58 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1120/Generated1120.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1120/Generated1120.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1121/Generated1121.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1121/Generated1121.ilproj
index e6df80e613..19a5426585 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1121/Generated1121.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1121/Generated1121.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1122/Generated1122.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1122/Generated1122.ilproj
index 50666b69a6..808dcb0dca 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1122/Generated1122.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1122/Generated1122.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1123/Generated1123.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1123/Generated1123.ilproj
index f18502acdc..9249652bff 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1123/Generated1123.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1123/Generated1123.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1124/Generated1124.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1124/Generated1124.ilproj
index bddade4546..dc99fbdbd3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1124/Generated1124.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1124/Generated1124.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1125/Generated1125.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1125/Generated1125.ilproj
index 72820015dd..b34c555c7f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1125/Generated1125.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1125/Generated1125.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1126/Generated1126.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1126/Generated1126.ilproj
index 4d599bf60c..28a7c8ae46 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1126/Generated1126.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1126/Generated1126.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1127/Generated1127.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1127/Generated1127.ilproj
index 1067c3f847..eb904a96c0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1127/Generated1127.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1127/Generated1127.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1128/Generated1128.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1128/Generated1128.ilproj
index 1936a210b2..9b73e8a3b8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1128/Generated1128.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1128/Generated1128.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1129/Generated1129.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1129/Generated1129.ilproj
index e8219dc6ab..71fe9068be 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1129/Generated1129.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1129/Generated1129.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest113/Generated113.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest113/Generated113.ilproj
index ed2e067d88..490bc80c52 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest113/Generated113.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest113/Generated113.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1130/Generated1130.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1130/Generated1130.ilproj
index 07352e0185..c5f9670ab1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1130/Generated1130.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1130/Generated1130.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1131/Generated1131.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1131/Generated1131.ilproj
index fb4527bf90..6b2fb3a872 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1131/Generated1131.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1131/Generated1131.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1132/Generated1132.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1132/Generated1132.ilproj
index bb2b876236..c253abafeb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1132/Generated1132.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1132/Generated1132.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1133/Generated1133.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1133/Generated1133.ilproj
index ec0fc9c7e4..31011955c1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1133/Generated1133.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1133/Generated1133.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1134/Generated1134.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1134/Generated1134.ilproj
index 1fb0f1ee86..9cb8f49b7a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1134/Generated1134.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1134/Generated1134.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1135/Generated1135.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1135/Generated1135.ilproj
index db6eacbad7..0710085e0a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1135/Generated1135.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1135/Generated1135.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1136/Generated1136.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1136/Generated1136.ilproj
index 85ae949791..1a11f1eefa 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1136/Generated1136.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1136/Generated1136.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1137/Generated1137.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1137/Generated1137.ilproj
index a09b4eb58e..860f81c102 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1137/Generated1137.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1137/Generated1137.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1138/Generated1138.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1138/Generated1138.ilproj
index f735654132..8b3c41c4af 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1138/Generated1138.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1138/Generated1138.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1139/Generated1139.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1139/Generated1139.ilproj
index 6e0f166d78..1f59184576 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1139/Generated1139.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1139/Generated1139.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest114/Generated114.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest114/Generated114.ilproj
index d13b33d424..f308bd78ea 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest114/Generated114.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest114/Generated114.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1140/Generated1140.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1140/Generated1140.ilproj
index ddcfa3dde6..888c5234c3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1140/Generated1140.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1140/Generated1140.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1141/Generated1141.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1141/Generated1141.ilproj
index 85398adee0..e2869a714c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1141/Generated1141.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1141/Generated1141.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1142/Generated1142.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1142/Generated1142.ilproj
index 4f5f33cffc..9667565a16 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1142/Generated1142.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1142/Generated1142.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1143/Generated1143.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1143/Generated1143.ilproj
index 4668627554..2e04f98da4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1143/Generated1143.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1143/Generated1143.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1144/Generated1144.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1144/Generated1144.ilproj
index a4d1abfa9d..05a4190fbb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1144/Generated1144.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1144/Generated1144.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1145/Generated1145.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1145/Generated1145.ilproj
index 71e4da716c..2336730de4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1145/Generated1145.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1145/Generated1145.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1146/Generated1146.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1146/Generated1146.ilproj
index 9095f80c80..c473d3fe12 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1146/Generated1146.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1146/Generated1146.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1147/Generated1147.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1147/Generated1147.ilproj
index f3ab098662..26fdd6de36 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1147/Generated1147.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1147/Generated1147.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1148/Generated1148.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1148/Generated1148.ilproj
index 97561b6485..14921dd858 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1148/Generated1148.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1148/Generated1148.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1149/Generated1149.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1149/Generated1149.ilproj
index 4806193473..95d619fb93 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1149/Generated1149.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1149/Generated1149.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest115/Generated115.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest115/Generated115.ilproj
index 2ec24b079b..bfedc1cd43 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest115/Generated115.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest115/Generated115.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1150/Generated1150.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1150/Generated1150.ilproj
index d583e37dfd..4250792ba0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1150/Generated1150.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1150/Generated1150.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1151/Generated1151.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1151/Generated1151.ilproj
index 74f74badb8..7374d61da7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1151/Generated1151.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1151/Generated1151.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1152/Generated1152.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1152/Generated1152.ilproj
index 045bcaf3cd..2bf6b61f3b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1152/Generated1152.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1152/Generated1152.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1153/Generated1153.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1153/Generated1153.ilproj
index 64f57513e0..920b822d85 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1153/Generated1153.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1153/Generated1153.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1154/Generated1154.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1154/Generated1154.ilproj
index 40804dc22a..44e3c74e33 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1154/Generated1154.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1154/Generated1154.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1155/Generated1155.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1155/Generated1155.ilproj
index 4886d44098..d5c049e274 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1155/Generated1155.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1155/Generated1155.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1156/Generated1156.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1156/Generated1156.ilproj
index 216b6c34c2..2e0ce73511 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1156/Generated1156.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1156/Generated1156.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1157/Generated1157.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1157/Generated1157.ilproj
index 1d75597934..c2c8805b71 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1157/Generated1157.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1157/Generated1157.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1158/Generated1158.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1158/Generated1158.ilproj
index e3a11fda65..d8aff1ae3d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1158/Generated1158.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1158/Generated1158.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1159/Generated1159.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1159/Generated1159.ilproj
index a82e6da8ea..50f1259a0d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1159/Generated1159.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1159/Generated1159.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest116/Generated116.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest116/Generated116.ilproj
index 40bb02a544..33a14bea20 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest116/Generated116.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest116/Generated116.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1160/Generated1160.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1160/Generated1160.ilproj
index e1184d0b58..6b404baa91 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1160/Generated1160.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1160/Generated1160.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1161/Generated1161.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1161/Generated1161.ilproj
index db9d47eb6e..b37eec959f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1161/Generated1161.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1161/Generated1161.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1162/Generated1162.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1162/Generated1162.ilproj
index 0a4a1504ab..c89843c7e8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1162/Generated1162.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1162/Generated1162.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1163/Generated1163.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1163/Generated1163.ilproj
index 657cfd85a1..c1a6917cdb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1163/Generated1163.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1163/Generated1163.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1164/Generated1164.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1164/Generated1164.ilproj
index 3f976199b9..f532e5762d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1164/Generated1164.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1164/Generated1164.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1165/Generated1165.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1165/Generated1165.ilproj
index 8d4bd857fb..0646062581 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1165/Generated1165.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1165/Generated1165.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1166/Generated1166.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1166/Generated1166.ilproj
index d3988c3085..3dc12bad12 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1166/Generated1166.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1166/Generated1166.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1167/Generated1167.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1167/Generated1167.ilproj
index 0076b00f59..542d138c46 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1167/Generated1167.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1167/Generated1167.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1168/Generated1168.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1168/Generated1168.ilproj
index 3c3167a12f..ea9352b329 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1168/Generated1168.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1168/Generated1168.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1169/Generated1169.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1169/Generated1169.ilproj
index 0d2faa55cc..5fbf90ca9e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1169/Generated1169.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1169/Generated1169.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest117/Generated117.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest117/Generated117.ilproj
index e79378621a..3fe5cde38b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest117/Generated117.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest117/Generated117.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1170/Generated1170.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1170/Generated1170.ilproj
index 456f7ae7e1..12c994b702 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1170/Generated1170.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1170/Generated1170.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1171/Generated1171.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1171/Generated1171.ilproj
index 2c6544377a..0553c0fec6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1171/Generated1171.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1171/Generated1171.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1172/Generated1172.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1172/Generated1172.ilproj
index 366868d9c1..997d9ce8ff 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1172/Generated1172.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1172/Generated1172.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1173/Generated1173.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1173/Generated1173.ilproj
index 65b92280f5..67bb46a7af 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1173/Generated1173.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1173/Generated1173.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1174/Generated1174.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1174/Generated1174.ilproj
index 472e897f9f..3e25ca7757 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1174/Generated1174.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1174/Generated1174.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1175/Generated1175.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1175/Generated1175.ilproj
index 804d5511ac..f257a9e68f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1175/Generated1175.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1175/Generated1175.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1176/Generated1176.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1176/Generated1176.ilproj
index ff193b3715..228042059b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1176/Generated1176.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1176/Generated1176.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1177/Generated1177.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1177/Generated1177.ilproj
index f63e3ebda0..fb6bdee2bb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1177/Generated1177.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1177/Generated1177.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1178/Generated1178.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1178/Generated1178.ilproj
index 59f17934e4..df1e82de27 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1178/Generated1178.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1178/Generated1178.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1179/Generated1179.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1179/Generated1179.ilproj
index 13e1284581..3f275cd14c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1179/Generated1179.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1179/Generated1179.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest118/Generated118.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest118/Generated118.ilproj
index 82bac6ee73..d487fbb475 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest118/Generated118.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest118/Generated118.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1180/Generated1180.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1180/Generated1180.ilproj
index 0bc436c35a..f82885a341 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1180/Generated1180.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1180/Generated1180.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1181/Generated1181.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1181/Generated1181.ilproj
index 11031e15b0..de63d751a0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1181/Generated1181.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1181/Generated1181.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1182/Generated1182.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1182/Generated1182.ilproj
index 23d703ea04..f4a0b2769b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1182/Generated1182.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1182/Generated1182.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1183/Generated1183.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1183/Generated1183.ilproj
index 4c448adc4e..5abc6b4b20 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1183/Generated1183.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1183/Generated1183.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1184/Generated1184.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1184/Generated1184.ilproj
index 20f2a9aebc..1456db0f62 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1184/Generated1184.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1184/Generated1184.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1185/Generated1185.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1185/Generated1185.ilproj
index c45e7a8898..d73ee45198 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1185/Generated1185.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1185/Generated1185.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1186/Generated1186.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1186/Generated1186.ilproj
index b49d018592..8646188298 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1186/Generated1186.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1186/Generated1186.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1187/Generated1187.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1187/Generated1187.ilproj
index 68c45fe9e8..a00cb1c297 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1187/Generated1187.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1187/Generated1187.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1188/Generated1188.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1188/Generated1188.ilproj
index 5f522dfa2b..d617048c19 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1188/Generated1188.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1188/Generated1188.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1189/Generated1189.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1189/Generated1189.ilproj
index 9f24de0e1a..3c2dc4a227 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1189/Generated1189.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1189/Generated1189.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest119/Generated119.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest119/Generated119.ilproj
index a2fe3f0a41..6750726c33 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest119/Generated119.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest119/Generated119.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1190/Generated1190.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1190/Generated1190.ilproj
index ac582c825a..24abda034d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1190/Generated1190.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1190/Generated1190.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1191/Generated1191.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1191/Generated1191.ilproj
index a3ef306fd9..a57a950d48 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1191/Generated1191.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1191/Generated1191.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1192/Generated1192.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1192/Generated1192.ilproj
index b231e6052d..0a70a9c840 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1192/Generated1192.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1192/Generated1192.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1193/Generated1193.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1193/Generated1193.ilproj
index a6815d62a2..f5375e8f77 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1193/Generated1193.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1193/Generated1193.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1194/Generated1194.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1194/Generated1194.ilproj
index d154bac66f..38e0c39673 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1194/Generated1194.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1194/Generated1194.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1195/Generated1195.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1195/Generated1195.ilproj
index 346b10c232..29eab5b648 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1195/Generated1195.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1195/Generated1195.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1196/Generated1196.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1196/Generated1196.ilproj
index 73e2a9b7de..bdfcd61a3d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1196/Generated1196.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1196/Generated1196.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1197/Generated1197.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1197/Generated1197.ilproj
index 18b66806dd..4f235ac3eb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1197/Generated1197.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1197/Generated1197.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1198/Generated1198.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1198/Generated1198.ilproj
index d0328c5cf9..e24aa6fba2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1198/Generated1198.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1198/Generated1198.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1199/Generated1199.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1199/Generated1199.ilproj
index f3418f1a0d..87768b4ad5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1199/Generated1199.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1199/Generated1199.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest12/Generated12.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest12/Generated12.ilproj
index b4b1a9a6ce..f308481713 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest12/Generated12.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest12/Generated12.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest120/Generated120.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest120/Generated120.ilproj
index d4fc01171f..39f7c90340 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest120/Generated120.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest120/Generated120.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1200/Generated1200.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1200/Generated1200.ilproj
index 233358abeb..246da8086a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1200/Generated1200.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1200/Generated1200.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1201/Generated1201.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1201/Generated1201.ilproj
index 3ba1da7ff5..45561722d0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1201/Generated1201.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1201/Generated1201.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1202/Generated1202.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1202/Generated1202.ilproj
index 0b866994db..f4cdae3940 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1202/Generated1202.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1202/Generated1202.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1203/Generated1203.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1203/Generated1203.ilproj
index c74bbaf850..945dbe84db 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1203/Generated1203.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1203/Generated1203.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1204/Generated1204.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1204/Generated1204.ilproj
index 81338b04f7..0b1665ee58 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1204/Generated1204.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1204/Generated1204.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1205/Generated1205.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1205/Generated1205.ilproj
index c5a52ed95e..96de550f33 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1205/Generated1205.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1205/Generated1205.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1206/Generated1206.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1206/Generated1206.ilproj
index bf3b412e80..7af154617e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1206/Generated1206.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1206/Generated1206.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1207/Generated1207.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1207/Generated1207.ilproj
index 3f983125f1..10324821d4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1207/Generated1207.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1207/Generated1207.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1208/Generated1208.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1208/Generated1208.ilproj
index 784aaa1ed7..86f1d47d46 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1208/Generated1208.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1208/Generated1208.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1209/Generated1209.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1209/Generated1209.ilproj
index 40df5335b6..00286b3276 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1209/Generated1209.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1209/Generated1209.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest121/Generated121.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest121/Generated121.ilproj
index f68daed776..9d0db84f9d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest121/Generated121.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest121/Generated121.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1210/Generated1210.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1210/Generated1210.ilproj
index 66c96fca38..dd4e02ea2e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1210/Generated1210.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1210/Generated1210.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1211/Generated1211.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1211/Generated1211.ilproj
index e57b0c4b5a..c45b901c0a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1211/Generated1211.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1211/Generated1211.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1212/Generated1212.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1212/Generated1212.ilproj
index 87588d9c7c..edd67af6ea 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1212/Generated1212.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1212/Generated1212.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1213/Generated1213.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1213/Generated1213.ilproj
index 22a3454ee2..1613b5c26d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1213/Generated1213.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1213/Generated1213.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1214/Generated1214.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1214/Generated1214.ilproj
index 57e11fe1d2..d6fde4d8fd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1214/Generated1214.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1214/Generated1214.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1215/Generated1215.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1215/Generated1215.ilproj
index ba4d3c4350..8d9f4518b0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1215/Generated1215.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1215/Generated1215.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1216/Generated1216.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1216/Generated1216.ilproj
index 26bdb8e982..f9496b30f8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1216/Generated1216.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1216/Generated1216.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1217/Generated1217.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1217/Generated1217.ilproj
index 0a363ffae8..3874c55527 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1217/Generated1217.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1217/Generated1217.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1218/Generated1218.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1218/Generated1218.ilproj
index ff398d13ae..3b4e234b49 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1218/Generated1218.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1218/Generated1218.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1219/Generated1219.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1219/Generated1219.ilproj
index 0d0d67243a..fc04f96d58 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1219/Generated1219.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1219/Generated1219.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest122/Generated122.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest122/Generated122.ilproj
index 29337f79ca..ac6cf21aa3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest122/Generated122.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest122/Generated122.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1220/Generated1220.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1220/Generated1220.ilproj
index 6b78ae0368..2a05228fd3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1220/Generated1220.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1220/Generated1220.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1221/Generated1221.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1221/Generated1221.ilproj
index 2f496ff968..9daf96adcb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1221/Generated1221.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1221/Generated1221.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1222/Generated1222.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1222/Generated1222.ilproj
index d20ed53acd..b838f720fc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1222/Generated1222.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1222/Generated1222.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1223/Generated1223.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1223/Generated1223.ilproj
index 71176959cb..fc78f92199 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1223/Generated1223.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1223/Generated1223.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1224/Generated1224.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1224/Generated1224.ilproj
index 7843cd3122..40d6936e97 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1224/Generated1224.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1224/Generated1224.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1225/Generated1225.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1225/Generated1225.ilproj
index d40a73b994..8081fcd619 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1225/Generated1225.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1225/Generated1225.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1226/Generated1226.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1226/Generated1226.ilproj
index 2b127f4915..cd7e3e0448 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1226/Generated1226.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1226/Generated1226.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1227/Generated1227.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1227/Generated1227.ilproj
index 96b2668217..c1d0378842 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1227/Generated1227.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1227/Generated1227.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1228/Generated1228.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1228/Generated1228.ilproj
index 53f58d97ca..e5bfd39be0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1228/Generated1228.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1228/Generated1228.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1229/Generated1229.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1229/Generated1229.ilproj
index da5fe88d33..ccc69e82a6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1229/Generated1229.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1229/Generated1229.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest123/Generated123.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest123/Generated123.ilproj
index 4274b3a451..6ef81beac6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest123/Generated123.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest123/Generated123.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1230/Generated1230.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1230/Generated1230.ilproj
index eb2e91a1e2..ffa285256d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1230/Generated1230.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1230/Generated1230.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1231/Generated1231.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1231/Generated1231.ilproj
index 91f1e1ce70..202f176593 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1231/Generated1231.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1231/Generated1231.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1232/Generated1232.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1232/Generated1232.ilproj
index 8d5df2e091..696e3924bf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1232/Generated1232.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1232/Generated1232.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1233/Generated1233.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1233/Generated1233.ilproj
index 559779a342..a6ce5a6565 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1233/Generated1233.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1233/Generated1233.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1234/Generated1234.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1234/Generated1234.ilproj
index 4910c3d759..0118a7c37e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1234/Generated1234.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1234/Generated1234.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1235/Generated1235.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1235/Generated1235.ilproj
index 9c081d6529..0662cc5a09 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1235/Generated1235.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1235/Generated1235.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1236/Generated1236.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1236/Generated1236.ilproj
index 04f951ad20..a51ad664a2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1236/Generated1236.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1236/Generated1236.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1237/Generated1237.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1237/Generated1237.ilproj
index 40db73304c..b3a3f1b867 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1237/Generated1237.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1237/Generated1237.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1238/Generated1238.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1238/Generated1238.ilproj
index 36946d1e9c..ae33d65349 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1238/Generated1238.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1238/Generated1238.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1239/Generated1239.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1239/Generated1239.ilproj
index 0e2c4d2501..77b0effd00 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1239/Generated1239.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1239/Generated1239.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest124/Generated124.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest124/Generated124.ilproj
index 413c12e62a..c72d7103ce 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest124/Generated124.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest124/Generated124.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1240/Generated1240.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1240/Generated1240.ilproj
index 66afb5f4a6..2a5112673c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1240/Generated1240.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1240/Generated1240.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1241/Generated1241.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1241/Generated1241.ilproj
index 43b0f1eafd..23ff7e5e2e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1241/Generated1241.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1241/Generated1241.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1242/Generated1242.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1242/Generated1242.ilproj
index a5a5c3c9b8..7aa35a2ec7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1242/Generated1242.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1242/Generated1242.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1243/Generated1243.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1243/Generated1243.ilproj
index 20d5019d8c..4922db694d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1243/Generated1243.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1243/Generated1243.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1244/Generated1244.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1244/Generated1244.ilproj
index 1794800ffb..b3913eeb0b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1244/Generated1244.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1244/Generated1244.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1245/Generated1245.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1245/Generated1245.ilproj
index 3f1b910686..8af880d770 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1245/Generated1245.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1245/Generated1245.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1246/Generated1246.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1246/Generated1246.ilproj
index 8b1b0b8730..915393d8f8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1246/Generated1246.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1246/Generated1246.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1247/Generated1247.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1247/Generated1247.ilproj
index 42c4be7890..d488eb2d48 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1247/Generated1247.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1247/Generated1247.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1248/Generated1248.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1248/Generated1248.ilproj
index ff47a3486f..b3195c103d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1248/Generated1248.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1248/Generated1248.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1249/Generated1249.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1249/Generated1249.ilproj
index f28d5b84fc..5a8b16f59f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1249/Generated1249.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1249/Generated1249.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest125/Generated125.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest125/Generated125.ilproj
index c3a7a35a9f..1ef9d22dc2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest125/Generated125.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest125/Generated125.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1250/Generated1250.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1250/Generated1250.ilproj
index 3139e918ba..b376cd327c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1250/Generated1250.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1250/Generated1250.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1251/Generated1251.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1251/Generated1251.ilproj
index 61702eadaf..abaa0df6eb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1251/Generated1251.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1251/Generated1251.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1252/Generated1252.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1252/Generated1252.ilproj
index a73cf0d61d..0b26cdc7a5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1252/Generated1252.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1252/Generated1252.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1253/Generated1253.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1253/Generated1253.ilproj
index 8d46d6f016..0740204c1e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1253/Generated1253.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1253/Generated1253.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1254/Generated1254.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1254/Generated1254.ilproj
index 1cfc2b981f..018f6f88e6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1254/Generated1254.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1254/Generated1254.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1255/Generated1255.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1255/Generated1255.ilproj
index 2671b8a449..772d7bb578 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1255/Generated1255.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1255/Generated1255.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1256/Generated1256.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1256/Generated1256.ilproj
index af97cb67ec..34c726fde3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1256/Generated1256.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1256/Generated1256.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1257/Generated1257.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1257/Generated1257.ilproj
index be4765c422..0a5ac23303 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1257/Generated1257.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1257/Generated1257.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1258/Generated1258.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1258/Generated1258.ilproj
index 56e89baab1..593ffa7147 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1258/Generated1258.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1258/Generated1258.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1259/Generated1259.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1259/Generated1259.ilproj
index 8b1dc68538..4a61e60efd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1259/Generated1259.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1259/Generated1259.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest126/Generated126.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest126/Generated126.ilproj
index 22bdbabf37..eaae27ffc8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest126/Generated126.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest126/Generated126.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1260/Generated1260.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1260/Generated1260.ilproj
index 24f1463709..2f49685691 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1260/Generated1260.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1260/Generated1260.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1261/Generated1261.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1261/Generated1261.ilproj
index 964faa0ea1..a491db9a71 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1261/Generated1261.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1261/Generated1261.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1262/Generated1262.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1262/Generated1262.ilproj
index 04652a2b6d..f4e61f6894 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1262/Generated1262.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1262/Generated1262.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1263/Generated1263.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1263/Generated1263.ilproj
index 839647a1ef..8165b8f41f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1263/Generated1263.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1263/Generated1263.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1264/Generated1264.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1264/Generated1264.ilproj
index 10726fd04e..4770c4f3d7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1264/Generated1264.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1264/Generated1264.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1265/Generated1265.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1265/Generated1265.ilproj
index 2910c3111e..4898d5d126 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1265/Generated1265.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1265/Generated1265.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1266/Generated1266.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1266/Generated1266.ilproj
index 31ba0cb4a1..37e6c2d731 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1266/Generated1266.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1266/Generated1266.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1267/Generated1267.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1267/Generated1267.ilproj
index 842a593a83..6315667c8d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1267/Generated1267.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1267/Generated1267.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1268/Generated1268.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1268/Generated1268.ilproj
index 928a9ed377..b18a23651a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1268/Generated1268.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1268/Generated1268.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1269/Generated1269.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1269/Generated1269.ilproj
index 7500839912..76a3c0802c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1269/Generated1269.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1269/Generated1269.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest127/Generated127.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest127/Generated127.ilproj
index 613fceb685..74c1a69cdb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest127/Generated127.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest127/Generated127.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1270/Generated1270.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1270/Generated1270.ilproj
index 8e50571f5e..fbe67775a3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1270/Generated1270.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1270/Generated1270.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1271/Generated1271.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1271/Generated1271.ilproj
index ba57dba8c4..3bc2f2a36c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1271/Generated1271.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1271/Generated1271.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1272/Generated1272.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1272/Generated1272.ilproj
index 3e9380ce23..726231c24d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1272/Generated1272.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1272/Generated1272.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1273/Generated1273.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1273/Generated1273.ilproj
index 5745900f44..7834bb3161 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1273/Generated1273.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1273/Generated1273.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1274/Generated1274.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1274/Generated1274.ilproj
index e510de7e42..1adef80d19 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1274/Generated1274.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1274/Generated1274.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1275/Generated1275.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1275/Generated1275.ilproj
index ce87e7ca71..15b2ec17f9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1275/Generated1275.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1275/Generated1275.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1276/Generated1276.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1276/Generated1276.ilproj
index 98a80e2a52..ec6f708ec1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1276/Generated1276.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1276/Generated1276.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1277/Generated1277.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1277/Generated1277.ilproj
index 7d923a29c1..984965dc62 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1277/Generated1277.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1277/Generated1277.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1278/Generated1278.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1278/Generated1278.ilproj
index acdeec2133..26fa6b74a5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1278/Generated1278.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1278/Generated1278.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1279/Generated1279.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1279/Generated1279.ilproj
index e68d429cd7..742d7d48ed 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1279/Generated1279.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1279/Generated1279.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest128/Generated128.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest128/Generated128.ilproj
index 7a25410c1d..a64c182119 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest128/Generated128.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest128/Generated128.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1280/Generated1280.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1280/Generated1280.ilproj
index 653ce76c80..a49f8a5ecc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1280/Generated1280.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1280/Generated1280.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1281/Generated1281.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1281/Generated1281.ilproj
index 6bcb78aa99..ba70f131d1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1281/Generated1281.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1281/Generated1281.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1282/Generated1282.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1282/Generated1282.ilproj
index d5c966b9ec..968354f185 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1282/Generated1282.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1282/Generated1282.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1283/Generated1283.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1283/Generated1283.ilproj
index 235ef81ffe..baa2c9295f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1283/Generated1283.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1283/Generated1283.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1284/Generated1284.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1284/Generated1284.ilproj
index fbb1f49a61..c5d95e096b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1284/Generated1284.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1284/Generated1284.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1285/Generated1285.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1285/Generated1285.ilproj
index 12d93bdbd7..6992ffdf9d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1285/Generated1285.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1285/Generated1285.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1286/Generated1286.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1286/Generated1286.ilproj
index 0f418b686f..a4a52b823e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1286/Generated1286.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1286/Generated1286.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1287/Generated1287.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1287/Generated1287.ilproj
index 44d1f5fba4..96abe26b4d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1287/Generated1287.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1287/Generated1287.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1288/Generated1288.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1288/Generated1288.ilproj
index d40a37dabd..bfa26d4007 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1288/Generated1288.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1288/Generated1288.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1289/Generated1289.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1289/Generated1289.ilproj
index c4695a9861..e9f5b198ca 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1289/Generated1289.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1289/Generated1289.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest129/Generated129.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest129/Generated129.ilproj
index cd533c90b3..5914c3e2da 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest129/Generated129.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest129/Generated129.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1290/Generated1290.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1290/Generated1290.ilproj
index 54838907d6..8e9795bfff 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1290/Generated1290.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1290/Generated1290.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1291/Generated1291.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1291/Generated1291.ilproj
index 1a73031796..04070b7ce3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1291/Generated1291.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1291/Generated1291.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1292/Generated1292.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1292/Generated1292.ilproj
index cdd6e00f3a..3c6d67b66e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1292/Generated1292.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1292/Generated1292.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1293/Generated1293.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1293/Generated1293.ilproj
index 51ec469041..1f611f9f66 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1293/Generated1293.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1293/Generated1293.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1294/Generated1294.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1294/Generated1294.ilproj
index 2e18a34bc7..0502733670 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1294/Generated1294.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1294/Generated1294.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1295/Generated1295.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1295/Generated1295.ilproj
index 132ae229d6..7046b713e0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1295/Generated1295.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1295/Generated1295.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1296/Generated1296.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1296/Generated1296.ilproj
index dfff235ecf..d2dec3413f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1296/Generated1296.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1296/Generated1296.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1297/Generated1297.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1297/Generated1297.ilproj
index 98c5d49c4e..0b790cfe88 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1297/Generated1297.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1297/Generated1297.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1298/Generated1298.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1298/Generated1298.ilproj
index 7e1dcfbfc8..e2428bf426 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1298/Generated1298.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1298/Generated1298.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1299/Generated1299.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1299/Generated1299.ilproj
index b9209b69cf..9c1c332a42 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1299/Generated1299.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1299/Generated1299.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest13/Generated13.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest13/Generated13.ilproj
index 31a878f886..d6f253bd76 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest13/Generated13.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest13/Generated13.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest130/Generated130.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest130/Generated130.ilproj
index db1422afab..bc4c01e8d3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest130/Generated130.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest130/Generated130.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1300/Generated1300.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1300/Generated1300.ilproj
index 48e0e8f572..953192a2bf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1300/Generated1300.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1300/Generated1300.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1301/Generated1301.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1301/Generated1301.ilproj
index 30bf60d9ba..d042b2e4be 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1301/Generated1301.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1301/Generated1301.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1302/Generated1302.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1302/Generated1302.ilproj
index d5c1832149..714da71415 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1302/Generated1302.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1302/Generated1302.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1303/Generated1303.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1303/Generated1303.ilproj
index f8a5cae589..c902fe61fc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1303/Generated1303.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1303/Generated1303.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1304/Generated1304.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1304/Generated1304.ilproj
index f65520aba4..219de5cdee 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1304/Generated1304.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1304/Generated1304.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1305/Generated1305.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1305/Generated1305.ilproj
index 61f5ef8c20..3043f1c399 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1305/Generated1305.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1305/Generated1305.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1306/Generated1306.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1306/Generated1306.ilproj
index 87230e97b2..c094e717bd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1306/Generated1306.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1306/Generated1306.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1307/Generated1307.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1307/Generated1307.ilproj
index 256ed5618b..5256884d2f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1307/Generated1307.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1307/Generated1307.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1308/Generated1308.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1308/Generated1308.ilproj
index 40f378bebe..36fea13557 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1308/Generated1308.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1308/Generated1308.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1309/Generated1309.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1309/Generated1309.ilproj
index 5e3ead5d49..c50705f56b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1309/Generated1309.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1309/Generated1309.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest131/Generated131.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest131/Generated131.ilproj
index 9fb02d222b..050babcd96 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest131/Generated131.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest131/Generated131.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1310/Generated1310.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1310/Generated1310.ilproj
index fb401d8479..a77d44e14e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1310/Generated1310.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1310/Generated1310.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1311/Generated1311.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1311/Generated1311.ilproj
index f37b73ccc7..92a5deb921 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1311/Generated1311.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1311/Generated1311.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1312/Generated1312.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1312/Generated1312.ilproj
index 6685fb58db..9d6af0748a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1312/Generated1312.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1312/Generated1312.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1313/Generated1313.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1313/Generated1313.ilproj
index dd248814f1..133757d881 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1313/Generated1313.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1313/Generated1313.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1314/Generated1314.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1314/Generated1314.ilproj
index 5dce219f6b..b54672fc3f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1314/Generated1314.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1314/Generated1314.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1315/Generated1315.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1315/Generated1315.ilproj
index c17f8f335c..655169f084 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1315/Generated1315.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1315/Generated1315.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1316/Generated1316.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1316/Generated1316.ilproj
index 2ce2e14787..d1517b3d22 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1316/Generated1316.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1316/Generated1316.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1317/Generated1317.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1317/Generated1317.ilproj
index 6d281c45bc..8c999bf7fd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1317/Generated1317.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1317/Generated1317.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1318/Generated1318.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1318/Generated1318.ilproj
index 26d58bb718..2e1a26cab2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1318/Generated1318.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1318/Generated1318.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1319/Generated1319.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1319/Generated1319.ilproj
index 744278d624..cb6d3912fe 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1319/Generated1319.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1319/Generated1319.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest132/Generated132.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest132/Generated132.ilproj
index 8e09f3bfb5..6871f651c4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest132/Generated132.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest132/Generated132.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1320/Generated1320.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1320/Generated1320.ilproj
index 1b0ecedfd1..e084b8f06e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1320/Generated1320.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1320/Generated1320.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1321/Generated1321.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1321/Generated1321.ilproj
index 00e603f9f4..4012fc2409 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1321/Generated1321.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1321/Generated1321.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1322/Generated1322.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1322/Generated1322.ilproj
index be8c1036c4..4f0ca9175f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1322/Generated1322.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1322/Generated1322.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1323/Generated1323.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1323/Generated1323.ilproj
index d0e7ae5138..7905fda407 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1323/Generated1323.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1323/Generated1323.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1324/Generated1324.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1324/Generated1324.ilproj
index ad54d255c2..4be48e08c2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1324/Generated1324.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1324/Generated1324.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1325/Generated1325.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1325/Generated1325.ilproj
index 8743df5b98..74630a09bf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1325/Generated1325.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1325/Generated1325.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1326/Generated1326.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1326/Generated1326.ilproj
index efb31cc094..786517f7e3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1326/Generated1326.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1326/Generated1326.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1327/Generated1327.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1327/Generated1327.ilproj
index b3282b8215..c2f4962a9c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1327/Generated1327.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1327/Generated1327.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1328/Generated1328.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1328/Generated1328.ilproj
index a3b49c9a0d..aac508e2b2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1328/Generated1328.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1328/Generated1328.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1329/Generated1329.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1329/Generated1329.ilproj
index 7f4cacb108..7fef042212 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1329/Generated1329.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1329/Generated1329.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest133/Generated133.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest133/Generated133.ilproj
index 8c65da0426..572b612177 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest133/Generated133.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest133/Generated133.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1330/Generated1330.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1330/Generated1330.ilproj
index bfaf1ee10e..349bba9db6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1330/Generated1330.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1330/Generated1330.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1331/Generated1331.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1331/Generated1331.ilproj
index 5a845e67fe..211f0a8edb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1331/Generated1331.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1331/Generated1331.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1332/Generated1332.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1332/Generated1332.ilproj
index e036e28524..dc4d9e6d0a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1332/Generated1332.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1332/Generated1332.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1333/Generated1333.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1333/Generated1333.ilproj
index b176585818..22d558b97c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1333/Generated1333.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1333/Generated1333.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1334/Generated1334.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1334/Generated1334.ilproj
index 49c7df24aa..2973982071 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1334/Generated1334.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1334/Generated1334.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1335/Generated1335.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1335/Generated1335.ilproj
index bec3e7356b..d5aa510172 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1335/Generated1335.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1335/Generated1335.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1336/Generated1336.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1336/Generated1336.ilproj
index 372852b1e1..3b23f18bd5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1336/Generated1336.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1336/Generated1336.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1337/Generated1337.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1337/Generated1337.ilproj
index 57899730d6..58fcf11731 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1337/Generated1337.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1337/Generated1337.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1338/Generated1338.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1338/Generated1338.ilproj
index 85ed5cdd55..d9c1dd667f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1338/Generated1338.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1338/Generated1338.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1339/Generated1339.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1339/Generated1339.ilproj
index 69adebf4da..19d57557b7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1339/Generated1339.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1339/Generated1339.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest134/Generated134.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest134/Generated134.ilproj
index 37cbd47178..0ca0bf4b9f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest134/Generated134.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest134/Generated134.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1340/Generated1340.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1340/Generated1340.ilproj
index a202665d01..23978b91a3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1340/Generated1340.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1340/Generated1340.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1341/Generated1341.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1341/Generated1341.ilproj
index ed428cc543..4f2ec87e6c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1341/Generated1341.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1341/Generated1341.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1342/Generated1342.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1342/Generated1342.ilproj
index 360886db94..d89df1c1e5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1342/Generated1342.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1342/Generated1342.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1343/Generated1343.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1343/Generated1343.ilproj
index b7ca6ee23b..00c381f69a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1343/Generated1343.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1343/Generated1343.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1344/Generated1344.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1344/Generated1344.ilproj
index 4c5c261761..3e0d057cac 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1344/Generated1344.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1344/Generated1344.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1345/Generated1345.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1345/Generated1345.ilproj
index e28ce63205..c94d7cbe52 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1345/Generated1345.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1345/Generated1345.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1346/Generated1346.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1346/Generated1346.ilproj
index 93309a1080..73c0ba2c2a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1346/Generated1346.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1346/Generated1346.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1347/Generated1347.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1347/Generated1347.ilproj
index b0607a3874..4e72a04585 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1347/Generated1347.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1347/Generated1347.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1348/Generated1348.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1348/Generated1348.ilproj
index eb96d6a718..aa4b5733fc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1348/Generated1348.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1348/Generated1348.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1349/Generated1349.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1349/Generated1349.ilproj
index fdce6dc617..0d8442248e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1349/Generated1349.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1349/Generated1349.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest135/Generated135.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest135/Generated135.ilproj
index 6792fe92bf..877c7d4d91 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest135/Generated135.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest135/Generated135.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1350/Generated1350.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1350/Generated1350.ilproj
index 9eebd398dc..6344f09afd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1350/Generated1350.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1350/Generated1350.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1351/Generated1351.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1351/Generated1351.ilproj
index 1f4b03df82..5da69e4918 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1351/Generated1351.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1351/Generated1351.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1352/Generated1352.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1352/Generated1352.ilproj
index f231e7f417..f2aef34398 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1352/Generated1352.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1352/Generated1352.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1353/Generated1353.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1353/Generated1353.ilproj
index 5e6cda0df1..949d4db6cd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1353/Generated1353.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1353/Generated1353.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1354/Generated1354.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1354/Generated1354.ilproj
index 3e2dc00e76..349e62d546 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1354/Generated1354.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1354/Generated1354.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1355/Generated1355.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1355/Generated1355.ilproj
index 3efdb9211f..552c0b3eed 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1355/Generated1355.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1355/Generated1355.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1356/Generated1356.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1356/Generated1356.ilproj
index 3a5bb95781..14de0f5081 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1356/Generated1356.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1356/Generated1356.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1357/Generated1357.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1357/Generated1357.ilproj
index 9e6846bd44..e9dfe515f2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1357/Generated1357.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1357/Generated1357.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1358/Generated1358.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1358/Generated1358.ilproj
index 9f8a598a25..7443d47f9c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1358/Generated1358.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1358/Generated1358.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1359/Generated1359.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1359/Generated1359.ilproj
index 023d1781c4..9ad0703533 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1359/Generated1359.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1359/Generated1359.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest136/Generated136.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest136/Generated136.ilproj
index 7bb953e730..7c304695ae 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest136/Generated136.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest136/Generated136.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1360/Generated1360.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1360/Generated1360.ilproj
index 80ec393ce6..332709a8ee 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1360/Generated1360.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1360/Generated1360.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1361/Generated1361.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1361/Generated1361.ilproj
index 7044661c8b..4599980f9e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1361/Generated1361.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1361/Generated1361.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1362/Generated1362.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1362/Generated1362.ilproj
index 859820a0a8..9c824acc3e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1362/Generated1362.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1362/Generated1362.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1363/Generated1363.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1363/Generated1363.ilproj
index 0dedb145f5..a16a483c39 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1363/Generated1363.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1363/Generated1363.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1364/Generated1364.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1364/Generated1364.ilproj
index 96afb64bfd..65621d3d4f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1364/Generated1364.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1364/Generated1364.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1365/Generated1365.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1365/Generated1365.ilproj
index 7ffbd5f745..8341d0c1dc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1365/Generated1365.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1365/Generated1365.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1366/Generated1366.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1366/Generated1366.ilproj
index 86e13ba6cd..1471cb40f7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1366/Generated1366.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1366/Generated1366.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1367/Generated1367.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1367/Generated1367.ilproj
index 3ab84ef93d..7e161ca8a0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1367/Generated1367.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1367/Generated1367.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1368/Generated1368.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1368/Generated1368.ilproj
index 425499db7a..827b986f69 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1368/Generated1368.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1368/Generated1368.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1369/Generated1369.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1369/Generated1369.ilproj
index f57ba1d958..458372329e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1369/Generated1369.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1369/Generated1369.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest137/Generated137.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest137/Generated137.ilproj
index 14151246c0..6afefadcef 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest137/Generated137.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest137/Generated137.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1370/Generated1370.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1370/Generated1370.ilproj
index 00e5524771..47e84bad5e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1370/Generated1370.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1370/Generated1370.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1371/Generated1371.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1371/Generated1371.ilproj
index 32099f979c..6a43ae4fe1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1371/Generated1371.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1371/Generated1371.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1372/Generated1372.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1372/Generated1372.ilproj
index 114aa86a60..f6e4c76a9a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1372/Generated1372.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1372/Generated1372.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1373/Generated1373.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1373/Generated1373.ilproj
index abdae2956f..f0d49c5b81 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1373/Generated1373.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1373/Generated1373.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1374/Generated1374.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1374/Generated1374.ilproj
index 8fc1332590..91ab67db4e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1374/Generated1374.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1374/Generated1374.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1375/Generated1375.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1375/Generated1375.ilproj
index 8b83606396..8f71ba8c8c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1375/Generated1375.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1375/Generated1375.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1376/Generated1376.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1376/Generated1376.ilproj
index 7bd13bcfba..665d52f8c1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1376/Generated1376.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1376/Generated1376.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1377/Generated1377.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1377/Generated1377.ilproj
index 460e107fd3..899dfb1707 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1377/Generated1377.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1377/Generated1377.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1378/Generated1378.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1378/Generated1378.ilproj
index 58a65f29d6..2eb869e050 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1378/Generated1378.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1378/Generated1378.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1379/Generated1379.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1379/Generated1379.ilproj
index e6fd3148bb..937ffbdb5e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1379/Generated1379.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1379/Generated1379.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest138/Generated138.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest138/Generated138.ilproj
index 79212fd344..8daeb9e748 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest138/Generated138.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest138/Generated138.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1380/Generated1380.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1380/Generated1380.ilproj
index 587830b848..2b5d397d22 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1380/Generated1380.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1380/Generated1380.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1381/Generated1381.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1381/Generated1381.ilproj
index 4fe05409a9..566f62f72d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1381/Generated1381.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1381/Generated1381.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1382/Generated1382.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1382/Generated1382.ilproj
index 9f84abd6d8..f13447a142 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1382/Generated1382.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1382/Generated1382.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1383/Generated1383.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1383/Generated1383.ilproj
index 9a63ade1ee..74cd288be8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1383/Generated1383.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1383/Generated1383.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1384/Generated1384.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1384/Generated1384.ilproj
index 3608573ebe..773f6c18d4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1384/Generated1384.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1384/Generated1384.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1385/Generated1385.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1385/Generated1385.ilproj
index 488bdafad4..7978ed0ec7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1385/Generated1385.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1385/Generated1385.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1386/Generated1386.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1386/Generated1386.ilproj
index 3a177d8511..28b0b4d83e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1386/Generated1386.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1386/Generated1386.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1387/Generated1387.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1387/Generated1387.ilproj
index dc17db1a2e..9e8f886245 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1387/Generated1387.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1387/Generated1387.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1388/Generated1388.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1388/Generated1388.ilproj
index 9c22c836f5..eac88fe698 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1388/Generated1388.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1388/Generated1388.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1389/Generated1389.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1389/Generated1389.ilproj
index b117cbb76c..6c8eb77b03 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1389/Generated1389.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1389/Generated1389.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest139/Generated139.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest139/Generated139.ilproj
index d41880ab5d..b58a43be39 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest139/Generated139.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest139/Generated139.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1390/Generated1390.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1390/Generated1390.ilproj
index 267e879848..bafef7a5e0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1390/Generated1390.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1390/Generated1390.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1391/Generated1391.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1391/Generated1391.ilproj
index 965c8d4540..1be348cceb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1391/Generated1391.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1391/Generated1391.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1392/Generated1392.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1392/Generated1392.ilproj
index 1f5b9a97a5..fa0c682402 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1392/Generated1392.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1392/Generated1392.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1393/Generated1393.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1393/Generated1393.ilproj
index 776cd1cacc..ec1c19e6fa 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1393/Generated1393.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1393/Generated1393.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1394/Generated1394.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1394/Generated1394.ilproj
index 2b172b614d..790bc66d17 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1394/Generated1394.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1394/Generated1394.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1395/Generated1395.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1395/Generated1395.ilproj
index 5ff4eeb1eb..75becdb06f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1395/Generated1395.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1395/Generated1395.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1396/Generated1396.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1396/Generated1396.ilproj
index 88ddbd443f..09df4c25c1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1396/Generated1396.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1396/Generated1396.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1397/Generated1397.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1397/Generated1397.ilproj
index 2cf89b0f00..eb533817f4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1397/Generated1397.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1397/Generated1397.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1398/Generated1398.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1398/Generated1398.ilproj
index e9c096c6ed..4429112ffb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1398/Generated1398.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1398/Generated1398.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1399/Generated1399.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1399/Generated1399.ilproj
index 33e145a6d5..68ed46bcfb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1399/Generated1399.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1399/Generated1399.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest14/Generated14.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest14/Generated14.ilproj
index 089c411cd0..15a03077fc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest14/Generated14.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest14/Generated14.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest140/Generated140.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest140/Generated140.ilproj
index 583b1826b5..3c0443c701 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest140/Generated140.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest140/Generated140.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1400/Generated1400.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1400/Generated1400.ilproj
index 9d66d72f4a..44e1905915 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1400/Generated1400.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1400/Generated1400.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1401/Generated1401.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1401/Generated1401.ilproj
index 0408d4814c..9e2b3c11cf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1401/Generated1401.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1401/Generated1401.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1402/Generated1402.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1402/Generated1402.ilproj
index abdf434043..9c29c41a13 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1402/Generated1402.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1402/Generated1402.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1403/Generated1403.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1403/Generated1403.ilproj
index ce1f5363c1..ae99976d05 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1403/Generated1403.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1403/Generated1403.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1404/Generated1404.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1404/Generated1404.ilproj
index d0078208c2..f52ec8546e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1404/Generated1404.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1404/Generated1404.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1405/Generated1405.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1405/Generated1405.ilproj
index a23c6a965b..1cac6c97b6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1405/Generated1405.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1405/Generated1405.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1406/Generated1406.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1406/Generated1406.ilproj
index 6b0520a371..519a500b2f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1406/Generated1406.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1406/Generated1406.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1407/Generated1407.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1407/Generated1407.ilproj
index baf84b9bef..2a2dd58ec9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1407/Generated1407.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1407/Generated1407.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1408/Generated1408.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1408/Generated1408.ilproj
index 21d8e16cb2..54ca731a18 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1408/Generated1408.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1408/Generated1408.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1409/Generated1409.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1409/Generated1409.ilproj
index b51bd75213..65f9e942fd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1409/Generated1409.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1409/Generated1409.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest141/Generated141.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest141/Generated141.ilproj
index 87f7557214..cc8005077a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest141/Generated141.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest141/Generated141.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1410/Generated1410.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1410/Generated1410.ilproj
index a7bcd4f39b..9ebe0bfa45 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1410/Generated1410.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1410/Generated1410.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1411/Generated1411.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1411/Generated1411.ilproj
index cd73108aef..ed0e319927 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1411/Generated1411.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1411/Generated1411.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1412/Generated1412.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1412/Generated1412.ilproj
index 02199ffaea..43622c7d84 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1412/Generated1412.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1412/Generated1412.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1413/Generated1413.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1413/Generated1413.ilproj
index 4cb4b60f78..0063a4bd8a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1413/Generated1413.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1413/Generated1413.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1414/Generated1414.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1414/Generated1414.ilproj
index cda27c8ffe..d1476939eb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1414/Generated1414.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1414/Generated1414.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1415/Generated1415.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1415/Generated1415.ilproj
index b8e15b7689..fe1c79fac2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1415/Generated1415.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1415/Generated1415.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1416/Generated1416.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1416/Generated1416.ilproj
index 8c270a53dc..8cd8a4e92d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1416/Generated1416.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1416/Generated1416.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1417/Generated1417.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1417/Generated1417.ilproj
index 75db30ec46..f083149071 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1417/Generated1417.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1417/Generated1417.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1418/Generated1418.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1418/Generated1418.ilproj
index 41c4630407..40e1f36933 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1418/Generated1418.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1418/Generated1418.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1419/Generated1419.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1419/Generated1419.ilproj
index a02f33b93c..de288b06a7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1419/Generated1419.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1419/Generated1419.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest142/Generated142.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest142/Generated142.ilproj
index f8595c49dd..148e7607cd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest142/Generated142.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest142/Generated142.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1420/Generated1420.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1420/Generated1420.ilproj
index 6478571e27..834fbe02aa 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1420/Generated1420.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1420/Generated1420.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1421/Generated1421.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1421/Generated1421.ilproj
index 835c8250c7..3be5e0da32 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1421/Generated1421.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1421/Generated1421.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1422/Generated1422.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1422/Generated1422.ilproj
index b058dbc66e..68e092bf1d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1422/Generated1422.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1422/Generated1422.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1423/Generated1423.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1423/Generated1423.ilproj
index 776a7cf2fd..b1cae34a63 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1423/Generated1423.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1423/Generated1423.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1424/Generated1424.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1424/Generated1424.ilproj
index 7548087522..f9024e3fbb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1424/Generated1424.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1424/Generated1424.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1425/Generated1425.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1425/Generated1425.ilproj
index 0ec57fb87c..2a03978a84 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1425/Generated1425.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1425/Generated1425.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1426/Generated1426.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1426/Generated1426.ilproj
index 050ba3b9e2..78cc6911a4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1426/Generated1426.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1426/Generated1426.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1427/Generated1427.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1427/Generated1427.ilproj
index dff224addc..d3aaf449ea 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1427/Generated1427.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1427/Generated1427.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1428/Generated1428.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1428/Generated1428.ilproj
index 4060c542b4..ce7f92b742 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1428/Generated1428.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1428/Generated1428.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1429/Generated1429.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1429/Generated1429.ilproj
index 443a63ab89..b283280216 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1429/Generated1429.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1429/Generated1429.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest143/Generated143.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest143/Generated143.ilproj
index dda6c4c50c..6d87a5b2e4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest143/Generated143.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest143/Generated143.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1430/Generated1430.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1430/Generated1430.ilproj
index 453c77326a..f3778e9f21 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1430/Generated1430.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1430/Generated1430.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1431/Generated1431.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1431/Generated1431.ilproj
index 0e0dc71e9e..421226a294 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1431/Generated1431.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1431/Generated1431.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1432/Generated1432.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1432/Generated1432.ilproj
index 5459bc318d..c249974c0d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1432/Generated1432.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1432/Generated1432.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1433/Generated1433.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1433/Generated1433.ilproj
index c5aec790d9..00dd82e31d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1433/Generated1433.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1433/Generated1433.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1434/Generated1434.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1434/Generated1434.ilproj
index 069edd5149..96e88b6cfd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1434/Generated1434.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1434/Generated1434.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1435/Generated1435.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1435/Generated1435.ilproj
index f29c994775..c7f57cffe7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1435/Generated1435.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1435/Generated1435.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1436/Generated1436.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1436/Generated1436.ilproj
index ea724021fd..17b800ccde 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1436/Generated1436.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1436/Generated1436.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1437/Generated1437.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1437/Generated1437.ilproj
index dc3dcfc906..7b8912164a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1437/Generated1437.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1437/Generated1437.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1438/Generated1438.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1438/Generated1438.ilproj
index 4aa59d67f4..39f3c1ce04 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1438/Generated1438.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1438/Generated1438.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1439/Generated1439.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1439/Generated1439.ilproj
index 39d25186b1..100b53f5c5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1439/Generated1439.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1439/Generated1439.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest144/Generated144.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest144/Generated144.ilproj
index df592b1652..c0b237ccb5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest144/Generated144.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest144/Generated144.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1440/Generated1440.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1440/Generated1440.ilproj
index 34aa9ecdfe..22616f04b1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1440/Generated1440.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1440/Generated1440.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1441/Generated1441.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1441/Generated1441.ilproj
index 6fe644548d..190b99367e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1441/Generated1441.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1441/Generated1441.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1442/Generated1442.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1442/Generated1442.ilproj
index d4f536229f..0fdbf9f933 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1442/Generated1442.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1442/Generated1442.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1443/Generated1443.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1443/Generated1443.ilproj
index 9d52e3a42e..45c639ec78 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1443/Generated1443.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1443/Generated1443.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1444/Generated1444.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1444/Generated1444.ilproj
index 42ceabf289..071d513bcb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1444/Generated1444.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1444/Generated1444.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1445/Generated1445.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1445/Generated1445.ilproj
index fa41116c3d..4aaaa11923 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1445/Generated1445.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1445/Generated1445.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1446/Generated1446.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1446/Generated1446.ilproj
index e33de321bc..3ca918254c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1446/Generated1446.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1446/Generated1446.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1447/Generated1447.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1447/Generated1447.ilproj
index b9eed8385e..d96e2befb5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1447/Generated1447.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1447/Generated1447.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1448/Generated1448.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1448/Generated1448.ilproj
index 41faf588f5..7049edcaba 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1448/Generated1448.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1448/Generated1448.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1449/Generated1449.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1449/Generated1449.ilproj
index 5f9f59eaad..7e24b2f116 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1449/Generated1449.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1449/Generated1449.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest145/Generated145.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest145/Generated145.ilproj
index 9e2448da6c..3d3eb113e5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest145/Generated145.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest145/Generated145.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1450/Generated1450.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1450/Generated1450.ilproj
index 8ba129c620..2861cf6374 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1450/Generated1450.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1450/Generated1450.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1451/Generated1451.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1451/Generated1451.ilproj
index 3ec16d4eea..960cf01962 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1451/Generated1451.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1451/Generated1451.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1452/Generated1452.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1452/Generated1452.ilproj
index 96327497cf..d7a52d8510 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1452/Generated1452.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1452/Generated1452.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1453/Generated1453.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1453/Generated1453.ilproj
index 4894798b03..971b3b3177 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1453/Generated1453.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1453/Generated1453.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1454/Generated1454.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1454/Generated1454.ilproj
index d180d465f8..d31fc582bd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1454/Generated1454.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1454/Generated1454.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1455/Generated1455.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1455/Generated1455.ilproj
index ae71aeab8e..1d7edcea63 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1455/Generated1455.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1455/Generated1455.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1456/Generated1456.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1456/Generated1456.ilproj
index e9a9f7d9d8..595beaa416 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1456/Generated1456.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1456/Generated1456.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1457/Generated1457.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1457/Generated1457.ilproj
index 06ecab51f1..4a37a998a7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1457/Generated1457.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1457/Generated1457.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1458/Generated1458.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1458/Generated1458.ilproj
index 176587fd3b..0b1bbcc6a5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1458/Generated1458.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1458/Generated1458.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1459/Generated1459.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1459/Generated1459.ilproj
index 4c53829f74..4e05d01064 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1459/Generated1459.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1459/Generated1459.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest146/Generated146.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest146/Generated146.ilproj
index eec633b7cd..f3b06f313b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest146/Generated146.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest146/Generated146.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1460/Generated1460.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1460/Generated1460.ilproj
index 5c086adfde..4bfa4fb734 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1460/Generated1460.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1460/Generated1460.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1461/Generated1461.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1461/Generated1461.ilproj
index 4895be5bf0..8f672b88ce 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1461/Generated1461.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1461/Generated1461.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1462/Generated1462.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1462/Generated1462.ilproj
index f1f3707119..b8ad12edfb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1462/Generated1462.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1462/Generated1462.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1463/Generated1463.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1463/Generated1463.ilproj
index 2fe8cfedb3..fc318ec372 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1463/Generated1463.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1463/Generated1463.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1464/Generated1464.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1464/Generated1464.ilproj
index ed9261a682..810809723d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1464/Generated1464.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1464/Generated1464.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1465/Generated1465.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1465/Generated1465.ilproj
index 5b1a7163fa..8ef33229cd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1465/Generated1465.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1465/Generated1465.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1466/Generated1466.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1466/Generated1466.ilproj
index 265f2465c3..68c4fe47e6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1466/Generated1466.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1466/Generated1466.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1467/Generated1467.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1467/Generated1467.ilproj
index 4b656b0666..6f63fef6c2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1467/Generated1467.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1467/Generated1467.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1468/Generated1468.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1468/Generated1468.ilproj
index e173606521..3ac9b28dc1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1468/Generated1468.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1468/Generated1468.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1469/Generated1469.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1469/Generated1469.ilproj
index 00c5543470..f2e2e09b56 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1469/Generated1469.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1469/Generated1469.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest147/Generated147.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest147/Generated147.ilproj
index ce086a96ee..4dea4b427d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest147/Generated147.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest147/Generated147.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1470/Generated1470.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1470/Generated1470.ilproj
index 63726549bf..5098dc517a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1470/Generated1470.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1470/Generated1470.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1471/Generated1471.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1471/Generated1471.ilproj
index 294f5b3d9d..d06fce882d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1471/Generated1471.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1471/Generated1471.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1472/Generated1472.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1472/Generated1472.ilproj
index 694f32ad2f..e105dc53d5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1472/Generated1472.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1472/Generated1472.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1473/Generated1473.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1473/Generated1473.ilproj
index 5c35df4d87..0248fae56b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1473/Generated1473.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1473/Generated1473.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1474/Generated1474.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1474/Generated1474.ilproj
index 9135c19ddd..597e44fdd3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1474/Generated1474.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1474/Generated1474.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1475/Generated1475.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1475/Generated1475.ilproj
index 7d79082e1c..d06fb9ec5b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1475/Generated1475.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1475/Generated1475.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1476/Generated1476.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1476/Generated1476.ilproj
index 02a4a8b516..1b350dff19 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1476/Generated1476.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1476/Generated1476.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1477/Generated1477.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1477/Generated1477.ilproj
index 8ead9ba919..9842aded2d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1477/Generated1477.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1477/Generated1477.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1478/Generated1478.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1478/Generated1478.ilproj
index d1d66d6d8f..0e2c9cd493 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1478/Generated1478.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1478/Generated1478.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1479/Generated1479.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1479/Generated1479.ilproj
index 2de7437e12..e0d0f0f2f0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1479/Generated1479.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1479/Generated1479.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest148/Generated148.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest148/Generated148.ilproj
index 9690a94de4..3145ceff36 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest148/Generated148.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest148/Generated148.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1480/Generated1480.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1480/Generated1480.ilproj
index 05a2c9b5d6..353581a6b8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1480/Generated1480.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1480/Generated1480.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1481/Generated1481.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1481/Generated1481.ilproj
index 4dcb76c7e8..7718e1ff8d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1481/Generated1481.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1481/Generated1481.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1482/Generated1482.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1482/Generated1482.ilproj
index bd2906aef8..f708664e8c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1482/Generated1482.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1482/Generated1482.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1483/Generated1483.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1483/Generated1483.ilproj
index 379a697917..cb58bb41fe 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1483/Generated1483.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1483/Generated1483.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1484/Generated1484.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1484/Generated1484.ilproj
index 54b4f1d91c..e0e819438b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1484/Generated1484.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1484/Generated1484.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1485/Generated1485.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1485/Generated1485.ilproj
index 96b67a57c0..05fb0118d4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1485/Generated1485.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1485/Generated1485.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1486/Generated1486.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1486/Generated1486.ilproj
index 6b781e2bef..bc943acf09 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1486/Generated1486.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1486/Generated1486.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1487/Generated1487.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1487/Generated1487.ilproj
index 493bf83cbc..0147c83182 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1487/Generated1487.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1487/Generated1487.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1488/Generated1488.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1488/Generated1488.ilproj
index 4ee21d3a04..ed1c9c14ea 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1488/Generated1488.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1488/Generated1488.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1489/Generated1489.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1489/Generated1489.ilproj
index 8e260157ad..3f27bd595a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1489/Generated1489.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1489/Generated1489.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest149/Generated149.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest149/Generated149.ilproj
index 3222fa093d..f160935be8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest149/Generated149.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest149/Generated149.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1490/Generated1490.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1490/Generated1490.ilproj
index 23b197a785..971dda1aa7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1490/Generated1490.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1490/Generated1490.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1491/Generated1491.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1491/Generated1491.ilproj
index d484ffab90..5caa59e0ef 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1491/Generated1491.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1491/Generated1491.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1492/Generated1492.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1492/Generated1492.ilproj
index 1ae03ed755..272aa6d12a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1492/Generated1492.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1492/Generated1492.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1493/Generated1493.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1493/Generated1493.ilproj
index 2442ec8356..dec451f76b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1493/Generated1493.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1493/Generated1493.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1494/Generated1494.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1494/Generated1494.ilproj
index af9b6259ba..bd8370cc87 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1494/Generated1494.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1494/Generated1494.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1495/Generated1495.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1495/Generated1495.ilproj
index f95f32e03e..6f591e1421 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1495/Generated1495.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1495/Generated1495.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1496/Generated1496.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1496/Generated1496.ilproj
index 0e742b6589..bb68bdb3ee 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1496/Generated1496.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1496/Generated1496.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1497/Generated1497.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1497/Generated1497.ilproj
index 233b5e6213..80a38bf651 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1497/Generated1497.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1497/Generated1497.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1498/Generated1498.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1498/Generated1498.ilproj
index 412e88c986..2bb25b2e09 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1498/Generated1498.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1498/Generated1498.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1499/Generated1499.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1499/Generated1499.ilproj
index b85c84d5c0..528854db70 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1499/Generated1499.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1499/Generated1499.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest15/Generated15.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest15/Generated15.ilproj
index e34e851f34..e3fd3358a6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest15/Generated15.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest15/Generated15.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest150/Generated150.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest150/Generated150.ilproj
index 5a7d417fa7..16bd996f40 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest150/Generated150.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest150/Generated150.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1500/Generated1500.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1500/Generated1500.ilproj
index 98b77089c3..8bb74d89e0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1500/Generated1500.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest1500/Generated1500.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest151/Generated151.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest151/Generated151.ilproj
index 1253138953..10b8ecea3c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest151/Generated151.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest151/Generated151.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest152/Generated152.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest152/Generated152.ilproj
index 4bb7466c2f..f2983f803d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest152/Generated152.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest152/Generated152.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest153/Generated153.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest153/Generated153.ilproj
index e22bc685cd..57717ddb73 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest153/Generated153.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest153/Generated153.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest154/Generated154.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest154/Generated154.ilproj
index b2ed2517bb..02e7cafde3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest154/Generated154.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest154/Generated154.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest155/Generated155.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest155/Generated155.ilproj
index e8f02eb899..d892310ce9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest155/Generated155.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest155/Generated155.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest156/Generated156.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest156/Generated156.ilproj
index 6ffce96a44..171bfa2864 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest156/Generated156.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest156/Generated156.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest157/Generated157.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest157/Generated157.ilproj
index 30e5643d0b..e51dd8bad0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest157/Generated157.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest157/Generated157.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest158/Generated158.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest158/Generated158.ilproj
index 63f9a0b439..a2a9644e5d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest158/Generated158.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest158/Generated158.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest159/Generated159.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest159/Generated159.ilproj
index 35a3c59d17..0ea9e480f2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest159/Generated159.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest159/Generated159.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest16/Generated16.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest16/Generated16.ilproj
index 7dfe107890..af74c5af04 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest16/Generated16.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest16/Generated16.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest160/Generated160.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest160/Generated160.ilproj
index 28d6e929d5..2bbb5e15dd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest160/Generated160.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest160/Generated160.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest161/Generated161.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest161/Generated161.ilproj
index 75305a42f8..77045a4d65 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest161/Generated161.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest161/Generated161.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest162/Generated162.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest162/Generated162.ilproj
index bb0bfe3ab1..ca44a2aeb9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest162/Generated162.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest162/Generated162.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest163/Generated163.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest163/Generated163.ilproj
index 1f35613607..587e021544 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest163/Generated163.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest163/Generated163.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest164/Generated164.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest164/Generated164.ilproj
index 56d2c378cb..744b63646a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest164/Generated164.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest164/Generated164.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest165/Generated165.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest165/Generated165.ilproj
index 77ef53d049..61532bb309 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest165/Generated165.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest165/Generated165.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest166/Generated166.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest166/Generated166.ilproj
index 2334f9ecdf..36548b74ac 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest166/Generated166.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest166/Generated166.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest167/Generated167.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest167/Generated167.ilproj
index 6cbb97f39c..02f6de8faf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest167/Generated167.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest167/Generated167.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest168/Generated168.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest168/Generated168.ilproj
index 7fe869d55e..f91b47b967 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest168/Generated168.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest168/Generated168.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest169/Generated169.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest169/Generated169.ilproj
index 6fc7a6d299..1122944b72 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest169/Generated169.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest169/Generated169.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest17/Generated17.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest17/Generated17.ilproj
index 141013913b..52bd1341f9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest17/Generated17.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest17/Generated17.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest170/Generated170.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest170/Generated170.ilproj
index 41dc80ee10..865df96801 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest170/Generated170.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest170/Generated170.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest171/Generated171.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest171/Generated171.ilproj
index 014574c1f1..2f5e2d3bfa 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest171/Generated171.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest171/Generated171.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest172/Generated172.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest172/Generated172.ilproj
index 2329f87110..b74a048d88 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest172/Generated172.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest172/Generated172.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest173/Generated173.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest173/Generated173.ilproj
index 2b013abd0c..f8d855f933 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest173/Generated173.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest173/Generated173.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest174/Generated174.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest174/Generated174.ilproj
index 4e7d97aacc..e6c119ef4d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest174/Generated174.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest174/Generated174.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest175/Generated175.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest175/Generated175.ilproj
index 11a711f061..5dbafa7cfc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest175/Generated175.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest175/Generated175.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest176/Generated176.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest176/Generated176.ilproj
index 98a9d86a2d..ccad5abf67 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest176/Generated176.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest176/Generated176.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest177/Generated177.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest177/Generated177.ilproj
index e0114f0655..7f34630552 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest177/Generated177.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest177/Generated177.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest178/Generated178.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest178/Generated178.ilproj
index f40ec0d35f..ae0e2a126c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest178/Generated178.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest178/Generated178.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest179/Generated179.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest179/Generated179.ilproj
index 09670c4694..55b8b60917 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest179/Generated179.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest179/Generated179.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest18/Generated18.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest18/Generated18.ilproj
index 64e517512b..c2ee6c7c0e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest18/Generated18.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest18/Generated18.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest180/Generated180.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest180/Generated180.ilproj
index 94d04a3280..e8e42521b0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest180/Generated180.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest180/Generated180.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest181/Generated181.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest181/Generated181.ilproj
index 35377be85b..273a128098 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest181/Generated181.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest181/Generated181.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest182/Generated182.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest182/Generated182.ilproj
index db72504098..c1c5f90fee 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest182/Generated182.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest182/Generated182.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest183/Generated183.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest183/Generated183.ilproj
index 62643e17ea..6e232fa308 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest183/Generated183.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest183/Generated183.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest184/Generated184.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest184/Generated184.ilproj
index c7f7e1f6fd..71783ca1e0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest184/Generated184.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest184/Generated184.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest185/Generated185.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest185/Generated185.ilproj
index df5417e1bc..7ca5a6724a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest185/Generated185.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest185/Generated185.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest186/Generated186.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest186/Generated186.ilproj
index 6afffcb174..905c578454 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest186/Generated186.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest186/Generated186.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest187/Generated187.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest187/Generated187.ilproj
index 0065671713..9374b15b6e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest187/Generated187.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest187/Generated187.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest188/Generated188.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest188/Generated188.ilproj
index 20fa39f910..91e191cfd9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest188/Generated188.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest188/Generated188.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest189/Generated189.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest189/Generated189.ilproj
index a7b725a54b..81806154c1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest189/Generated189.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest189/Generated189.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest19/Generated19.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest19/Generated19.ilproj
index 65543c33bf..dc835ebd3a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest19/Generated19.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest19/Generated19.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest190/Generated190.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest190/Generated190.ilproj
index b7aa8b46e5..af640e0b32 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest190/Generated190.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest190/Generated190.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest191/Generated191.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest191/Generated191.ilproj
index fdb99ac02c..a3258f8475 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest191/Generated191.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest191/Generated191.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest192/Generated192.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest192/Generated192.ilproj
index efb0c4ae28..4f56e1adb2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest192/Generated192.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest192/Generated192.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest193/Generated193.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest193/Generated193.ilproj
index 7dc63c2648..5a62d5169a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest193/Generated193.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest193/Generated193.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest194/Generated194.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest194/Generated194.ilproj
index d19598c26e..a06505ef19 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest194/Generated194.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest194/Generated194.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest195/Generated195.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest195/Generated195.ilproj
index 7d5a49d0fa..302b35e1c0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest195/Generated195.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest195/Generated195.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest196/Generated196.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest196/Generated196.ilproj
index a5bc2dc306..0be265fbb1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest196/Generated196.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest196/Generated196.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest197/Generated197.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest197/Generated197.ilproj
index 336d86d51f..fe396fed13 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest197/Generated197.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest197/Generated197.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest198/Generated198.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest198/Generated198.ilproj
index 69e1cb5e33..03cb147382 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest198/Generated198.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest198/Generated198.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest199/Generated199.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest199/Generated199.ilproj
index 9165fc8f30..c84316c23e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest199/Generated199.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest199/Generated199.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest2/Generated2.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest2/Generated2.ilproj
index 65ef2f4bae..c73d51ed61 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest2/Generated2.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest2/Generated2.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest20/Generated20.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest20/Generated20.ilproj
index a4e82c529c..7bb9c59ddb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest20/Generated20.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest20/Generated20.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest200/Generated200.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest200/Generated200.ilproj
index 0982afca78..4be476a1ba 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest200/Generated200.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest200/Generated200.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest201/Generated201.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest201/Generated201.ilproj
index 1514ef768a..7b34d7ab5f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest201/Generated201.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest201/Generated201.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest202/Generated202.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest202/Generated202.ilproj
index 2ec4a0c9b2..536ef42d1e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest202/Generated202.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest202/Generated202.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest203/Generated203.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest203/Generated203.ilproj
index cc556793a7..90e2d1f4ad 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest203/Generated203.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest203/Generated203.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest204/Generated204.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest204/Generated204.ilproj
index f90610faf8..ac8c8186ca 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest204/Generated204.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest204/Generated204.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest205/Generated205.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest205/Generated205.ilproj
index 0772937210..54fc8ae312 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest205/Generated205.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest205/Generated205.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest206/Generated206.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest206/Generated206.ilproj
index ae6c8db717..54c19d0a7a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest206/Generated206.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest206/Generated206.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest207/Generated207.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest207/Generated207.ilproj
index c4b1e05925..38ca070d49 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest207/Generated207.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest207/Generated207.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest208/Generated208.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest208/Generated208.ilproj
index bd1423456f..cd969168b7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest208/Generated208.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest208/Generated208.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest209/Generated209.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest209/Generated209.ilproj
index 9aa61090cc..ddf1e4fcb8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest209/Generated209.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest209/Generated209.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest21/Generated21.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest21/Generated21.ilproj
index f802826553..59996217e5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest21/Generated21.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest21/Generated21.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest210/Generated210.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest210/Generated210.ilproj
index 021b44deaa..268cd0924f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest210/Generated210.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest210/Generated210.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest211/Generated211.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest211/Generated211.ilproj
index 5bbb589ad4..00fc9f5646 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest211/Generated211.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest211/Generated211.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest212/Generated212.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest212/Generated212.ilproj
index ca45a22c07..8401d0caad 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest212/Generated212.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest212/Generated212.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest213/Generated213.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest213/Generated213.ilproj
index 20ed8f988a..f538cd9508 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest213/Generated213.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest213/Generated213.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest214/Generated214.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest214/Generated214.ilproj
index bc6c76da41..516a7a5325 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest214/Generated214.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest214/Generated214.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest215/Generated215.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest215/Generated215.ilproj
index 951f1586cc..f5cb25151d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest215/Generated215.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest215/Generated215.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest216/Generated216.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest216/Generated216.ilproj
index 5622fa40f2..6aa1d15211 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest216/Generated216.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest216/Generated216.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest217/Generated217.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest217/Generated217.ilproj
index 4cd69074b8..9c8ddbb4cd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest217/Generated217.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest217/Generated217.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest218/Generated218.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest218/Generated218.ilproj
index 47790f1a12..907c4a3719 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest218/Generated218.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest218/Generated218.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest219/Generated219.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest219/Generated219.ilproj
index 5138ad99b0..a4c2414779 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest219/Generated219.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest219/Generated219.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest22/Generated22.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest22/Generated22.ilproj
index 9c960f5407..030cdd5851 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest22/Generated22.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest22/Generated22.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest220/Generated220.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest220/Generated220.ilproj
index a9c1bcee44..fab574e023 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest220/Generated220.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest220/Generated220.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest221/Generated221.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest221/Generated221.ilproj
index e0d691b84e..01a50ff392 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest221/Generated221.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest221/Generated221.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest222/Generated222.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest222/Generated222.ilproj
index e9299bd664..a5bcc73c0a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest222/Generated222.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest222/Generated222.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest223/Generated223.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest223/Generated223.ilproj
index f65699a1a2..4ce5fc464b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest223/Generated223.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest223/Generated223.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest224/Generated224.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest224/Generated224.ilproj
index a51dd8c56e..31ca82fd50 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest224/Generated224.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest224/Generated224.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest225/Generated225.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest225/Generated225.ilproj
index 5019e14169..2a30dc3c46 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest225/Generated225.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest225/Generated225.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest226/Generated226.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest226/Generated226.ilproj
index 103c5d0f09..4147e28877 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest226/Generated226.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest226/Generated226.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest227/Generated227.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest227/Generated227.ilproj
index eb71bb65d8..6af1fd7e86 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest227/Generated227.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest227/Generated227.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest228/Generated228.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest228/Generated228.ilproj
index f6913a18a3..c487428116 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest228/Generated228.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest228/Generated228.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest229/Generated229.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest229/Generated229.ilproj
index ff7b4b060e..1d5ae1a5b4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest229/Generated229.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest229/Generated229.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest23/Generated23.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest23/Generated23.ilproj
index a558dec355..12c755d351 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest23/Generated23.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest23/Generated23.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest230/Generated230.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest230/Generated230.ilproj
index 739153f2fb..916213169a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest230/Generated230.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest230/Generated230.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest231/Generated231.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest231/Generated231.ilproj
index dc39c7f8b7..fc77210d88 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest231/Generated231.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest231/Generated231.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest232/Generated232.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest232/Generated232.ilproj
index e09968081e..7ecf827ebb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest232/Generated232.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest232/Generated232.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest233/Generated233.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest233/Generated233.ilproj
index cc616f9f68..77d1e4caa7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest233/Generated233.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest233/Generated233.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest234/Generated234.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest234/Generated234.ilproj
index 38472b8928..8f0c4b5852 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest234/Generated234.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest234/Generated234.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest235/Generated235.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest235/Generated235.ilproj
index 39873ec531..c66d198d1b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest235/Generated235.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest235/Generated235.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest236/Generated236.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest236/Generated236.ilproj
index c5b3e423c2..429cbd4c91 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest236/Generated236.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest236/Generated236.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest237/Generated237.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest237/Generated237.ilproj
index ba90b37bd6..2bc8264f88 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest237/Generated237.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest237/Generated237.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest238/Generated238.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest238/Generated238.ilproj
index fdf92665db..0f0eb83d18 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest238/Generated238.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest238/Generated238.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest239/Generated239.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest239/Generated239.ilproj
index 008e474158..a73dd0cd14 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest239/Generated239.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest239/Generated239.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest24/Generated24.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest24/Generated24.ilproj
index c0e0313695..188ff97117 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest24/Generated24.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest24/Generated24.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest240/Generated240.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest240/Generated240.ilproj
index 27f56ec03e..d2248162c1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest240/Generated240.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest240/Generated240.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest241/Generated241.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest241/Generated241.ilproj
index 81a754a7c8..f8182066b8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest241/Generated241.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest241/Generated241.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest242/Generated242.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest242/Generated242.ilproj
index 65d9ca5227..1693b51d3c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest242/Generated242.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest242/Generated242.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest243/Generated243.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest243/Generated243.ilproj
index 51eeaedc46..ddd601b014 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest243/Generated243.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest243/Generated243.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest244/Generated244.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest244/Generated244.ilproj
index 9d3c929385..a5af4cd58b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest244/Generated244.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest244/Generated244.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest245/Generated245.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest245/Generated245.ilproj
index ef245fab8c..89946648d7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest245/Generated245.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest245/Generated245.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest246/Generated246.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest246/Generated246.ilproj
index 6ad77100ac..a668e4aaeb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest246/Generated246.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest246/Generated246.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest247/Generated247.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest247/Generated247.ilproj
index 5efb771a78..7d144b8a42 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest247/Generated247.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest247/Generated247.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest248/Generated248.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest248/Generated248.ilproj
index c28a4e82d6..b70ac6d5fc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest248/Generated248.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest248/Generated248.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest249/Generated249.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest249/Generated249.ilproj
index 01cd287acd..f58d46d8d9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest249/Generated249.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest249/Generated249.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest25/Generated25.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest25/Generated25.ilproj
index 24d43855c8..03c6f74ab1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest25/Generated25.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest25/Generated25.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest250/Generated250.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest250/Generated250.ilproj
index 9c5a4cf2a1..406a16af21 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest250/Generated250.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest250/Generated250.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest251/Generated251.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest251/Generated251.ilproj
index ea9ce363e4..ff9ab8c27c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest251/Generated251.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest251/Generated251.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest252/Generated252.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest252/Generated252.ilproj
index 299e5f7415..de78a9ce24 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest252/Generated252.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest252/Generated252.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest253/Generated253.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest253/Generated253.ilproj
index 3c92ec95a0..d0ed7fe94f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest253/Generated253.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest253/Generated253.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest254/Generated254.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest254/Generated254.ilproj
index 60ae966240..9a04d72596 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest254/Generated254.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest254/Generated254.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest255/Generated255.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest255/Generated255.ilproj
index 9d7a437032..9ea8a0edb5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest255/Generated255.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest255/Generated255.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest256/Generated256.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest256/Generated256.ilproj
index c8587dc0ed..ed744c24b4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest256/Generated256.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest256/Generated256.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest257/Generated257.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest257/Generated257.ilproj
index 3f28768a5c..40ffaeb0dc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest257/Generated257.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest257/Generated257.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest258/Generated258.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest258/Generated258.ilproj
index 3b0e9ee0cc..87c67eb243 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest258/Generated258.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest258/Generated258.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest259/Generated259.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest259/Generated259.ilproj
index 9dd61316a1..51642eb37b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest259/Generated259.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest259/Generated259.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest26/Generated26.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest26/Generated26.ilproj
index 3d85275dc9..f74cf6dfe2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest26/Generated26.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest26/Generated26.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest260/Generated260.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest260/Generated260.ilproj
index dc32c5ae48..1f8dd2acf5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest260/Generated260.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest260/Generated260.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest261/Generated261.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest261/Generated261.ilproj
index ab52fcec34..86cfcd6921 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest261/Generated261.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest261/Generated261.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest262/Generated262.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest262/Generated262.ilproj
index 93b1898142..4b34df8ae0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest262/Generated262.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest262/Generated262.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest263/Generated263.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest263/Generated263.ilproj
index 3b950c0d79..82999cbb4f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest263/Generated263.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest263/Generated263.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest264/Generated264.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest264/Generated264.ilproj
index 594f28cad1..d17d0c5eef 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest264/Generated264.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest264/Generated264.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest265/Generated265.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest265/Generated265.ilproj
index f0f2d22e1f..5d6a524ba5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest265/Generated265.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest265/Generated265.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest266/Generated266.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest266/Generated266.ilproj
index 4f0042754d..cb3a04620c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest266/Generated266.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest266/Generated266.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest267/Generated267.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest267/Generated267.ilproj
index 41eb897133..11608cab20 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest267/Generated267.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest267/Generated267.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest268/Generated268.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest268/Generated268.ilproj
index ba47fa8981..b7358e2ac3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest268/Generated268.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest268/Generated268.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest269/Generated269.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest269/Generated269.ilproj
index 0ef8c72d80..4c837d9b1f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest269/Generated269.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest269/Generated269.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest27/Generated27.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest27/Generated27.ilproj
index 39d452780c..eb685eeca5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest27/Generated27.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest27/Generated27.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest270/Generated270.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest270/Generated270.ilproj
index eebc9a0ea8..f6d0db01f0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest270/Generated270.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest270/Generated270.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest271/Generated271.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest271/Generated271.ilproj
index 02faf8da04..b5d2df27a8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest271/Generated271.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest271/Generated271.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest272/Generated272.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest272/Generated272.ilproj
index 267641d913..2d892231a4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest272/Generated272.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest272/Generated272.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest273/Generated273.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest273/Generated273.ilproj
index ad1b88ed19..7921312976 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest273/Generated273.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest273/Generated273.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest274/Generated274.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest274/Generated274.ilproj
index 41b3f6c974..d47a29d4b3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest274/Generated274.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest274/Generated274.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest275/Generated275.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest275/Generated275.ilproj
index 7e5eb56cc0..db414e15ed 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest275/Generated275.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest275/Generated275.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest276/Generated276.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest276/Generated276.ilproj
index e5448d283d..afda61cdc0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest276/Generated276.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest276/Generated276.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest277/Generated277.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest277/Generated277.ilproj
index 5a8fe19613..5d379cc78b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest277/Generated277.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest277/Generated277.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest278/Generated278.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest278/Generated278.ilproj
index 206ff98c13..f74b95b6b6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest278/Generated278.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest278/Generated278.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest279/Generated279.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest279/Generated279.ilproj
index c3bcc92372..339a644548 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest279/Generated279.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest279/Generated279.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest28/Generated28.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest28/Generated28.ilproj
index 07c1209a88..827fd7de25 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest28/Generated28.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest28/Generated28.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest280/Generated280.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest280/Generated280.ilproj
index 6ebb5fcf0e..34e07e0b92 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest280/Generated280.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest280/Generated280.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest281/Generated281.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest281/Generated281.ilproj
index b8bb45c741..907f2f5b44 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest281/Generated281.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest281/Generated281.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest282/Generated282.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest282/Generated282.ilproj
index 4d217c81b4..161982f217 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest282/Generated282.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest282/Generated282.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest283/Generated283.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest283/Generated283.ilproj
index 42e15d0958..5e83d5fd16 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest283/Generated283.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest283/Generated283.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest284/Generated284.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest284/Generated284.ilproj
index 4cfa8be956..80e9532c2b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest284/Generated284.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest284/Generated284.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest285/Generated285.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest285/Generated285.ilproj
index 2257b8ff65..0f6297e744 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest285/Generated285.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest285/Generated285.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest286/Generated286.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest286/Generated286.ilproj
index ee623d2ea2..966280226e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest286/Generated286.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest286/Generated286.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest287/Generated287.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest287/Generated287.ilproj
index c5b80e1fdc..77cd4b2723 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest287/Generated287.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest287/Generated287.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest288/Generated288.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest288/Generated288.ilproj
index b16aef3f20..a238bdf346 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest288/Generated288.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest288/Generated288.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest289/Generated289.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest289/Generated289.ilproj
index 79c9d2a851..4dba32215c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest289/Generated289.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest289/Generated289.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest29/Generated29.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest29/Generated29.ilproj
index 0616922242..cf5696b6fc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest29/Generated29.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest29/Generated29.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest290/Generated290.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest290/Generated290.ilproj
index 16b107ad9b..d4d37bc659 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest290/Generated290.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest290/Generated290.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest291/Generated291.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest291/Generated291.ilproj
index 25830264a2..d8b62456a7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest291/Generated291.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest291/Generated291.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest292/Generated292.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest292/Generated292.ilproj
index 20ab9d43fc..0e7871e59d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest292/Generated292.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest292/Generated292.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest293/Generated293.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest293/Generated293.ilproj
index d47c219169..924f82aaec 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest293/Generated293.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest293/Generated293.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest294/Generated294.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest294/Generated294.ilproj
index fbc5c03414..c2f95e1329 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest294/Generated294.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest294/Generated294.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest295/Generated295.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest295/Generated295.ilproj
index 4d23ca06d0..64a1ef94b4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest295/Generated295.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest295/Generated295.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest296/Generated296.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest296/Generated296.ilproj
index 8b3388e8e2..d13ff6a4f0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest296/Generated296.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest296/Generated296.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest297/Generated297.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest297/Generated297.ilproj
index b8dabaef97..9ee9fc44ec 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest297/Generated297.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest297/Generated297.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest298/Generated298.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest298/Generated298.ilproj
index 93ede2c021..7ac2d24098 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest298/Generated298.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest298/Generated298.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest299/Generated299.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest299/Generated299.ilproj
index dfff3ecfdf..471ec2208a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest299/Generated299.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest299/Generated299.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest3/Generated3.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest3/Generated3.ilproj
index 081d4f1fe6..5add719a07 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest3/Generated3.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest3/Generated3.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest30/Generated30.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest30/Generated30.ilproj
index b2c42734bd..ae9b86f626 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest30/Generated30.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest30/Generated30.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest300/Generated300.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest300/Generated300.ilproj
index d34acc40f8..60474647fe 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest300/Generated300.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest300/Generated300.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest301/Generated301.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest301/Generated301.ilproj
index 984c55b4ad..59e091db63 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest301/Generated301.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest301/Generated301.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest302/Generated302.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest302/Generated302.ilproj
index ea24f137b9..c83bd150ab 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest302/Generated302.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest302/Generated302.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest303/Generated303.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest303/Generated303.ilproj
index 191b877ad9..4054e9bd05 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest303/Generated303.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest303/Generated303.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest304/Generated304.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest304/Generated304.ilproj
index 0b0635bae3..ab03f87627 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest304/Generated304.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest304/Generated304.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest305/Generated305.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest305/Generated305.ilproj
index b36a578a14..dfdf5c4b68 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest305/Generated305.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest305/Generated305.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest306/Generated306.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest306/Generated306.ilproj
index c74a7dc0ff..19dc54edea 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest306/Generated306.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest306/Generated306.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest307/Generated307.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest307/Generated307.ilproj
index 8996188ad8..cd7d8b6892 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest307/Generated307.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest307/Generated307.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest308/Generated308.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest308/Generated308.ilproj
index 954512226a..e6a65e540b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest308/Generated308.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest308/Generated308.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest309/Generated309.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest309/Generated309.ilproj
index c0b6681195..2e5d13bd86 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest309/Generated309.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest309/Generated309.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest31/Generated31.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest31/Generated31.ilproj
index f9012f01d9..3c59389057 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest31/Generated31.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest31/Generated31.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest310/Generated310.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest310/Generated310.ilproj
index 6a23a53c1c..90100d4303 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest310/Generated310.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest310/Generated310.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest311/Generated311.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest311/Generated311.ilproj
index e1c8759845..60b30de168 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest311/Generated311.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest311/Generated311.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest312/Generated312.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest312/Generated312.ilproj
index 1098e78cd4..56f34b28d6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest312/Generated312.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest312/Generated312.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest313/Generated313.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest313/Generated313.ilproj
index 8e4c138e96..ec01659b03 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest313/Generated313.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest313/Generated313.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest314/Generated314.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest314/Generated314.ilproj
index d8f3479336..1c6614bbf5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest314/Generated314.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest314/Generated314.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest315/Generated315.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest315/Generated315.ilproj
index 27f32c8839..67591faa60 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest315/Generated315.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest315/Generated315.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest316/Generated316.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest316/Generated316.ilproj
index 56aa09fd53..b7f2654539 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest316/Generated316.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest316/Generated316.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest317/Generated317.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest317/Generated317.ilproj
index 935bda5f1e..b107eebe04 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest317/Generated317.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest317/Generated317.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest318/Generated318.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest318/Generated318.ilproj
index f3e535f4b2..7bee7e497a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest318/Generated318.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest318/Generated318.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest319/Generated319.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest319/Generated319.ilproj
index 4d6f840765..b72889ca07 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest319/Generated319.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest319/Generated319.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest32/Generated32.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest32/Generated32.ilproj
index 274018d087..6cc85b19b5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest32/Generated32.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest32/Generated32.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest320/Generated320.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest320/Generated320.ilproj
index d52cc24096..7af56c142b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest320/Generated320.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest320/Generated320.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest321/Generated321.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest321/Generated321.ilproj
index 90e0fbe778..41e39a13ec 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest321/Generated321.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest321/Generated321.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest322/Generated322.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest322/Generated322.ilproj
index ffeb880326..4ab162cb74 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest322/Generated322.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest322/Generated322.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest323/Generated323.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest323/Generated323.ilproj
index fd6dd51e25..c279dd3d53 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest323/Generated323.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest323/Generated323.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest324/Generated324.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest324/Generated324.ilproj
index 78aa5f0ae9..fecf50a512 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest324/Generated324.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest324/Generated324.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest325/Generated325.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest325/Generated325.ilproj
index a045c50062..67fb8f91fc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest325/Generated325.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest325/Generated325.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest326/Generated326.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest326/Generated326.ilproj
index be2071804b..7121a9f376 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest326/Generated326.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest326/Generated326.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest327/Generated327.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest327/Generated327.ilproj
index 4e4cb9e6a2..199e5f775b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest327/Generated327.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest327/Generated327.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest328/Generated328.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest328/Generated328.ilproj
index b5a4b8156a..dd0449a647 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest328/Generated328.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest328/Generated328.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest329/Generated329.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest329/Generated329.ilproj
index f3ff8f8ed7..0d50775caf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest329/Generated329.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest329/Generated329.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest33/Generated33.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest33/Generated33.ilproj
index 4bf3457e3b..c701ecb131 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest33/Generated33.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest33/Generated33.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest330/Generated330.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest330/Generated330.ilproj
index 2fa40ee7cb..543027f902 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest330/Generated330.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest330/Generated330.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest331/Generated331.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest331/Generated331.ilproj
index fcaecb6fb3..b334fef64b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest331/Generated331.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest331/Generated331.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest332/Generated332.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest332/Generated332.ilproj
index 67f66c352f..12ef8edb7a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest332/Generated332.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest332/Generated332.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest333/Generated333.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest333/Generated333.ilproj
index 051836f314..607231fc15 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest333/Generated333.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest333/Generated333.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest334/Generated334.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest334/Generated334.ilproj
index 5749e802d1..42fe32480b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest334/Generated334.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest334/Generated334.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest335/Generated335.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest335/Generated335.ilproj
index d15bfe7a27..054fe71477 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest335/Generated335.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest335/Generated335.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest336/Generated336.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest336/Generated336.ilproj
index c9df51ac7f..1623ed06ca 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest336/Generated336.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest336/Generated336.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest337/Generated337.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest337/Generated337.ilproj
index 044751bca8..ce7ff3d4a6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest337/Generated337.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest337/Generated337.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest338/Generated338.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest338/Generated338.ilproj
index 65c335d651..b6dcb550a8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest338/Generated338.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest338/Generated338.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest339/Generated339.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest339/Generated339.ilproj
index 2a732c3614..55fc2a9843 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest339/Generated339.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest339/Generated339.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest34/Generated34.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest34/Generated34.ilproj
index 2a715fa15b..f3ad43c822 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest34/Generated34.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest34/Generated34.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest340/Generated340.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest340/Generated340.ilproj
index ffd0dda21f..c734aa8da8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest340/Generated340.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest340/Generated340.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest341/Generated341.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest341/Generated341.ilproj
index bc66728c00..9f494afdff 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest341/Generated341.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest341/Generated341.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest342/Generated342.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest342/Generated342.ilproj
index e7e3d34b4e..af5b9de02d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest342/Generated342.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest342/Generated342.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest343/Generated343.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest343/Generated343.ilproj
index a108f5a96c..91893f283b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest343/Generated343.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest343/Generated343.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest344/Generated344.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest344/Generated344.ilproj
index 579004181b..8846c23470 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest344/Generated344.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest344/Generated344.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest345/Generated345.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest345/Generated345.ilproj
index dcb7fed35f..e56a67cd28 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest345/Generated345.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest345/Generated345.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest346/Generated346.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest346/Generated346.ilproj
index 4954f69b25..b1e954a9ba 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest346/Generated346.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest346/Generated346.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest347/Generated347.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest347/Generated347.ilproj
index 89fc4e3f8a..e11af10dc6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest347/Generated347.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest347/Generated347.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest348/Generated348.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest348/Generated348.ilproj
index 3154a29e69..2fc312456c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest348/Generated348.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest348/Generated348.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest349/Generated349.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest349/Generated349.ilproj
index e24a3a7559..deabaec887 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest349/Generated349.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest349/Generated349.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest35/Generated35.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest35/Generated35.ilproj
index 1a43685e06..a65e11d75f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest35/Generated35.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest35/Generated35.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest350/Generated350.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest350/Generated350.ilproj
index 36c92d1813..b39a8d9d90 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest350/Generated350.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest350/Generated350.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest351/Generated351.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest351/Generated351.ilproj
index 06a10683a0..f844c72377 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest351/Generated351.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest351/Generated351.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest352/Generated352.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest352/Generated352.ilproj
index 2f9631d852..bba1440214 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest352/Generated352.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest352/Generated352.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest353/Generated353.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest353/Generated353.ilproj
index 20b9c7c479..cac0927bef 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest353/Generated353.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest353/Generated353.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest354/Generated354.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest354/Generated354.ilproj
index 864af55e14..2bd60cede7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest354/Generated354.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest354/Generated354.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest355/Generated355.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest355/Generated355.ilproj
index b8028f5262..12ae0eb9d6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest355/Generated355.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest355/Generated355.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest356/Generated356.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest356/Generated356.ilproj
index ed8d7a9b63..45f7aca2fe 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest356/Generated356.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest356/Generated356.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest357/Generated357.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest357/Generated357.ilproj
index 6652d42625..bd450db970 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest357/Generated357.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest357/Generated357.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest358/Generated358.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest358/Generated358.ilproj
index ec85d6c159..f358e8cba8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest358/Generated358.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest358/Generated358.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest359/Generated359.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest359/Generated359.ilproj
index 39040b60d1..b025129dd6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest359/Generated359.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest359/Generated359.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest36/Generated36.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest36/Generated36.ilproj
index 2913eca11e..5f9a40d920 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest36/Generated36.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest36/Generated36.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest360/Generated360.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest360/Generated360.ilproj
index d705f98d32..89f5bb5b82 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest360/Generated360.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest360/Generated360.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest361/Generated361.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest361/Generated361.ilproj
index 7024b2571e..2f1b3bdd9c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest361/Generated361.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest361/Generated361.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest362/Generated362.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest362/Generated362.ilproj
index 0079eb5667..bfd3cd2d42 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest362/Generated362.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest362/Generated362.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest363/Generated363.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest363/Generated363.ilproj
index cdc3daa0fb..e4ff0cfc95 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest363/Generated363.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest363/Generated363.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest364/Generated364.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest364/Generated364.ilproj
index 3ca7f50149..d1e741df2f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest364/Generated364.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest364/Generated364.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest365/Generated365.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest365/Generated365.ilproj
index 7c6b1ad394..88406668f2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest365/Generated365.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest365/Generated365.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest366/Generated366.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest366/Generated366.ilproj
index dc0bf136e9..9ec33bd539 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest366/Generated366.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest366/Generated366.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest367/Generated367.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest367/Generated367.ilproj
index affbf8293a..368e5a5af9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest367/Generated367.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest367/Generated367.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest368/Generated368.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest368/Generated368.ilproj
index 9f17be74c5..2211b94a43 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest368/Generated368.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest368/Generated368.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest369/Generated369.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest369/Generated369.ilproj
index a1675938da..621126a243 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest369/Generated369.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest369/Generated369.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest37/Generated37.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest37/Generated37.ilproj
index 5df170541d..e3a298fda8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest37/Generated37.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest37/Generated37.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest370/Generated370.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest370/Generated370.ilproj
index 9743f0ae6a..f4dc5d32dd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest370/Generated370.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest370/Generated370.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest371/Generated371.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest371/Generated371.ilproj
index f8d47dab5d..ed5b9e3e81 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest371/Generated371.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest371/Generated371.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest372/Generated372.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest372/Generated372.ilproj
index ce13150eaf..7dd1f8ef9a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest372/Generated372.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest372/Generated372.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest373/Generated373.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest373/Generated373.ilproj
index 15f3512e1b..6ccfcef83f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest373/Generated373.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest373/Generated373.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest374/Generated374.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest374/Generated374.ilproj
index 719ccaf1a8..a2e69ac409 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest374/Generated374.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest374/Generated374.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest375/Generated375.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest375/Generated375.ilproj
index 551adb1fd2..81af612373 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest375/Generated375.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest375/Generated375.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest376/Generated376.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest376/Generated376.ilproj
index efc25c8a5f..4199db9185 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest376/Generated376.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest376/Generated376.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest377/Generated377.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest377/Generated377.ilproj
index 43ec4a0800..afe6d6b2d7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest377/Generated377.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest377/Generated377.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest378/Generated378.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest378/Generated378.ilproj
index 0dae73864f..56b18451cb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest378/Generated378.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest378/Generated378.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest379/Generated379.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest379/Generated379.ilproj
index c359373b51..5c37cb05a7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest379/Generated379.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest379/Generated379.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest38/Generated38.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest38/Generated38.ilproj
index 5b7e656ef5..6c289cd011 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest38/Generated38.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest38/Generated38.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest380/Generated380.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest380/Generated380.ilproj
index df0ffa0dff..3ecb792093 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest380/Generated380.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest380/Generated380.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest381/Generated381.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest381/Generated381.ilproj
index ae78925904..4297975906 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest381/Generated381.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest381/Generated381.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest382/Generated382.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest382/Generated382.ilproj
index 218a0a8417..eb89306ab2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest382/Generated382.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest382/Generated382.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest383/Generated383.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest383/Generated383.ilproj
index 13a69a2fb4..e070c909cd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest383/Generated383.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest383/Generated383.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest384/Generated384.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest384/Generated384.ilproj
index 862fe9a352..ed468b42d2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest384/Generated384.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest384/Generated384.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest385/Generated385.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest385/Generated385.ilproj
index 778c728ca9..5971022920 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest385/Generated385.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest385/Generated385.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest386/Generated386.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest386/Generated386.ilproj
index fae9f9d671..542ad77a06 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest386/Generated386.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest386/Generated386.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest387/Generated387.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest387/Generated387.ilproj
index cf656bd432..45040f9fb1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest387/Generated387.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest387/Generated387.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest388/Generated388.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest388/Generated388.ilproj
index 82c6c19144..44975ec8bd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest388/Generated388.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest388/Generated388.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest389/Generated389.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest389/Generated389.ilproj
index a6365cf194..331ce9542f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest389/Generated389.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest389/Generated389.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest39/Generated39.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest39/Generated39.ilproj
index efbff7622f..b14ebb5724 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest39/Generated39.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest39/Generated39.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest390/Generated390.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest390/Generated390.ilproj
index 7ac3ca2774..f5c98fa51d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest390/Generated390.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest390/Generated390.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest391/Generated391.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest391/Generated391.ilproj
index 6493d0b453..534c1564b4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest391/Generated391.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest391/Generated391.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest392/Generated392.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest392/Generated392.ilproj
index b2254a9302..4f390df5fe 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest392/Generated392.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest392/Generated392.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest393/Generated393.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest393/Generated393.ilproj
index 803890d670..513ea98541 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest393/Generated393.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest393/Generated393.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest394/Generated394.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest394/Generated394.ilproj
index 99842d9c57..578cdb9bb1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest394/Generated394.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest394/Generated394.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest395/Generated395.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest395/Generated395.ilproj
index 40e0b78230..03ad3cf61b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest395/Generated395.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest395/Generated395.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest396/Generated396.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest396/Generated396.ilproj
index 3e5a069f7b..47c0e9d128 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest396/Generated396.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest396/Generated396.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest397/Generated397.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest397/Generated397.ilproj
index 9d02fade53..05501a954c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest397/Generated397.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest397/Generated397.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest398/Generated398.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest398/Generated398.ilproj
index c7ad331431..8877b6df48 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest398/Generated398.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest398/Generated398.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest399/Generated399.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest399/Generated399.ilproj
index c845eb390f..8c08f1dee1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest399/Generated399.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest399/Generated399.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest4/Generated4.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest4/Generated4.ilproj
index e3b19a6891..ba9ea5e7bc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest4/Generated4.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest4/Generated4.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest40/Generated40.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest40/Generated40.ilproj
index e61aea0595..f952f3c5b2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest40/Generated40.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest40/Generated40.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest400/Generated400.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest400/Generated400.ilproj
index b29498131a..cd9083890f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest400/Generated400.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest400/Generated400.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest401/Generated401.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest401/Generated401.ilproj
index 79d46a5daa..f35d613301 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest401/Generated401.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest401/Generated401.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest402/Generated402.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest402/Generated402.ilproj
index 0edd9e7e79..9c6a77e427 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest402/Generated402.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest402/Generated402.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest403/Generated403.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest403/Generated403.ilproj
index 22fc9be064..997af0fe20 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest403/Generated403.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest403/Generated403.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest404/Generated404.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest404/Generated404.ilproj
index c552fa7d87..077396c3b0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest404/Generated404.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest404/Generated404.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest405/Generated405.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest405/Generated405.ilproj
index c7e32edecf..e59b7dcf9a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest405/Generated405.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest405/Generated405.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest406/Generated406.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest406/Generated406.ilproj
index f61525f562..01588d2fd6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest406/Generated406.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest406/Generated406.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest407/Generated407.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest407/Generated407.ilproj
index 318538df75..52aa3086cf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest407/Generated407.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest407/Generated407.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest408/Generated408.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest408/Generated408.ilproj
index d7e20a6112..46b262d619 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest408/Generated408.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest408/Generated408.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest409/Generated409.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest409/Generated409.ilproj
index b4ba2060e1..30750aa7ad 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest409/Generated409.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest409/Generated409.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest41/Generated41.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest41/Generated41.ilproj
index 90d4d6bc4b..3820d1e718 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest41/Generated41.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest41/Generated41.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest410/Generated410.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest410/Generated410.ilproj
index 0bd6ddb349..5f37ef6265 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest410/Generated410.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest410/Generated410.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest411/Generated411.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest411/Generated411.ilproj
index 4898f376ff..0181c01c45 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest411/Generated411.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest411/Generated411.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest412/Generated412.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest412/Generated412.ilproj
index c20c602c5d..9f88c47678 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest412/Generated412.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest412/Generated412.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest413/Generated413.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest413/Generated413.ilproj
index 19341138e9..b8fdac1cf7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest413/Generated413.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest413/Generated413.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest414/Generated414.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest414/Generated414.ilproj
index 97c396ce19..26142b1135 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest414/Generated414.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest414/Generated414.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest415/Generated415.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest415/Generated415.ilproj
index 2a215a7385..cf991b7b36 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest415/Generated415.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest415/Generated415.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest416/Generated416.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest416/Generated416.ilproj
index 550b3d70cf..d127baea63 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest416/Generated416.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest416/Generated416.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest417/Generated417.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest417/Generated417.ilproj
index cc9aca92ad..e8336ba7b3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest417/Generated417.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest417/Generated417.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest418/Generated418.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest418/Generated418.ilproj
index 199ad23c93..24ea77235b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest418/Generated418.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest418/Generated418.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest419/Generated419.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest419/Generated419.ilproj
index 54bf75bb46..596711f783 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest419/Generated419.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest419/Generated419.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest42/Generated42.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest42/Generated42.ilproj
index d2cd938e06..ddfa371fe4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest42/Generated42.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest42/Generated42.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest420/Generated420.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest420/Generated420.ilproj
index 3f4de1d6c4..9bab441637 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest420/Generated420.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest420/Generated420.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest421/Generated421.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest421/Generated421.ilproj
index 549e754e30..30815f4672 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest421/Generated421.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest421/Generated421.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest422/Generated422.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest422/Generated422.ilproj
index 839a1cc406..3fc6c926b3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest422/Generated422.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest422/Generated422.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest423/Generated423.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest423/Generated423.ilproj
index 6a65b89ecf..3bb2719280 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest423/Generated423.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest423/Generated423.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest424/Generated424.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest424/Generated424.ilproj
index 9ae9510112..d7237f0b8e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest424/Generated424.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest424/Generated424.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest425/Generated425.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest425/Generated425.ilproj
index 052d0f639c..10aa6390f9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest425/Generated425.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest425/Generated425.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest426/Generated426.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest426/Generated426.ilproj
index ab0cf4f5a5..7e2473d88d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest426/Generated426.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest426/Generated426.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest427/Generated427.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest427/Generated427.ilproj
index d064c27982..86a8cecf71 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest427/Generated427.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest427/Generated427.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest428/Generated428.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest428/Generated428.ilproj
index e054ee9415..1ec8074f5c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest428/Generated428.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest428/Generated428.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest429/Generated429.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest429/Generated429.ilproj
index 4e07416ba4..72d8a6e382 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest429/Generated429.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest429/Generated429.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest43/Generated43.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest43/Generated43.ilproj
index 4ea3949cab..081ab29ec6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest43/Generated43.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest43/Generated43.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest430/Generated430.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest430/Generated430.ilproj
index b3bfbb1921..6f190cd811 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest430/Generated430.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest430/Generated430.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest431/Generated431.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest431/Generated431.ilproj
index abcd46aac0..8663417409 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest431/Generated431.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest431/Generated431.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest432/Generated432.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest432/Generated432.ilproj
index 6893c838dd..58b492f00f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest432/Generated432.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest432/Generated432.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest433/Generated433.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest433/Generated433.ilproj
index 931bcba41b..eb8968213a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest433/Generated433.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest433/Generated433.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest434/Generated434.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest434/Generated434.ilproj
index 0fd94639d2..2f9bfaba77 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest434/Generated434.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest434/Generated434.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest435/Generated435.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest435/Generated435.ilproj
index f3fc93804c..867d9a97d5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest435/Generated435.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest435/Generated435.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest436/Generated436.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest436/Generated436.ilproj
index 923b69fe96..75e5ced4cd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest436/Generated436.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest436/Generated436.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest437/Generated437.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest437/Generated437.ilproj
index abf10b1ac0..8a9f626f57 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest437/Generated437.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest437/Generated437.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest438/Generated438.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest438/Generated438.ilproj
index 7839aaf3e4..e3e8b9a694 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest438/Generated438.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest438/Generated438.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest439/Generated439.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest439/Generated439.ilproj
index 5209fc3a28..9c6fb2696c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest439/Generated439.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest439/Generated439.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest44/Generated44.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest44/Generated44.ilproj
index 1d7793e80a..98529e3c17 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest44/Generated44.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest44/Generated44.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest440/Generated440.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest440/Generated440.ilproj
index a520e12d76..9408efe2b0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest440/Generated440.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest440/Generated440.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest441/Generated441.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest441/Generated441.ilproj
index e61c623eb9..77fb605deb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest441/Generated441.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest441/Generated441.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest442/Generated442.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest442/Generated442.ilproj
index ee259333b2..8776489f66 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest442/Generated442.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest442/Generated442.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest443/Generated443.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest443/Generated443.ilproj
index ed00ddcc7c..c8b7ebda29 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest443/Generated443.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest443/Generated443.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest444/Generated444.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest444/Generated444.ilproj
index 80f2b841ce..c880a5f02c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest444/Generated444.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest444/Generated444.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest445/Generated445.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest445/Generated445.ilproj
index 6f12d366e5..a8d3bcfa49 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest445/Generated445.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest445/Generated445.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest446/Generated446.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest446/Generated446.ilproj
index f8674b45d7..bf3eee46a9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest446/Generated446.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest446/Generated446.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest447/Generated447.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest447/Generated447.ilproj
index 5f63a5b750..832c438286 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest447/Generated447.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest447/Generated447.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest448/Generated448.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest448/Generated448.ilproj
index 9dfc3d2088..94c9bebafa 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest448/Generated448.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest448/Generated448.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest449/Generated449.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest449/Generated449.ilproj
index 16f4b92600..00957a06bd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest449/Generated449.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest449/Generated449.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest45/Generated45.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest45/Generated45.ilproj
index 1efd659644..41004115fb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest45/Generated45.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest45/Generated45.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest450/Generated450.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest450/Generated450.ilproj
index 7bd8122a7f..55836485b5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest450/Generated450.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest450/Generated450.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest451/Generated451.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest451/Generated451.ilproj
index c311a870cd..45ecfbd66e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest451/Generated451.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest451/Generated451.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest452/Generated452.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest452/Generated452.ilproj
index cb494576d7..c2bbe2a28f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest452/Generated452.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest452/Generated452.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest453/Generated453.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest453/Generated453.ilproj
index e69c7ced6a..add6eccffa 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest453/Generated453.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest453/Generated453.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest454/Generated454.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest454/Generated454.ilproj
index 3ea883d800..66177d07b4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest454/Generated454.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest454/Generated454.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest455/Generated455.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest455/Generated455.ilproj
index 16900db902..422af685c7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest455/Generated455.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest455/Generated455.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest456/Generated456.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest456/Generated456.ilproj
index 6ee73623b8..059326dc42 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest456/Generated456.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest456/Generated456.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest457/Generated457.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest457/Generated457.ilproj
index 351645c503..5e9c90da0e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest457/Generated457.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest457/Generated457.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest458/Generated458.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest458/Generated458.ilproj
index 0b644255e4..4cc28a1ed8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest458/Generated458.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest458/Generated458.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest459/Generated459.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest459/Generated459.ilproj
index 75fa8e81e7..f662c16032 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest459/Generated459.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest459/Generated459.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest46/Generated46.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest46/Generated46.ilproj
index f29f8e82ba..90d898ce6b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest46/Generated46.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest46/Generated46.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest460/Generated460.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest460/Generated460.ilproj
index 3ebcccd4d7..2fd7d10134 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest460/Generated460.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest460/Generated460.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest461/Generated461.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest461/Generated461.ilproj
index ed6cd1a1da..b7fc0373c9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest461/Generated461.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest461/Generated461.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest462/Generated462.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest462/Generated462.ilproj
index e7cd8463ac..a5a28fa43a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest462/Generated462.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest462/Generated462.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest463/Generated463.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest463/Generated463.ilproj
index 003c8dc72b..5edeffb0ad 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest463/Generated463.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest463/Generated463.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest464/Generated464.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest464/Generated464.ilproj
index 1d4c0377a6..bb9d769165 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest464/Generated464.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest464/Generated464.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest465/Generated465.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest465/Generated465.ilproj
index 643443b422..7cfbe21898 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest465/Generated465.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest465/Generated465.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest466/Generated466.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest466/Generated466.ilproj
index 2f6c404ef4..5aa379c298 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest466/Generated466.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest466/Generated466.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest467/Generated467.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest467/Generated467.ilproj
index 5fd7769e3f..66d0b04156 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest467/Generated467.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest467/Generated467.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest468/Generated468.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest468/Generated468.ilproj
index 67a2cb9f40..aee0155291 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest468/Generated468.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest468/Generated468.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest469/Generated469.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest469/Generated469.ilproj
index 360bc763db..130c08c3e5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest469/Generated469.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest469/Generated469.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest47/Generated47.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest47/Generated47.ilproj
index 295eced6a3..fc9cf0c794 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest47/Generated47.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest47/Generated47.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest470/Generated470.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest470/Generated470.ilproj
index 3363f52f32..7a0cb20bbb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest470/Generated470.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest470/Generated470.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest471/Generated471.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest471/Generated471.ilproj
index 4094e759e8..f57eaf1227 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest471/Generated471.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest471/Generated471.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest472/Generated472.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest472/Generated472.ilproj
index 5f4c6acd57..d4024b84b7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest472/Generated472.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest472/Generated472.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest473/Generated473.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest473/Generated473.ilproj
index eaa063aca1..5dcdae7690 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest473/Generated473.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest473/Generated473.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest474/Generated474.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest474/Generated474.ilproj
index 1d881a1ac4..4700a2831b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest474/Generated474.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest474/Generated474.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest475/Generated475.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest475/Generated475.ilproj
index b79946116b..0db5f9fc89 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest475/Generated475.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest475/Generated475.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest476/Generated476.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest476/Generated476.ilproj
index f53203a8a4..62e901766b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest476/Generated476.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest476/Generated476.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest477/Generated477.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest477/Generated477.ilproj
index 6979960266..445a51b022 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest477/Generated477.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest477/Generated477.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest478/Generated478.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest478/Generated478.ilproj
index 1b7919cb29..9bbbc1914f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest478/Generated478.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest478/Generated478.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest479/Generated479.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest479/Generated479.ilproj
index 660e2ec25f..40a76938b2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest479/Generated479.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest479/Generated479.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest48/Generated48.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest48/Generated48.ilproj
index ed45a80846..b03d035393 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest48/Generated48.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest48/Generated48.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest480/Generated480.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest480/Generated480.ilproj
index 56ecb4160c..581bd5d1a2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest480/Generated480.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest480/Generated480.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest481/Generated481.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest481/Generated481.ilproj
index 57bba50751..57a6d329fa 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest481/Generated481.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest481/Generated481.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest482/Generated482.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest482/Generated482.ilproj
index 240213a504..96229de50d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest482/Generated482.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest482/Generated482.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest483/Generated483.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest483/Generated483.ilproj
index 1127f97685..e2b163a6af 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest483/Generated483.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest483/Generated483.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest484/Generated484.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest484/Generated484.ilproj
index be7bb80172..cfd87db3e3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest484/Generated484.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest484/Generated484.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest485/Generated485.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest485/Generated485.ilproj
index e329bce5c8..bed7370865 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest485/Generated485.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest485/Generated485.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest486/Generated486.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest486/Generated486.ilproj
index 7e1be1f26e..4a7887bf02 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest486/Generated486.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest486/Generated486.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest487/Generated487.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest487/Generated487.ilproj
index 777d3194d2..ecbd228c0a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest487/Generated487.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest487/Generated487.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest488/Generated488.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest488/Generated488.ilproj
index 83bf770284..bbd9cdfa3b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest488/Generated488.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest488/Generated488.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest489/Generated489.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest489/Generated489.ilproj
index 61b3eaf69c..f1cad6b874 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest489/Generated489.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest489/Generated489.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest49/Generated49.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest49/Generated49.ilproj
index f8a3515ca4..8dba4c3767 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest49/Generated49.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest49/Generated49.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest490/Generated490.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest490/Generated490.ilproj
index de7f930521..de6bb9f6a0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest490/Generated490.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest490/Generated490.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest491/Generated491.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest491/Generated491.ilproj
index d024c1df63..1f93cda384 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest491/Generated491.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest491/Generated491.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest492/Generated492.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest492/Generated492.ilproj
index a415a626d8..550faec2c6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest492/Generated492.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest492/Generated492.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest493/Generated493.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest493/Generated493.ilproj
index 5d61f5384e..eab6db638d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest493/Generated493.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest493/Generated493.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest494/Generated494.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest494/Generated494.ilproj
index 09ff8e51c4..6f309a7128 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest494/Generated494.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest494/Generated494.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest495/Generated495.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest495/Generated495.ilproj
index 821e408bd3..117f50f3f5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest495/Generated495.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest495/Generated495.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest496/Generated496.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest496/Generated496.ilproj
index 9fd7177e2e..a88fc9d549 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest496/Generated496.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest496/Generated496.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest497/Generated497.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest497/Generated497.ilproj
index 4e723ed36c..6c30d6ac69 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest497/Generated497.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest497/Generated497.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest498/Generated498.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest498/Generated498.ilproj
index fee075b6e5..0c3c4954c5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest498/Generated498.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest498/Generated498.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest499/Generated499.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest499/Generated499.ilproj
index c143ba750a..0f41a318f8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest499/Generated499.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest499/Generated499.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest5/Generated5.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest5/Generated5.ilproj
index 75e57835b7..99192675b9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest5/Generated5.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest5/Generated5.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest50/Generated50.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest50/Generated50.ilproj
index 5c2e0ee92e..670c10f937 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest50/Generated50.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest50/Generated50.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest500/Generated500.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest500/Generated500.ilproj
index 6a4dae3a95..ad64061de4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest500/Generated500.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest500/Generated500.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest501/Generated501.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest501/Generated501.ilproj
index 9c0d129008..cb30ab138e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest501/Generated501.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest501/Generated501.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest502/Generated502.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest502/Generated502.ilproj
index ba0de520d0..3c116a3ff6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest502/Generated502.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest502/Generated502.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest503/Generated503.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest503/Generated503.ilproj
index 201c10c5d9..0a719bcf86 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest503/Generated503.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest503/Generated503.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest504/Generated504.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest504/Generated504.ilproj
index 9eafef16f4..2a569698ca 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest504/Generated504.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest504/Generated504.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest505/Generated505.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest505/Generated505.ilproj
index 68d3c01a9f..9c6ece17d7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest505/Generated505.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest505/Generated505.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest506/Generated506.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest506/Generated506.ilproj
index 95b1dc18c1..878ee1d0a9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest506/Generated506.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest506/Generated506.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest507/Generated507.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest507/Generated507.ilproj
index 0cd725b98f..b79c8b7607 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest507/Generated507.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest507/Generated507.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest508/Generated508.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest508/Generated508.ilproj
index dd0dc2f2e5..5f9352a277 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest508/Generated508.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest508/Generated508.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest509/Generated509.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest509/Generated509.ilproj
index 6284fe7c6c..d7e9a890f4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest509/Generated509.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest509/Generated509.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest51/Generated51.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest51/Generated51.ilproj
index 1cd27ac89f..b52c42ca5c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest51/Generated51.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest51/Generated51.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest510/Generated510.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest510/Generated510.ilproj
index 825611a211..011272a763 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest510/Generated510.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest510/Generated510.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest511/Generated511.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest511/Generated511.ilproj
index 817dd8b3f4..420b8f8681 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest511/Generated511.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest511/Generated511.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest512/Generated512.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest512/Generated512.ilproj
index 1bf41280cc..38d454f88f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest512/Generated512.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest512/Generated512.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest513/Generated513.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest513/Generated513.ilproj
index dac89063c5..dc938db90b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest513/Generated513.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest513/Generated513.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest514/Generated514.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest514/Generated514.ilproj
index b452decd24..726ef9ff4d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest514/Generated514.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest514/Generated514.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest515/Generated515.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest515/Generated515.ilproj
index 497fe62b44..e08eb03e71 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest515/Generated515.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest515/Generated515.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest516/Generated516.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest516/Generated516.ilproj
index b443767a20..7d444ebbd8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest516/Generated516.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest516/Generated516.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest517/Generated517.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest517/Generated517.ilproj
index b1f6a45620..196bbda0e0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest517/Generated517.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest517/Generated517.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest518/Generated518.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest518/Generated518.ilproj
index 868998933e..a4a3113c17 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest518/Generated518.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest518/Generated518.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest519/Generated519.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest519/Generated519.ilproj
index c8102cd3d4..0e2e79c1b9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest519/Generated519.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest519/Generated519.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest52/Generated52.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest52/Generated52.ilproj
index b90f31ab90..cbd9aefb9b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest52/Generated52.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest52/Generated52.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest520/Generated520.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest520/Generated520.ilproj
index 1c2ae75bee..004a17e1f7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest520/Generated520.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest520/Generated520.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest521/Generated521.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest521/Generated521.ilproj
index 4c9f731036..ae6162a6f2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest521/Generated521.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest521/Generated521.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest522/Generated522.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest522/Generated522.ilproj
index 1974b7c984..bdb65e6df9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest522/Generated522.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest522/Generated522.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest523/Generated523.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest523/Generated523.ilproj
index 34ca20068f..b217364ace 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest523/Generated523.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest523/Generated523.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest524/Generated524.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest524/Generated524.ilproj
index 68f79859cc..05c6ef6222 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest524/Generated524.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest524/Generated524.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest525/Generated525.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest525/Generated525.ilproj
index 005e1fdc2a..9f5d73c08e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest525/Generated525.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest525/Generated525.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest526/Generated526.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest526/Generated526.ilproj
index c39864b58f..56c5d077c0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest526/Generated526.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest526/Generated526.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest527/Generated527.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest527/Generated527.ilproj
index 4ecec5c44c..91a7c39489 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest527/Generated527.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest527/Generated527.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest528/Generated528.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest528/Generated528.ilproj
index 6a90e2b62b..61611c1911 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest528/Generated528.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest528/Generated528.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest529/Generated529.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest529/Generated529.ilproj
index 6c02962ec1..a889c8b700 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest529/Generated529.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest529/Generated529.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest53/Generated53.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest53/Generated53.ilproj
index 7441c9e15a..3618214fec 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest53/Generated53.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest53/Generated53.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest530/Generated530.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest530/Generated530.ilproj
index 228d8b7944..b8a84d8f0e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest530/Generated530.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest530/Generated530.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest531/Generated531.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest531/Generated531.ilproj
index 66fd6362d6..6b3e6f6af4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest531/Generated531.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest531/Generated531.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest532/Generated532.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest532/Generated532.ilproj
index 10252b388a..9979a5dd25 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest532/Generated532.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest532/Generated532.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest533/Generated533.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest533/Generated533.ilproj
index 320f7fff45..4453e28d8f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest533/Generated533.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest533/Generated533.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest534/Generated534.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest534/Generated534.ilproj
index 920df1ecc9..115c02bad9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest534/Generated534.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest534/Generated534.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest535/Generated535.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest535/Generated535.ilproj
index 34d701fe28..a474ba056a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest535/Generated535.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest535/Generated535.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest536/Generated536.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest536/Generated536.ilproj
index f711ad13e7..20d004673c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest536/Generated536.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest536/Generated536.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest537/Generated537.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest537/Generated537.ilproj
index 1357c4fbde..1acb1354cb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest537/Generated537.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest537/Generated537.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest538/Generated538.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest538/Generated538.ilproj
index 1ab3a30be8..e0d3db4c9f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest538/Generated538.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest538/Generated538.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest539/Generated539.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest539/Generated539.ilproj
index 56585613ef..fbefe73133 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest539/Generated539.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest539/Generated539.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest54/Generated54.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest54/Generated54.ilproj
index e760b6dad3..fae4f027de 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest54/Generated54.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest54/Generated54.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest540/Generated540.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest540/Generated540.ilproj
index fdb10743dd..589c185a21 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest540/Generated540.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest540/Generated540.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest541/Generated541.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest541/Generated541.ilproj
index 1c78d754f1..424e8bfd71 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest541/Generated541.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest541/Generated541.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest542/Generated542.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest542/Generated542.ilproj
index 55b0b27568..0e26cfb68a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest542/Generated542.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest542/Generated542.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest543/Generated543.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest543/Generated543.ilproj
index 4f9c51e0e4..612aaae71f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest543/Generated543.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest543/Generated543.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest544/Generated544.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest544/Generated544.ilproj
index 2465f4a67c..0595904e27 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest544/Generated544.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest544/Generated544.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest545/Generated545.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest545/Generated545.ilproj
index 1b9e93becc..19d4279f1c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest545/Generated545.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest545/Generated545.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest546/Generated546.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest546/Generated546.ilproj
index aee7691773..74bc149bbc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest546/Generated546.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest546/Generated546.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest547/Generated547.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest547/Generated547.ilproj
index 27960473b6..54156d067d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest547/Generated547.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest547/Generated547.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest548/Generated548.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest548/Generated548.ilproj
index 0a01cb2d8d..b0c9598dd2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest548/Generated548.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest548/Generated548.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest549/Generated549.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest549/Generated549.ilproj
index cc94d85dee..e651612c62 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest549/Generated549.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest549/Generated549.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest55/Generated55.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest55/Generated55.ilproj
index 6af0811bf7..957d9ab1df 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest55/Generated55.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest55/Generated55.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest550/Generated550.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest550/Generated550.ilproj
index cf938834ca..85695ffcdb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest550/Generated550.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest550/Generated550.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest551/Generated551.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest551/Generated551.ilproj
index 523178b951..c4c2370e21 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest551/Generated551.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest551/Generated551.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest552/Generated552.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest552/Generated552.ilproj
index 48d5b1f290..1e72d7f45c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest552/Generated552.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest552/Generated552.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest553/Generated553.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest553/Generated553.ilproj
index 15e48edd3e..af8c785f05 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest553/Generated553.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest553/Generated553.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest554/Generated554.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest554/Generated554.ilproj
index fc9ad9937e..28db436af4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest554/Generated554.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest554/Generated554.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest555/Generated555.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest555/Generated555.ilproj
index 1c2a5a3dd7..0205c64df4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest555/Generated555.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest555/Generated555.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest556/Generated556.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest556/Generated556.ilproj
index a3bdf42b0f..60e5f2ec8c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest556/Generated556.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest556/Generated556.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest557/Generated557.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest557/Generated557.ilproj
index 2a7063efac..ba3f942860 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest557/Generated557.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest557/Generated557.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest558/Generated558.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest558/Generated558.ilproj
index 61ee5102ae..e4ac01296c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest558/Generated558.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest558/Generated558.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest559/Generated559.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest559/Generated559.ilproj
index 57c7ee5674..0211c218d9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest559/Generated559.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest559/Generated559.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest56/Generated56.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest56/Generated56.ilproj
index abafbf74d4..b6aa531bdc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest56/Generated56.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest56/Generated56.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest560/Generated560.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest560/Generated560.ilproj
index 26f19962de..76986a2914 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest560/Generated560.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest560/Generated560.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest561/Generated561.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest561/Generated561.ilproj
index c40df81e34..ed316a3f38 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest561/Generated561.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest561/Generated561.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest562/Generated562.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest562/Generated562.ilproj
index a83c9382e9..d338424603 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest562/Generated562.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest562/Generated562.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest563/Generated563.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest563/Generated563.ilproj
index 92f77496e4..dc9b86dc99 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest563/Generated563.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest563/Generated563.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest564/Generated564.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest564/Generated564.ilproj
index c077b9f7f1..9cf913b0c0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest564/Generated564.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest564/Generated564.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest565/Generated565.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest565/Generated565.ilproj
index 7691289918..6998ecda7e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest565/Generated565.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest565/Generated565.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest566/Generated566.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest566/Generated566.ilproj
index 655d3ef569..b8f854417c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest566/Generated566.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest566/Generated566.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest567/Generated567.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest567/Generated567.ilproj
index 20a608d101..ae68fd8eab 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest567/Generated567.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest567/Generated567.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest568/Generated568.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest568/Generated568.ilproj
index 28094c7408..0931457ef1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest568/Generated568.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest568/Generated568.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest569/Generated569.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest569/Generated569.ilproj
index 33acabcbe2..5907257554 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest569/Generated569.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest569/Generated569.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest57/Generated57.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest57/Generated57.ilproj
index a4398e8532..3b0a2bbff8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest57/Generated57.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest57/Generated57.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest570/Generated570.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest570/Generated570.ilproj
index 2aee0bf8b1..ce37975971 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest570/Generated570.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest570/Generated570.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest571/Generated571.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest571/Generated571.ilproj
index edcbd6c933..711a6484df 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest571/Generated571.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest571/Generated571.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest572/Generated572.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest572/Generated572.ilproj
index 3d645e88ea..8d03aac42f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest572/Generated572.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest572/Generated572.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest573/Generated573.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest573/Generated573.ilproj
index 48ec340754..c1058919a7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest573/Generated573.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest573/Generated573.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest574/Generated574.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest574/Generated574.ilproj
index a0f5d98e8e..d8522fbaa7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest574/Generated574.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest574/Generated574.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest575/Generated575.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest575/Generated575.ilproj
index 1e1d3ae8df..a24dd08e95 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest575/Generated575.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest575/Generated575.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest576/Generated576.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest576/Generated576.ilproj
index 28585b3113..2dc1240dfc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest576/Generated576.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest576/Generated576.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest577/Generated577.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest577/Generated577.ilproj
index 06329cba62..85e925c01a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest577/Generated577.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest577/Generated577.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest578/Generated578.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest578/Generated578.ilproj
index 3eda113cdd..957eb8e9b6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest578/Generated578.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest578/Generated578.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest579/Generated579.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest579/Generated579.ilproj
index f3b9a4e2b1..4e4f34cba1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest579/Generated579.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest579/Generated579.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest58/Generated58.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest58/Generated58.ilproj
index 3e0294d348..7e53f54909 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest58/Generated58.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest58/Generated58.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest580/Generated580.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest580/Generated580.ilproj
index c69148ec1a..dfa795da54 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest580/Generated580.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest580/Generated580.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest581/Generated581.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest581/Generated581.ilproj
index b029e4fd31..3fa950e80c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest581/Generated581.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest581/Generated581.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest582/Generated582.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest582/Generated582.ilproj
index a2f9a2321a..a6342b5c7e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest582/Generated582.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest582/Generated582.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest583/Generated583.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest583/Generated583.ilproj
index 432071111d..0afd5cb5f0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest583/Generated583.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest583/Generated583.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest584/Generated584.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest584/Generated584.ilproj
index 95794ad253..64c310d1f7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest584/Generated584.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest584/Generated584.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest585/Generated585.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest585/Generated585.ilproj
index 57d1a51232..c802adf252 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest585/Generated585.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest585/Generated585.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest586/Generated586.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest586/Generated586.ilproj
index ca23361114..c89ad2a556 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest586/Generated586.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest586/Generated586.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest587/Generated587.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest587/Generated587.ilproj
index 7f36ef839a..ae5b5f4d4f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest587/Generated587.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest587/Generated587.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest588/Generated588.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest588/Generated588.ilproj
index bdfbaf1ba0..47b4870a98 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest588/Generated588.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest588/Generated588.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest589/Generated589.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest589/Generated589.ilproj
index d8350f1b91..8a4a01911d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest589/Generated589.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest589/Generated589.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest59/Generated59.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest59/Generated59.ilproj
index 2e2f53cf62..0f87db44ca 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest59/Generated59.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest59/Generated59.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest590/Generated590.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest590/Generated590.ilproj
index 5183a83151..8e70b903fa 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest590/Generated590.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest590/Generated590.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest591/Generated591.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest591/Generated591.ilproj
index 614e17fe99..aa8d33baa4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest591/Generated591.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest591/Generated591.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest592/Generated592.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest592/Generated592.ilproj
index a73d871f72..0195e5556d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest592/Generated592.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest592/Generated592.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest593/Generated593.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest593/Generated593.ilproj
index d5e19b0110..89d89de16f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest593/Generated593.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest593/Generated593.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest594/Generated594.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest594/Generated594.ilproj
index ab77a5cc23..05c6c68ed3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest594/Generated594.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest594/Generated594.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest595/Generated595.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest595/Generated595.ilproj
index c6253b07d1..d19d57b4b2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest595/Generated595.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest595/Generated595.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest596/Generated596.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest596/Generated596.ilproj
index 596abee515..7ac94360d1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest596/Generated596.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest596/Generated596.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest597/Generated597.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest597/Generated597.ilproj
index 12ef98acce..4872a034bf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest597/Generated597.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest597/Generated597.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest598/Generated598.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest598/Generated598.ilproj
index ec66038e39..18689c14d9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest598/Generated598.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest598/Generated598.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest599/Generated599.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest599/Generated599.ilproj
index 5df7126c8b..92ea56e9a4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest599/Generated599.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest599/Generated599.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest6/Generated6.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest6/Generated6.ilproj
index 59ec49eb09..e8447f10f4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest6/Generated6.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest6/Generated6.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest60/Generated60.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest60/Generated60.ilproj
index 153939253c..0c2400a153 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest60/Generated60.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest60/Generated60.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest600/Generated600.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest600/Generated600.ilproj
index 9893938ef8..29fee8eae2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest600/Generated600.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest600/Generated600.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest601/Generated601.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest601/Generated601.ilproj
index 9c1c5a1b50..8b5b7fc9df 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest601/Generated601.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest601/Generated601.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest602/Generated602.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest602/Generated602.ilproj
index cfe9729ab6..a234696c6b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest602/Generated602.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest602/Generated602.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest603/Generated603.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest603/Generated603.ilproj
index a0bd903cd0..3d656676dd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest603/Generated603.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest603/Generated603.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest604/Generated604.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest604/Generated604.ilproj
index ef2d618293..6f726b8184 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest604/Generated604.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest604/Generated604.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest605/Generated605.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest605/Generated605.ilproj
index 360e139907..1bbbadba13 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest605/Generated605.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest605/Generated605.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest606/Generated606.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest606/Generated606.ilproj
index 1af7b28621..808de9d1c8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest606/Generated606.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest606/Generated606.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest607/Generated607.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest607/Generated607.ilproj
index 44d78c39e7..119bce34d2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest607/Generated607.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest607/Generated607.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest608/Generated608.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest608/Generated608.ilproj
index ea0a5290e7..ea6a65d2f9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest608/Generated608.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest608/Generated608.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest609/Generated609.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest609/Generated609.ilproj
index 763c22e42e..5349fd20ae 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest609/Generated609.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest609/Generated609.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest61/Generated61.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest61/Generated61.ilproj
index 6e4bdabb03..f4cdbe84a1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest61/Generated61.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest61/Generated61.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest610/Generated610.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest610/Generated610.ilproj
index b453d9a440..4392781a0a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest610/Generated610.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest610/Generated610.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest611/Generated611.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest611/Generated611.ilproj
index e8c36f74a7..92e365f52b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest611/Generated611.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest611/Generated611.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest612/Generated612.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest612/Generated612.ilproj
index 85496c20dd..c41c6e9dee 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest612/Generated612.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest612/Generated612.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest613/Generated613.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest613/Generated613.ilproj
index 1100e46630..f29270de65 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest613/Generated613.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest613/Generated613.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614.ilproj
index 373efc91cd..4eb7251ca6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest615/Generated615.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest615/Generated615.ilproj
index 88e9a6c0e6..c556b3b291 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest615/Generated615.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest615/Generated615.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest616/Generated616.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest616/Generated616.ilproj
index ee39296a4f..679339c0ea 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest616/Generated616.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest616/Generated616.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest617/Generated617.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest617/Generated617.ilproj
index 8ada9a5cd8..22cd7a382b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest617/Generated617.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest617/Generated617.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest618/Generated618.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest618/Generated618.ilproj
index 70e77f4143..7699e6ea78 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest618/Generated618.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest618/Generated618.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest619/Generated619.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest619/Generated619.ilproj
index 2b83779b3d..b4748a5a92 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest619/Generated619.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest619/Generated619.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest62/Generated62.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest62/Generated62.ilproj
index 0dfbea7b77..0b969062cf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest62/Generated62.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest62/Generated62.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest620/Generated620.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest620/Generated620.ilproj
index 80e58ac8ca..aa6795cbc9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest620/Generated620.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest620/Generated620.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest621/Generated621.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest621/Generated621.ilproj
index 82530ca713..f1dd8d119f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest621/Generated621.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest621/Generated621.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest622/Generated622.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest622/Generated622.ilproj
index 32628dbc17..890a36859e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest622/Generated622.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest622/Generated622.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest623/Generated623.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest623/Generated623.ilproj
index 0e49398452..9c75d9d106 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest623/Generated623.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest623/Generated623.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest624/Generated624.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest624/Generated624.ilproj
index 542dfe6725..2513ec35f3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest624/Generated624.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest624/Generated624.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest625/Generated625.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest625/Generated625.ilproj
index cd60f52066..d8959dc100 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest625/Generated625.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest625/Generated625.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest626/Generated626.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest626/Generated626.ilproj
index 1ffb9bec83..05ed293562 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest626/Generated626.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest626/Generated626.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest627/Generated627.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest627/Generated627.ilproj
index acc805afee..730f196bcc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest627/Generated627.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest627/Generated627.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest628/Generated628.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest628/Generated628.ilproj
index 8535955c91..5215815b30 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest628/Generated628.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest628/Generated628.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest629/Generated629.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest629/Generated629.ilproj
index a5ec42a7f6..793da0e593 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest629/Generated629.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest629/Generated629.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest63/Generated63.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest63/Generated63.ilproj
index abf0e4c9ec..724b44cbf7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest63/Generated63.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest63/Generated63.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest630/Generated630.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest630/Generated630.ilproj
index 0e8335989e..7559bc5b2f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest630/Generated630.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest630/Generated630.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest631/Generated631.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest631/Generated631.ilproj
index 62a688588f..5273eb38a5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest631/Generated631.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest631/Generated631.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest632/Generated632.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest632/Generated632.ilproj
index 1eb73bb130..2366d54ba1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest632/Generated632.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest632/Generated632.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest633/Generated633.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest633/Generated633.ilproj
index a84ba68d34..3f8a16f947 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest633/Generated633.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest633/Generated633.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest634/Generated634.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest634/Generated634.ilproj
index aaa2e7f745..8cfc42b12a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest634/Generated634.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest634/Generated634.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest635/Generated635.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest635/Generated635.ilproj
index 5be009b351..35cb5b9ac6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest635/Generated635.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest635/Generated635.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest636/Generated636.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest636/Generated636.ilproj
index 13531272a7..91de5be5f6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest636/Generated636.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest636/Generated636.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest637/Generated637.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest637/Generated637.ilproj
index 1d49382b1c..9140668e3a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest637/Generated637.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest637/Generated637.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest638/Generated638.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest638/Generated638.ilproj
index c3e24d5e94..279be11ebb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest638/Generated638.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest638/Generated638.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest639/Generated639.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest639/Generated639.ilproj
index 3e60410a9d..9016672074 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest639/Generated639.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest639/Generated639.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest64/Generated64.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest64/Generated64.ilproj
index f83562998b..4b28de71ad 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest64/Generated64.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest64/Generated64.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest640/Generated640.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest640/Generated640.ilproj
index 36630606a5..ad8b135f33 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest640/Generated640.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest640/Generated640.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest641/Generated641.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest641/Generated641.ilproj
index 1aba87ebe9..b8465dca63 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest641/Generated641.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest641/Generated641.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest642/Generated642.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest642/Generated642.ilproj
index 1d4d81c762..31f367cf7d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest642/Generated642.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest642/Generated642.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest643/Generated643.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest643/Generated643.ilproj
index ceef6eb79e..910744ffa4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest643/Generated643.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest643/Generated643.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest644/Generated644.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest644/Generated644.ilproj
index de51c0336f..099b6b58cf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest644/Generated644.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest644/Generated644.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest645/Generated645.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest645/Generated645.ilproj
index 48d9b4c8a3..e40f38ea52 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest645/Generated645.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest645/Generated645.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest646/Generated646.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest646/Generated646.ilproj
index a590ceb97d..a33b23b61b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest646/Generated646.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest646/Generated646.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest647/Generated647.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest647/Generated647.ilproj
index 566684ba23..00814d290c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest647/Generated647.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest647/Generated647.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest648/Generated648.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest648/Generated648.ilproj
index b10fab4280..86c0f5d9ad 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest648/Generated648.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest648/Generated648.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest649/Generated649.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest649/Generated649.ilproj
index a5024dde56..c9a4c12f03 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest649/Generated649.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest649/Generated649.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest65/Generated65.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest65/Generated65.ilproj
index dcc72e2edd..b09f6d25c7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest65/Generated65.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest65/Generated65.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest650/Generated650.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest650/Generated650.ilproj
index e75568f3ef..ff00b492a9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest650/Generated650.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest650/Generated650.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest651/Generated651.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest651/Generated651.ilproj
index 9f0ce41c36..fdf3f5b89c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest651/Generated651.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest651/Generated651.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest652/Generated652.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest652/Generated652.ilproj
index c3498d53be..067ed31d56 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest652/Generated652.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest652/Generated652.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest653/Generated653.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest653/Generated653.ilproj
index cb5aa2b200..2795d1a5ef 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest653/Generated653.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest653/Generated653.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest654/Generated654.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest654/Generated654.ilproj
index 3cae8032df..8552f44e7e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest654/Generated654.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest654/Generated654.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest655/Generated655.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest655/Generated655.ilproj
index fbcb2bc41a..ecedcccd97 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest655/Generated655.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest655/Generated655.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest656/Generated656.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest656/Generated656.ilproj
index 5d1abdbb98..2978b6267d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest656/Generated656.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest656/Generated656.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest657/Generated657.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest657/Generated657.ilproj
index b68655c607..f768f7bd64 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest657/Generated657.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest657/Generated657.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest658/Generated658.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest658/Generated658.ilproj
index f7738e9f19..84bea59e0c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest658/Generated658.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest658/Generated658.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest659/Generated659.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest659/Generated659.ilproj
index 4c57e3a9c3..3a3bcc7b63 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest659/Generated659.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest659/Generated659.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest66/Generated66.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest66/Generated66.ilproj
index 0244c60cbf..fce801d964 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest66/Generated66.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest66/Generated66.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest660/Generated660.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest660/Generated660.ilproj
index 8547cf516f..669c16d2aa 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest660/Generated660.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest660/Generated660.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest661/Generated661.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest661/Generated661.ilproj
index 5d8a63425e..076d44a9ec 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest661/Generated661.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest661/Generated661.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest662/Generated662.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest662/Generated662.ilproj
index b105ebf0a0..52fa9aa6ef 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest662/Generated662.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest662/Generated662.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest663/Generated663.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest663/Generated663.ilproj
index 05c1595e7b..c6c65ae825 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest663/Generated663.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest663/Generated663.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest664/Generated664.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest664/Generated664.ilproj
index 53552d2487..0344ff11d9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest664/Generated664.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest664/Generated664.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest665/Generated665.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest665/Generated665.ilproj
index 49c1b1f95c..4e744ae3d7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest665/Generated665.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest665/Generated665.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest666/Generated666.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest666/Generated666.ilproj
index d9b67852a1..e505824e5b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest666/Generated666.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest666/Generated666.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest667/Generated667.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest667/Generated667.ilproj
index 8bbd7b3fdb..13dc5f6205 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest667/Generated667.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest667/Generated667.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest668/Generated668.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest668/Generated668.ilproj
index 3f4f79c23a..6d619befcd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest668/Generated668.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest668/Generated668.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest669/Generated669.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest669/Generated669.ilproj
index 262c6f902e..88725ccac5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest669/Generated669.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest669/Generated669.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest67/Generated67.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest67/Generated67.ilproj
index 78831b2311..6cc16a66d8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest67/Generated67.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest67/Generated67.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest670/Generated670.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest670/Generated670.ilproj
index 356540551b..1651ade0e9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest670/Generated670.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest670/Generated670.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest671/Generated671.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest671/Generated671.ilproj
index cf0895b1bd..de164c8f32 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest671/Generated671.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest671/Generated671.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest672/Generated672.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest672/Generated672.ilproj
index 3db50b56cd..be6367db09 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest672/Generated672.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest672/Generated672.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest673/Generated673.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest673/Generated673.ilproj
index dc507102ce..30a46cb7c7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest673/Generated673.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest673/Generated673.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest674/Generated674.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest674/Generated674.ilproj
index ecd053c548..44658c202d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest674/Generated674.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest674/Generated674.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest675/Generated675.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest675/Generated675.ilproj
index 039787ea87..1d8f6bd181 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest675/Generated675.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest675/Generated675.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest676/Generated676.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest676/Generated676.ilproj
index 47078f8738..4177554798 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest676/Generated676.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest676/Generated676.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest677/Generated677.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest677/Generated677.ilproj
index 60e63665e2..214895fee6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest677/Generated677.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest677/Generated677.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest678/Generated678.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest678/Generated678.ilproj
index 777ee0c4c9..2e18c747a7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest678/Generated678.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest678/Generated678.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest679/Generated679.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest679/Generated679.ilproj
index 722172f177..cfb65e7145 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest679/Generated679.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest679/Generated679.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest68/Generated68.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest68/Generated68.ilproj
index 8217f821ac..833bf78107 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest68/Generated68.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest68/Generated68.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest680/Generated680.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest680/Generated680.ilproj
index 2bf6760c3b..d4a5edf4be 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest680/Generated680.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest680/Generated680.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest681/Generated681.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest681/Generated681.ilproj
index 79b8998978..cab2cec193 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest681/Generated681.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest681/Generated681.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest682/Generated682.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest682/Generated682.ilproj
index 28b0e38441..abc75cba77 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest682/Generated682.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest682/Generated682.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest683/Generated683.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest683/Generated683.ilproj
index 3f30be0c56..232f12dcc7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest683/Generated683.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest683/Generated683.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest684/Generated684.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest684/Generated684.ilproj
index 31d1672aab..33b02e15fe 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest684/Generated684.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest684/Generated684.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest685/Generated685.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest685/Generated685.ilproj
index b9e289e6b7..112f2c860c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest685/Generated685.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest685/Generated685.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest686/Generated686.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest686/Generated686.ilproj
index c709140db8..50aa18c615 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest686/Generated686.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest686/Generated686.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest687/Generated687.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest687/Generated687.ilproj
index 39bd0d6426..447dc92da7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest687/Generated687.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest687/Generated687.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest688/Generated688.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest688/Generated688.ilproj
index 94d34e3f5e..5bd7c60945 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest688/Generated688.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest688/Generated688.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest689/Generated689.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest689/Generated689.ilproj
index 3d44d79031..5c5f91bfd4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest689/Generated689.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest689/Generated689.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest69/Generated69.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest69/Generated69.ilproj
index f79ed3a6f4..18a76c2490 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest69/Generated69.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest69/Generated69.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest690/Generated690.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest690/Generated690.ilproj
index 9a777aa666..bf588f94e5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest690/Generated690.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest690/Generated690.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest691/Generated691.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest691/Generated691.ilproj
index 6e5d5f6f49..64df9ab1a2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest691/Generated691.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest691/Generated691.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest692/Generated692.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest692/Generated692.ilproj
index dd5b7d19d1..c8fb7f7024 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest692/Generated692.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest692/Generated692.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest693/Generated693.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest693/Generated693.ilproj
index 4af797fcc8..cbe20f3a6d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest693/Generated693.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest693/Generated693.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest694/Generated694.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest694/Generated694.ilproj
index ff3b70c564..ce25731a80 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest694/Generated694.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest694/Generated694.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest695/Generated695.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest695/Generated695.ilproj
index c9a0119822..bdc484af7a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest695/Generated695.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest695/Generated695.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest696/Generated696.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest696/Generated696.ilproj
index 005c8c5f5b..948983079b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest696/Generated696.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest696/Generated696.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest697/Generated697.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest697/Generated697.ilproj
index 565a41a7cc..faddb70744 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest697/Generated697.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest697/Generated697.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest698/Generated698.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest698/Generated698.ilproj
index fe6666e903..84deca7d70 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest698/Generated698.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest698/Generated698.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest699/Generated699.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest699/Generated699.ilproj
index ba70f80a67..34357c8fcd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest699/Generated699.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest699/Generated699.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest7/Generated7.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest7/Generated7.ilproj
index cace9fa581..7ded3f1aba 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest7/Generated7.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest7/Generated7.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest70/Generated70.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest70/Generated70.ilproj
index f6cb6d95eb..9f08eb1e80 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest70/Generated70.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest70/Generated70.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest700/Generated700.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest700/Generated700.ilproj
index eee64b904d..18c6b156a9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest700/Generated700.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest700/Generated700.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest701/Generated701.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest701/Generated701.ilproj
index 06cae97060..7da7e02f59 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest701/Generated701.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest701/Generated701.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest702/Generated702.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest702/Generated702.ilproj
index de826fbd22..52c92674cf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest702/Generated702.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest702/Generated702.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest703/Generated703.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest703/Generated703.ilproj
index 3c511fa0ed..6cabffec1b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest703/Generated703.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest703/Generated703.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest704/Generated704.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest704/Generated704.ilproj
index 911739671c..82108ea22e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest704/Generated704.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest704/Generated704.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest705/Generated705.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest705/Generated705.ilproj
index c8d88aeb9a..49a3fb05c4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest705/Generated705.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest705/Generated705.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest706/Generated706.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest706/Generated706.ilproj
index 1208ecdc8f..9a3f4e32eb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest706/Generated706.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest706/Generated706.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest707/Generated707.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest707/Generated707.ilproj
index 43d62a90d8..f2d73a86d0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest707/Generated707.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest707/Generated707.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest708/Generated708.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest708/Generated708.ilproj
index 4cbb44b0d2..cf4528c3ef 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest708/Generated708.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest708/Generated708.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest709/Generated709.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest709/Generated709.ilproj
index 46ffe4a85e..25194d9016 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest709/Generated709.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest709/Generated709.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest71/Generated71.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest71/Generated71.ilproj
index 2965596a14..b9a294edf8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest71/Generated71.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest71/Generated71.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest710/Generated710.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest710/Generated710.ilproj
index a4886793a8..57ce54db25 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest710/Generated710.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest710/Generated710.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest711/Generated711.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest711/Generated711.ilproj
index 480d86ceb1..3e7bf0c592 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest711/Generated711.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest711/Generated711.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest712/Generated712.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest712/Generated712.ilproj
index 48ded8d900..2b6a6cdd39 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest712/Generated712.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest712/Generated712.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest713/Generated713.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest713/Generated713.ilproj
index d1e9fd1f04..1f450a8797 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest713/Generated713.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest713/Generated713.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest714/Generated714.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest714/Generated714.ilproj
index feceb77f38..0e50ee0c05 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest714/Generated714.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest714/Generated714.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest715/Generated715.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest715/Generated715.ilproj
index fa399e331d..28d28aa9db 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest715/Generated715.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest715/Generated715.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest716/Generated716.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest716/Generated716.ilproj
index 6eb6ae1005..612ca0d5da 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest716/Generated716.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest716/Generated716.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest717/Generated717.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest717/Generated717.ilproj
index b240fcc9c6..44860b9d93 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest717/Generated717.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest717/Generated717.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest718/Generated718.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest718/Generated718.ilproj
index 20febfaddd..2a7b46dbe3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest718/Generated718.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest718/Generated718.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest719/Generated719.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest719/Generated719.ilproj
index 2f79094045..f6dec97304 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest719/Generated719.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest719/Generated719.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest72/Generated72.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest72/Generated72.ilproj
index b495cf20c3..6f11b26835 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest72/Generated72.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest72/Generated72.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest720/Generated720.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest720/Generated720.ilproj
index 4e08a5813e..23f7872288 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest720/Generated720.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest720/Generated720.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest721/Generated721.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest721/Generated721.ilproj
index aad60dfd8f..a47ee4d25a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest721/Generated721.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest721/Generated721.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest722/Generated722.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest722/Generated722.ilproj
index df04bf8621..5ea520f960 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest722/Generated722.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest722/Generated722.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest723/Generated723.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest723/Generated723.ilproj
index 6f86b8f84e..01fbd929b0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest723/Generated723.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest723/Generated723.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest724/Generated724.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest724/Generated724.ilproj
index a233f1866b..65b14ae3e2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest724/Generated724.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest724/Generated724.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest725/Generated725.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest725/Generated725.ilproj
index 179031d8ed..a8c85a5ddb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest725/Generated725.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest725/Generated725.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest726/Generated726.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest726/Generated726.ilproj
index f809c32f71..6884bcf0a8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest726/Generated726.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest726/Generated726.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest727/Generated727.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest727/Generated727.ilproj
index d5655efb54..160bfa6ba0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest727/Generated727.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest727/Generated727.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest728/Generated728.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest728/Generated728.ilproj
index 994350a230..9260a5a4ca 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest728/Generated728.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest728/Generated728.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest729/Generated729.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest729/Generated729.ilproj
index 0a6efdd64f..11a562a577 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest729/Generated729.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest729/Generated729.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest73/Generated73.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest73/Generated73.ilproj
index 325d6d959d..fb30e7c03e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest73/Generated73.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest73/Generated73.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest730/Generated730.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest730/Generated730.ilproj
index c08ef81b50..f5052db82d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest730/Generated730.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest730/Generated730.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest731/Generated731.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest731/Generated731.ilproj
index 022e7c86d4..ef914a87b0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest731/Generated731.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest731/Generated731.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest732/Generated732.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest732/Generated732.ilproj
index 2193ed67f3..a937828b98 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest732/Generated732.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest732/Generated732.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest733/Generated733.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest733/Generated733.ilproj
index cea8321e00..b46a810987 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest733/Generated733.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest733/Generated733.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest734/Generated734.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest734/Generated734.ilproj
index 43f9488451..d6b162556c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest734/Generated734.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest734/Generated734.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest735/Generated735.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest735/Generated735.ilproj
index 35cef9af43..6cff7086f7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest735/Generated735.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest735/Generated735.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest736/Generated736.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest736/Generated736.ilproj
index 19f6a03550..da746af31c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest736/Generated736.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest736/Generated736.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest737/Generated737.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest737/Generated737.ilproj
index 6bbc811292..45060d2cf4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest737/Generated737.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest737/Generated737.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest738/Generated738.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest738/Generated738.ilproj
index 7b2328e0b9..2024238f43 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest738/Generated738.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest738/Generated738.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest739/Generated739.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest739/Generated739.ilproj
index 43cc1b0ffb..af81bc7f3a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest739/Generated739.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest739/Generated739.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest74/Generated74.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest74/Generated74.ilproj
index 0e117aecf6..574438208e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest74/Generated74.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest74/Generated74.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest740/Generated740.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest740/Generated740.ilproj
index 43f5e6998b..dd29521df5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest740/Generated740.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest740/Generated740.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest741/Generated741.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest741/Generated741.ilproj
index f6a6a87a72..7c6600a888 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest741/Generated741.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest741/Generated741.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest742/Generated742.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest742/Generated742.ilproj
index 8f81d09e86..78d10bd309 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest742/Generated742.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest742/Generated742.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest743/Generated743.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest743/Generated743.ilproj
index 80f9688f33..6c061b262f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest743/Generated743.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest743/Generated743.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest744/Generated744.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest744/Generated744.ilproj
index d657573c54..9b927698b5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest744/Generated744.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest744/Generated744.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest745/Generated745.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest745/Generated745.ilproj
index 165fa29836..3ada558514 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest745/Generated745.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest745/Generated745.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest746/Generated746.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest746/Generated746.ilproj
index a389437c50..9081590ab9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest746/Generated746.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest746/Generated746.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest747/Generated747.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest747/Generated747.ilproj
index b5f283b4c8..6045dd203e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest747/Generated747.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest747/Generated747.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest748/Generated748.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest748/Generated748.ilproj
index cfae87a151..7da06badc8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest748/Generated748.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest748/Generated748.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest749/Generated749.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest749/Generated749.ilproj
index e52026fe32..005138dddd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest749/Generated749.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest749/Generated749.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest75/Generated75.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest75/Generated75.ilproj
index fe9ec3dc5d..91d0c517eb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest75/Generated75.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest75/Generated75.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest750/Generated750.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest750/Generated750.ilproj
index 62ae333861..3551596498 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest750/Generated750.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest750/Generated750.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest751/Generated751.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest751/Generated751.ilproj
index 245e08dbd2..54ce7d0d81 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest751/Generated751.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest751/Generated751.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest752/Generated752.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest752/Generated752.ilproj
index fc72bb9ae8..d1ad534c6c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest752/Generated752.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest752/Generated752.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest753/Generated753.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest753/Generated753.ilproj
index 9d17c68e7a..3049a842f5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest753/Generated753.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest753/Generated753.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest754/Generated754.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest754/Generated754.ilproj
index dc94895076..53201342b3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest754/Generated754.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest754/Generated754.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest755/Generated755.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest755/Generated755.ilproj
index 1c9a8b3018..5fbcaebb9b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest755/Generated755.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest755/Generated755.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest756/Generated756.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest756/Generated756.ilproj
index edc5ffb0f6..b6ec69829f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest756/Generated756.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest756/Generated756.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest757/Generated757.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest757/Generated757.ilproj
index 84c80152e6..2cb0e01287 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest757/Generated757.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest757/Generated757.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest758/Generated758.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest758/Generated758.ilproj
index 879c3eb8d5..a04b4b9db8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest758/Generated758.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest758/Generated758.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest759/Generated759.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest759/Generated759.ilproj
index 2d67282085..a71350bd8e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest759/Generated759.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest759/Generated759.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest76/Generated76.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest76/Generated76.ilproj
index 51e174faf0..da820b749e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest76/Generated76.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest76/Generated76.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest760/Generated760.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest760/Generated760.ilproj
index 72c8f61113..37d2561cfb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest760/Generated760.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest760/Generated760.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest761/Generated761.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest761/Generated761.ilproj
index 49af5d9b0a..434b2ba845 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest761/Generated761.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest761/Generated761.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest762/Generated762.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest762/Generated762.ilproj
index 6da2b93b78..8b7136cd9b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest762/Generated762.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest762/Generated762.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest763/Generated763.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest763/Generated763.ilproj
index 0bbef138d6..6703e1607d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest763/Generated763.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest763/Generated763.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest764/Generated764.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest764/Generated764.ilproj
index d71cd5d72e..ba06b4764d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest764/Generated764.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest764/Generated764.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest765/Generated765.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest765/Generated765.ilproj
index 4c6d04a43a..76e448864c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest765/Generated765.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest765/Generated765.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest766/Generated766.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest766/Generated766.ilproj
index 20bcb14551..a2c65e271f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest766/Generated766.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest766/Generated766.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest767/Generated767.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest767/Generated767.ilproj
index 7eb8893325..21b3cb9ab3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest767/Generated767.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest767/Generated767.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest768/Generated768.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest768/Generated768.ilproj
index 8c8fbe8609..e14e23c537 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest768/Generated768.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest768/Generated768.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest769/Generated769.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest769/Generated769.ilproj
index 11a4281a48..f54e03681b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest769/Generated769.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest769/Generated769.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest77/Generated77.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest77/Generated77.ilproj
index 74b8085ac1..628480136c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest77/Generated77.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest77/Generated77.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest770/Generated770.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest770/Generated770.ilproj
index e3f0bef5b1..d49589ac4f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest770/Generated770.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest770/Generated770.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest771/Generated771.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest771/Generated771.ilproj
index 3cd8b2bb6d..e9d70ca438 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest771/Generated771.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest771/Generated771.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest772/Generated772.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest772/Generated772.ilproj
index 0c520046ee..093886f41f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest772/Generated772.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest772/Generated772.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest773/Generated773.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest773/Generated773.ilproj
index 334c700836..794e3152d5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest773/Generated773.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest773/Generated773.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest774/Generated774.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest774/Generated774.ilproj
index 715439069f..6013a5041d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest774/Generated774.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest774/Generated774.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest775/Generated775.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest775/Generated775.ilproj
index 719eff121c..3e99d88b30 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest775/Generated775.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest775/Generated775.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest776/Generated776.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest776/Generated776.ilproj
index 5687ae75c8..628fa3afb9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest776/Generated776.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest776/Generated776.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest777/Generated777.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest777/Generated777.ilproj
index 15cf2c798b..0de48bea2a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest777/Generated777.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest777/Generated777.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest778/Generated778.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest778/Generated778.ilproj
index 41a872805d..21fdc9a72a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest778/Generated778.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest778/Generated778.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest779/Generated779.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest779/Generated779.ilproj
index 9617d44ed1..cb0ab10734 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest779/Generated779.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest779/Generated779.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest78/Generated78.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest78/Generated78.ilproj
index 01c695728f..b0ae4a87e2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest78/Generated78.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest78/Generated78.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest780/Generated780.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest780/Generated780.ilproj
index 32d772ed9a..0a77347585 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest780/Generated780.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest780/Generated780.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest781/Generated781.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest781/Generated781.ilproj
index 9dd93b7382..889a16823a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest781/Generated781.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest781/Generated781.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest782/Generated782.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest782/Generated782.ilproj
index bd587af29e..fea279c83a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest782/Generated782.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest782/Generated782.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest783/Generated783.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest783/Generated783.ilproj
index 9b9f5b3f94..69a32cbd72 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest783/Generated783.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest783/Generated783.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest784/Generated784.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest784/Generated784.ilproj
index 2077d94aae..008730c6f1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest784/Generated784.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest784/Generated784.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest785/Generated785.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest785/Generated785.ilproj
index 8ee4ed8cc6..0c5e83c7ea 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest785/Generated785.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest785/Generated785.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest786/Generated786.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest786/Generated786.ilproj
index 63b2bc9943..97ef4fbce1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest786/Generated786.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest786/Generated786.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest787/Generated787.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest787/Generated787.ilproj
index 29ecaab79a..d9e98c8ead 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest787/Generated787.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest787/Generated787.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest788/Generated788.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest788/Generated788.ilproj
index e38213d53d..2dd5e89473 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest788/Generated788.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest788/Generated788.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest789/Generated789.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest789/Generated789.ilproj
index ea0b7962f1..a4b12414a2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest789/Generated789.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest789/Generated789.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest79/Generated79.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest79/Generated79.ilproj
index 1f20e79937..ab40843459 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest79/Generated79.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest79/Generated79.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest790/Generated790.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest790/Generated790.ilproj
index 0de742e027..bf92d639bb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest790/Generated790.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest790/Generated790.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest791/Generated791.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest791/Generated791.ilproj
index 7bae71d91f..550afd12d3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest791/Generated791.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest791/Generated791.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest792/Generated792.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest792/Generated792.ilproj
index 52d231a786..60dbfd6b47 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest792/Generated792.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest792/Generated792.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest793/Generated793.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest793/Generated793.ilproj
index 249d3b3159..ae5e0bc9f3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest793/Generated793.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest793/Generated793.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest794/Generated794.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest794/Generated794.ilproj
index 725fef3956..9bc9841dc8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest794/Generated794.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest794/Generated794.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest795/Generated795.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest795/Generated795.ilproj
index a7854a618a..deafc8a100 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest795/Generated795.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest795/Generated795.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest796/Generated796.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest796/Generated796.ilproj
index 27b5f2bb6b..8d9a444b24 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest796/Generated796.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest796/Generated796.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest797/Generated797.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest797/Generated797.ilproj
index 3bf8361004..003575e13d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest797/Generated797.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest797/Generated797.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest798/Generated798.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest798/Generated798.ilproj
index ce1a95f4b4..d7192c6fc5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest798/Generated798.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest798/Generated798.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest799/Generated799.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest799/Generated799.ilproj
index 1811d0face..f9457d9c8e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest799/Generated799.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest799/Generated799.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest8/Generated8.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest8/Generated8.ilproj
index 6cb4e36f33..84773264d3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest8/Generated8.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest8/Generated8.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest80/Generated80.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest80/Generated80.ilproj
index 7e693e0e52..3c31123b11 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest80/Generated80.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest80/Generated80.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest800/Generated800.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest800/Generated800.ilproj
index bad7fdbd6d..4329c1ba62 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest800/Generated800.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest800/Generated800.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest801/Generated801.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest801/Generated801.ilproj
index b2d9d0b423..414b48e6f2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest801/Generated801.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest801/Generated801.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest802/Generated802.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest802/Generated802.ilproj
index ecc51d3844..32f8e5bab9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest802/Generated802.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest802/Generated802.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest803/Generated803.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest803/Generated803.ilproj
index 8ce235e831..bd052a4bb7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest803/Generated803.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest803/Generated803.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest804/Generated804.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest804/Generated804.ilproj
index 2a2a267517..397c8e9c91 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest804/Generated804.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest804/Generated804.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest805/Generated805.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest805/Generated805.ilproj
index f501405c33..a0d2e4817a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest805/Generated805.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest805/Generated805.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest806/Generated806.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest806/Generated806.ilproj
index ad69bafac9..239dcda966 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest806/Generated806.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest806/Generated806.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest807/Generated807.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest807/Generated807.ilproj
index 644fe6e182..0597eba088 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest807/Generated807.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest807/Generated807.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest808/Generated808.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest808/Generated808.ilproj
index 8b2dad755b..07f02a6d97 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest808/Generated808.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest808/Generated808.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest809/Generated809.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest809/Generated809.ilproj
index 859b0a8e16..4b9e92e737 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest809/Generated809.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest809/Generated809.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest81/Generated81.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest81/Generated81.ilproj
index c075ed5a98..69d66d34e5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest81/Generated81.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest81/Generated81.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest810/Generated810.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest810/Generated810.ilproj
index b3f2cecd07..0bdff22e0f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest810/Generated810.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest810/Generated810.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest811/Generated811.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest811/Generated811.ilproj
index 2c68167699..6c9749f08a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest811/Generated811.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest811/Generated811.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest812/Generated812.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest812/Generated812.ilproj
index 26fb070005..fe3f4359a1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest812/Generated812.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest812/Generated812.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest813/Generated813.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest813/Generated813.ilproj
index 3d4a770b67..da57d3e046 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest813/Generated813.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest813/Generated813.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest814/Generated814.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest814/Generated814.ilproj
index 12e02f2941..27b39e740b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest814/Generated814.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest814/Generated814.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest815/Generated815.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest815/Generated815.ilproj
index a9b3ad94de..1f089a260c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest815/Generated815.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest815/Generated815.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest816/Generated816.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest816/Generated816.ilproj
index c0b1d972f0..9b8f5ee521 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest816/Generated816.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest816/Generated816.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest817/Generated817.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest817/Generated817.ilproj
index affe46b1a0..c0a359ce83 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest817/Generated817.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest817/Generated817.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest818/Generated818.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest818/Generated818.ilproj
index af196fb1df..d7ef4eb03e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest818/Generated818.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest818/Generated818.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest819/Generated819.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest819/Generated819.ilproj
index 61d3ec4990..8db5ab1ccc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest819/Generated819.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest819/Generated819.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest82/Generated82.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest82/Generated82.ilproj
index d1bfdc4dc0..73aac50be2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest82/Generated82.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest82/Generated82.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest820/Generated820.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest820/Generated820.ilproj
index 74a00d6eb4..6f652fca8f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest820/Generated820.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest820/Generated820.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest821/Generated821.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest821/Generated821.ilproj
index 76b6d986c6..813e2be5ae 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest821/Generated821.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest821/Generated821.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest822/Generated822.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest822/Generated822.ilproj
index fa4cb843d8..242c5f3912 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest822/Generated822.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest822/Generated822.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest823/Generated823.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest823/Generated823.ilproj
index df430049f0..967fbd3da5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest823/Generated823.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest823/Generated823.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest824/Generated824.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest824/Generated824.ilproj
index e4e66fff43..5f118d65fc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest824/Generated824.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest824/Generated824.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest825/Generated825.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest825/Generated825.ilproj
index f2383d43d1..0ef6e9c063 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest825/Generated825.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest825/Generated825.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest826/Generated826.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest826/Generated826.ilproj
index d932b635ae..5e22426d3c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest826/Generated826.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest826/Generated826.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest827/Generated827.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest827/Generated827.ilproj
index 345301ab32..cad787deab 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest827/Generated827.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest827/Generated827.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest828/Generated828.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest828/Generated828.ilproj
index 512b4f1ab4..b444d52e15 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest828/Generated828.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest828/Generated828.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest829/Generated829.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest829/Generated829.ilproj
index 625a44a473..82497fa5e0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest829/Generated829.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest829/Generated829.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest83/Generated83.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest83/Generated83.ilproj
index a726ca2453..1594af63e0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest83/Generated83.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest83/Generated83.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest830/Generated830.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest830/Generated830.ilproj
index 8cdeac805f..1660392070 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest830/Generated830.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest830/Generated830.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest831/Generated831.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest831/Generated831.ilproj
index b9e43cb272..d0e999fddd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest831/Generated831.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest831/Generated831.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest832/Generated832.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest832/Generated832.ilproj
index 35e8a873d3..48b9266a14 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest832/Generated832.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest832/Generated832.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest833/Generated833.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest833/Generated833.ilproj
index 704c55b0bd..988294037a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest833/Generated833.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest833/Generated833.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest834/Generated834.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest834/Generated834.ilproj
index 0bdef76d29..94587c0c54 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest834/Generated834.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest834/Generated834.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest835/Generated835.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest835/Generated835.ilproj
index bfff94c05d..c596ddb72d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest835/Generated835.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest835/Generated835.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest836/Generated836.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest836/Generated836.ilproj
index 21dd65ff07..3c607630f7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest836/Generated836.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest836/Generated836.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest837/Generated837.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest837/Generated837.ilproj
index 167903a671..01083fe557 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest837/Generated837.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest837/Generated837.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest838/Generated838.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest838/Generated838.ilproj
index a2ea1d1b6d..1681b8d9c3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest838/Generated838.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest838/Generated838.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest839/Generated839.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest839/Generated839.ilproj
index 9967b64979..9306d36199 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest839/Generated839.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest839/Generated839.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest84/Generated84.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest84/Generated84.ilproj
index c2b7a027dd..3795e3a032 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest84/Generated84.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest84/Generated84.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest840/Generated840.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest840/Generated840.ilproj
index b1e91a4702..d4d9eb7a1f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest840/Generated840.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest840/Generated840.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest841/Generated841.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest841/Generated841.ilproj
index c1909521d1..725ae735d9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest841/Generated841.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest841/Generated841.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest842/Generated842.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest842/Generated842.ilproj
index 899f57ca97..581766e0b3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest842/Generated842.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest842/Generated842.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest843/Generated843.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest843/Generated843.ilproj
index bb9c9e47dd..7354f34b93 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest843/Generated843.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest843/Generated843.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest844/Generated844.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest844/Generated844.ilproj
index 2530705b5f..f8376c816f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest844/Generated844.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest844/Generated844.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest845/Generated845.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest845/Generated845.ilproj
index d93a74a91b..a96b5992b7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest845/Generated845.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest845/Generated845.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest846/Generated846.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest846/Generated846.ilproj
index 12cea43b23..b0b7fd0c24 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest846/Generated846.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest846/Generated846.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest847/Generated847.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest847/Generated847.ilproj
index 9f0ecce77e..497b3bab57 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest847/Generated847.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest847/Generated847.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest848/Generated848.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest848/Generated848.ilproj
index 32bc4caad2..140af57594 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest848/Generated848.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest848/Generated848.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest849/Generated849.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest849/Generated849.ilproj
index cdff18ff04..c9fc233c9b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest849/Generated849.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest849/Generated849.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest85/Generated85.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest85/Generated85.ilproj
index 64e9af3be7..ea11f0392a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest85/Generated85.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest85/Generated85.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest850/Generated850.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest850/Generated850.ilproj
index a88f76d58a..03b35a8d55 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest850/Generated850.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest850/Generated850.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest851/Generated851.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest851/Generated851.ilproj
index 4214ec363f..ec902f4b7a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest851/Generated851.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest851/Generated851.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest852/Generated852.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest852/Generated852.ilproj
index 08fe76a85b..11a3b65a98 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest852/Generated852.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest852/Generated852.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest853/Generated853.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest853/Generated853.ilproj
index ff4fa97b09..677a9ffc83 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest853/Generated853.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest853/Generated853.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest854/Generated854.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest854/Generated854.ilproj
index 2bf8795205..f5e5b76469 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest854/Generated854.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest854/Generated854.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest855/Generated855.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest855/Generated855.ilproj
index 52e7da88b4..cf1f70b7bc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest855/Generated855.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest855/Generated855.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest856/Generated856.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest856/Generated856.ilproj
index af5f6d24d7..fce54477ab 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest856/Generated856.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest856/Generated856.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest857/Generated857.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest857/Generated857.ilproj
index 3894a04fb3..30f994b211 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest857/Generated857.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest857/Generated857.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest858/Generated858.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest858/Generated858.ilproj
index d25c0bdc58..8c92db2127 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest858/Generated858.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest858/Generated858.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest859/Generated859.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest859/Generated859.ilproj
index 297755e4f4..10b2738dcb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest859/Generated859.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest859/Generated859.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest86/Generated86.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest86/Generated86.ilproj
index 478ef1b220..2e8b53ced3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest86/Generated86.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest86/Generated86.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest860/Generated860.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest860/Generated860.ilproj
index 9735fed840..65077a7a6d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest860/Generated860.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest860/Generated860.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest861/Generated861.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest861/Generated861.ilproj
index f2f39a0954..a20d2837fe 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest861/Generated861.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest861/Generated861.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest862/Generated862.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest862/Generated862.ilproj
index c5d32b7ecf..81bfa0b1ba 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest862/Generated862.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest862/Generated862.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest863/Generated863.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest863/Generated863.ilproj
index b88ef5d6f7..8d69aa3b87 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest863/Generated863.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest863/Generated863.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest864/Generated864.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest864/Generated864.ilproj
index 5d15a3147b..78aaba1ebc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest864/Generated864.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest864/Generated864.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest865/Generated865.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest865/Generated865.ilproj
index ea1b28e1f4..b26bc9d5be 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest865/Generated865.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest865/Generated865.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest866/Generated866.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest866/Generated866.ilproj
index f6fa646036..3cdb3429b4 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest866/Generated866.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest866/Generated866.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest867/Generated867.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest867/Generated867.ilproj
index 81527c43c5..b32b9bbc30 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest867/Generated867.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest867/Generated867.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest868/Generated868.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest868/Generated868.ilproj
index cf8a600e9b..a8ee961ee0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest868/Generated868.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest868/Generated868.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest869/Generated869.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest869/Generated869.ilproj
index fb59581b29..d431eb6f3d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest869/Generated869.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest869/Generated869.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest87/Generated87.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest87/Generated87.ilproj
index 461bbaa769..8950eeff3e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest87/Generated87.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest87/Generated87.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest870/Generated870.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest870/Generated870.ilproj
index f572e5089f..5c7271627f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest870/Generated870.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest870/Generated870.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest871/Generated871.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest871/Generated871.ilproj
index 4e47c95bfc..c911ab5c4e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest871/Generated871.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest871/Generated871.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest872/Generated872.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest872/Generated872.ilproj
index 98042c2bb2..e133079cd9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest872/Generated872.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest872/Generated872.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest873/Generated873.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest873/Generated873.ilproj
index 2c434b7ec6..9a67200b22 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest873/Generated873.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest873/Generated873.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest874/Generated874.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest874/Generated874.ilproj
index d3bf39d3b7..20715c5d8a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest874/Generated874.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest874/Generated874.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest875/Generated875.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest875/Generated875.ilproj
index 9c8255fa09..b1a2c6c851 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest875/Generated875.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest875/Generated875.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest876/Generated876.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest876/Generated876.ilproj
index 1929f3d460..15a5ece415 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest876/Generated876.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest876/Generated876.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest877/Generated877.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest877/Generated877.ilproj
index 1bcb4fe24c..12a56b99db 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest877/Generated877.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest877/Generated877.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest878/Generated878.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest878/Generated878.ilproj
index 3c21468b37..1d86882f4e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest878/Generated878.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest878/Generated878.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest879/Generated879.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest879/Generated879.ilproj
index feb85ab4af..22120e3e19 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest879/Generated879.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest879/Generated879.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest88/Generated88.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest88/Generated88.ilproj
index 0bbb0d43f4..cda2d02403 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest88/Generated88.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest88/Generated88.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest880/Generated880.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest880/Generated880.ilproj
index ce5e0d06c4..8ddc021bf6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest880/Generated880.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest880/Generated880.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest881/Generated881.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest881/Generated881.ilproj
index f68814eda4..1b14283c4b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest881/Generated881.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest881/Generated881.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest882/Generated882.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest882/Generated882.ilproj
index 291f00b202..6fbef106b7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest882/Generated882.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest882/Generated882.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest883/Generated883.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest883/Generated883.ilproj
index ed9b7cf8d4..e4c003cffc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest883/Generated883.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest883/Generated883.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest884/Generated884.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest884/Generated884.ilproj
index 442ecc3e48..2da57b5c91 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest884/Generated884.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest884/Generated884.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest885/Generated885.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest885/Generated885.ilproj
index d4b9c8fef3..8f79f79af5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest885/Generated885.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest885/Generated885.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest886/Generated886.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest886/Generated886.ilproj
index f8e3862ce7..4ae995f547 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest886/Generated886.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest886/Generated886.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest887/Generated887.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest887/Generated887.ilproj
index fa44c94580..a8bba762fc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest887/Generated887.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest887/Generated887.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest888/Generated888.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest888/Generated888.ilproj
index 67e9e815c4..f1c107d9de 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest888/Generated888.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest888/Generated888.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest889/Generated889.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest889/Generated889.ilproj
index ca78e531c5..c4f50ad6b6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest889/Generated889.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest889/Generated889.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest89/Generated89.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest89/Generated89.ilproj
index 1904bf718a..92ef607f26 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest89/Generated89.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest89/Generated89.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest890/Generated890.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest890/Generated890.ilproj
index e8e8779702..bce1d2f5a6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest890/Generated890.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest890/Generated890.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest891/Generated891.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest891/Generated891.ilproj
index 556cd95b3f..e2f618b968 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest891/Generated891.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest891/Generated891.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest892/Generated892.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest892/Generated892.ilproj
index e48ab61e4b..77d42328c7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest892/Generated892.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest892/Generated892.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest893/Generated893.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest893/Generated893.ilproj
index 8b3a46c71a..0351deac4b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest893/Generated893.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest893/Generated893.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest894/Generated894.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest894/Generated894.ilproj
index 9f74a9a353..24f34cb392 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest894/Generated894.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest894/Generated894.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest895/Generated895.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest895/Generated895.ilproj
index c2bfee79cd..4792f7a914 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest895/Generated895.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest895/Generated895.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest896/Generated896.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest896/Generated896.ilproj
index fc6a5fffc1..a3bd77c4eb 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest896/Generated896.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest896/Generated896.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest897/Generated897.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest897/Generated897.ilproj
index a483cb57df..dd96b064c6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest897/Generated897.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest897/Generated897.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest898/Generated898.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest898/Generated898.ilproj
index dfc25336d9..45eaa1039f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest898/Generated898.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest898/Generated898.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest899/Generated899.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest899/Generated899.ilproj
index cc0a8eecfc..2964ff1b07 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest899/Generated899.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest899/Generated899.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest9/Generated9.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest9/Generated9.ilproj
index 941e5bde8d..4054abe2d3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest9/Generated9.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest9/Generated9.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest90/Generated90.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest90/Generated90.ilproj
index 300e57b514..47e83ff909 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest90/Generated90.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest90/Generated90.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest900/Generated900.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest900/Generated900.ilproj
index c99e336a52..aba82c1faf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest900/Generated900.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest900/Generated900.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest901/Generated901.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest901/Generated901.ilproj
index 4dc1cb3780..26a79ec484 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest901/Generated901.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest901/Generated901.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest902/Generated902.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest902/Generated902.ilproj
index f18a4e6600..f469ffe2cf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest902/Generated902.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest902/Generated902.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest903/Generated903.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest903/Generated903.ilproj
index 8d7e441c73..11a807d588 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest903/Generated903.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest903/Generated903.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest904/Generated904.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest904/Generated904.ilproj
index f3d2683502..c976eb83e1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest904/Generated904.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest904/Generated904.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest905/Generated905.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest905/Generated905.ilproj
index bf3545ce02..b62e22e63b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest905/Generated905.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest905/Generated905.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest906/Generated906.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest906/Generated906.ilproj
index 3ea33dfe27..67693517f3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest906/Generated906.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest906/Generated906.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest907/Generated907.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest907/Generated907.ilproj
index 45f46d0656..b32180710d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest907/Generated907.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest907/Generated907.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest908/Generated908.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest908/Generated908.ilproj
index 7137cdd037..e8dae940dd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest908/Generated908.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest908/Generated908.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest909/Generated909.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest909/Generated909.ilproj
index adcf85c77a..8d745629fc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest909/Generated909.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest909/Generated909.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest91/Generated91.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest91/Generated91.ilproj
index 8853c6344a..e964b19ca5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest91/Generated91.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest91/Generated91.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest910/Generated910.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest910/Generated910.ilproj
index 8ce5e8ca3b..84ec06a4c0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest910/Generated910.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest910/Generated910.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest911/Generated911.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest911/Generated911.ilproj
index d5e07cf29e..408c43870c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest911/Generated911.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest911/Generated911.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest912/Generated912.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest912/Generated912.ilproj
index 0040939a88..b03aaba3d3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest912/Generated912.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest912/Generated912.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest913/Generated913.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest913/Generated913.ilproj
index 4ff6ac89ad..70afda43fa 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest913/Generated913.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest913/Generated913.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest914/Generated914.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest914/Generated914.ilproj
index f4e9674bfb..b844739b60 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest914/Generated914.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest914/Generated914.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest915/Generated915.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest915/Generated915.ilproj
index 254e47fa5f..fb1bacda53 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest915/Generated915.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest915/Generated915.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest916/Generated916.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest916/Generated916.ilproj
index 63b8416f02..abfee3a282 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest916/Generated916.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest916/Generated916.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest917/Generated917.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest917/Generated917.ilproj
index a220922ae8..6eefe9bc61 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest917/Generated917.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest917/Generated917.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest918/Generated918.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest918/Generated918.ilproj
index cc8f480639..55bf9f332a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest918/Generated918.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest918/Generated918.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest919/Generated919.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest919/Generated919.ilproj
index caa8d6dd6f..4b26c1bf45 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest919/Generated919.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest919/Generated919.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest92/Generated92.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest92/Generated92.ilproj
index d782bfed76..24cfaa1a6a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest92/Generated92.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest92/Generated92.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest920/Generated920.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest920/Generated920.ilproj
index 5c7d7546cb..adcbb56a36 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest920/Generated920.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest920/Generated920.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest921/Generated921.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest921/Generated921.ilproj
index 529211e7dd..9314fc7596 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest921/Generated921.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest921/Generated921.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest922/Generated922.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest922/Generated922.ilproj
index b8886aa61e..8fad3b1406 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest922/Generated922.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest922/Generated922.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest923/Generated923.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest923/Generated923.ilproj
index 5b397934fc..0e27c10c57 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest923/Generated923.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest923/Generated923.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest924/Generated924.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest924/Generated924.ilproj
index 6b06aea724..fa8793d441 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest924/Generated924.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest924/Generated924.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest925/Generated925.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest925/Generated925.ilproj
index b5ce64b7dc..db89af9776 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest925/Generated925.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest925/Generated925.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest926/Generated926.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest926/Generated926.ilproj
index cbcbe02aea..a16156af63 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest926/Generated926.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest926/Generated926.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest927/Generated927.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest927/Generated927.ilproj
index b702c88e0a..5a98786881 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest927/Generated927.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest927/Generated927.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest928/Generated928.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest928/Generated928.ilproj
index 39d6452170..18ec839df3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest928/Generated928.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest928/Generated928.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest929/Generated929.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest929/Generated929.ilproj
index 441258b5ce..f10c1da76e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest929/Generated929.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest929/Generated929.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest93/Generated93.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest93/Generated93.ilproj
index 2db5956321..b6a2a9f611 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest93/Generated93.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest93/Generated93.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest930/Generated930.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest930/Generated930.ilproj
index 18eef09c38..4c7f8b76cc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest930/Generated930.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest930/Generated930.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest931/Generated931.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest931/Generated931.ilproj
index fa761cdf36..c6377beb39 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest931/Generated931.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest931/Generated931.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest932/Generated932.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest932/Generated932.ilproj
index 102cfe81de..5627d0c928 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest932/Generated932.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest932/Generated932.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest933/Generated933.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest933/Generated933.ilproj
index 26183aa0b2..e2e06f618e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest933/Generated933.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest933/Generated933.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest934/Generated934.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest934/Generated934.ilproj
index 1893ac5122..17a797e8d3 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest934/Generated934.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest934/Generated934.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest935/Generated935.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest935/Generated935.ilproj
index 0fbaada28d..cd37468089 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest935/Generated935.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest935/Generated935.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest936/Generated936.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest936/Generated936.ilproj
index 391c04f1d9..12653bfb78 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest936/Generated936.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest936/Generated936.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest937/Generated937.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest937/Generated937.ilproj
index 855e843a4c..002102d571 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest937/Generated937.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest937/Generated937.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest938/Generated938.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest938/Generated938.ilproj
index 9c2041c008..00bd3d78a6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest938/Generated938.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest938/Generated938.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest939/Generated939.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest939/Generated939.ilproj
index 90837bcfe2..8cd385dd28 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest939/Generated939.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest939/Generated939.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest94/Generated94.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest94/Generated94.ilproj
index fb34987373..d7c63a16d7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest94/Generated94.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest94/Generated94.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest940/Generated940.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest940/Generated940.ilproj
index f46719b1be..fc1a247049 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest940/Generated940.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest940/Generated940.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest941/Generated941.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest941/Generated941.ilproj
index 3bd6191920..90a0d5d5cf 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest941/Generated941.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest941/Generated941.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest942/Generated942.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest942/Generated942.ilproj
index 738f4e9829..0121764c25 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest942/Generated942.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest942/Generated942.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest943/Generated943.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest943/Generated943.ilproj
index f0ad18f60c..abf84dc57e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest943/Generated943.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest943/Generated943.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest944/Generated944.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest944/Generated944.ilproj
index 1062dc20fc..1721105530 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest944/Generated944.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest944/Generated944.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest945/Generated945.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest945/Generated945.ilproj
index 020e387943..b54dab8580 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest945/Generated945.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest945/Generated945.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest946/Generated946.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest946/Generated946.ilproj
index 8688abf4aa..f9ce08e74d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest946/Generated946.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest946/Generated946.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest947/Generated947.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest947/Generated947.ilproj
index 9c3d4a465a..ce7e15c7cc 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest947/Generated947.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest947/Generated947.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest948/Generated948.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest948/Generated948.ilproj
index 3e981c2fd0..9d01ca5d6a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest948/Generated948.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest948/Generated948.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest949/Generated949.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest949/Generated949.ilproj
index f3c9c46322..44318ad335 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest949/Generated949.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest949/Generated949.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest95/Generated95.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest95/Generated95.ilproj
index ef2ff13a90..7c397908b1 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest95/Generated95.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest95/Generated95.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest950/Generated950.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest950/Generated950.ilproj
index a81aa1c463..a0eb3c6227 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest950/Generated950.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest950/Generated950.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest951/Generated951.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest951/Generated951.ilproj
index 01ea499d83..a886c2496d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest951/Generated951.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest951/Generated951.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest952/Generated952.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest952/Generated952.ilproj
index 01df6e4548..03d1c932bd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest952/Generated952.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest952/Generated952.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest953/Generated953.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest953/Generated953.ilproj
index 0dff69ada5..7d3c777545 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest953/Generated953.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest953/Generated953.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest954/Generated954.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest954/Generated954.ilproj
index a0162f32f3..2dd59be21e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest954/Generated954.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest954/Generated954.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest955/Generated955.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest955/Generated955.ilproj
index 36be39a8ef..11757a0ccd 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest955/Generated955.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest955/Generated955.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest956/Generated956.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest956/Generated956.ilproj
index 807ff0c454..f5c3e6a1f8 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest956/Generated956.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest956/Generated956.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest957/Generated957.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest957/Generated957.ilproj
index 77332850d7..58d85a6027 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest957/Generated957.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest957/Generated957.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest958/Generated958.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest958/Generated958.ilproj
index dbc4ffd342..f3fc8e6b33 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest958/Generated958.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest958/Generated958.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest959/Generated959.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest959/Generated959.ilproj
index 09e4ff4e57..d7d5fe2d86 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest959/Generated959.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest959/Generated959.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest96/Generated96.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest96/Generated96.ilproj
index 81b1579467..a0283efba6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest96/Generated96.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest96/Generated96.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest960/Generated960.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest960/Generated960.ilproj
index 5dc286f1f7..d54f901964 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest960/Generated960.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest960/Generated960.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest961/Generated961.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest961/Generated961.ilproj
index d9f59ae782..079a6dc94e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest961/Generated961.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest961/Generated961.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest962/Generated962.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest962/Generated962.ilproj
index cc476971f8..2e016e9951 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest962/Generated962.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest962/Generated962.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest963/Generated963.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest963/Generated963.ilproj
index c7bb12fe35..29b9cca730 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest963/Generated963.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest963/Generated963.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest964/Generated964.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest964/Generated964.ilproj
index b9fb9b1f2c..493d780b13 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest964/Generated964.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest964/Generated964.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest965/Generated965.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest965/Generated965.ilproj
index 7842fc0ed1..984bce2941 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest965/Generated965.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest965/Generated965.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest966/Generated966.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest966/Generated966.ilproj
index 531f494ca8..4cbba2833a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest966/Generated966.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest966/Generated966.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest967/Generated967.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest967/Generated967.ilproj
index a8e55a04c6..1923f7e38f 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest967/Generated967.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest967/Generated967.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest968/Generated968.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest968/Generated968.ilproj
index 801b3c3a93..28eb8b1e0b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest968/Generated968.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest968/Generated968.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest969/Generated969.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest969/Generated969.ilproj
index f3a4b3911d..12073547a9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest969/Generated969.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest969/Generated969.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest97/Generated97.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest97/Generated97.ilproj
index b563d16568..06b1d4e369 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest97/Generated97.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest97/Generated97.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest970/Generated970.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest970/Generated970.ilproj
index 1ca290cbd3..42d18e295e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest970/Generated970.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest970/Generated970.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest971/Generated971.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest971/Generated971.ilproj
index 4f20a82df1..de4bbebe24 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest971/Generated971.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest971/Generated971.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest972/Generated972.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest972/Generated972.ilproj
index b0c73e5e14..1765b9445c 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest972/Generated972.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest972/Generated972.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest973/Generated973.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest973/Generated973.ilproj
index c8e688062c..5dcac0747a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest973/Generated973.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest973/Generated973.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest974/Generated974.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest974/Generated974.ilproj
index ea651a6db9..b3a4f5bd19 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest974/Generated974.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest974/Generated974.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest975/Generated975.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest975/Generated975.ilproj
index ce495b3bbf..70db43f93a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest975/Generated975.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest975/Generated975.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest976/Generated976.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest976/Generated976.ilproj
index 8c77c2cbb3..c5bb8916a5 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest976/Generated976.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest976/Generated976.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest977/Generated977.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest977/Generated977.ilproj
index c58094bc54..6e71be55df 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest977/Generated977.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest977/Generated977.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest978/Generated978.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest978/Generated978.ilproj
index 04c489ea8d..e04cacf67d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest978/Generated978.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest978/Generated978.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest979/Generated979.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest979/Generated979.ilproj
index 6bb9e59c2f..b5334bc1c0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest979/Generated979.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest979/Generated979.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest98/Generated98.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest98/Generated98.ilproj
index 11fd030b2d..1cb7df98d7 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest98/Generated98.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest98/Generated98.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest980/Generated980.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest980/Generated980.ilproj
index 563fc23667..b4431e92e9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest980/Generated980.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest980/Generated980.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest981/Generated981.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest981/Generated981.ilproj
index 2167777ecb..13b5904af9 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest981/Generated981.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest981/Generated981.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest982/Generated982.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest982/Generated982.ilproj
index fd7806cb28..dd3292543d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest982/Generated982.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest982/Generated982.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest983/Generated983.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest983/Generated983.ilproj
index b390d59f56..ecb8eae0e6 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest983/Generated983.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest983/Generated983.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest984/Generated984.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest984/Generated984.ilproj
index 4a6bae9b07..05d7f10a96 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest984/Generated984.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest984/Generated984.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest985/Generated985.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest985/Generated985.ilproj
index 61156869a7..3495c0428a 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest985/Generated985.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest985/Generated985.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest986/Generated986.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest986/Generated986.ilproj
index beb744b0d9..0c7c0decca 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest986/Generated986.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest986/Generated986.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest987/Generated987.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest987/Generated987.ilproj
index 7595623c4e..43d01291be 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest987/Generated987.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest987/Generated987.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest988/Generated988.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest988/Generated988.ilproj
index a803dc1ca2..33e84e54ae 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest988/Generated988.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest988/Generated988.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest989/Generated989.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest989/Generated989.ilproj
index 2721887756..d126cc0663 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest989/Generated989.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest989/Generated989.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest99/Generated99.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest99/Generated99.ilproj
index 043c18577c..1025f7b432 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest99/Generated99.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest99/Generated99.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest990/Generated990.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest990/Generated990.ilproj
index da0d02cb3b..f14fac7a70 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest990/Generated990.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest990/Generated990.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest991/Generated991.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest991/Generated991.ilproj
index 0d4e9c8cee..0f58f14155 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest991/Generated991.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest991/Generated991.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest992/Generated992.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest992/Generated992.ilproj
index 0dd92aac49..23d8eb075d 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest992/Generated992.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest992/Generated992.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest993/Generated993.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest993/Generated993.ilproj
index 5a4bdb13cf..5ae969435e 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest993/Generated993.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest993/Generated993.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest994/Generated994.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest994/Generated994.ilproj
index 6c2736f210..34eba65be2 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest994/Generated994.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest994/Generated994.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest995/Generated995.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest995/Generated995.ilproj
index a19eb0b1cd..cec8b4f652 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest995/Generated995.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest995/Generated995.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest996/Generated996.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest996/Generated996.ilproj
index 58349ef284..3ce6eaa5ed 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest996/Generated996.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest996/Generated996.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest997/Generated997.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest997/Generated997.ilproj
index 7bae664dfc..5cb5f74f13 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest997/Generated997.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest997/Generated997.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest998/Generated998.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest998/Generated998.ilproj
index 67aff9c506..459e991a0b 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest998/Generated998.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest998/Generated998.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest999/Generated999.ilproj b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest999/Generated999.ilproj
index 6183ce5ca1..700ec5f3a0 100644
--- a/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest999/Generated999.ilproj
+++ b/tests/src/Loader/classloader/TypeGeneratorTests/TypeGeneratorTest999/Generated999.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorOpenFile.csproj b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorOpenFile.csproj
index 1bb9538bc1..4ea4f4508b 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorOpenFile.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorOpenFile.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowInlinedStatic.csproj b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowInlinedStatic.csproj
index 8a8532f6e3..c1406025a8 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowInlinedStatic.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowInlinedStatic.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowLDFTNStaticMethod.ilproj b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowLDFTNStaticMethod.ilproj
index 11263ec605..56c821b7bb 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowLDFTNStaticMethod.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowLDFTNStaticMethod.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowMethodAccess.csproj b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowMethodAccess.csproj
index e658a4b6e8..8edd25a073 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowMethodAccess.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowMethodAccess.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticField.csproj b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticField.csproj
index a735115550..b02f73654f 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticField.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticField.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticFieldBFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticFieldBFI.ilproj
index cbc1a6d1cd..8485ded667 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticFieldBFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/CctorThrowStaticFieldBFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/ResetGlobalFields.ilproj b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/ResetGlobalFields.ilproj
index 197a707dbc..c8ab2858a0 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/ResetGlobalFields.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/ResetGlobalFields.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcep.csproj b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcep.csproj
index 0c57bccc5d..0d0aa14d2e 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcep.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcep.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcepBFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcepBFI.ilproj
index 18907ec32d..5c5d9cbc02 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcepBFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/TypeLoadInitExcepBFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/UntrustedCodeBFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/UntrustedCodeBFI.ilproj
index f4549a91ad..784b46214a 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/UntrustedCodeBFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CctorsWithSideEffects/UntrustedCodeBFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreads.csproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreads.csproj
index f2222b9d61..a16ab06cd7 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreads.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreads.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il
index f567de543f..d434600112 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.il
@@ -46,11 +46,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x7d0
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In A.cctor: thread {0}: B.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 B::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -68,8 +68,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -89,8 +89,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In B.cctor: thread {0}: C.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 C::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -108,8 +108,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -141,11 +141,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x7d0
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In C.cctor: thread {0}: D.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 D::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -163,8 +163,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -184,11 +184,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x1388
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In D.cctor: thread {0}: E.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 E::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -206,8 +206,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -239,8 +239,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In E.cctor: thread {0}: A.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 A::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -258,8 +258,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -316,85 +316,85 @@
     .entrypoint
     // Code size       302 (0x12e)
     .maxstack  3
-    .locals init (class [mscorlib]System.Threading.Thread V_0,
-             class [mscorlib]System.Threading.Thread V_1,
-             class [mscorlib]System.Threading.Thread V_2,
-             class [mscorlib]System.Threading.Thread V_3,
+    .locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
+             class [System.Threading.Thread]System.Threading.Thread V_1,
+             class [System.Threading.Thread]System.Threading.Thread V_2,
+             class [System.Threading.Thread]System.Threading.Thread V_3,
              int32 V_4,
              bool V_5)
     IL_0000:  nop
     IL_0001:  ldnull
     IL_0002:  ldftn      void Test::RunGetA()
-    IL_0008:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0008:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_000d:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_000d:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0012:  stloc.0
     IL_0013:  ldloc.0
     IL_0014:  ldstr      "T1"
-    IL_0019:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0019:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_001e:  nop
     IL_001f:  ldnull
     IL_0020:  ldftn      void Test::RunGetC()
-    IL_0026:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0026:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_002b:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_002b:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0030:  stloc.1
     IL_0031:  ldloc.1
     IL_0032:  ldstr      "T2"
-    IL_0037:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0037:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_003c:  nop
     IL_003d:  ldnull
     IL_003e:  ldftn      void Test::RunGetD()
-    IL_0044:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0044:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0049:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0049:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_004e:  stloc.2
     IL_004f:  ldloc.2
     IL_0050:  ldstr      "T3"
-    IL_0055:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0055:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_005a:  nop
     IL_005b:  ldnull
     IL_005c:  ldftn      void Test::RunGetE()
-    IL_0062:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0062:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0067:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0067:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_006c:  stloc.3
     IL_006d:  ldloc.3
     IL_006e:  ldstr      "T4"
-    IL_0073:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0073:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_0078:  nop
     IL_0079:  ldloc.0
-    IL_007a:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_007a:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_007f:  nop
     IL_0080:  ldc.i4     0x3e8
-    IL_0085:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0085:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_008a:  nop
     IL_008b:  ldloc.1
-    IL_008c:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_008c:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0091:  nop
     IL_0092:  ldc.i4     0x3e8
-    IL_0097:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0097:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_009c:  nop
     IL_009d:  ldloc.2
-    IL_009e:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_009e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_00a3:  nop
     IL_00a4:  ldc.i4     0x3e8
-    IL_00a9:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_00a9:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_00ae:  nop
     IL_00af:  ldloc.3
-    IL_00b0:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_00b0:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_00b5:  nop
     IL_00b6:  ldloc.3
-    IL_00b7:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_00b7:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_00bc:  nop
     IL_00bd:  ldloc.2
-    IL_00be:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_00be:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_00c3:  nop
     IL_00c4:  ldloc.1
-    IL_00c5:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_00c5:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_00ca:  nop
     IL_00cb:  ldloc.0
-    IL_00cc:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_00cc:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_00d1:  nop
     IL_00d2:  ldsfld     int32 A::i
     IL_00d7:  ldc.i4.5
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.ilproj
index 0ed96ea478..03f8f16882 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorFourThreadsBFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01.csproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01.csproj
index 516157a1e1..34e181bf57 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il
index e3bf0905b1..2d65b10424 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.il
@@ -44,8 +44,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In A.cctor: thread {0}: B.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 B::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -63,8 +63,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -94,8 +94,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In B.cctor: thread {0}: C.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 C::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -113,8 +113,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -144,8 +144,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In C.cctor: thread {0}: D.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 D::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -163,8 +163,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -194,8 +194,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In D.cctor: thread {0}: E.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 E::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -213,8 +213,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -244,8 +244,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In E.cctor: thread {0}: A.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 A::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -263,8 +263,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -321,65 +321,65 @@
     .entrypoint
     // Code size       244 (0xf4)
     .maxstack  3
-    .locals init (class [mscorlib]System.Threading.Thread V_0,
-             class [mscorlib]System.Threading.Thread V_1,
-             class [mscorlib]System.Threading.Thread V_2,
+    .locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
+             class [System.Threading.Thread]System.Threading.Thread V_1,
+             class [System.Threading.Thread]System.Threading.Thread V_2,
              int32 V_3,
              bool V_4)
     IL_0000:  nop
     IL_0001:  ldnull
     IL_0002:  ldftn      void Test::RunGetA()
-    IL_0008:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0008:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_000d:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_000d:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0012:  stloc.0
     IL_0013:  ldloc.0
     IL_0014:  ldstr      "T1"
-    IL_0019:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0019:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_001e:  nop
     IL_001f:  ldnull
     IL_0020:  ldftn      void Test::RunGetC()
-    IL_0026:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0026:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_002b:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_002b:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0030:  stloc.1
     IL_0031:  ldloc.1
     IL_0032:  ldstr      "T2"
-    IL_0037:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0037:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_003c:  nop
     IL_003d:  ldnull
     IL_003e:  ldftn      void Test::RunGetE()
-    IL_0044:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0044:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0049:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0049:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_004e:  stloc.2
     IL_004f:  ldloc.2
     IL_0050:  ldstr      "T3"
-    IL_0055:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0055:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_005a:  nop
     IL_005b:  ldloc.0
-    IL_005c:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_005c:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0061:  nop
     IL_0062:  ldc.i4     0x3e8
-    IL_0067:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0067:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_006c:  nop
     IL_006d:  ldloc.1
-    IL_006e:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_006e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0073:  nop
     IL_0074:  ldc.i4     0x3e8
-    IL_0079:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0079:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_007e:  nop
     IL_007f:  ldloc.2
-    IL_0080:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_0080:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0085:  nop
     IL_0086:  ldloc.2
-    IL_0087:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0087:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_008c:  nop
     IL_008d:  ldloc.1
-    IL_008e:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_008e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_0093:  nop
     IL_0094:  ldloc.0
-    IL_0095:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0095:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_009a:  nop
     IL_009b:  ldsfld     int32 A::i
     IL_00a0:  ldc.i4.5
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.ilproj
index a4173dec6a..22ca80d90e 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads01BFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02.csproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02.csproj
index e1833639f2..485d8e2ed4 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il
index 5c75d8ff5c..73f1125d96 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.il
@@ -44,11 +44,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x7d0
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In A.cctor: thread {0}: B.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 B::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -66,8 +66,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -97,8 +97,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In B.cctor: thread {0}: C.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 C::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -116,8 +116,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -147,8 +147,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In C.cctor: thread {0}: D.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 D::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -166,8 +166,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -197,8 +197,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In D.cctor: thread {0}: E.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 E::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -216,8 +216,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -247,8 +247,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In E.cctor: thread {0}: A.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 A::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -266,8 +266,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -324,65 +324,65 @@
     .entrypoint
     // Code size       244 (0xf4)
     .maxstack  3
-    .locals init (class [mscorlib]System.Threading.Thread V_0,
-             class [mscorlib]System.Threading.Thread V_1,
-             class [mscorlib]System.Threading.Thread V_2,
+    .locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
+             class [System.Threading.Thread]System.Threading.Thread V_1,
+             class [System.Threading.Thread]System.Threading.Thread V_2,
              int32 V_3,
              bool V_4)
     IL_0000:  nop
     IL_0001:  ldnull
     IL_0002:  ldftn      void Test::RunGetA()
-    IL_0008:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0008:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_000d:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_000d:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0012:  stloc.0
     IL_0013:  ldloc.0
     IL_0014:  ldstr      "T1"
-    IL_0019:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0019:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_001e:  nop
     IL_001f:  ldnull
     IL_0020:  ldftn      void Test::RunGetC()
-    IL_0026:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0026:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_002b:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_002b:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0030:  stloc.1
     IL_0031:  ldloc.1
     IL_0032:  ldstr      "T2"
-    IL_0037:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0037:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_003c:  nop
     IL_003d:  ldnull
     IL_003e:  ldftn      void Test::RunGetE()
-    IL_0044:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0044:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0049:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0049:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_004e:  stloc.2
     IL_004f:  ldloc.2
     IL_0050:  ldstr      "T3"
-    IL_0055:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0055:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_005a:  nop
     IL_005b:  ldloc.0
-    IL_005c:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_005c:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0061:  nop
     IL_0062:  ldc.i4     0x3e8
-    IL_0067:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0067:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_006c:  nop
     IL_006d:  ldloc.1
-    IL_006e:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_006e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0073:  nop
     IL_0074:  ldc.i4     0x3e8
-    IL_0079:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0079:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_007e:  nop
     IL_007f:  ldloc.2
-    IL_0080:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_0080:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0085:  nop
     IL_0086:  ldloc.2
-    IL_0087:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0087:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_008c:  nop
     IL_008d:  ldloc.1
-    IL_008e:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_008e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_0093:  nop
     IL_0094:  ldloc.0
-    IL_0095:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0095:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_009a:  nop
     IL_009b:  ldsfld     int32 A::i
     IL_00a0:  ldc.i4.5
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.ilproj
index 2f5fa4ef4a..7790cff36c 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads02BFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03.csproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03.csproj
index 3aed42082e..720ade18e1 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il
index 51d9a3bbe7..1a895424a6 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.il
@@ -44,11 +44,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x7d0
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In A.cctor: thread {0}: B.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 B::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -66,8 +66,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -97,8 +97,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In B.cctor: thread {0}: C.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 C::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -116,8 +116,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -147,11 +147,11 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldc.i4     0x7d0
-    IL_0006:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0006:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_000b:  nop
     IL_000c:  ldstr      "In C.cctor: thread {0}: D.i {1}"
-    IL_0011:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_0016:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0011:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_0016:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_001b:  ldsfld     int32 D::i
     IL_0020:  box        [mscorlib]System.Int32
     IL_0025:  call       void [System.Console]System.Console::WriteLine(string,
@@ -169,8 +169,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -200,8 +200,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In D.cctor: thread {0}: E.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 E::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -219,8 +219,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -250,8 +250,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In E.cctor: thread {0}: A.i {1}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  ldsfld     int32 A::i
     IL_0015:  box        [mscorlib]System.Int32
     IL_001a:  call       void [System.Console]System.Console::WriteLine(string,
@@ -269,8 +269,8 @@
     .maxstack  8
     IL_0000:  nop
     IL_0001:  ldstr      "In MyClass.SomeMethod(): thread {0}"
-    IL_0006:  call       class [mscorlib]System.Threading.Thread [mscorlib]System.Threading.Thread::get_CurrentThread()
-    IL_000b:  callvirt   instance string [mscorlib]System.Threading.Thread::get_Name()
+    IL_0006:  call       class [System.Threading.Thread]System.Threading.Thread [System.Threading.Thread]System.Threading.Thread::get_CurrentThread()
+    IL_000b:  callvirt   instance string [System.Threading.Thread]System.Threading.Thread::get_Name()
     IL_0010:  call       void [System.Console]System.Console::WriteLine(string,
                                                                   object)
     IL_0015:  nop
@@ -327,65 +327,65 @@
     .entrypoint
     // Code size       244 (0xf4)
     .maxstack  3
-    .locals init (class [mscorlib]System.Threading.Thread V_0,
-             class [mscorlib]System.Threading.Thread V_1,
-             class [mscorlib]System.Threading.Thread V_2,
+    .locals init (class [System.Threading.Thread]System.Threading.Thread V_0,
+             class [System.Threading.Thread]System.Threading.Thread V_1,
+             class [System.Threading.Thread]System.Threading.Thread V_2,
              int32 V_3,
              bool V_4)
     IL_0000:  nop
     IL_0001:  ldnull
     IL_0002:  ldftn      void Test::RunGetA()
-    IL_0008:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0008:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_000d:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_000d:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0012:  stloc.0
     IL_0013:  ldloc.0
     IL_0014:  ldstr      "T1"
-    IL_0019:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0019:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_001e:  nop
     IL_001f:  ldnull
     IL_0020:  ldftn      void Test::RunGetC()
-    IL_0026:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0026:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_002b:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_002b:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_0030:  stloc.1
     IL_0031:  ldloc.1
     IL_0032:  ldstr      "T2"
-    IL_0037:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0037:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_003c:  nop
     IL_003d:  ldnull
     IL_003e:  ldftn      void Test::RunGetE()
-    IL_0044:  newobj     instance void [mscorlib]System.Threading.ThreadStart::.ctor(object,
+    IL_0044:  newobj     instance void [System.Threading.Thread]System.Threading.ThreadStart::.ctor(object,
                                                                                      native int)
-    IL_0049:  newobj     instance void [mscorlib]System.Threading.Thread::.ctor(class [mscorlib]System.Threading.ThreadStart)
+    IL_0049:  newobj     instance void [System.Threading.Thread]System.Threading.Thread::.ctor(class [System.Threading.Thread]System.Threading.ThreadStart)
     IL_004e:  stloc.2
     IL_004f:  ldloc.2
     IL_0050:  ldstr      "T3"
-    IL_0055:  callvirt   instance void [mscorlib]System.Threading.Thread::set_Name(string)
+    IL_0055:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::set_Name(string)
     IL_005a:  nop
     IL_005b:  ldloc.0
-    IL_005c:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_005c:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0061:  nop
     IL_0062:  ldc.i4     0x3e8
-    IL_0067:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0067:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_006c:  nop
     IL_006d:  ldloc.1
-    IL_006e:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_006e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0073:  nop
     IL_0074:  ldc.i4     0x3e8
-    IL_0079:  call       void [mscorlib]System.Threading.Thread::Sleep(int32)
+    IL_0079:  call       void [System.Threading.Thread]System.Threading.Thread::Sleep(int32)
     IL_007e:  nop
     IL_007f:  ldloc.2
-    IL_0080:  callvirt   instance void [mscorlib]System.Threading.Thread::Start()
+    IL_0080:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Start()
     IL_0085:  nop
     IL_0086:  ldloc.2
-    IL_0087:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0087:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_008c:  nop
     IL_008d:  ldloc.1
-    IL_008e:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_008e:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_0093:  nop
     IL_0094:  ldloc.0
-    IL_0095:  callvirt   instance void [mscorlib]System.Threading.Thread::Join()
+    IL_0095:  callvirt   instance void [System.Threading.Thread]System.Threading.Thread::Join()
     IL_009a:  nop
     IL_009b:  ldsfld     int32 A::i
     IL_00a0:  ldc.i4.5
diff --git a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.ilproj
index 130a046d52..bbf176cd85 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CircularCctors/CircularCctorThreeThreads03BFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CoreCLR/CctorThrowStaticFieldBFI.ilproj b/tests/src/Loader/classloader/TypeInitialization/CoreCLR/CctorThrowStaticFieldBFI.ilproj
index cbc1a6d1cd..8485ded667 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CoreCLR/CctorThrowStaticFieldBFI.ilproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CoreCLR/CctorThrowStaticFieldBFI.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/CoreCLR/CircularCctorThreeThreads03.csproj b/tests/src/Loader/classloader/TypeInitialization/CoreCLR/CircularCctorThreeThreads03.csproj
index 3aed42082e..720ade18e1 100644
--- a/tests/src/Loader/classloader/TypeInitialization/CoreCLR/CircularCctorThreeThreads03.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/CoreCLR/CircularCctorThreeThreads03.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/Inlining/GenMethInlined.csproj b/tests/src/Loader/classloader/TypeInitialization/Inlining/GenMethInlined.csproj
index ddf22dc70d..18c90f53d2 100644
--- a/tests/src/Loader/classloader/TypeInitialization/Inlining/GenMethInlined.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/Inlining/GenMethInlined.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/Inlining/GenMethInlined_Multinested.csproj b/tests/src/Loader/classloader/TypeInitialization/Inlining/GenMethInlined_Multinested.csproj
index e4d45e1268..dd498430eb 100644
--- a/tests/src/Loader/classloader/TypeInitialization/Inlining/GenMethInlined_Multinested.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/Inlining/GenMethInlined_Multinested.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/Inlining/GenTypeInlined.csproj b/tests/src/Loader/classloader/TypeInitialization/Inlining/GenTypeInlined.csproj
index 5a4a47617b..50a5bf5be2 100644
--- a/tests/src/Loader/classloader/TypeInitialization/Inlining/GenTypeInlined.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/Inlining/GenTypeInlined.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/Inlining/GenTypeInlined_Multinested.csproj b/tests/src/Loader/classloader/TypeInitialization/Inlining/GenTypeInlined_Multinested.csproj
index fd9dbe4c4f..1a35fd287e 100644
--- a/tests/src/Loader/classloader/TypeInitialization/Inlining/GenTypeInlined_Multinested.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/Inlining/GenTypeInlined_Multinested.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/Inlining/Inlined.csproj b/tests/src/Loader/classloader/TypeInitialization/Inlining/Inlined.csproj
index 1648bce589..c68e3a49c2 100644
--- a/tests/src/Loader/classloader/TypeInitialization/Inlining/Inlined.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/Inlining/Inlined.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/Inlining/Inlined_Multinested.csproj b/tests/src/Loader/classloader/TypeInitialization/Inlining/Inlined_Multinested.csproj
index 18e87f05ad..6a4a8eb11b 100644
--- a/tests/src/Loader/classloader/TypeInitialization/Inlining/Inlined_Multinested.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/Inlining/Inlined_Multinested.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal01.csproj b/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal01.csproj
index 93d3d2715e..fac7afa158 100644
--- a/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal01.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal01.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal02.csproj b/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal02.csproj
index 0b37ba9732..f9326d5386 100644
--- a/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal02.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal02.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal03.csproj b/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal03.csproj
index 0eb2ec7430..2ecab860c4 100644
--- a/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal03.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/ThisNulllPointer/CctorZeroVal03.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/TypeInitialization/backpatching/test1.csproj b/tests/src/Loader/classloader/TypeInitialization/backpatching/test1.csproj
index 59b7322d2b..faf9287655 100644
--- a/tests/src/Loader/classloader/TypeInitialization/backpatching/test1.csproj
+++ b/tests/src/Loader/classloader/TypeInitialization/backpatching/test1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/298006/explicitStruct_oddSize.csproj b/tests/src/Loader/classloader/explicitlayout/Regressions/298006/explicitStruct_oddSize.csproj
index f7c2929ae1..c6ddcea6c7 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/298006/explicitStruct_oddSize.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/298006/explicitStruct_oddSize.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/369794/repro369794.csproj b/tests/src/Loader/classloader/explicitlayout/Regressions/369794/repro369794.csproj
index 42bc3091e8..bb63ddb41a 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/369794/repro369794.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/369794/repro369794.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/bigdat.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/bigdat.ilproj
index aa71caceb1..1175e271d3 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/bigdat.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/bigdat.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test10.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test10.ilproj
index b2aec1a465..1f8d5d4aaf 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test10.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test10.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test11.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test11.ilproj
index a1b333334f..ae8206cb91 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test11.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test11.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test13.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test13.ilproj
index be1e9c73fa..1d638e5791 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test13.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test13.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test14.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test14.ilproj
index c4e9d94371..734695b411 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test14.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test14.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test15.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test15.ilproj
index 1fba48aa7c..19856536f8 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test15.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test15.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test16.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test16.ilproj
index d6c5d6b204..90fc1aae70 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test16.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test16.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test2.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test2.ilproj
index 55d28eedc7..5b0225d7ec 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test2.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test2.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test21.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test21.ilproj
index d45d30bff4..d20cc920bf 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test21.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test21.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test23.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test23.ilproj
index 7742c3e669..fc3b22d08b 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test23.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test23.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test24.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test24.ilproj
index aadc030469..ca1b39dd95 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test24.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test24.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test3.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test3.ilproj
index c25f9935eb..fd9d8e38fa 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test3.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test3.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test9.ilproj b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test9.ilproj
index 946d6a065a..77fbfcca95 100644
--- a/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test9.ilproj
+++ b/tests/src/Loader/classloader/explicitlayout/Regressions/ASURT/ASURT150271/test9.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/misc/case10.csproj b/tests/src/Loader/classloader/explicitlayout/misc/case10.csproj
index 5f9bd289c6..2210ef23e0 100644
--- a/tests/src/Loader/classloader/explicitlayout/misc/case10.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/misc/case10.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/misc/derivedExplicitClass.csproj b/tests/src/Loader/classloader/explicitlayout/misc/derivedExplicitClass.csproj
index 32b76688a4..d23a3ce386 100644
--- a/tests/src/Loader/classloader/explicitlayout/misc/derivedExplicitClass.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/misc/derivedExplicitClass.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case1.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case1.csproj
index 8dbd78892a..c2042218a6 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case1.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case11.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case11.csproj
index d670087b31..781643deb8 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case11.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case11.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case12.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case12.csproj
index 0ab766bde7..185f95b5bb 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case12.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case12.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case14.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case14.csproj
index 51c614190b..1bdfdde1ed 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case14.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case14.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case15.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case15.csproj
index 00615b55f1..7f91f8c119 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case15.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case15.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case2.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case2.csproj
index 31831197ae..630c10eda1 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case2.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case3.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case3.csproj
index 2022402a6d..ea4c1ab336 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case3.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case4.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case4.csproj
index bc8989a8dd..11cb5f75d3 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case4.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case4.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case5.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case5.csproj
index cd4c00baa9..d6b9371607 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case5.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case5.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case6.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case6.csproj
index 1da5be1bde..305c7f203c 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case6.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case6.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case7.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case7.csproj
index ac77629bee..8b51596d36 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case7.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case7.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case8.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case8.csproj
index 4eb3c16c35..c762b70950 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case8.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case8.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case9.csproj b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case9.csproj
index 486fef0e6b..7bf26c6596 100644
--- a/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case9.csproj
+++ b/tests/src/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/case9.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Constraints/General/ManyGenConstraints.csproj b/tests/src/Loader/classloader/generics/Constraints/General/ManyGenConstraints.csproj
index 3194fa3b06..bec7ddd0aa 100644
--- a/tests/src/Loader/classloader/generics/Constraints/General/ManyGenConstraints.csproj
+++ b/tests/src/Loader/classloader/generics/Constraints/General/ManyGenConstraints.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Constraints/Recursion/RecursiveConstraints.csproj b/tests/src/Loader/classloader/generics/Constraints/Recursion/RecursiveConstraints.csproj
index 1a2f50bf7f..1233619cb7 100644
--- a/tests/src/Loader/classloader/generics/Constraints/Recursion/RecursiveConstraints.csproj
+++ b/tests/src/Loader/classloader/generics/Constraints/Recursion/RecursiveConstraints.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Constraints/Regressions/532403/VSW532403.csproj b/tests/src/Loader/classloader/generics/Constraints/Regressions/532403/VSW532403.csproj
index 211b423cf0..bd16064147 100644
--- a/tests/src/Loader/classloader/generics/Constraints/Regressions/532403/VSW532403.csproj
+++ b/tests/src/Loader/classloader/generics/Constraints/Regressions/532403/VSW532403.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Constraints/Regressions/ddb62403/bug62403.csproj b/tests/src/Loader/classloader/generics/Constraints/Regressions/ddb62403/bug62403.csproj
index c223b9e7fb..fdfcd50856 100644
--- a/tests/src/Loader/classloader/generics/Constraints/Regressions/ddb62403/bug62403.csproj
+++ b/tests/src/Loader/classloader/generics/Constraints/Regressions/ddb62403/bug62403.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Constraints/Regressions/dev10_512868/dev10_512868.csproj b/tests/src/Loader/classloader/generics/Constraints/Regressions/dev10_512868/dev10_512868.csproj
index 9e302d218f..0fc20a133e 100644
--- a/tests/src/Loader/classloader/generics/Constraints/Regressions/dev10_512868/dev10_512868.csproj
+++ b/tests/src/Loader/classloader/generics/Constraints/Regressions/dev10_512868/dev10_512868.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Constraints/Regressions/vsw609874/vsw609874.csproj b/tests/src/Loader/classloader/generics/Constraints/Regressions/vsw609874/vsw609874.csproj
index 3e4f209123..e413fec4c8 100644
--- a/tests/src/Loader/classloader/generics/Constraints/Regressions/vsw609874/vsw609874.csproj
+++ b/tests/src/Loader/classloader/generics/Constraints/Regressions/vsw609874/vsw609874.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/VSW491668.csproj b/tests/src/Loader/classloader/generics/GenericMethods/VSW491668.csproj
index 18fe03cd00..139b63da06 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/VSW491668.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/VSW491668.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/VarargTypes.ilproj b/tests/src/Loader/classloader/generics/GenericMethods/VarargTypes.ilproj
index 464173023d..039be37dc9 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/VarargTypes.ilproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/VarargTypes.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/arity01.ilproj b/tests/src/Loader/classloader/generics/GenericMethods/arity01.ilproj
index 21e046af71..86c1ecc548 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/arity01.ilproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/arity01.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method001.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method001.csproj
index 1da43296d5..1788071f4d 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method001.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method001.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method001a.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method001a.csproj
index e8e06c7104..6b3270154c 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method001a.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method001a.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method001b.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method001b.csproj
index 2e49227a1c..160df24f8a 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method001b.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method001b.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method001c.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method001c.csproj
index 1f5fa06964..644003d19c 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method001c.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method001c.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method001d.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method001d.csproj
index 4f8993666e..e871b9aa8f 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method001d.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method001d.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method001e.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method001e.csproj
index 58f097454e..7891770395 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method001e.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method001e.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method001f.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method001f.csproj
index 7a07491643..bed8eaf436 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method001f.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method001f.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method001g.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method001g.csproj
index f9d42c24cc..f18bd209d1 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method001g.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method001g.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method001h.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method001h.csproj
index f3b9ef06cc..9c16c30379 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method001h.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method001h.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method001i.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method001i.csproj
index 78d4b92f69..660811869a 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method001i.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method001i.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method001j.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method001j.csproj
index 1eb0c80082..a04316ab45 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method001j.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method001j.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method002.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method002.csproj
index 9ebfb31d4e..e972740e55 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method002.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method002.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method003.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method003.csproj
index 8f525a4da6..2f42963007 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method003.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method003.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method004.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method004.csproj
index 85b36055e1..31145da941 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method004.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method004.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method005.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method005.csproj
index d52a314ebe..72ae09e7c6 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method005.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method005.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method006.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method006.csproj
index 5771503100..065798bfa7 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method006.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method006.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method007.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method007.csproj
index dcc3e2ee0f..82d140fde3 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method007.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method007.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method008.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method008.csproj
index 02d3b65a62..62ae1c5e57 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method008.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method008.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method009.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method009.csproj
index 6746e486b7..01c398209a 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method009.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method009.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method010.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method010.csproj
index 01786b6c5c..54164665a9 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method010.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method010.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method011.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method011.csproj
index 3980e93a4d..96dda1ca82 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method011.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method011.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method012.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method012.csproj
index 5e1fa64aa2..b6537886e9 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method012.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method012.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method013.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method013.csproj
index e0dfd2a068..58c3ff6fca 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method013.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method013.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method014.ilproj b/tests/src/Loader/classloader/generics/GenericMethods/method014.ilproj
index a44fa74d79..eb1f3b1c11 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method014.ilproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method014.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method015.csproj b/tests/src/Loader/classloader/generics/GenericMethods/method015.csproj
index f57003a9a7..87ced62a87 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method015.csproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method015.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/GenericMethods/method016.ilproj b/tests/src/Loader/classloader/generics/GenericMethods/method016.ilproj
index b84b2fa464..a94e3d4ce1 100644
--- a/tests/src/Loader/classloader/generics/GenericMethods/method016.ilproj
+++ b/tests/src/Loader/classloader/generics/GenericMethods/method016.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/T_Types.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/T_Types.ilproj
index d9c145a1a9..99d98c67af 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/T_Types.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/T_Types.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/Type_ofT_Inherit_FromT.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/Type_ofT_Inherit_FromT.ilproj
index 1673dd07aa..c6becce8cc 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/Type_ofT_Inherit_FromT.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/Type_ofT_Inherit_FromT.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract01.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract01.ilproj
index bc42a49d64..1c1a36cc86 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract01.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract01.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract02.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract02.ilproj
index 250271a173..c8a7c164c3 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract02.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract02.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract02.reflect.xml b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract02.reflect.xml
new file mode 100644
index 0000000000..237cb23b05
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract02.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="abstract02">
+        <type fullname="GenBase" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract03.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract03.ilproj
index 85067df801..450a479588 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract03.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract03.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract03.reflect.xml b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract03.reflect.xml
new file mode 100644
index 0000000000..38bfab98d6
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract03.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="abstract03">
+        <type fullname="GenBase" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract04.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract04.ilproj
index 62ba4c75d2..6a319ee835 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract04.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract04.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract04.reflect.xml b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract04.reflect.xml
new file mode 100644
index 0000000000..a780585a2d
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract04.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="abstract04">
+        <type fullname="GenBase" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract05.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract05.ilproj
index 3b140c6f75..0bedfc9d0b 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract05.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract05.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract06.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract06.ilproj
index 534a63f06e..8640ed04ae 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract06.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract06.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract07.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract07.ilproj
index 3d70941405..ea3bbde1cf 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract07.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract07.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract08.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract08.ilproj
index 0167bc20bb..b92b5cb823 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract08.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract08.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract09.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract09.ilproj
index f1e965c476..d61163ff3e 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract09.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract09.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract10.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract10.ilproj
index 92fdcc5949..ab25793db1 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract10.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/abstract10.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/param01.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/param01.ilproj
index 9c161e1e13..f4173724e6 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/param01.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/param01.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/param02.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/param02.ilproj
index 0348790657..079fe5af7b 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/param02.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/param02.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/param03.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/param03.ilproj
index 89dafcf7b4..be1e5170bf 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/param03.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/param03.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/param04.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/param04.ilproj
index b74ba80c2d..62d5142506 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/param04.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/param04.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/param05.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/param05.ilproj
index b3e28769a5..1af596c6b3 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/param05.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/param05.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/param06.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/param06.ilproj
index 5a184a2efa..e54915be09 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/param06.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/param06.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/param07.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/param07.ilproj
index 34c961b857..5e1cb1b820 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/param07.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/param07.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Negative/param08.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Negative/param08.ilproj
index 675f126a9d..87094b255a 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Negative/param08.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Negative/param08.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj
index f3c40e002d..6f27e8bf33 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj
index 3a12200a99..9a214840c8 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj
index 994f6b156b..d4f7c90f52 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase01.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase01.csproj
index eed0e19697..9260a4792b 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase01.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase01.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase02.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase02.csproj
index 097740edfb..ea6687fb6c 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase02.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase02.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase03.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase03.csproj
index c1fb9929be..894a0438aa 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase03.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase03.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase04.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase04.csproj
index 65991f127c..11dbb5ee38 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase04.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase04.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase05.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase05.csproj
index c68644918f..8808c14dcd 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase05.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase05.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase06.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase06.csproj
index fd55dc6790..9b1b2815c3 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase06.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase06.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase07.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase07.csproj
index 8c16947bee..7112d691f2 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase07.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/AbstractBase07.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface01.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface01.csproj
index afdb98d2c4..c8b3bba3c4 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface01.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface01.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface02.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface02.csproj
index 29c842f5cf..e374f044de 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface02.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface02.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface03.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface03.csproj
index 2e9ab3923a..87a6308df3 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface03.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface03.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface04.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface04.csproj
index 7535443732..1c55ba33b4 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface04.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface04.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface05.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface05.csproj
index 4806bf41e5..559d7f28c0 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface05.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface05.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface06.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface06.csproj
index 2f35377779..1e98081e49 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface06.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface06.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface07.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface07.csproj
index c634e64e9f..827d989af7 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface07.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface07.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface08.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface08.csproj
index e7b61afc03..f95deca933 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface08.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface08.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface09.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface09.csproj
index 531cc1a88a..b738c41fbf 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface09.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface09.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface10.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface10.csproj
index 07d6e4a68b..be568a697b 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface10.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface10.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface11.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface11.csproj
index 3e9e954941..38fce2356d 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface11.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface11.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface12.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface12.csproj
index 142ce3f0ba..a333eb9171 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface12.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface12.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface13.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface13.csproj
index fe28372498..121c5965bc 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface13.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface13.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface14.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface14.csproj
index 1f2a9ca414..fb3c78b315 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface14.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/MultipleInterface14.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass01.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass01.csproj
index 0187ca816d..9bfa694fab 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass01.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass01.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass02.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass02.csproj
index c1bb547082..810c9a0ef5 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass02.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass02.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass03.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass03.csproj
index 1833d7892c..a4a5565595 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass03.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass03.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass04.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass04.csproj
index 0dcc93705d..3344254f96 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass04.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass04.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass05.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass05.csproj
index e1e839aeeb..fec947ec64 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass05.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass05.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass06.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass06.csproj
index c37f554db1..eb2a03ac14 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass06.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedBaseClass06.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass01.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass01.csproj
index 180f1724ca..3a799f46b9 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass01.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass01.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass02.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass02.csproj
index afbaa47500..d983538537 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass02.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass02.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass03.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass03.csproj
index 012d3f6395..210096d232 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass03.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass03.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass04.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass04.csproj
index f7d0266bab..16c4c7ea43 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass04.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedClass04.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface01.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface01.csproj
index cd1175c14e..eaa9b6b170 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface01.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface01.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface02.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface02.csproj
index e3c487af15..a849a20d1f 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface02.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface02.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface03.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface03.csproj
index 7dfae2be3c..9df770a317 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface03.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface03.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface04.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface04.csproj
index 654c2d60cb..7aa13fc159 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface04.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface04.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface05.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface05.csproj
index 296f89e792..23919023a3 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface05.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface05.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface06.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface06.csproj
index 4025339328..25ab157e93 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface06.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface06.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface07.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface07.csproj
index 36f4a388b8..a711649389 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface07.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface07.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface08.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface08.csproj
index 3c8acf6f04..6591a5c9f8 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface08.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedInterface08.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct01.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct01.csproj
index 9871ce107e..02dd9533c4 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct01.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct01.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct02.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct02.csproj
index 340a44ec30..02e5d5b48c 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct02.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct02.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct03.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct03.csproj
index 8f54cb6eee..6f23a86c1b 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct03.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct03.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct04.csproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct04.csproj
index dae41765b4..b01f4dcaeb 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct04.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/NestedStruct04.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Positive/Types.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Positive/Types.ilproj
index 4526a96666..fe5422b8dc 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Positive/Types.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Positive/Types.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Recursion/GenTypeItself.csproj b/tests/src/Loader/classloader/generics/Instantiation/Recursion/GenTypeItself.csproj
index 8cb0f6f4cb..85f45f6937 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Recursion/GenTypeItself.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Recursion/GenTypeItself.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Recursion/RecursiveInheritance.csproj b/tests/src/Loader/classloader/generics/Instantiation/Recursion/RecursiveInheritance.csproj
index bd97f89765..2199c5a5cd 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Recursion/RecursiveInheritance.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Recursion/RecursiveInheritance.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Recursion/Struct_ImplementMscorlibGenInterface.csproj b/tests/src/Loader/classloader/generics/Instantiation/Recursion/Struct_ImplementMscorlibGenInterface.csproj
index c34f51de56..98e3c81438 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Recursion/Struct_ImplementMscorlibGenInterface.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Recursion/Struct_ImplementMscorlibGenInterface.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Recursion/genrecur.csproj b/tests/src/Loader/classloader/generics/Instantiation/Recursion/genrecur.csproj
index 9badafd82b..8a56ddda53 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Recursion/genrecur.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Recursion/genrecur.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Regressions/607/DevDiv607.csproj b/tests/src/Loader/classloader/generics/Instantiation/Regressions/607/DevDiv607.csproj
index 66af63e26b..b04c26d421 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Regressions/607/DevDiv607.csproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Regressions/607/DevDiv607.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Instantiation/Regressions/607/check2.ilproj b/tests/src/Loader/classloader/generics/Instantiation/Regressions/607/check2.ilproj
index 1b5167e2cf..4bc2a9d8bc 100644
--- a/tests/src/Loader/classloader/generics/Instantiation/Regressions/607/check2.ilproj
+++ b/tests/src/Loader/classloader/generics/Instantiation/Regressions/607/check2.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base01a_auto.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base01a_auto.csproj
index 6e2b848b2a..f6306536d0 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base01a_auto.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base01a_auto.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base01a_auto_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base01a_auto_ser.csproj
index 486256f8c2..413035991b 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base01a_auto_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base01a_auto_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base01a_seq.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base01a_seq.csproj
index 2d69822b7f..f4768f7cbb 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base01a_seq.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base01a_seq.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base01a_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base01a_seq_ser.csproj
index 052f51385c..af68e089a9 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base01a_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base01a_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base01b_auto_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base01b_auto_ser.csproj
index 6bd017b75c..c8ace01658 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base01b_auto_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base01b_auto_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base01b_seq.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base01b_seq.csproj
index 855caf3176..b6148ec775 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base01b_seq.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base01b_seq.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base01b_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base01b_seq_ser.csproj
index c440f774ae..9afe761f47 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base01b_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base01b_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base01c_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base01c_seq_ser.csproj
index 249db6fadd..a2500e7b5c 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base01c_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base01c_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base01d_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base01d_seq_ser.csproj
index 079c2443fa..deee9700f0 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base01d_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base01d_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base02a_auto.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base02a_auto.csproj
index 7e5560c621..00d27e63e8 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base02a_auto.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base02a_auto.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base02a_auto_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base02a_auto_ser.csproj
index 8f02eb2729..09d46b3916 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base02a_auto_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base02a_auto_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base02a_seq.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base02a_seq.csproj
index 21f417088b..79c0023b73 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base02a_seq.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base02a_seq.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base02a_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base02a_seq_ser.csproj
index 4b6fd87b7e..80190bf5fd 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base02a_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base02a_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base02b_auto_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base02b_auto_ser.csproj
index 468e79c545..b3a5d73514 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base02b_auto_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base02b_auto_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base02b_seq.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base02b_seq.csproj
index 08ebabcf58..b7f11cf305 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base02b_seq.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base02b_seq.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base02b_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base02b_seq_ser.csproj
index f04266d53a..04adc83521 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base02b_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base02b_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base02c_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base02c_seq_ser.csproj
index d9c58e051f..f881f7e71c 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base02c_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base02c_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/Base02d_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/Base02d_seq_ser.csproj
index 4e7874dec3..e1fb26fa05 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/Base02d_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/Base02d_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/class01_auto.csproj b/tests/src/Loader/classloader/generics/Layout/General/class01_auto.csproj
index 1a0f38c8b4..7727984d7c 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/class01_auto.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/class01_auto.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/class01_auto_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/class01_auto_ser.csproj
index 3fb9ea9d63..70e5d40805 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/class01_auto_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/class01_auto_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/class01_seq.csproj b/tests/src/Loader/classloader/generics/Layout/General/class01_seq.csproj
index 0f7d285f31..906674b85d 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/class01_seq.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/class01_seq.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/class01_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/class01_seq_ser.csproj
index 8d45914e6c..2a82463de9 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/class01_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/class01_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/class02_auto.csproj b/tests/src/Loader/classloader/generics/Layout/General/class02_auto.csproj
index 152f9540b4..dba2936f3e 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/class02_auto.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/class02_auto.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/class02_auto_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/class02_auto_ser.csproj
index 29d2a653a5..a1362ec357 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/class02_auto_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/class02_auto_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/class02_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/class02_seq_ser.csproj
index f4a78c2433..5012f5c0de 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/class02_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/class02_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/struct01_auto.csproj b/tests/src/Loader/classloader/generics/Layout/General/struct01_auto.csproj
index bfa7bf985c..7503e679d8 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/struct01_auto.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/struct01_auto.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/struct01_auto_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/struct01_auto_ser.csproj
index ef71c0cd40..a14a496c5e 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/struct01_auto_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/struct01_auto_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/struct01_seq.csproj b/tests/src/Loader/classloader/generics/Layout/General/struct01_seq.csproj
index f63f12e187..d8cdc7e289 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/struct01_seq.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/struct01_seq.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/struct01_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/struct01_seq_ser.csproj
index bd1e866677..b00d6b0e67 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/struct01_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/struct01_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/struct02_auto.csproj b/tests/src/Loader/classloader/generics/Layout/General/struct02_auto.csproj
index 032558d559..74991e74f5 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/struct02_auto.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/struct02_auto.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/struct02_auto_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/struct02_auto_ser.csproj
index b1b8f4dcaa..3dc30d6c61 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/struct02_auto_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/struct02_auto_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/struct02_seq.csproj b/tests/src/Loader/classloader/generics/Layout/General/struct02_seq.csproj
index 51b98a303b..86590d1c58 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/struct02_seq.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/struct02_seq.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/General/struct02_seq_ser.csproj b/tests/src/Loader/classloader/generics/Layout/General/struct02_seq_ser.csproj
index eed2cc98a9..903cf87347 100644
--- a/tests/src/Loader/classloader/generics/Layout/General/struct02_seq_ser.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/General/struct02_seq_ser.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/Specific/Negative002.csproj b/tests/src/Loader/classloader/generics/Layout/Specific/Negative002.csproj
index a592cc04de..767d7cd78d 100644
--- a/tests/src/Loader/classloader/generics/Layout/Specific/Negative002.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/Specific/Negative002.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/Specific/Negative004.csproj b/tests/src/Loader/classloader/generics/Layout/Specific/Negative004.csproj
index 010f349c77..f760dc1a9b 100644
--- a/tests/src/Loader/classloader/generics/Layout/Specific/Negative004.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/Specific/Negative004.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/Specific/Negative_ExplicitGen.csproj b/tests/src/Loader/classloader/generics/Layout/Specific/Negative_ExplicitGen.csproj
index 8ffd85e791..c9eeb574df 100644
--- a/tests/src/Loader/classloader/generics/Layout/Specific/Negative_ExplicitGen.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/Specific/Negative_ExplicitGen.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/Specific/Positive007.csproj b/tests/src/Loader/classloader/generics/Layout/Specific/Positive007.csproj
index ba728266d0..0e7839564c 100644
--- a/tests/src/Loader/classloader/generics/Layout/Specific/Positive007.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/Specific/Positive007.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/Specific/Positive008.csproj b/tests/src/Loader/classloader/generics/Layout/Specific/Positive008.csproj
index 30b7a6c9e3..9cba459916 100644
--- a/tests/src/Loader/classloader/generics/Layout/Specific/Positive008.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/Specific/Positive008.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/Specific/Positive009.csproj b/tests/src/Loader/classloader/generics/Layout/Specific/Positive009.csproj
index 5063f1c56c..9f14363e1f 100644
--- a/tests/src/Loader/classloader/generics/Layout/Specific/Positive009.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/Specific/Positive009.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Layout/Specific/Positive010.csproj b/tests/src/Loader/classloader/generics/Layout/Specific/Positive010.csproj
index 38e01d8447..10b1cadc76 100644
--- a/tests/src/Loader/classloader/generics/Layout/Specific/Positive010.csproj
+++ b/tests/src/Loader/classloader/generics/Layout/Specific/Positive010.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Misc/Classes.csproj b/tests/src/Loader/classloader/generics/Misc/Classes.csproj
index 65b1491cb4..1a56137623 100644
--- a/tests/src/Loader/classloader/generics/Misc/Classes.csproj
+++ b/tests/src/Loader/classloader/generics/Misc/Classes.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Misc/ConstraintsAndInheritance.csproj b/tests/src/Loader/classloader/generics/Misc/ConstraintsAndInheritance.csproj
index 279b3f5153..60de56b6c1 100644
--- a/tests/src/Loader/classloader/generics/Misc/ConstraintsAndInheritance.csproj
+++ b/tests/src/Loader/classloader/generics/Misc/ConstraintsAndInheritance.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Misc/TestWithManyParams.csproj b/tests/src/Loader/classloader/generics/Misc/TestWithManyParams.csproj
index 32ce759378..4d064b90b2 100644
--- a/tests/src/Loader/classloader/generics/Misc/TestWithManyParams.csproj
+++ b/tests/src/Loader/classloader/generics/Misc/TestWithManyParams.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem1.csproj b/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem1.csproj
index 177f897d65..046657eeac 100644
--- a/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem1.csproj
+++ b/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem2.csproj b/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem2.csproj
index 9158b0adb0..7062344154 100644
--- a/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem2.csproj
+++ b/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem3.csproj b/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem3.csproj
index b1495beeae..b15aec6e7c 100644
--- a/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem3.csproj
+++ b/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem4.csproj b/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem4.csproj
index 73d9514d45..f8b66f5441 100644
--- a/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem4.csproj
+++ b/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem4.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem5.csproj b/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem5.csproj
index b65a5288a0..7bbbb1e3c9 100644
--- a/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem5.csproj
+++ b/tests/src/Loader/classloader/generics/Statics/Regressions/524571/StaticsProblem5.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtual.csproj b/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtual.csproj
index 6f19b2e785..b3ac26ce57 100644
--- a/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtual.csproj
+++ b/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtual.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtualNewslot.csproj b/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtualNewslot.csproj
index 6832bce939..1dba6a4b57 100644
--- a/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtualNewslot.csproj
+++ b/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtualNewslot.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtualNewslot_Interface.csproj b/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtualNewslot_Interface.csproj
index 52da6dc468..08a58be07f 100644
--- a/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtualNewslot_Interface.csproj
+++ b/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtualNewslot_Interface.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtual_Interface.csproj b/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtual_Interface.csproj
index e20b29a48a..76b5783d49 100644
--- a/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtual_Interface.csproj
+++ b/tests/src/Loader/classloader/generics/VSD/Class2_ImplicitOverrideVirtual_Interface.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Class_ExplicitOverrideVirtualNewslot.ilproj b/tests/src/Loader/classloader/generics/VSD/Class_ExplicitOverrideVirtualNewslot.ilproj
index 4c350a49f1..2033d93beb 100644
--- a/tests/src/Loader/classloader/generics/VSD/Class_ExplicitOverrideVirtualNewslot.ilproj
+++ b/tests/src/Loader/classloader/generics/VSD/Class_ExplicitOverrideVirtualNewslot.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Class_ExplicitOverrideVirtualNewslotFinal.csproj b/tests/src/Loader/classloader/generics/VSD/Class_ExplicitOverrideVirtualNewslotFinal.csproj
index 69f633dbab..4a8d70fe1c 100644
--- a/tests/src/Loader/classloader/generics/VSD/Class_ExplicitOverrideVirtualNewslotFinal.csproj
+++ b/tests/src/Loader/classloader/generics/VSD/Class_ExplicitOverrideVirtualNewslotFinal.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Class_ImplicitOverrideVirtualNewslot.csproj b/tests/src/Loader/classloader/generics/VSD/Class_ImplicitOverrideVirtualNewslot.csproj
index 9ad13ed2a4..fbff907203 100644
--- a/tests/src/Loader/classloader/generics/VSD/Class_ImplicitOverrideVirtualNewslot.csproj
+++ b/tests/src/Loader/classloader/generics/VSD/Class_ImplicitOverrideVirtualNewslot.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Class_ImplicitOverrideVirtualNewslotFinal.csproj b/tests/src/Loader/classloader/generics/VSD/Class_ImplicitOverrideVirtualNewslotFinal.csproj
index 07c3f4c993..780ed96691 100644
--- a/tests/src/Loader/classloader/generics/VSD/Class_ImplicitOverrideVirtualNewslotFinal.csproj
+++ b/tests/src/Loader/classloader/generics/VSD/Class_ImplicitOverrideVirtualNewslotFinal.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Struct_ExplicitOverrideVirtualNewslot.ilproj b/tests/src/Loader/classloader/generics/VSD/Struct_ExplicitOverrideVirtualNewslot.ilproj
index fa83eb4ffe..ccff0712f2 100644
--- a/tests/src/Loader/classloader/generics/VSD/Struct_ExplicitOverrideVirtualNewslot.ilproj
+++ b/tests/src/Loader/classloader/generics/VSD/Struct_ExplicitOverrideVirtualNewslot.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Struct_ExplicitOverrideVirtualNewslotFinal.csproj b/tests/src/Loader/classloader/generics/VSD/Struct_ExplicitOverrideVirtualNewslotFinal.csproj
index 355f9f4b65..a8a131c6b0 100644
--- a/tests/src/Loader/classloader/generics/VSD/Struct_ExplicitOverrideVirtualNewslotFinal.csproj
+++ b/tests/src/Loader/classloader/generics/VSD/Struct_ExplicitOverrideVirtualNewslotFinal.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslot.ilproj b/tests/src/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslot.ilproj
index 67ff1a4a8c..2228023a4c 100644
--- a/tests/src/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslot.ilproj
+++ b/tests/src/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslot.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslotFinal.csproj b/tests/src/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslotFinal.csproj
index ffa92541c0..161a4e615e 100644
--- a/tests/src/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslotFinal.csproj
+++ b/tests/src/Loader/classloader/generics/VSD/Struct_ImplicitOverrideVirtualNewslotFinal.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/CoreCLR/Lib.ilproj b/tests/src/Loader/classloader/generics/Variance/CoreCLR/Lib.ilproj
index 6b591c81dc..60adcf3dc4 100644
--- a/tests/src/Loader/classloader/generics/Variance/CoreCLR/Lib.ilproj
+++ b/tests/src/Loader/classloader/generics/Variance/CoreCLR/Lib.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/CoreCLR/Lib2.ilproj b/tests/src/Loader/classloader/generics/Variance/CoreCLR/Lib2.ilproj
index 04cc9f9ea5..b836ac3e2e 100644
--- a/tests/src/Loader/classloader/generics/Variance/CoreCLR/Lib2.ilproj
+++ b/tests/src/Loader/classloader/generics/Variance/CoreCLR/Lib2.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/CoreCLR/Method001.csproj b/tests/src/Loader/classloader/generics/Variance/CoreCLR/Method001.csproj
index f88b5beaa4..33011fdcb5 100644
--- a/tests/src/Loader/classloader/generics/Variance/CoreCLR/Method001.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/CoreCLR/Method001.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/CoreCLR/Method003.csproj b/tests/src/Loader/classloader/generics/Variance/CoreCLR/Method003.csproj
index 229ffa71de..715170bf86 100644
--- a/tests/src/Loader/classloader/generics/Variance/CoreCLR/Method003.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/CoreCLR/Method003.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Delegates/Delegates001.csproj b/tests/src/Loader/classloader/generics/Variance/Delegates/Delegates001.csproj
index 7d65c58359..4838abf1d1 100644
--- a/tests/src/Loader/classloader/generics/Variance/Delegates/Delegates001.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/Delegates/Delegates001.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Delegates/Delegates002.csproj b/tests/src/Loader/classloader/generics/Variance/Delegates/Delegates002.csproj
index b94a8a047e..82ce0d9816 100644
--- a/tests/src/Loader/classloader/generics/Variance/Delegates/Delegates002.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/Delegates/Delegates002.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Delegates/Lib.ilproj b/tests/src/Loader/classloader/generics/Variance/Delegates/Lib.ilproj
index 6b591c81dc..60adcf3dc4 100644
--- a/tests/src/Loader/classloader/generics/Variance/Delegates/Lib.ilproj
+++ b/tests/src/Loader/classloader/generics/Variance/Delegates/Lib.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/CastClass001.csproj b/tests/src/Loader/classloader/generics/Variance/IL/CastClass001.csproj
index 909d8bd928..2414ec8e75 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/CastClass001.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/CastClass001.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/CastClass001.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/CastClass001.reflect.xml
new file mode 100644
index 0000000000..077ab03a05
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/CastClass001.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="CastClass001">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/CastClass004.csproj b/tests/src/Loader/classloader/generics/Variance/IL/CastClass004.csproj
index c2d1b63dfb..0012262a23 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/CastClass004.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/CastClass004.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/CastClass004.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/CastClass004.reflect.xml
new file mode 100644
index 0000000000..1f2f4d37ae
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/CastClass004.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="CastClass004">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/InterfaceInheritanceTest2.csproj b/tests/src/Loader/classloader/generics/Variance/IL/InterfaceInheritanceTest2.csproj
index 3b98bd17fa..8bd910d10a 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/InterfaceInheritanceTest2.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/InterfaceInheritanceTest2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst001.csproj b/tests/src/Loader/classloader/generics/Variance/IL/IsInst001.csproj
index 2e6142f48d..ed458a163d 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/IsInst001.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst001.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst001.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/IsInst001.reflect.xml
new file mode 100644
index 0000000000..d75d6a295f
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst001.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="IsInst001">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst002.csproj b/tests/src/Loader/classloader/generics/Variance/IL/IsInst002.csproj
index 2187db2960..c500ea068a 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/IsInst002.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst002.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst002.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/IsInst002.reflect.xml
new file mode 100644
index 0000000000..162ca63f74
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst002.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="IsInst002">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst003.csproj b/tests/src/Loader/classloader/generics/Variance/IL/IsInst003.csproj
index 25cd8e361a..6dd22dc0b7 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/IsInst003.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst003.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst003.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/IsInst003.reflect.xml
new file mode 100644
index 0000000000..7e4c7b6443
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst003.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="IsInst003">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst004.csproj b/tests/src/Loader/classloader/generics/Variance/IL/IsInst004.csproj
index 739cf4e708..d8a2865b22 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/IsInst004.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst004.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst004.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/IsInst004.reflect.xml
new file mode 100644
index 0000000000..09a841ff85
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst004.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="IsInst004">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst005.csproj b/tests/src/Loader/classloader/generics/Variance/IL/IsInst005.csproj
index 46bad46c2e..b41f2e25af 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/IsInst005.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst005.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst005.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/IsInst005.reflect.xml
new file mode 100644
index 0000000000..dd98bf8ef6
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst005.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="IsInst005">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst006.csproj b/tests/src/Loader/classloader/generics/Variance/IL/IsInst006.csproj
index 195207c38c..e07723cedd 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/IsInst006.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst006.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/IsInst006.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/IsInst006.reflect.xml
new file mode 100644
index 0000000000..8e2fc041b4
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/IsInst006.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="IsInst006">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Lib.ilproj b/tests/src/Loader/classloader/generics/Variance/IL/Lib.ilproj
index 6b591c81dc..60adcf3dc4 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/Lib.ilproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Lib.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox001.csproj b/tests/src/Loader/classloader/generics/Variance/IL/Unbox001.csproj
index 268be47824..b88aab511d 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/Unbox001.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox001.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox001.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/Unbox001.reflect.xml
new file mode 100644
index 0000000000..3572bdcc5e
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox001.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="Unbox001">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox002.csproj b/tests/src/Loader/classloader/generics/Variance/IL/Unbox002.csproj
index 2e63181d3b..f83d730cbb 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/Unbox002.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox002.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox002.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/Unbox002.reflect.xml
new file mode 100644
index 0000000000..8c607487ca
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox002.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="Unbox002">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox003.csproj b/tests/src/Loader/classloader/generics/Variance/IL/Unbox003.csproj
index 6e336880a0..46e9cd8f80 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/Unbox003.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox003.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox003.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/Unbox003.reflect.xml
new file mode 100644
index 0000000000..b70f20a2f2
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox003.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="Unbox003">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox004.csproj b/tests/src/Loader/classloader/generics/Variance/IL/Unbox004.csproj
index 06528af67b..76485ad791 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/Unbox004.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox004.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox004.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/Unbox004.reflect.xml
new file mode 100644
index 0000000000..d97a8d00a1
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox004.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="Unbox004">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox005.csproj b/tests/src/Loader/classloader/generics/Variance/IL/Unbox005.csproj
index b69977dc45..b64980f94c 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/Unbox005.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox005.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox005.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/Unbox005.reflect.xml
new file mode 100644
index 0000000000..9810fa4053
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox005.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="Unbox005">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox006.csproj b/tests/src/Loader/classloader/generics/Variance/IL/Unbox006.csproj
index c0f00a000a..6b65e4cafa 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/Unbox006.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox006.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/Unbox006.reflect.xml b/tests/src/Loader/classloader/generics/Variance/IL/Unbox006.reflect.xml
new file mode 100644
index 0000000000..51a1ca7e71
--- /dev/null
+++ b/tests/src/Loader/classloader/generics/Variance/IL/Unbox006.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="Unbox006">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/VarInterfaceLib.ilproj b/tests/src/Loader/classloader/generics/Variance/IL/VarInterfaceLib.ilproj
index e7615baaed..f1c9a3499b 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/VarInterfaceLib.ilproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/VarInterfaceLib.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/VarInterfaceLib2.ilproj b/tests/src/Loader/classloader/generics/Variance/IL/VarInterfaceLib2.ilproj
index 1ffd8d3fd8..6d05044855 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/VarInterfaceLib2.ilproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/VarInterfaceLib2.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/varlib.ilproj b/tests/src/Loader/classloader/generics/Variance/IL/varlib.ilproj
index 971542ce15..f42102b51e 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/varlib.ilproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/varlib.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/IL/vsw543506.csproj b/tests/src/Loader/classloader/generics/Variance/IL/vsw543506.csproj
index 0c8fe09f47..8e1c575aff 100644
--- a/tests/src/Loader/classloader/generics/Variance/IL/vsw543506.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/IL/vsw543506.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Interfaces/Interfaces001.csproj b/tests/src/Loader/classloader/generics/Variance/Interfaces/Interfaces001.csproj
index 3545faea43..d466eed596 100644
--- a/tests/src/Loader/classloader/generics/Variance/Interfaces/Interfaces001.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/Interfaces/Interfaces001.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Interfaces/Interfaces002.csproj b/tests/src/Loader/classloader/generics/Variance/Interfaces/Interfaces002.csproj
index e76ec889b6..3d4b38c622 100644
--- a/tests/src/Loader/classloader/generics/Variance/Interfaces/Interfaces002.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/Interfaces/Interfaces002.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Interfaces/Lib.ilproj b/tests/src/Loader/classloader/generics/Variance/Interfaces/Lib.ilproj
index 6b591c81dc..60adcf3dc4 100644
--- a/tests/src/Loader/classloader/generics/Variance/Interfaces/Lib.ilproj
+++ b/tests/src/Loader/classloader/generics/Variance/Interfaces/Lib.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Methods/Lib.ilproj b/tests/src/Loader/classloader/generics/Variance/Methods/Lib.ilproj
index 6b591c81dc..60adcf3dc4 100644
--- a/tests/src/Loader/classloader/generics/Variance/Methods/Lib.ilproj
+++ b/tests/src/Loader/classloader/generics/Variance/Methods/Lib.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Methods/Lib2.ilproj b/tests/src/Loader/classloader/generics/Variance/Methods/Lib2.ilproj
index 04cc9f9ea5..b836ac3e2e 100644
--- a/tests/src/Loader/classloader/generics/Variance/Methods/Lib2.ilproj
+++ b/tests/src/Loader/classloader/generics/Variance/Methods/Lib2.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Methods/Method001.csproj b/tests/src/Loader/classloader/generics/Variance/Methods/Method001.csproj
index f88b5beaa4..33011fdcb5 100644
--- a/tests/src/Loader/classloader/generics/Variance/Methods/Method001.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/Methods/Method001.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Methods/Method002.csproj b/tests/src/Loader/classloader/generics/Variance/Methods/Method002.csproj
index 3e3360e339..8930d492eb 100644
--- a/tests/src/Loader/classloader/generics/Variance/Methods/Method002.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/Methods/Method002.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Methods/Method003.csproj b/tests/src/Loader/classloader/generics/Variance/Methods/Method003.csproj
index 229ffa71de..715170bf86 100644
--- a/tests/src/Loader/classloader/generics/Variance/Methods/Method003.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/Methods/Method003.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Methods/Method004.csproj b/tests/src/Loader/classloader/generics/Variance/Methods/Method004.csproj
index a4f7d38caf..ccf92459da 100644
--- a/tests/src/Loader/classloader/generics/Variance/Methods/Method004.csproj
+++ b/tests/src/Loader/classloader/generics/Variance/Methods/Method004.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Variance/Regressions/dev10_468712/dev10_468712.ilproj b/tests/src/Loader/classloader/generics/Variance/Regressions/dev10_468712/dev10_468712.ilproj
index 71136e9c31..e594c1ba4b 100644
--- a/tests/src/Loader/classloader/generics/Variance/Regressions/dev10_468712/dev10_468712.ilproj
+++ b/tests/src/Loader/classloader/generics/Variance/Regressions/dev10_468712/dev10_468712.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Visibility/A_Types.ilproj b/tests/src/Loader/classloader/generics/Visibility/A_Types.ilproj
index 62e0e43b51..6fcd822ba9 100644
--- a/tests/src/Loader/classloader/generics/Visibility/A_Types.ilproj
+++ b/tests/src/Loader/classloader/generics/Visibility/A_Types.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/Visibility/B_Types.ilproj b/tests/src/Loader/classloader/generics/Visibility/B_Types.ilproj
index b8e42a7cfe..6a1a95c777 100644
--- a/tests/src/Loader/classloader/generics/Visibility/B_Types.ilproj
+++ b/tests/src/Loader/classloader/generics/Visibility/B_Types.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/109968/test.ilproj b/tests/src/Loader/classloader/generics/regressions/109968/test.ilproj
index 8e4d7068ad..a41757afad 100644
--- a/tests/src/Loader/classloader/generics/regressions/109968/test.ilproj
+++ b/tests/src/Loader/classloader/generics/regressions/109968/test.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/123712/repro123712.csproj b/tests/src/Loader/classloader/generics/regressions/123712/repro123712.csproj
index 1f4544a446..d14a39f907 100644
--- a/tests/src/Loader/classloader/generics/regressions/123712/repro123712.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/123712/repro123712.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/137310/test137310.csproj b/tests/src/Loader/classloader/generics/regressions/137310/test137310.csproj
index 4a1a0da362..0f99e4d17a 100644
--- a/tests/src/Loader/classloader/generics/regressions/137310/test137310.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/137310/test137310.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/188892/test188892.csproj b/tests/src/Loader/classloader/generics/regressions/188892/test188892.csproj
index 402b6942ce..ececbd6e7d 100644
--- a/tests/src/Loader/classloader/generics/regressions/188892/test188892.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/188892/test188892.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/237932/repro237932.csproj b/tests/src/Loader/classloader/generics/regressions/237932/repro237932.csproj
index e7e26d4d39..b8e80f29a9 100644
--- a/tests/src/Loader/classloader/generics/regressions/237932/repro237932.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/237932/repro237932.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/334376/b334376.csproj b/tests/src/Loader/classloader/generics/regressions/334376/b334376.csproj
index fd0cef5d58..ad9fd502a7 100644
--- a/tests/src/Loader/classloader/generics/regressions/334376/b334376.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/334376/b334376.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/341477/Test.csproj b/tests/src/Loader/classloader/generics/regressions/341477/Test.csproj
index 62e074e631..b70eaac3ef 100644
--- a/tests/src/Loader/classloader/generics/regressions/341477/Test.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/341477/Test.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/395780/testExplicitOverride.csproj b/tests/src/Loader/classloader/generics/regressions/395780/testExplicitOverride.csproj
index 5a4da13ca5..c22c58b7f9 100644
--- a/tests/src/Loader/classloader/generics/regressions/395780/testExplicitOverride.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/395780/testExplicitOverride.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/395780/testExplicitOverride2.ilproj b/tests/src/Loader/classloader/generics/regressions/395780/testExplicitOverride2.ilproj
index 626e6a707c..985d483c80 100644
--- a/tests/src/Loader/classloader/generics/regressions/395780/testExplicitOverride2.ilproj
+++ b/tests/src/Loader/classloader/generics/regressions/395780/testExplicitOverride2.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/433497/vsw433497.csproj b/tests/src/Loader/classloader/generics/regressions/433497/vsw433497.csproj
index 1c2ddcd487..cefc273b30 100644
--- a/tests/src/Loader/classloader/generics/regressions/433497/vsw433497.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/433497/vsw433497.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/448208/b448208.csproj b/tests/src/Loader/classloader/generics/regressions/448208/b448208.csproj
index 15e45c2bf2..899f0f4489 100644
--- a/tests/src/Loader/classloader/generics/regressions/448208/b448208.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/448208/b448208.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/515341/vsw515341.csproj b/tests/src/Loader/classloader/generics/regressions/515341/vsw515341.csproj
index e9a09a593f..4e0d3e5b78 100644
--- a/tests/src/Loader/classloader/generics/regressions/515341/vsw515341.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/515341/vsw515341.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/536564/vsw536564.csproj b/tests/src/Loader/classloader/generics/regressions/536564/vsw536564.csproj
index 472e60e343..bb11fc20f8 100644
--- a/tests/src/Loader/classloader/generics/regressions/536564/vsw536564.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/536564/vsw536564.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/DD117522/Test.csproj b/tests/src/Loader/classloader/generics/regressions/DD117522/Test.csproj
index 62e074e631..b70eaac3ef 100644
--- a/tests/src/Loader/classloader/generics/regressions/DD117522/Test.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/DD117522/Test.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/dd95372/dd95372.csproj b/tests/src/Loader/classloader/generics/regressions/dd95372/dd95372.csproj
index 3ce55b5992..a1b44e0407 100644
--- a/tests/src/Loader/classloader/generics/regressions/dd95372/dd95372.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/dd95372/dd95372.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/ddb3422/ddb3422.csproj b/tests/src/Loader/classloader/generics/regressions/ddb3422/ddb3422.csproj
index 52d24087b0..e6fd7110cd 100644
--- a/tests/src/Loader/classloader/generics/regressions/ddb3422/ddb3422.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/ddb3422/ddb3422.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/dev10_393447/dev10_393447.ilproj b/tests/src/Loader/classloader/generics/regressions/dev10_393447/dev10_393447.ilproj
index 98d77de8a8..1977295833 100644
--- a/tests/src/Loader/classloader/generics/regressions/dev10_393447/dev10_393447.ilproj
+++ b/tests/src/Loader/classloader/generics/regressions/dev10_393447/dev10_393447.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/dev10_531793/dev10_531793.ilproj b/tests/src/Loader/classloader/generics/regressions/dev10_531793/dev10_531793.ilproj
index 11c77bb9f7..a4441ff3e9 100644
--- a/tests/src/Loader/classloader/generics/regressions/dev10_531793/dev10_531793.ilproj
+++ b/tests/src/Loader/classloader/generics/regressions/dev10_531793/dev10_531793.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/vsw237932/repro237932.csproj b/tests/src/Loader/classloader/generics/regressions/vsw237932/repro237932.csproj
index e7e26d4d39..b8e80f29a9 100644
--- a/tests/src/Loader/classloader/generics/regressions/vsw237932/repro237932.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/vsw237932/repro237932.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride2.ilproj b/tests/src/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride2.ilproj
index 626e6a707c..985d483c80 100644
--- a/tests/src/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride2.ilproj
+++ b/tests/src/Loader/classloader/generics/regressions/vsw395780/testExplicitOverride2.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/vsw514968/vsw514968.csproj b/tests/src/Loader/classloader/generics/regressions/vsw514968/vsw514968.csproj
index d3d767f044..cfdd7d8c04 100644
--- a/tests/src/Loader/classloader/generics/regressions/vsw514968/vsw514968.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/vsw514968/vsw514968.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/vsw524571/StaticsProblem5.csproj b/tests/src/Loader/classloader/generics/regressions/vsw524571/StaticsProblem5.csproj
index cf6050d8a4..62c2c13483 100644
--- a/tests/src/Loader/classloader/generics/regressions/vsw524571/StaticsProblem5.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/vsw524571/StaticsProblem5.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/generics/regressions/vsw578898/vsw578898.csproj b/tests/src/Loader/classloader/generics/regressions/vsw578898/vsw578898.csproj
index 47a6747d62..0cd980ab50 100644
--- a/tests/src/Loader/classloader/generics/regressions/vsw578898/vsw578898.csproj
+++ b/tests/src/Loader/classloader/generics/regressions/vsw578898/vsw578898.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/methodoverriding/regressions/549411/exploit.csproj b/tests/src/Loader/classloader/methodoverriding/regressions/549411/exploit.csproj
index 29cb737ea5..1ebf6ee1d0 100644
--- a/tests/src/Loader/classloader/methodoverriding/regressions/549411/exploit.csproj
+++ b/tests/src/Loader/classloader/methodoverriding/regressions/549411/exploit.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/methodoverriding/regressions/576621/VSW576621.csproj b/tests/src/Loader/classloader/methodoverriding/regressions/576621/VSW576621.csproj
index 0c07b5287f..723446e83e 100644
--- a/tests/src/Loader/classloader/methodoverriding/regressions/576621/VSW576621.csproj
+++ b/tests/src/Loader/classloader/methodoverriding/regressions/576621/VSW576621.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/methodoverriding/regressions/576621/test.ilproj b/tests/src/Loader/classloader/methodoverriding/regressions/576621/test.ilproj
index 125d8ee753..8b29873be5 100644
--- a/tests/src/Loader/classloader/methodoverriding/regressions/576621/test.ilproj
+++ b/tests/src/Loader/classloader/methodoverriding/regressions/576621/test.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/methodoverriding/regressions/577403/vsw577403.csproj b/tests/src/Loader/classloader/methodoverriding/regressions/577403/vsw577403.csproj
index 8441e1b730..758dbc376e 100644
--- a/tests/src/Loader/classloader/methodoverriding/regressions/577403/vsw577403.csproj
+++ b/tests/src/Loader/classloader/methodoverriding/regressions/577403/vsw577403.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/methodoverriding/regressions/592026/test.ilproj b/tests/src/Loader/classloader/methodoverriding/regressions/592026/test.ilproj
index 125d8ee753..8b29873be5 100644
--- a/tests/src/Loader/classloader/methodoverriding/regressions/592026/test.ilproj
+++ b/tests/src/Loader/classloader/methodoverriding/regressions/592026/test.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/methodoverriding/regressions/593884/vsw593884.csproj b/tests/src/Loader/classloader/methodoverriding/regressions/593884/vsw593884.csproj
index a7a868698a..87bea623b8 100644
--- a/tests/src/Loader/classloader/methodoverriding/regressions/593884/vsw593884.csproj
+++ b/tests/src/Loader/classloader/methodoverriding/regressions/593884/vsw593884.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/dev10_432038.csproj b/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/dev10_432038.csproj
index 15614de9ef..58a7e8807d 100644
--- a/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/dev10_432038.csproj
+++ b/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/dev10_432038.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/foo1.csproj b/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/foo1.csproj
index cb93e2bfa7..42fdb64b73 100644
--- a/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/foo1.csproj
+++ b/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/foo1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/foo2.csproj b/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/foo2.csproj
index a32deca841..d276b09b34 100644
--- a/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/foo2.csproj
+++ b/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/foo2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/interface.csproj b/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/interface.csproj
index 3e06a61b06..f4cfbd6e20 100644
--- a/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/interface.csproj
+++ b/tests/src/Loader/classloader/methodoverriding/regressions/dev10_432038/interface.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/Regressions/dev10_602978/Library.csproj b/tests/src/Loader/classloader/nesting/Regressions/dev10_602978/Library.csproj
index c75fd114de..016c432317 100644
--- a/tests/src/Loader/classloader/nesting/Regressions/dev10_602978/Library.csproj
+++ b/tests/src/Loader/classloader/nesting/Regressions/dev10_602978/Library.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/Regressions/dev10_602978/MainApp.csproj b/tests/src/Loader/classloader/nesting/Regressions/dev10_602978/MainApp.csproj
index 46c34cd6c2..bf1e96b5e2 100644
--- a/tests/src/Loader/classloader/nesting/Regressions/dev10_602978/MainApp.csproj
+++ b/tests/src/Loader/classloader/nesting/Regressions/dev10_602978/MainApp.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/Tests/nesting4.ilproj b/tests/src/Loader/classloader/nesting/Tests/nesting4.ilproj
index 7e02bedfb8..ecb5a8a00d 100644
--- a/tests/src/Loader/classloader/nesting/Tests/nesting4.ilproj
+++ b/tests/src/Loader/classloader/nesting/Tests/nesting4.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/Tests/nesting63.ilproj b/tests/src/Loader/classloader/nesting/Tests/nesting63.ilproj
index d10cb69395..5d00c00e0d 100644
--- a/tests/src/Loader/classloader/nesting/Tests/nesting63.ilproj
+++ b/tests/src/Loader/classloader/nesting/Tests/nesting63.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/Tests/nesting7.ilproj b/tests/src/Loader/classloader/nesting/Tests/nesting7.ilproj
index 1aef1ce00e..098ac1dfa4 100644
--- a/tests/src/Loader/classloader/nesting/Tests/nesting7.ilproj
+++ b/tests/src/Loader/classloader/nesting/Tests/nesting7.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/Tests/nesting88.ilproj b/tests/src/Loader/classloader/nesting/Tests/nesting88.ilproj
index 003cdc1579..cdfa93cf76 100644
--- a/tests/src/Loader/classloader/nesting/Tests/nesting88.ilproj
+++ b/tests/src/Loader/classloader/nesting/Tests/nesting88.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/coreclr/VSW491577.csproj b/tests/src/Loader/classloader/nesting/coreclr/VSW491577.csproj
index 55e452c7b9..5125080194 100644
--- a/tests/src/Loader/classloader/nesting/coreclr/VSW491577.csproj
+++ b/tests/src/Loader/classloader/nesting/coreclr/VSW491577.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/coreclr/exec16.ilproj b/tests/src/Loader/classloader/nesting/coreclr/exec16.ilproj
index 237d2d630c..506b521fc8 100644
--- a/tests/src/Loader/classloader/nesting/coreclr/exec16.ilproj
+++ b/tests/src/Loader/classloader/nesting/coreclr/exec16.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/coreclr/exec3.ilproj b/tests/src/Loader/classloader/nesting/coreclr/exec3.ilproj
index e300b60284..9d0836f33e 100644
--- a/tests/src/Loader/classloader/nesting/coreclr/exec3.ilproj
+++ b/tests/src/Loader/classloader/nesting/coreclr/exec3.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/coreclr/nesting16.ilproj b/tests/src/Loader/classloader/nesting/coreclr/nesting16.ilproj
index 11b9dc8f70..e491bd91f5 100644
--- a/tests/src/Loader/classloader/nesting/coreclr/nesting16.ilproj
+++ b/tests/src/Loader/classloader/nesting/coreclr/nesting16.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/coreclr/nesting18.ilproj b/tests/src/Loader/classloader/nesting/coreclr/nesting18.ilproj
index ff49759fa6..9871ebe3fa 100644
--- a/tests/src/Loader/classloader/nesting/coreclr/nesting18.ilproj
+++ b/tests/src/Loader/classloader/nesting/coreclr/nesting18.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/coreclr/nesting3.ilproj b/tests/src/Loader/classloader/nesting/coreclr/nesting3.ilproj
index c995605e14..5fa8ebf63d 100644
--- a/tests/src/Loader/classloader/nesting/coreclr/nesting3.ilproj
+++ b/tests/src/Loader/classloader/nesting/coreclr/nesting3.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/coreclr/nesting31.ilproj b/tests/src/Loader/classloader/nesting/coreclr/nesting31.ilproj
index c1c9cdba52..1c65443c2f 100644
--- a/tests/src/Loader/classloader/nesting/coreclr/nesting31.ilproj
+++ b/tests/src/Loader/classloader/nesting/coreclr/nesting31.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/nesting/coreclr/nesting4.ilproj b/tests/src/Loader/classloader/nesting/coreclr/nesting4.ilproj
index 7e02bedfb8..ecb5a8a00d 100644
--- a/tests/src/Loader/classloader/nesting/coreclr/nesting4.ilproj
+++ b/tests/src/Loader/classloader/nesting/coreclr/nesting4.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/101682/lib.csproj b/tests/src/Loader/classloader/regressions/101682/lib.csproj
index be6b2bc9c3..c47dae7b97 100644
--- a/tests/src/Loader/classloader/regressions/101682/lib.csproj
+++ b/tests/src/Loader/classloader/regressions/101682/lib.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/101904/test.csproj b/tests/src/Loader/classloader/regressions/101904/test.csproj
index 67d2b7c9a6..9f96f57222 100644
--- a/tests/src/Loader/classloader/regressions/101904/test.csproj
+++ b/tests/src/Loader/classloader/regressions/101904/test.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/106647/lib.csproj b/tests/src/Loader/classloader/regressions/106647/lib.csproj
index be6b2bc9c3..c47dae7b97 100644
--- a/tests/src/Loader/classloader/regressions/106647/lib.csproj
+++ b/tests/src/Loader/classloader/regressions/106647/lib.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/111021/main.csproj b/tests/src/Loader/classloader/regressions/111021/main.csproj
index 2719060551..ade48dedb9 100644
--- a/tests/src/Loader/classloader/regressions/111021/main.csproj
+++ b/tests/src/Loader/classloader/regressions/111021/main.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/123413/ilib.csproj b/tests/src/Loader/classloader/regressions/123413/ilib.csproj
index eef563ff1c..32e6bf1559 100644
--- a/tests/src/Loader/classloader/regressions/123413/ilib.csproj
+++ b/tests/src/Loader/classloader/regressions/123413/ilib.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/123413/lib.csproj b/tests/src/Loader/classloader/regressions/123413/lib.csproj
index be6b2bc9c3..c47dae7b97 100644
--- a/tests/src/Loader/classloader/regressions/123413/lib.csproj
+++ b/tests/src/Loader/classloader/regressions/123413/lib.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/139056/Foo.ilproj b/tests/src/Loader/classloader/regressions/139056/Foo.ilproj
index 96616b3328..33ee85eeb6 100644
--- a/tests/src/Loader/classloader/regressions/139056/Foo.ilproj
+++ b/tests/src/Loader/classloader/regressions/139056/Foo.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/144257/vsw144257.csproj b/tests/src/Loader/classloader/regressions/144257/vsw144257.csproj
index 84db903f20..3f685363d2 100644
--- a/tests/src/Loader/classloader/regressions/144257/vsw144257.csproj
+++ b/tests/src/Loader/classloader/regressions/144257/vsw144257.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/14610/TestObjectGetTypeVirtual.csproj b/tests/src/Loader/classloader/regressions/14610/TestObjectGetTypeVirtual.csproj
index 64b24ce071..1a987c5ef8 100644
--- a/tests/src/Loader/classloader/regressions/14610/TestObjectGetTypeVirtual.csproj
+++ b/tests/src/Loader/classloader/regressions/14610/TestObjectGetTypeVirtual.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/14610/TestObjectGetTypeVirtual.reflect.xml b/tests/src/Loader/classloader/regressions/14610/TestObjectGetTypeVirtual.reflect.xml
new file mode 100644
index 0000000000..b052d520c6
--- /dev/null
+++ b/tests/src/Loader/classloader/regressions/14610/TestObjectGetTypeVirtual.reflect.xml
@@ -0,0 +1,5 @@
+<linker>
+    <assembly fullname="TestObjectGetTypeVirtual">
+        <type fullname="*" required="true" />
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/regressions/163172/MethodImplFinal.ilproj b/tests/src/Loader/classloader/regressions/163172/MethodImplFinal.ilproj
index 55fb3f30d7..1eca32e98e 100644
--- a/tests/src/Loader/classloader/regressions/163172/MethodImplFinal.ilproj
+++ b/tests/src/Loader/classloader/regressions/163172/MethodImplFinal.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/181424/test5.ilproj b/tests/src/Loader/classloader/regressions/181424/test5.ilproj
index be13df5fce..f7d512d09c 100644
--- a/tests/src/Loader/classloader/regressions/181424/test5.ilproj
+++ b/tests/src/Loader/classloader/regressions/181424/test5.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/208900/bug.csproj b/tests/src/Loader/classloader/regressions/208900/bug.csproj
index 25ec264eec..7f4b93f47e 100644
--- a/tests/src/Loader/classloader/regressions/208900/bug.csproj
+++ b/tests/src/Loader/classloader/regressions/208900/bug.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/226741/test3.ilproj b/tests/src/Loader/classloader/regressions/226741/test3.ilproj
index c25f9935eb..fd9d8e38fa 100644
--- a/tests/src/Loader/classloader/regressions/226741/test3.ilproj
+++ b/tests/src/Loader/classloader/regressions/226741/test3.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/245191/nullenum1000.csproj b/tests/src/Loader/classloader/regressions/245191/nullenum1000.csproj
index 8b85a6d735..ea4c93f8e9 100644
--- a/tests/src/Loader/classloader/regressions/245191/nullenum1000.csproj
+++ b/tests/src/Loader/classloader/regressions/245191/nullenum1000.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/307137/vsw307137.csproj b/tests/src/Loader/classloader/regressions/307137/vsw307137.csproj
index c79c07d4cd..dd40c410ce 100644
--- a/tests/src/Loader/classloader/regressions/307137/vsw307137.csproj
+++ b/tests/src/Loader/classloader/regressions/307137/vsw307137.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/347422/b347422.csproj b/tests/src/Loader/classloader/regressions/347422/b347422.csproj
index 434e7d43f0..0b916ca5dc 100644
--- a/tests/src/Loader/classloader/regressions/347422/b347422.csproj
+++ b/tests/src/Loader/classloader/regressions/347422/b347422.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/348842/A.csproj b/tests/src/Loader/classloader/regressions/348842/A.csproj
index 48dbfb6f03..e7337ec008 100644
--- a/tests/src/Loader/classloader/regressions/348842/A.csproj
+++ b/tests/src/Loader/classloader/regressions/348842/A.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/359519/test359519.csproj b/tests/src/Loader/classloader/regressions/359519/test359519.csproj
index 6f81e65df2..9387f24a70 100644
--- a/tests/src/Loader/classloader/regressions/359519/test359519.csproj
+++ b/tests/src/Loader/classloader/regressions/359519/test359519.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/405223/vsw405223.csproj b/tests/src/Loader/classloader/regressions/405223/vsw405223.csproj
index 59f799ce12..fca3d95d05 100644
--- a/tests/src/Loader/classloader/regressions/405223/vsw405223.csproj
+++ b/tests/src/Loader/classloader/regressions/405223/vsw405223.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/421439/RefX1.ilproj b/tests/src/Loader/classloader/regressions/421439/RefX1.ilproj
index b1bb38fef0..8e135924b6 100644
--- a/tests/src/Loader/classloader/regressions/421439/RefX1.ilproj
+++ b/tests/src/Loader/classloader/regressions/421439/RefX1.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/421439/Test.ilproj b/tests/src/Loader/classloader/regressions/421439/Test.ilproj
index 418664f41f..6acd8fea74 100644
--- a/tests/src/Loader/classloader/regressions/421439/Test.ilproj
+++ b/tests/src/Loader/classloader/regressions/421439/Test.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/421439/ValX1.ilproj b/tests/src/Loader/classloader/regressions/421439/ValX1.ilproj
index 89c9f3d444..68451a8dd2 100644
--- a/tests/src/Loader/classloader/regressions/421439/ValX1.ilproj
+++ b/tests/src/Loader/classloader/regressions/421439/ValX1.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/429802/BarImpl.ilproj b/tests/src/Loader/classloader/regressions/429802/BarImpl.ilproj
index ed13a887cc..65c4fc1906 100644
--- a/tests/src/Loader/classloader/regressions/429802/BarImpl.ilproj
+++ b/tests/src/Loader/classloader/regressions/429802/BarImpl.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/429802/CMain.ilproj b/tests/src/Loader/classloader/regressions/429802/CMain.ilproj
index 50fdb9b7bf..fa56585ac2 100644
--- a/tests/src/Loader/classloader/regressions/429802/CMain.ilproj
+++ b/tests/src/Loader/classloader/regressions/429802/CMain.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/429802/MyBar.ilproj b/tests/src/Loader/classloader/regressions/429802/MyBar.ilproj
index fd46420bd7..13b79ce58e 100644
--- a/tests/src/Loader/classloader/regressions/429802/MyBar.ilproj
+++ b/tests/src/Loader/classloader/regressions/429802/MyBar.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/434481/b434481_GenericRecurInit.csproj b/tests/src/Loader/classloader/regressions/434481/b434481_GenericRecurInit.csproj
index 560c1e1614..79b70c0fac 100644
--- a/tests/src/Loader/classloader/regressions/434481/b434481_GenericRecurInit.csproj
+++ b/tests/src/Loader/classloader/regressions/434481/b434481_GenericRecurInit.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/440935/Bar.ilproj b/tests/src/Loader/classloader/regressions/440935/Bar.ilproj
index 91dafdf0f1..c72e45d601 100644
--- a/tests/src/Loader/classloader/regressions/440935/Bar.ilproj
+++ b/tests/src/Loader/classloader/regressions/440935/Bar.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/440935/Foo.ilproj b/tests/src/Loader/classloader/regressions/440935/Foo.ilproj
index badbbdf8f0..ac7029908e 100644
--- a/tests/src/Loader/classloader/regressions/440935/Foo.ilproj
+++ b/tests/src/Loader/classloader/regressions/440935/Foo.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/440935/Test.ilproj b/tests/src/Loader/classloader/regressions/440935/Test.ilproj
index fed6e241a9..221ac0d672 100644
--- a/tests/src/Loader/classloader/regressions/440935/Test.ilproj
+++ b/tests/src/Loader/classloader/regressions/440935/Test.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/451034/LoadType.csproj b/tests/src/Loader/classloader/regressions/451034/LoadType.csproj
index 32b8b70106..9e2b8ab14c 100644
--- a/tests/src/Loader/classloader/regressions/451034/LoadType.csproj
+++ b/tests/src/Loader/classloader/regressions/451034/LoadType.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/451034/Type.ilproj b/tests/src/Loader/classloader/regressions/451034/Type.ilproj
index 9f7ccd5687..8a540ac692 100644
--- a/tests/src/Loader/classloader/regressions/451034/Type.ilproj
+++ b/tests/src/Loader/classloader/regressions/451034/Type.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/452434/vsw452434.ilproj b/tests/src/Loader/classloader/regressions/452434/vsw452434.ilproj
index 5071f53a52..9c97ce7de2 100644
--- a/tests/src/Loader/classloader/regressions/452434/vsw452434.ilproj
+++ b/tests/src/Loader/classloader/regressions/452434/vsw452434.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/452707/b452707.ilproj b/tests/src/Loader/classloader/regressions/452707/b452707.ilproj
index b947ade1e8..f994a4ebb9 100644
--- a/tests/src/Loader/classloader/regressions/452707/b452707.ilproj
+++ b/tests/src/Loader/classloader/regressions/452707/b452707.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/523654/test532654_b.csproj b/tests/src/Loader/classloader/regressions/523654/test532654_b.csproj
index 4857a82a76..da50fca445 100644
--- a/tests/src/Loader/classloader/regressions/523654/test532654_b.csproj
+++ b/tests/src/Loader/classloader/regressions/523654/test532654_b.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/529206/moduleCctorThrow.ilproj b/tests/src/Loader/classloader/regressions/529206/moduleCctorThrow.ilproj
index f0e33fa40a..e1fe756d5c 100644
--- a/tests/src/Loader/classloader/regressions/529206/moduleCctorThrow.ilproj
+++ b/tests/src/Loader/classloader/regressions/529206/moduleCctorThrow.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/529206/vsw529206ModuleCctor.csproj b/tests/src/Loader/classloader/regressions/529206/vsw529206ModuleCctor.csproj
index 90fa1610e4..ed9cbdf109 100644
--- a/tests/src/Loader/classloader/regressions/529206/vsw529206ModuleCctor.csproj
+++ b/tests/src/Loader/classloader/regressions/529206/vsw529206ModuleCctor.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/529206/vsw529206StaticCctor.csproj b/tests/src/Loader/classloader/regressions/529206/vsw529206StaticCctor.csproj
index 2cf345553e..50f399870e 100644
--- a/tests/src/Loader/classloader/regressions/529206/vsw529206StaticCctor.csproj
+++ b/tests/src/Loader/classloader/regressions/529206/vsw529206StaticCctor.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/583649/Type_Class42.ilproj b/tests/src/Loader/classloader/regressions/583649/Type_Class42.ilproj
index 41c86f76b2..c321099d17 100644
--- a/tests/src/Loader/classloader/regressions/583649/Type_Class42.ilproj
+++ b/tests/src/Loader/classloader/regressions/583649/Type_Class42.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/583649/vsw583649.csproj b/tests/src/Loader/classloader/regressions/583649/vsw583649.csproj
index 1fa3e14954..67642b3f5f 100644
--- a/tests/src/Loader/classloader/regressions/583649/vsw583649.csproj
+++ b/tests/src/Loader/classloader/regressions/583649/vsw583649.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/91888/pumpFromCctor.csproj b/tests/src/Loader/classloader/regressions/91888/pumpFromCctor.csproj
index 44725acaf5..e66463ea9b 100644
--- a/tests/src/Loader/classloader/regressions/91888/pumpFromCctor.csproj
+++ b/tests/src/Loader/classloader/regressions/91888/pumpFromCctor.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/Dev12_518401/dev12_518401.csproj b/tests/src/Loader/classloader/regressions/Dev12_518401/dev12_518401.csproj
index a3f1248b6f..ba575f95e1 100644
--- a/tests/src/Loader/classloader/regressions/Dev12_518401/dev12_518401.csproj
+++ b/tests/src/Loader/classloader/regressions/Dev12_518401/dev12_518401.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/asurt150271/test23.ilproj b/tests/src/Loader/classloader/regressions/asurt150271/test23.ilproj
index 7742c3e669..fc3b22d08b 100644
--- a/tests/src/Loader/classloader/regressions/asurt150271/test23.ilproj
+++ b/tests/src/Loader/classloader/regressions/asurt150271/test23.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/asurt150271/test3.ilproj b/tests/src/Loader/classloader/regressions/asurt150271/test3.ilproj
index c25f9935eb..fd9d8e38fa 100644
--- a/tests/src/Loader/classloader/regressions/asurt150271/test3.ilproj
+++ b/tests/src/Loader/classloader/regressions/asurt150271/test3.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dd116295/dd116295.csproj b/tests/src/Loader/classloader/regressions/dd116295/dd116295.csproj
index d00da98b01..311d3065a7 100644
--- a/tests/src/Loader/classloader/regressions/dd116295/dd116295.csproj
+++ b/tests/src/Loader/classloader/regressions/dd116295/dd116295.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dd52/dd52.csproj b/tests/src/Loader/classloader/regressions/dd52/dd52.csproj
index 6d83027253..1530c92af5 100644
--- a/tests/src/Loader/classloader/regressions/dd52/dd52.csproj
+++ b/tests/src/Loader/classloader/regressions/dd52/dd52.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dd52/test.ilproj b/tests/src/Loader/classloader/regressions/dd52/test.ilproj
index 125d8ee753..8b29873be5 100644
--- a/tests/src/Loader/classloader/regressions/dd52/test.ilproj
+++ b/tests/src/Loader/classloader/regressions/dd52/test.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_398410/dev10_398410.csproj b/tests/src/Loader/classloader/regressions/dev10_398410/dev10_398410.csproj
index bd392490d3..44f55b8a08 100644
--- a/tests/src/Loader/classloader/regressions/dev10_398410/dev10_398410.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_398410/dev10_398410.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_398410/utility.csproj b/tests/src/Loader/classloader/regressions/dev10_398410/utility.csproj
index 70eeda9122..354c3fd2fa 100644
--- a/tests/src/Loader/classloader/regressions/dev10_398410/utility.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_398410/utility.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_403582/dev10_403582.ilproj b/tests/src/Loader/classloader/regressions/dev10_403582/dev10_403582.ilproj
index 4687451c76..c37210f3c8 100644
--- a/tests/src/Loader/classloader/regressions/dev10_403582/dev10_403582.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_403582/dev10_403582.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_403582/genmeth.ilproj b/tests/src/Loader/classloader/regressions/dev10_403582/genmeth.ilproj
index a76fcff7a1..5c1a119660 100644
--- a/tests/src/Loader/classloader/regressions/dev10_403582/genmeth.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_403582/genmeth.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_403582/gentype.ilproj b/tests/src/Loader/classloader/regressions/dev10_403582/gentype.ilproj
index e0dde50160..327a619722 100644
--- a/tests/src/Loader/classloader/regressions/dev10_403582/gentype.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_403582/gentype.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_443322/dev10_443322.ilproj b/tests/src/Loader/classloader/regressions/dev10_443322/dev10_443322.ilproj
index 5c00f39721..f9f55fbba6 100644
--- a/tests/src/Loader/classloader/regressions/dev10_443322/dev10_443322.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_443322/dev10_443322.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_493135/dev10_493135.ilproj b/tests/src/Loader/classloader/regressions/dev10_493135/dev10_493135.ilproj
index 23a3a4947e..42ad8df49b 100644
--- a/tests/src/Loader/classloader/regressions/dev10_493135/dev10_493135.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_493135/dev10_493135.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_526434/dev10_526434.csproj b/tests/src/Loader/classloader/regressions/dev10_526434/dev10_526434.csproj
index 86934d0390..77ecb17e5a 100644
--- a/tests/src/Loader/classloader/regressions/dev10_526434/dev10_526434.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_526434/dev10_526434.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/ConstrainedMethods.csproj b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/ConstrainedMethods.csproj
index 7cbb7c5f92..be7a373f48 100644
--- a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/ConstrainedMethods.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/ConstrainedMethods.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/MethodCalls.ilproj b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/MethodCalls.ilproj
index f3d90178a4..9c56801c12 100644
--- a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/MethodCalls.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/MethodCalls.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/RecursiveGen.ilproj b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/RecursiveGen.ilproj
index dcf6f17463..ae5e4dfcfa 100644
--- a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/RecursiveGen.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/RecursiveGen.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/SealedTypes.ilproj b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/SealedTypes.ilproj
index 0788325260..71d924afcd 100644
--- a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/SealedTypes.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/SealedTypes.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/Variance1.ilproj b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/Variance1.ilproj
index 62e7893ac6..8cea4ea7a4 100644
--- a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/Variance1.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/Variance1.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/Variance2.ilproj b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/Variance2.ilproj
index 82958c56da..82b8098348 100644
--- a/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/Variance2.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_568786/4_Misc/Variance2.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_630250/dev10_630250.csproj b/tests/src/Loader/classloader/regressions/dev10_630250/dev10_630250.csproj
index 7c817575b1..07e4b9e7c9 100644
--- a/tests/src/Loader/classloader/regressions/dev10_630250/dev10_630250.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_630250/dev10_630250.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_710121/dev10_710121.ilproj b/tests/src/Loader/classloader/regressions/dev10_710121/dev10_710121.ilproj
index 488b3c4778..08cd42054d 100644
--- a/tests/src/Loader/classloader/regressions/dev10_710121/dev10_710121.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_710121/dev10_710121.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_715437/dev10_715437.ilproj b/tests/src/Loader/classloader/regressions/dev10_715437/dev10_715437.ilproj
index 516f76df24..31dda966df 100644
--- a/tests/src/Loader/classloader/regressions/dev10_715437/dev10_715437.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_715437/dev10_715437.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_720779/dev10_720779.ilproj b/tests/src/Loader/classloader/regressions/dev10_720779/dev10_720779.ilproj
index b7d4ea7740..45bbc0cba1 100644
--- a/tests/src/Loader/classloader/regressions/dev10_720779/dev10_720779.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_720779/dev10_720779.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_724989/dev10_724989.csproj b/tests/src/Loader/classloader/regressions/dev10_724989/dev10_724989.csproj
index cdd41d6a45..ad84dae739 100644
--- a/tests/src/Loader/classloader/regressions/dev10_724989/dev10_724989.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_724989/dev10_724989.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_788724/dev10_788724.ilproj b/tests/src/Loader/classloader/regressions/dev10_788724/dev10_788724.ilproj
index 948174ee70..4bd33b19a6 100644
--- a/tests/src/Loader/classloader/regressions/dev10_788724/dev10_788724.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_788724/dev10_788724.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_794943/dev10_794943.csproj b/tests/src/Loader/classloader/regressions/dev10_794943/dev10_794943.csproj
index 57abc23577..aa00df9a2d 100644
--- a/tests/src/Loader/classloader/regressions/dev10_794943/dev10_794943.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_794943/dev10_794943.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_813331/Case1.csproj b/tests/src/Loader/classloader/regressions/dev10_813331/Case1.csproj
index 00ee550d61..48d8b49314 100644
--- a/tests/src/Loader/classloader/regressions/dev10_813331/Case1.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_813331/Case1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_813331/Case2.csproj b/tests/src/Loader/classloader/regressions/dev10_813331/Case2.csproj
index 2ce9c9f380..51ce3a2eba 100644
--- a/tests/src/Loader/classloader/regressions/dev10_813331/Case2.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_813331/Case2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_813331/Case3.csproj b/tests/src/Loader/classloader/regressions/dev10_813331/Case3.csproj
index feeadba56f..14a70a8432 100644
--- a/tests/src/Loader/classloader/regressions/dev10_813331/Case3.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_813331/Case3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_813331/Case4.csproj b/tests/src/Loader/classloader/regressions/dev10_813331/Case4.csproj
index 1938afa62e..c7876884b3 100644
--- a/tests/src/Loader/classloader/regressions/dev10_813331/Case4.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_813331/Case4.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_813331/Library1.csproj b/tests/src/Loader/classloader/regressions/dev10_813331/Library1.csproj
index 0fa4e8c6e3..b7a9f30790 100644
--- a/tests/src/Loader/classloader/regressions/dev10_813331/Library1.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_813331/Library1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_813331/Library2.csproj b/tests/src/Loader/classloader/regressions/dev10_813331/Library2.csproj
index 4f8b714076..7b3e54131b 100644
--- a/tests/src/Loader/classloader/regressions/dev10_813331/Library2.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_813331/Library2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_851479/dev10_851479.csproj b/tests/src/Loader/classloader/regressions/dev10_851479/dev10_851479.csproj
index 8f23535bde..48b19889f5 100644
--- a/tests/src/Loader/classloader/regressions/dev10_851479/dev10_851479.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_851479/dev10_851479.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_889822/dev10_889822.csproj b/tests/src/Loader/classloader/regressions/dev10_889822/dev10_889822.csproj
index b5d56cad44..b6d351076c 100644
--- a/tests/src/Loader/classloader/regressions/dev10_889822/dev10_889822.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_889822/dev10_889822.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_897464/Test.ilproj b/tests/src/Loader/classloader/regressions/dev10_897464/Test.ilproj
index 77903b344b..8bbbf52fb2 100644
--- a/tests/src/Loader/classloader/regressions/dev10_897464/Test.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev10_897464/Test.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev10_897464/dev10_897464.csproj b/tests/src/Loader/classloader/regressions/dev10_897464/dev10_897464.csproj
index 376e93dcc7..ee2116f020 100644
--- a/tests/src/Loader/classloader/regressions/dev10_897464/dev10_897464.csproj
+++ b/tests/src/Loader/classloader/regressions/dev10_897464/dev10_897464.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev11_11333/dev11_11333.ilproj b/tests/src/Loader/classloader/regressions/dev11_11333/dev11_11333.ilproj
index 8e3b28d7b7..df6a60d3aa 100644
--- a/tests/src/Loader/classloader/regressions/dev11_11333/dev11_11333.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev11_11333/dev11_11333.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev11_221340/Library.ilproj b/tests/src/Loader/classloader/regressions/dev11_221340/Library.ilproj
index a0aa82e250..e0f314ab7f 100644
--- a/tests/src/Loader/classloader/regressions/dev11_221340/Library.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev11_221340/Library.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev11_221340/TestLib.ilproj b/tests/src/Loader/classloader/regressions/dev11_221340/TestLib.ilproj
index 30a31a9fff..ab101565ad 100644
--- a/tests/src/Loader/classloader/regressions/dev11_221340/TestLib.ilproj
+++ b/tests/src/Loader/classloader/regressions/dev11_221340/TestLib.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev11_256384/Library.csproj b/tests/src/Loader/classloader/regressions/dev11_256384/Library.csproj
index c75fd114de..016c432317 100644
--- a/tests/src/Loader/classloader/regressions/dev11_256384/Library.csproj
+++ b/tests/src/Loader/classloader/regressions/dev11_256384/Library.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev11_38348/Lib.csproj b/tests/src/Loader/classloader/regressions/dev11_38348/Lib.csproj
index f4fa7821b2..da708df6a8 100644
--- a/tests/src/Loader/classloader/regressions/dev11_38348/Lib.csproj
+++ b/tests/src/Loader/classloader/regressions/dev11_38348/Lib.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev11_383846/LibraryThatImplementsStruct.csproj b/tests/src/Loader/classloader/regressions/dev11_383846/LibraryThatImplementsStruct.csproj
index 539161c033..cf4e0edcb9 100644
--- a/tests/src/Loader/classloader/regressions/dev11_383846/LibraryThatImplementsStruct.csproj
+++ b/tests/src/Loader/classloader/regressions/dev11_383846/LibraryThatImplementsStruct.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev11_383846/TypeForwarderLibrary.csproj b/tests/src/Loader/classloader/regressions/dev11_383846/TypeForwarderLibrary.csproj
index cadca984f7..d7a8e5a085 100644
--- a/tests/src/Loader/classloader/regressions/dev11_383846/TypeForwarderLibrary.csproj
+++ b/tests/src/Loader/classloader/regressions/dev11_383846/TypeForwarderLibrary.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev11_95728/dev11_95728.csproj b/tests/src/Loader/classloader/regressions/dev11_95728/dev11_95728.csproj
index 893005c41d..dd0270772f 100644
--- a/tests/src/Loader/classloader/regressions/dev11_95728/dev11_95728.csproj
+++ b/tests/src/Loader/classloader/regressions/dev11_95728/dev11_95728.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/dev11_95728/dev11_95728.reflect.xml b/tests/src/Loader/classloader/regressions/dev11_95728/dev11_95728.reflect.xml
new file mode 100644
index 0000000000..b74972aca1
--- /dev/null
+++ b/tests/src/Loader/classloader/regressions/dev11_95728/dev11_95728.reflect.xml
@@ -0,0 +1,9 @@
+<linker>
+    <assembly fullname="dev11_95728">
+        <type fullname="*" required="true" />
+    </assembly>
+    <assembly fullname="System.Linq.Expressions">
+     <!-- - Called by System.Linq.Expressions.Expression:CreateLambda --> 
+     <type fullname="System.Linq.Expressions.Expression`1" required="true" /> 
+    </assembly>
+</linker>
diff --git a/tests/src/Loader/classloader/regressions/vsw111021/main.csproj b/tests/src/Loader/classloader/regressions/vsw111021/main.csproj
index 2719060551..ade48dedb9 100644
--- a/tests/src/Loader/classloader/regressions/vsw111021/main.csproj
+++ b/tests/src/Loader/classloader/regressions/vsw111021/main.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/vsw188290/vsw188290.ilproj b/tests/src/Loader/classloader/regressions/vsw188290/vsw188290.ilproj
index 1708db6d4c..603f3fa2a1 100644
--- a/tests/src/Loader/classloader/regressions/vsw188290/vsw188290.ilproj
+++ b/tests/src/Loader/classloader/regressions/vsw188290/vsw188290.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/vsw305955/GenericAssertin.ilproj b/tests/src/Loader/classloader/regressions/vsw305955/GenericAssertin.ilproj
index c4664e5150..4f933d20db 100644
--- a/tests/src/Loader/classloader/regressions/vsw305955/GenericAssertin.ilproj
+++ b/tests/src/Loader/classloader/regressions/vsw305955/GenericAssertin.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/vsw307137/vsw307137.csproj b/tests/src/Loader/classloader/regressions/vsw307137/vsw307137.csproj
index c79c07d4cd..dd40c410ce 100644
--- a/tests/src/Loader/classloader/regressions/vsw307137/vsw307137.csproj
+++ b/tests/src/Loader/classloader/regressions/vsw307137/vsw307137.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/vsw529206/moduleCctorThrow.ilproj b/tests/src/Loader/classloader/regressions/vsw529206/moduleCctorThrow.ilproj
index f0e33fa40a..e1fe756d5c 100644
--- a/tests/src/Loader/classloader/regressions/vsw529206/moduleCctorThrow.ilproj
+++ b/tests/src/Loader/classloader/regressions/vsw529206/moduleCctorThrow.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/vsw529206/vsw529206ModuleCctor.csproj b/tests/src/Loader/classloader/regressions/vsw529206/vsw529206ModuleCctor.csproj
index 90fa1610e4..ed9cbdf109 100644
--- a/tests/src/Loader/classloader/regressions/vsw529206/vsw529206ModuleCctor.csproj
+++ b/tests/src/Loader/classloader/regressions/vsw529206/vsw529206ModuleCctor.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/regressions/vsw531159/vsw531159.csproj b/tests/src/Loader/classloader/regressions/vsw531159/vsw531159.csproj
index 34dfb059ea..8baf9147d4 100644
--- a/tests/src/Loader/classloader/regressions/vsw531159/vsw531159.csproj
+++ b/tests/src/Loader/classloader/regressions/vsw531159/vsw531159.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-11-6-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-11-6-two.ilproj
index a1f8ecefeb..1a09fe61e5 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-11-6-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-11-6-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-13-15-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-13-15-two.ilproj
index 8fcc882daf..27a3f8c73f 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-13-15-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-13-15-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-13-22-three.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-13-22-three.ilproj
index dbafd176dc..595c6017b3 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-13-22-three.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-13-22-three.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-13-25-five.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-13-25-five.ilproj
index 97cf456f16..abe9e38757 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-13-25-five.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-13-25-five.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-13-26-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-13-26-two.ilproj
index f6bae39f0c..4541f8479a 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-13-26-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-13-26-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-13-40a-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-13-40a-two.ilproj
index 87a5f367df..2f04fd2829 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-13-40a-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-13-40a-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-13-41a-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-13-41a-two.ilproj
index 48fd7ca944..a896b67212 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-13-41a-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-13-41a-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-13-41g-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-13-41g-two.ilproj
index 27686d4dab..4a2eab4be0 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-13-41g-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-13-41g-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-13-6b-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-13-6b-two.ilproj
index a7276491fa..ac581d4d45 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-13-6b-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-13-6b-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-13-7-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-13-7-two.ilproj
index 0bb648f60d..900f2cbc55 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-13-7-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-13-7-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-15-12b.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-15-12b.ilproj
index f049b888e0..4340b6820e 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-15-12b.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-15-12b.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-25-9-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-25-9-two.ilproj
index 09c49f7cc7..08354e2027 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-25-9-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-25-9-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-5-5-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-5-5-two.ilproj
index c62fde99b0..04669a9a34 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-5-5-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-5-5-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-5-8-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-5-8-two.ilproj
index 7e794ced9c..3f9748950e 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-5-8-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-5-8-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-8-20-one.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-8-20-one.ilproj
index 4feb111e9e..489e66d963 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-8-20-one.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-8-20-one.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-8-20-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-8-20-two.ilproj
index fb89843e35..e69018684d 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-8-20-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-8-20-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-8-28-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-8-28-two.ilproj
index 4c2cd75783..a2c17417d8 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-8-28-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-8-28-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-8-3-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-8-3-two.ilproj
index c40353097a..261978c35e 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-8-3-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-8-3-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-8-30-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-8-30-two.ilproj
index 48dfa2043e..eda28ad977 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-8-30-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-8-30-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-8-31-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-8-31-two.ilproj
index c78fd85855..651387c1ef 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-8-31-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-8-31-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-8-33-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-8-33-two.ilproj
index df66c27209..b72c0b438f 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-8-33-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-8-33-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-8-39g-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-8-39g-two.ilproj
index da32adb10d..e1990a9dce 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-8-39g-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-8-39g-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/rmv/il/RMV-2-8-7-two.ilproj b/tests/src/Loader/classloader/rmv/il/RMV-2-8-7-two.ilproj
index 7b57be5c7e..a4c28761a5 100644
--- a/tests/src/Loader/classloader/rmv/il/RMV-2-8-7-two.ilproj
+++ b/tests/src/Loader/classloader/rmv/il/RMV-2-8-7-two.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-1.csproj
index 8e2a416655..2eefccccf2 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-2.csproj
index d228e3624c..9e083a5dab 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-3.csproj
index 1cfb49c778..c0f5ad95dc 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-3D.csproj
index 96d29ab389..1206181c01 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-1-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-1.csproj
index 635072a047..c933949299 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-2.csproj
index 7ab139ae54..a986e9d293 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-3.csproj
index 5ee5060d14..e6a8bfda24 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-3D.csproj
index 85e4cb21c3..2d9ba1b205 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-10-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-1.csproj
index fe83d5684d..a33ca9044f 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-2.csproj
index 8e5eb752e7..51a83784b5 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-3.csproj
index e5776cf850..9421e34621 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-3D.csproj
index 1cddabeaf0..5a6888e7c1 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-11-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-1.csproj
index 580a120a49..3113ae5552 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-2.csproj
index df36f6921c..e9c3805d9f 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-3.csproj
index e22538cc75..0214e1fa61 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-3D.csproj
index 756b72b427..66e29e2ed9 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-12-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-1.csproj
index d0f26f9dae..2038d2c570 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-2.csproj
index 506440ea45..03d800ea4e 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-3.csproj
index 34249b7e04..24a15ff908 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-3D.csproj
index 495ddef0c1..81dab823e0 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-2-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-3-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-3-1.csproj
index c47f9344d5..32338e1e66 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-3-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-3-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-4-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-4-1.csproj
index 06170a5430..bcc88671e7 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-4-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-4-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-1.csproj
index 201477a6a5..c020610fb4 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-2.csproj
index c871ca76b7..1155b1a506 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-3.csproj
index d089c817c4..15c519cbaa 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-3D.csproj
index 88226f0004..c488c2a8c2 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-5-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-1.csproj
index 85ab380298..38deca5164 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-2.csproj
index 7bf4047efb..0d91d2efe3 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-3.csproj
index 0d715edec8..f5b3f6dc7a 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-3D.csproj
index a231acbf7b..74bc69a233 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-6-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-1.csproj
index 093932a05b..b473b3974b 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-2.csproj
index 57fbe4d9c1..75861f5fee 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-3.csproj
index aa304a6e9f..58fd9ff6c5 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-3D.csproj
index 3bdfd75b15..391bd14bd6 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-7-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-1.csproj
index 8f8084df47..88973340c9 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-2.csproj
index 2d30481fc3..d61c6aa0e8 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-3.csproj
index 8082b0a9a9..0a0cb711f9 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-3D.csproj
index ae22fc2691..d4596ab9ab 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-8-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-1.csproj
index ef85e64abc..052b6a386c 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-2.csproj
index 9cb8ba6192..b66a0cddb2 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-3.csproj
index c216a4bf22..ef86760a74 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-3D.csproj
index 8e39e5e6af..b85dd56e6b 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-1-9-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-1.csproj
index 43f63a47f5..e145652340 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-2.csproj
index 41fe71fd54..30c602a87f 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-3.csproj
index af0ebaea93..1e45ac5f07 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-3D.csproj
index f593095717..51a3fb12b4 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-10-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-1.csproj
index f566122236..985030a438 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-2.csproj
index ce248a5625..dade74cdde 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-3.csproj
index 327c9c0698..8c39086437 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-3D.csproj
index af13ff2009..82d2f63f02 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-11-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-1.csproj
index 657d622eac..cf46972c3a 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-2.csproj
index a15e066e01..97ea5ce5bd 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-3.csproj
index 85a831e41b..424d51ae6a 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-3D.csproj
index 6edc99b1b0..03fb43781e 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-12-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-3-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-3-1.csproj
index f6c6f7c697..879e59043b 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-3-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-3-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-4-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-4-1.csproj
index 370966939a..a04a01b86c 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-4-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-4-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-1.csproj
index 61261c60fa..1f78ecc555 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-2.csproj
index 44b0bf7f37..c68c3d934a 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-3.csproj
index 8b8f7ab4aa..7cde5a5f81 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-3D.csproj
index 5ac6f7b5e5..5b45f83a4e 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-5-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-1.csproj
index 460ecf132c..0d6ad4fabe 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-2.csproj
index 81d66d97a8..d79863cb43 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-3.csproj
index 8959131c78..83be3bdfd7 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-3D.csproj
index 9f125ce994..7b6946bf26 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-6-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-1.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-1.csproj
index 933be7be98..fddc986470 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-1.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-2.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-2.csproj
index 589b170f8d..18f398d217 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-2.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-3.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-3.csproj
index 4fa3a4373c..753cdc7525 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-3.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-3D.csproj b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-3D.csproj
index c89baaaa54..2e1ee6ffb8 100644
--- a/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-3D.csproj
+++ b/tests/src/Loader/classloader/v1/Beta1/Layout/Matrix/cs/L-2-9-3D.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/M10/Acceptance/Case1.csproj b/tests/src/Loader/classloader/v1/M10/Acceptance/Case1.csproj
index 522ff71a3a..bd18d6cfea 100644
--- a/tests/src/Loader/classloader/v1/M10/Acceptance/Case1.csproj
+++ b/tests/src/Loader/classloader/v1/M10/Acceptance/Case1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/M10/Acceptance/Case2.csproj b/tests/src/Loader/classloader/v1/M10/Acceptance/Case2.csproj
index 459a535a2f..7d055f4beb 100644
--- a/tests/src/Loader/classloader/v1/M10/Acceptance/Case2.csproj
+++ b/tests/src/Loader/classloader/v1/M10/Acceptance/Case2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/M10/Acceptance/Case3.csproj b/tests/src/Loader/classloader/v1/M10/Acceptance/Case3.csproj
index 43df61e605..23756d99c5 100644
--- a/tests/src/Loader/classloader/v1/M10/Acceptance/Case3.csproj
+++ b/tests/src/Loader/classloader/v1/M10/Acceptance/Case3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/M10/Acceptance/Case4.csproj b/tests/src/Loader/classloader/v1/M10/Acceptance/Case4.csproj
index 8bc12c7e23..788374b569 100644
--- a/tests/src/Loader/classloader/v1/M10/Acceptance/Case4.csproj
+++ b/tests/src/Loader/classloader/v1/M10/Acceptance/Case4.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/M10/Relocation/IL/IL_DLL.ilproj b/tests/src/Loader/classloader/v1/M10/Relocation/IL/IL_DLL.ilproj
index 0d488075c2..0ec3ee4f71 100644
--- a/tests/src/Loader/classloader/v1/M10/Relocation/IL/IL_DLL.ilproj
+++ b/tests/src/Loader/classloader/v1/M10/Relocation/IL/IL_DLL.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL1.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL1.csproj
index 796236b191..ad2d7154f5 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL1.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL1.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL10.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL10.csproj
index 4c1239302f..19f71deb67 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL10.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL10.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL11.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL11.csproj
index 9142115b0b..f221ae0ac5 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL11.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL11.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL12.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL12.csproj
index 8c6d3547a1..045d089c31 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL12.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL12.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL13.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL13.csproj
index c629f3df1a..d9573bac2b 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL13.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL13.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL14.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL14.csproj
index ec949ac8cb..613b452a9d 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL14.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL14.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL15.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL15.csproj
index f5c35ae108..1c62ebf7a2 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL15.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL15.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL16.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL16.csproj
index 464d697aca..cc459275e5 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL16.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL16.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL17.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL17.csproj
index a7b1c0a1f7..589054cdea 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL17.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL17.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL18.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL18.csproj
index 38f2c98e55..ff9891db03 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL18.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL18.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL19.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL19.csproj
index f1a011868c..d88b1d7785 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL19.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL19.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL2.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL2.csproj
index 6260195532..d200b56064 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL2.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL2.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL3.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL3.csproj
index 6c845d1c4e..0a4534adef 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL3.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL3.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL4.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL4.csproj
index e14b8ab36d..2d42c222bf 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL4.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL4.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL5.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL5.csproj
index b6497a118b..a2ed64219a 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL5.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL5.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL6.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL6.csproj
index 89e4d1e4e2..58af7873ad 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL6.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL6.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL7.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL7.csproj
index 1934f12b95..e78a12a124 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL7.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL7.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL8.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL8.csproj
index e8e765f406..7bb339c5d8 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL8.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL8.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL9.csproj b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL9.csproj
index b9ca574364..801e214a10 100644
--- a/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL9.csproj
+++ b/tests/src/Loader/classloader/v1/Stress/Beta1/CLStressA/CLStressADLL9.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/Loader/lowlevel/regress/105736/Exception.csproj b/tests/src/Loader/lowlevel/regress/105736/Exception.csproj
index 32f7e04a99..d949b69eab 100644
--- a/tests/src/Loader/lowlevel/regress/105736/Exception.csproj
+++ b/tests/src/Loader/lowlevel/regress/105736/Exception.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Loader/multimodule/DontUseNetmodule.csproj b/tests/src/Loader/multimodule/DontUseNetmodule.csproj
index 2387f122b5..eb676aee57 100644
--- a/tests/src/Loader/multimodule/DontUseNetmodule.csproj
+++ b/tests/src/Loader/multimodule/DontUseNetmodule.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Loader/regressions/classloader/main.csproj b/tests/src/Loader/regressions/classloader/main.csproj
index 4f216d1306..a0e7fca9cd 100644
--- a/tests/src/Loader/regressions/classloader/main.csproj
+++ b/tests/src/Loader/regressions/classloader/main.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D2BE451D-2E46-4899-BA3F-244E8CBDBD35}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Loader/regressions/classloader/vsw307137.csproj b/tests/src/Loader/regressions/classloader/vsw307137.csproj
index a2b02f11cd..07365a8f4b 100644
--- a/tests/src/Loader/regressions/classloader/vsw307137.csproj
+++ b/tests/src/Loader/regressions/classloader/vsw307137.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C1CC49D1-A6E0-4AC8-858C-6BFD733A29C5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Loader/regressions/polyrec/Polyrec.csproj b/tests/src/Loader/regressions/polyrec/Polyrec.csproj
index 1aa70106cb..7a4be021f0 100644
--- a/tests/src/Loader/regressions/polyrec/Polyrec.csproj
+++ b/tests/src/Loader/regressions/polyrec/Polyrec.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B50A2D18-32B1-4051-A3E4-B004A6BBBF4D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <CLRTestExecutionArguments>4 50</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/Loader/versioning/coverage/AssemblyAttrs.csproj b/tests/src/Loader/versioning/coverage/AssemblyAttrs.csproj
index c11e6df0cd..835c0a7a86 100644
--- a/tests/src/Loader/versioning/coverage/AssemblyAttrs.csproj
+++ b/tests/src/Loader/versioning/coverage/AssemblyAttrs.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/assemblyref/assem.csproj b/tests/src/Regressions/assemblyref/assem.csproj
index 2c6e58f172..9055cacf48 100644
--- a/tests/src/Regressions/assemblyref/assem.csproj
+++ b/tests/src/Regressions/assemblyref/assem.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{946AE2D9-F656-4771-81DB-6D02EEEEFFCB}</ProjectGuid>
     <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>SharedLibrary</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Regressions/assemblyref/test.csproj b/tests/src/Regressions/assemblyref/test.csproj
index 4bc5997273..42e4838cf7 100644
--- a/tests/src/Regressions/assemblyref/test.csproj
+++ b/tests/src/Regressions/assemblyref/test.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CDA666E1-9A22-4795-9FBD-3B3FAEB759A4}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Regressions/common/AboveStackLimit.csproj b/tests/src/Regressions/common/AboveStackLimit.csproj
index b7b1ba26b5..70b3d74359 100644
--- a/tests/src/Regressions/common/AboveStackLimit.csproj
+++ b/tests/src/Regressions/common/AboveStackLimit.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/ArrayCopy.csproj b/tests/src/Regressions/common/ArrayCopy.csproj
index 05c412e195..1f358403e3 100644
--- a/tests/src/Regressions/common/ArrayCopy.csproj
+++ b/tests/src/Regressions/common/ArrayCopy.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/CompEx.csproj b/tests/src/Regressions/common/CompEx.csproj
index b95677c055..478ec6c18f 100644
--- a/tests/src/Regressions/common/CompEx.csproj
+++ b/tests/src/Regressions/common/CompEx.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/DisableTransparencyEnforcement.csproj b/tests/src/Regressions/common/DisableTransparencyEnforcement.csproj
index 090b045a67..55396dce6f 100644
--- a/tests/src/Regressions/common/DisableTransparencyEnforcement.csproj
+++ b/tests/src/Regressions/common/DisableTransparencyEnforcement.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/Marshal.csproj b/tests/src/Regressions/common/Marshal.csproj
index 5cffcafe2e..2ce947ad18 100644
--- a/tests/src/Regressions/common/Marshal.csproj
+++ b/tests/src/Regressions/common/Marshal.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Regressions/common/ThreadCulture.csproj b/tests/src/Regressions/common/ThreadCulture.csproj
index 609165bff9..1bbfe8dff5 100644
--- a/tests/src/Regressions/common/ThreadCulture.csproj
+++ b/tests/src/Regressions/common/ThreadCulture.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/ToLower.csproj b/tests/src/Regressions/common/ToLower.csproj
index 49f8da07cf..508f842b34 100644
--- a/tests/src/Regressions/common/ToLower.csproj
+++ b/tests/src/Regressions/common/ToLower.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/Unsafe.csproj b/tests/src/Regressions/common/Unsafe.csproj
index 71b8ef3322..f38d1445cc 100644
--- a/tests/src/Regressions/common/Unsafe.csproj
+++ b/tests/src/Regressions/common/Unsafe.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/Regressions/common/avtest.csproj b/tests/src/Regressions/common/avtest.csproj
index 7c8032153f..7d3511c27a 100644
--- a/tests/src/Regressions/common/avtest.csproj
+++ b/tests/src/Regressions/common/avtest.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/date.csproj b/tests/src/Regressions/common/date.csproj
index 645d4acdfb..81738a678c 100644
--- a/tests/src/Regressions/common/date.csproj
+++ b/tests/src/Regressions/common/date.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/interlock.csproj b/tests/src/Regressions/common/interlock.csproj
index 2d7585455b..cf9d84a67a 100644
--- a/tests/src/Regressions/common/interlock.csproj
+++ b/tests/src/Regressions/common/interlock.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/pow3.csproj b/tests/src/Regressions/common/pow3.csproj
index 4f2e5a5f2d..f9ea76cc33 100644
--- a/tests/src/Regressions/common/pow3.csproj
+++ b/tests/src/Regressions/common/pow3.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/test1307.csproj b/tests/src/Regressions/common/test1307.csproj
index b695cbb3f0..26d7a9ac5b 100644
--- a/tests/src/Regressions/common/test1307.csproj
+++ b/tests/src/Regressions/common/test1307.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/testClass.csproj b/tests/src/Regressions/common/testClass.csproj
index d75240190e..7504be0429 100644
--- a/tests/src/Regressions/common/testClass.csproj
+++ b/tests/src/Regressions/common/testClass.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/common/testInterface.csproj b/tests/src/Regressions/common/testInterface.csproj
index 58df5b459a..464564db68 100644
--- a/tests/src/Regressions/common/testInterface.csproj
+++ b/tests/src/Regressions/common/testInterface.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/Regressions/coreclr/0014/avtest.csproj b/tests/src/Regressions/coreclr/0014/avtest.csproj
index a1f0c05d54..a9d4304fb6 100644
--- a/tests/src/Regressions/coreclr/0014/avtest.csproj
+++ b/tests/src/Regressions/coreclr/0014/avtest.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0018/ArrayCopy.csproj b/tests/src/Regressions/coreclr/0018/ArrayCopy.csproj
index 65ddaa7f55..e01afdb72f 100644
--- a/tests/src/Regressions/coreclr/0018/ArrayCopy.csproj
+++ b/tests/src/Regressions/coreclr/0018/ArrayCopy.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0028/thread08-simplified.csproj b/tests/src/Regressions/coreclr/0028/thread08-simplified.csproj
index 5d211c6e55..c7f330c610 100644
--- a/tests/src/Regressions/coreclr/0028/thread08-simplified.csproj
+++ b/tests/src/Regressions/coreclr/0028/thread08-simplified.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0041/expl_double_1.csproj b/tests/src/Regressions/coreclr/0041/expl_double_1.csproj
index 2462bbd4d1..fa250f15ff 100644
--- a/tests/src/Regressions/coreclr/0041/expl_double_1.csproj
+++ b/tests/src/Regressions/coreclr/0041/expl_double_1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0044/nullable.csproj b/tests/src/Regressions/coreclr/0044/nullable.csproj
index ff8ffb2606..778227dca6 100644
--- a/tests/src/Regressions/coreclr/0044/nullable.csproj
+++ b/tests/src/Regressions/coreclr/0044/nullable.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0046/istype.csproj b/tests/src/Regressions/coreclr/0046/istype.csproj
index 63243e6f45..143724a4c2 100644
--- a/tests/src/Regressions/coreclr/0046/istype.csproj
+++ b/tests/src/Regressions/coreclr/0046/istype.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0069/date.csproj b/tests/src/Regressions/coreclr/0069/date.csproj
index e18acf2dec..a0287f7c6e 100644
--- a/tests/src/Regressions/coreclr/0069/date.csproj
+++ b/tests/src/Regressions/coreclr/0069/date.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0075/LargeArrayTest.csproj b/tests/src/Regressions/coreclr/0075/LargeArrayTest.csproj
index b3695fdbdc..a452aaf21a 100644
--- a/tests/src/Regressions/coreclr/0075/LargeArrayTest.csproj
+++ b/tests/src/Regressions/coreclr/0075/LargeArrayTest.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0077/interlock.csproj b/tests/src/Regressions/coreclr/0077/interlock.csproj
index f53a3fc901..ad635a6569 100644
--- a/tests/src/Regressions/coreclr/0077/interlock.csproj
+++ b/tests/src/Regressions/coreclr/0077/interlock.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0080/delete_next_card_table.csproj b/tests/src/Regressions/coreclr/0080/delete_next_card_table.csproj
index d307144450..03e87fa7fc 100644
--- a/tests/src/Regressions/coreclr/0080/delete_next_card_table.csproj
+++ b/tests/src/Regressions/coreclr/0080/delete_next_card_table.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0099/AboveStackLimit.csproj b/tests/src/Regressions/coreclr/0099/AboveStackLimit.csproj
index ae34c21932..c6aad883ec 100644
--- a/tests/src/Regressions/coreclr/0099/AboveStackLimit.csproj
+++ b/tests/src/Regressions/coreclr/0099/AboveStackLimit.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0138/pow3.csproj b/tests/src/Regressions/coreclr/0138/pow3.csproj
index 9e8ec89b8f..ec0a34f31a 100644
--- a/tests/src/Regressions/coreclr/0138/pow3.csproj
+++ b/tests/src/Regressions/coreclr/0138/pow3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0149/SampleAssembly.csproj b/tests/src/Regressions/coreclr/0149/SampleAssembly.csproj
index 8d0282c531..a6931e9b44 100644
--- a/tests/src/Regressions/coreclr/0149/SampleAssembly.csproj
+++ b/tests/src/Regressions/coreclr/0149/SampleAssembly.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0198/CompEx.csproj b/tests/src/Regressions/coreclr/0198/CompEx.csproj
index cb06ed3966..373730ea81 100644
--- a/tests/src/Regressions/coreclr/0198/CompEx.csproj
+++ b/tests/src/Regressions/coreclr/0198/CompEx.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0202/ThreadCulture.csproj b/tests/src/Regressions/coreclr/0202/ThreadCulture.csproj
index 59b56bc4b5..4ad0876633 100644
--- a/tests/src/Regressions/coreclr/0202/ThreadCulture.csproj
+++ b/tests/src/Regressions/coreclr/0202/ThreadCulture.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0211/genrecur.csproj b/tests/src/Regressions/coreclr/0211/genrecur.csproj
index 169c51f573..78260fe1e1 100644
--- a/tests/src/Regressions/coreclr/0211/genrecur.csproj
+++ b/tests/src/Regressions/coreclr/0211/genrecur.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0275/Marshal.csproj b/tests/src/Regressions/coreclr/0275/Marshal.csproj
index df357cba63..5b35562a35 100644
--- a/tests/src/Regressions/coreclr/0275/Marshal.csproj
+++ b/tests/src/Regressions/coreclr/0275/Marshal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0308/ToLower.csproj b/tests/src/Regressions/coreclr/0308/ToLower.csproj
index 6cc693649d..e4517fe5cf 100644
--- a/tests/src/Regressions/coreclr/0308/ToLower.csproj
+++ b/tests/src/Regressions/coreclr/0308/ToLower.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0341/PlatformCode.csproj b/tests/src/Regressions/coreclr/0341/PlatformCode.csproj
index b8b7b54a08..4d0a0f2ae6 100644
--- a/tests/src/Regressions/coreclr/0341/PlatformCode.csproj
+++ b/tests/src/Regressions/coreclr/0341/PlatformCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0341/UserCode.csproj b/tests/src/Regressions/coreclr/0341/UserCode.csproj
index d48769e4a5..5ae8c0a235 100644
--- a/tests/src/Regressions/coreclr/0341/UserCode.csproj
+++ b/tests/src/Regressions/coreclr/0341/UserCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0342/unsafe.csproj b/tests/src/Regressions/coreclr/0342/unsafe.csproj
index d522f6222c..eac2297214 100644
--- a/tests/src/Regressions/coreclr/0342/unsafe.csproj
+++ b/tests/src/Regressions/coreclr/0342/unsafe.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0416/hello.csproj b/tests/src/Regressions/coreclr/0416/hello.csproj
index c28b078f4d..075bb2c5b4 100644
--- a/tests/src/Regressions/coreclr/0416/hello.csproj
+++ b/tests/src/Regressions/coreclr/0416/hello.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0433/assem.csproj b/tests/src/Regressions/coreclr/0433/assem.csproj
index 5d00559251..dcd69ebfee 100644
--- a/tests/src/Regressions/coreclr/0433/assem.csproj
+++ b/tests/src/Regressions/coreclr/0433/assem.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0433/test.csproj b/tests/src/Regressions/coreclr/0433/test.csproj
index cefd38775f..35d36827fd 100644
--- a/tests/src/Regressions/coreclr/0433/test.csproj
+++ b/tests/src/Regressions/coreclr/0433/test.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0487/test.csproj b/tests/src/Regressions/coreclr/0487/test.csproj
index 07824d1efe..487d45a192 100644
--- a/tests/src/Regressions/coreclr/0487/test.csproj
+++ b/tests/src/Regressions/coreclr/0487/test.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0570/Test570.csproj b/tests/src/Regressions/coreclr/0570/Test570.csproj
index 305497b7a1..225a1b6c76 100644
--- a/tests/src/Regressions/coreclr/0570/Test570.csproj
+++ b/tests/src/Regressions/coreclr/0570/Test570.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0576/Test0576.csproj b/tests/src/Regressions/coreclr/0576/Test0576.csproj
index 6a91fada32..da0ea2abd4 100644
--- a/tests/src/Regressions/coreclr/0576/Test0576.csproj
+++ b/tests/src/Regressions/coreclr/0576/Test0576.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0582/csgen.1.csproj b/tests/src/Regressions/coreclr/0582/csgen.1.csproj
index fec123df04..c0bc3c1d14 100644
--- a/tests/src/Regressions/coreclr/0582/csgen.1.csproj
+++ b/tests/src/Regressions/coreclr/0582/csgen.1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0583/Test583.csproj b/tests/src/Regressions/coreclr/0583/Test583.csproj
index a23dfc8f29..b93d06b3e8 100644
--- a/tests/src/Regressions/coreclr/0583/Test583.csproj
+++ b/tests/src/Regressions/coreclr/0583/Test583.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0584/Test584.csproj b/tests/src/Regressions/coreclr/0584/Test584.csproj
index e530158c37..65a6eb8138 100644
--- a/tests/src/Regressions/coreclr/0584/Test584.csproj
+++ b/tests/src/Regressions/coreclr/0584/Test584.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0694/CriticalCode.csproj b/tests/src/Regressions/coreclr/0694/CriticalCode.csproj
index 1f0a740438..56b3d15b5c 100644
--- a/tests/src/Regressions/coreclr/0694/CriticalCode.csproj
+++ b/tests/src/Regressions/coreclr/0694/CriticalCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0792/Test0792.csproj b/tests/src/Regressions/coreclr/0792/Test0792.csproj
index 8b827dc062..c1c190985e 100644
--- a/tests/src/Regressions/coreclr/0792/Test0792.csproj
+++ b/tests/src/Regressions/coreclr/0792/Test0792.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0828/Test0828.csproj b/tests/src/Regressions/coreclr/0828/Test0828.csproj
index 84e9c1c97b..26fa58303d 100644
--- a/tests/src/Regressions/coreclr/0828/Test0828.csproj
+++ b/tests/src/Regressions/coreclr/0828/Test0828.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0829/Test0829.csproj b/tests/src/Regressions/coreclr/0829/Test0829.csproj
index 2c97469c83..ff0110f4d3 100644
--- a/tests/src/Regressions/coreclr/0829/Test0829.csproj
+++ b/tests/src/Regressions/coreclr/0829/Test0829.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0857/override.csproj b/tests/src/Regressions/coreclr/0857/override.csproj
index 1314025cfb..9bbb02a9b3 100644
--- a/tests/src/Regressions/coreclr/0857/override.csproj
+++ b/tests/src/Regressions/coreclr/0857/override.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0939/test0939.csproj b/tests/src/Regressions/coreclr/0939/test0939.csproj
index 1faa1cdf69..976a2b1334 100644
--- a/tests/src/Regressions/coreclr/0939/test0939.csproj
+++ b/tests/src/Regressions/coreclr/0939/test0939.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/0968/Test968.csproj b/tests/src/Regressions/coreclr/0968/Test968.csproj
index fb6db7237c..9431a4618b 100644
--- a/tests/src/Regressions/coreclr/0968/Test968.csproj
+++ b/tests/src/Regressions/coreclr/0968/Test968.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/1307/test1307.csproj b/tests/src/Regressions/coreclr/1307/test1307.csproj
index a113d7880b..ae738164c3 100644
--- a/tests/src/Regressions/coreclr/1307/test1307.csproj
+++ b/tests/src/Regressions/coreclr/1307/test1307.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/1333/testClass.csproj b/tests/src/Regressions/coreclr/1333/testClass.csproj
index 959d73acb4..70ed0d02eb 100644
--- a/tests/src/Regressions/coreclr/1333/testClass.csproj
+++ b/tests/src/Regressions/coreclr/1333/testClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/1333/testInterface.csproj b/tests/src/Regressions/coreclr/1333/testInterface.csproj
index 04361bae91..63d0f0abbb 100644
--- a/tests/src/Regressions/coreclr/1333/testInterface.csproj
+++ b/tests/src/Regressions/coreclr/1333/testInterface.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/1337/Test1337.csproj b/tests/src/Regressions/coreclr/1337/Test1337.csproj
index bde5376925..d20a10fcc3 100644
--- a/tests/src/Regressions/coreclr/1337/Test1337.csproj
+++ b/tests/src/Regressions/coreclr/1337/Test1337.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/1380/forwarder1.csproj b/tests/src/Regressions/coreclr/1380/forwarder1.csproj
index 113a9c59e2..7ea920ef70 100644
--- a/tests/src/Regressions/coreclr/1380/forwarder1.csproj
+++ b/tests/src/Regressions/coreclr/1380/forwarder1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/1386/Co1727ctor_OO.csproj b/tests/src/Regressions/coreclr/1386/Co1727ctor_OO.csproj
index 29d012b568..745db740f3 100644
--- a/tests/src/Regressions/coreclr/1386/Co1727ctor_OO.csproj
+++ b/tests/src/Regressions/coreclr/1386/Co1727ctor_OO.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/1402/Test1402.csproj b/tests/src/Regressions/coreclr/1402/Test1402.csproj
index e46176482c..deff6d0d2f 100644
--- a/tests/src/Regressions/coreclr/1402/Test1402.csproj
+++ b/tests/src/Regressions/coreclr/1402/Test1402.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/1514/InterlockExchange.csproj b/tests/src/Regressions/coreclr/1514/InterlockExchange.csproj
index ef64ce9f1a..baabd44e38 100644
--- a/tests/src/Regressions/coreclr/1514/InterlockExchange.csproj
+++ b/tests/src/Regressions/coreclr/1514/InterlockExchange.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/1534/Test1534.csproj b/tests/src/Regressions/coreclr/1534/Test1534.csproj
index 260d3ebd58..764205e9e8 100644
--- a/tests/src/Regressions/coreclr/1534/Test1534.csproj
+++ b/tests/src/Regressions/coreclr/1534/Test1534.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/1535/Test1535.csproj b/tests/src/Regressions/coreclr/1535/Test1535.csproj
index 24479d39f5..bd76ac9085 100644
--- a/tests/src/Regressions/coreclr/1535/Test1535.csproj
+++ b/tests/src/Regressions/coreclr/1535/Test1535.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/1549/Test1549.csproj b/tests/src/Regressions/coreclr/1549/Test1549.csproj
index 110484c1d7..04ec375625 100644
--- a/tests/src/Regressions/coreclr/1549/Test1549.csproj
+++ b/tests/src/Regressions/coreclr/1549/Test1549.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/72162/Test72162.csproj b/tests/src/Regressions/coreclr/72162/Test72162.csproj
index 19c3195c57..891c369528 100644
--- a/tests/src/Regressions/coreclr/72162/Test72162.csproj
+++ b/tests/src/Regressions/coreclr/72162/Test72162.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/coreclr/GitHub_7685/Test7685.csproj b/tests/src/Regressions/coreclr/GitHub_7685/Test7685.csproj
index 777c8dbf8d..26b1ea2a23 100644
--- a/tests/src/Regressions/coreclr/GitHub_7685/Test7685.csproj
+++ b/tests/src/Regressions/coreclr/GitHub_7685/Test7685.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E55A6F8B-B9E3-45CE-88F4-22AE70F606CB}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/Regressions/expl_double/expl_double.csproj b/tests/src/Regressions/expl_double/expl_double.csproj
index faa86faadd..66d10786aa 100644
--- a/tests/src/Regressions/expl_double/expl_double.csproj
+++ b/tests/src/Regressions/expl_double/expl_double.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8E3244CB-407F-4142-BAAB-E7A55901A5FA}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
diff --git a/tests/src/TestWrappersConfig/project.json b/tests/src/TestWrappersConfig/project.json
index 2f706066dd..93e73880a2 100644
--- a/tests/src/TestWrappersConfig/project.json
+++ b/tests/src/TestWrappersConfig/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25210-01",
     "xunit": "2.2.0-beta2-build3300",
     "xunit.assert": "2.2.0-beta2-build3300",
     "xunit.core": "2.2.0-beta2-build3300",
@@ -23,11 +23,10 @@
     "ubuntu.14.04-x64": {},
     "ubuntu.16.04-x64": {},
     "ubuntu.16.10-x64": {},
-    "osx.10.10-x64": {},
+    "osx.10.12-x64": {},
     "centos.7-x64": {},
     "rhel.7-x64": {},
     "debian.8-x64": {},
-    "fedora.23-x64": {},
-    "opensuse.13.2-x64": {}
+    "fedora.24-x64": {}
   }
 }
diff --git a/tests/src/baseservices/compilerservices/FixedAddressValueType/FixedAddressValueType.csproj b/tests/src/baseservices/compilerservices/FixedAddressValueType/FixedAddressValueType.csproj
index 19a779194f..1b0398cc4f 100644
--- a/tests/src/baseservices/compilerservices/FixedAddressValueType/FixedAddressValueType.csproj
+++ b/tests/src/baseservices/compilerservices/FixedAddressValueType/FixedAddressValueType.csproj
@@ -7,13 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/tests/src/baseservices/compilerservices/RuntimeHelpers/ExecuteCodeWithGuaranteedCleanup.csproj b/tests/src/baseservices/compilerservices/RuntimeHelpers/ExecuteCodeWithGuaranteedCleanup.csproj
index 605d11b1f1..1b25407f0b 100644
--- a/tests/src/baseservices/compilerservices/RuntimeHelpers/ExecuteCodeWithGuaranteedCleanup.csproj
+++ b/tests/src/baseservices/compilerservices/RuntimeHelpers/ExecuteCodeWithGuaranteedCleanup.csproj
@@ -7,13 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/compilerservices/RuntimeWrappedException/RuntimeWrappedException.csproj b/tests/src/baseservices/compilerservices/RuntimeWrappedException/RuntimeWrappedException.csproj
index 4b0c5cf68d..98b4a35d16 100644
--- a/tests/src/baseservices/compilerservices/RuntimeWrappedException/RuntimeWrappedException.csproj
+++ b/tests/src/baseservices/compilerservices/RuntimeWrappedException/RuntimeWrappedException.csproj
@@ -7,13 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/compilerservices/RuntimeWrappedException/StringThrower.ilproj b/tests/src/baseservices/compilerservices/RuntimeWrappedException/StringThrower.ilproj
index 79667cc7c6..125fb1c1ac 100644
--- a/tests/src/baseservices/compilerservices/RuntimeWrappedException/StringThrower.ilproj
+++ b/tests/src/baseservices/compilerservices/RuntimeWrappedException/StringThrower.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/compilerservices/dynamicobjectproperties/Dev10_535767.csproj b/tests/src/baseservices/compilerservices/dynamicobjectproperties/Dev10_535767.csproj
index b80575f47a..08f9711d42 100644
--- a/tests/src/baseservices/compilerservices/dynamicobjectproperties/Dev10_535767.csproj
+++ b/tests/src/baseservices/compilerservices/dynamicobjectproperties/Dev10_535767.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestAPIs.csproj b/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestAPIs.csproj
index 1283589d54..e4d74de410 100644
--- a/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestAPIs.csproj
+++ b/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestAPIs.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestGC.csproj b/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestGC.csproj
index 8b3e45163d..3b1a5f02b8 100644
--- a/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestGC.csproj
+++ b/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestGC.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestOverrides.csproj b/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestOverrides.csproj
index be4c5a6463..2ac88d63c6 100644
--- a/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestOverrides.csproj
+++ b/tests/src/baseservices/compilerservices/dynamicobjectproperties/TestOverrides.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/compilerservices/dynamicobjectproperties/test448035.csproj b/tests/src/baseservices/compilerservices/dynamicobjectproperties/test448035.csproj
index 9e80124999..d80a78b637 100644
--- a/tests/src/baseservices/compilerservices/dynamicobjectproperties/test448035.csproj
+++ b/tests/src/baseservices/compilerservices/dynamicobjectproperties/test448035.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/compilerservices/dynamicobjectproperties/testapis.cs b/tests/src/baseservices/compilerservices/dynamicobjectproperties/testapis.cs
index 3e352527f0..179b052482 100644
--- a/tests/src/baseservices/compilerservices/dynamicobjectproperties/testapis.cs
+++ b/tests/src/baseservices/compilerservices/dynamicobjectproperties/testapis.cs
@@ -91,8 +91,6 @@ public class Driver<K, V>
         ConditionalWeakTable<K,V> tbl = new ConditionalWeakTable<K,V>();
 
         // Try to remove key from an empty dictionary
-        Random r = new Random();
-
         // Remove should return false
         Test.Eval(!tbl.Remove(keys[0]), "Err_005 Expected Remove to return false");
 
@@ -147,7 +145,6 @@ public class Driver<K, V>
 
         // Try to get non existing key
         // TryGetValue should return false and value should contian default(TValue)
-        Random r = new Random();
         Test.Eval(!tbl.TryGetValue(key, out val), "Err_011 Expected TryGetValue to return false");
         Test.Eval(val == null, "Err_012 Expected val to be null");
     }
diff --git a/tests/src/baseservices/compilerservices/modulector/moduleCctor.ilproj b/tests/src/baseservices/compilerservices/modulector/moduleCctor.ilproj
index c846e02edb..72084cddc9 100644
--- a/tests/src/baseservices/compilerservices/modulector/moduleCctor.ilproj
+++ b/tests/src/baseservices/compilerservices/modulector/moduleCctor.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/compilerservices/modulector/runmoduleconstructor.csproj b/tests/src/baseservices/compilerservices/modulector/runmoduleconstructor.csproj
index fff05ea610..e7193b2ee8 100644
--- a/tests/src/baseservices/compilerservices/modulector/runmoduleconstructor.csproj
+++ b/tests/src/baseservices/compilerservices/modulector/runmoduleconstructor.csproj
@@ -7,13 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/exceptions/AccessViolationException/AVException01.csproj b/tests/src/baseservices/exceptions/AccessViolationException/AVException01.csproj
index 4e71db2512..f2fde61e08 100644
--- a/tests/src/baseservices/exceptions/AccessViolationException/AVException01.csproj
+++ b/tests/src/baseservices/exceptions/AccessViolationException/AVException01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/AccessViolationException/AVException02.csproj b/tests/src/baseservices/exceptions/AccessViolationException/AVException02.csproj
index 4e71db2512..f2fde61e08 100644
--- a/tests/src/baseservices/exceptions/AccessViolationException/AVException02.csproj
+++ b/tests/src/baseservices/exceptions/AccessViolationException/AVException02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/AccessViolationException/AVException03.csproj b/tests/src/baseservices/exceptions/AccessViolationException/AVException03.csproj
index 208109a0bb..d6ea8fa96c 100644
--- a/tests/src/baseservices/exceptions/AccessViolationException/AVException03.csproj
+++ b/tests/src/baseservices/exceptions/AccessViolationException/AVException03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/StackTracePreserve/StackTracePreserveTests.csproj b/tests/src/baseservices/exceptions/StackTracePreserve/StackTracePreserveTests.csproj
index 84ad30fdf8..33b019b70b 100644
--- a/tests/src/baseservices/exceptions/StackTracePreserve/StackTracePreserveTests.csproj
+++ b/tests/src/baseservices/exceptions/StackTracePreserve/StackTracePreserveTests.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj b/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj
index efaabfe9da..f9763e802e 100644
--- a/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj
+++ b/tests/src/baseservices/exceptions/generics/GenericExceptions.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/GenericExceptions01.csproj b/tests/src/baseservices/exceptions/generics/GenericExceptions01.csproj
index db7a774779..be9c33e078 100644
--- a/tests/src/baseservices/exceptions/generics/GenericExceptions01.csproj
+++ b/tests/src/baseservices/exceptions/generics/GenericExceptions01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/GenericExceptions02.csproj b/tests/src/baseservices/exceptions/generics/GenericExceptions02.csproj
index d2c3a4fd1d..110cae6cff 100644
--- a/tests/src/baseservices/exceptions/generics/GenericExceptions02.csproj
+++ b/tests/src/baseservices/exceptions/generics/GenericExceptions02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/GenericExceptions03.csproj b/tests/src/baseservices/exceptions/generics/GenericExceptions03.csproj
index 40eb42d341..8b923874ed 100644
--- a/tests/src/baseservices/exceptions/generics/GenericExceptions03.csproj
+++ b/tests/src/baseservices/exceptions/generics/GenericExceptions03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/GenericExceptions04.csproj b/tests/src/baseservices/exceptions/generics/GenericExceptions04.csproj
index 8c58ee3d43..8a34bc2654 100644
--- a/tests/src/baseservices/exceptions/generics/GenericExceptions04.csproj
+++ b/tests/src/baseservices/exceptions/generics/GenericExceptions04.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/GenericExceptions05.csproj b/tests/src/baseservices/exceptions/generics/GenericExceptions05.csproj
index 67206f4061..dddcf8409a 100644
--- a/tests/src/baseservices/exceptions/generics/GenericExceptions05.csproj
+++ b/tests/src/baseservices/exceptions/generics/GenericExceptions05.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/GenericExceptions06.csproj b/tests/src/baseservices/exceptions/generics/GenericExceptions06.csproj
index 491223cde5..e0c50c8adb 100644
--- a/tests/src/baseservices/exceptions/generics/GenericExceptions06.csproj
+++ b/tests/src/baseservices/exceptions/generics/GenericExceptions06.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/GenericExceptions07.csproj b/tests/src/baseservices/exceptions/generics/GenericExceptions07.csproj
index 744117c20a..ec81392f93 100644
--- a/tests/src/baseservices/exceptions/generics/GenericExceptions07.csproj
+++ b/tests/src/baseservices/exceptions/generics/GenericExceptions07.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/GenericExceptions08.csproj b/tests/src/baseservices/exceptions/generics/GenericExceptions08.csproj
index 4da0221749..8fd59e73f1 100644
--- a/tests/src/baseservices/exceptions/generics/GenericExceptions08.csproj
+++ b/tests/src/baseservices/exceptions/generics/GenericExceptions08.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter001.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter001.csproj
index 637077cc5b..7bec888827 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter001.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter001.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter002.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter002.csproj
index aceafc7886..7a95f6a176 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter002.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter002.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter003.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter003.csproj
index af46d7c3b6..f01cd07a61 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter003.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter003.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter004.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter004.csproj
index e47f9c6d63..4ad1943f37 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter004.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter004.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter005.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter005.csproj
index 7c290a3a86..925ff4f6e5 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter005.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter005.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter006.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter006.csproj
index 09b30c84ae..e796fbefeb 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter006.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter006.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter007.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter007.csproj
index 5aef6481fd..4a74c4b7b3 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter007.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter007.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter008.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter008.csproj
index 64e7f2aef7..98e336a64b 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter008.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter008.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter009.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter009.csproj
index bd588daeba..e3f78c10c4 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter009.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter009.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter010.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter010.csproj
index 3497367cce..6ee702fa06 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter010.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter010.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter011.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter011.csproj
index 030a92ed6d..9e3d290b4a 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter011.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter011.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter012.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter012.csproj
index 847a4eccd0..284588983e 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter012.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter012.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter013.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter013.csproj
index 3e03e4e995..8d85a43d95 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter013.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter013.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter014.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter014.csproj
index 4c1ff8ce0d..260a53f8c2 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter014.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter014.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter015.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter015.csproj
index ac5fc7d745..c927f7d45a 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter015.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter015.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter016.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter016.csproj
index 73783543f3..aff9728701 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter016.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter016.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter017.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter017.csproj
index 3510c6a750..f59bdc6888 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter017.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter017.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/TypeParameter018.csproj b/tests/src/baseservices/exceptions/generics/TypeParameter018.csproj
index 20181197e0..09dff0ef66 100644
--- a/tests/src/baseservices/exceptions/generics/TypeParameter018.csproj
+++ b/tests/src/baseservices/exceptions/generics/TypeParameter018.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/nested-try-catch01.csproj b/tests/src/baseservices/exceptions/generics/nested-try-catch01.csproj
index f66089a54c..656de81e12 100644
--- a/tests/src/baseservices/exceptions/generics/nested-try-catch01.csproj
+++ b/tests/src/baseservices/exceptions/generics/nested-try-catch01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/nested-try-catch02.csproj b/tests/src/baseservices/exceptions/generics/nested-try-catch02.csproj
index b95932c592..9969043df5 100644
--- a/tests/src/baseservices/exceptions/generics/nested-try-catch02.csproj
+++ b/tests/src/baseservices/exceptions/generics/nested-try-catch02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/nested-try-catch03.csproj b/tests/src/baseservices/exceptions/generics/nested-try-catch03.csproj
index 73353c171f..cc7de5a0c3 100644
--- a/tests/src/baseservices/exceptions/generics/nested-try-catch03.csproj
+++ b/tests/src/baseservices/exceptions/generics/nested-try-catch03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/nested-try-catch04.csproj b/tests/src/baseservices/exceptions/generics/nested-try-catch04.csproj
index 644c6e2571..f48e378568 100644
--- a/tests/src/baseservices/exceptions/generics/nested-try-catch04.csproj
+++ b/tests/src/baseservices/exceptions/generics/nested-try-catch04.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/nested-try-catch05.csproj b/tests/src/baseservices/exceptions/generics/nested-try-catch05.csproj
index 557afdb1fb..8d1e736236 100644
--- a/tests/src/baseservices/exceptions/generics/nested-try-catch05.csproj
+++ b/tests/src/baseservices/exceptions/generics/nested-try-catch05.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/nested-try-catch06.csproj b/tests/src/baseservices/exceptions/generics/nested-try-catch06.csproj
index c6995cc8fd..7ffb234e72 100644
--- a/tests/src/baseservices/exceptions/generics/nested-try-catch06.csproj
+++ b/tests/src/baseservices/exceptions/generics/nested-try-catch06.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/nested-try-catch07.csproj b/tests/src/baseservices/exceptions/generics/nested-try-catch07.csproj
index 01bc92d7ef..c0295491fc 100644
--- a/tests/src/baseservices/exceptions/generics/nested-try-catch07.csproj
+++ b/tests/src/baseservices/exceptions/generics/nested-try-catch07.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/nested-try-catch08.csproj b/tests/src/baseservices/exceptions/generics/nested-try-catch08.csproj
index da28169445..763613dcab 100644
--- a/tests/src/baseservices/exceptions/generics/nested-try-catch08.csproj
+++ b/tests/src/baseservices/exceptions/generics/nested-try-catch08.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/nested-try-catch09.csproj b/tests/src/baseservices/exceptions/generics/nested-try-catch09.csproj
index a86d05aaf9..46745b3bd6 100644
--- a/tests/src/baseservices/exceptions/generics/nested-try-catch09.csproj
+++ b/tests/src/baseservices/exceptions/generics/nested-try-catch09.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/nested-try-catch10.csproj b/tests/src/baseservices/exceptions/generics/nested-try-catch10.csproj
index 46b9b92803..795a2e7012 100644
--- a/tests/src/baseservices/exceptions/generics/nested-try-catch10.csproj
+++ b/tests/src/baseservices/exceptions/generics/nested-try-catch10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-finally-struct01.csproj b/tests/src/baseservices/exceptions/generics/try-catch-finally-struct01.csproj
index b06a18048b..1213a939d6 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-finally-struct01.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-finally-struct01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-finally-struct02.csproj b/tests/src/baseservices/exceptions/generics/try-catch-finally-struct02.csproj
index a8b4f61704..eb7fd05d3c 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-finally-struct02.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-finally-struct02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-finally-struct03.csproj b/tests/src/baseservices/exceptions/generics/try-catch-finally-struct03.csproj
index 8e3550a160..80a3630c3b 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-finally-struct03.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-finally-struct03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-finally01.csproj b/tests/src/baseservices/exceptions/generics/try-catch-finally01.csproj
index 55cf157e7e..750b34a968 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-finally01.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-finally01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-finally02.csproj b/tests/src/baseservices/exceptions/generics/try-catch-finally02.csproj
index f72a5d7588..221f2cea5b 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-finally02.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-finally02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-finally03.csproj b/tests/src/baseservices/exceptions/generics/try-catch-finally03.csproj
index bc9c98de86..ec152beb77 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-finally03.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-finally03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-struct01.csproj b/tests/src/baseservices/exceptions/generics/try-catch-struct01.csproj
index 0fb376b601..cc11b427d8 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-struct01.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-struct01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-struct02.csproj b/tests/src/baseservices/exceptions/generics/try-catch-struct02.csproj
index e8595c9507..456dae8d60 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-struct02.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-struct02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-struct03.csproj b/tests/src/baseservices/exceptions/generics/try-catch-struct03.csproj
index 0f2a4a0738..05630a6e49 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-struct03.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-struct03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-struct04.csproj b/tests/src/baseservices/exceptions/generics/try-catch-struct04.csproj
index 5be2c31251..f3a5ad03e7 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-struct04.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-struct04.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-struct05.csproj b/tests/src/baseservices/exceptions/generics/try-catch-struct05.csproj
index 6bf77b81a2..1bc9f72045 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-struct05.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-struct05.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-struct06.csproj b/tests/src/baseservices/exceptions/generics/try-catch-struct06.csproj
index b57b69d6a7..fb8099f0ff 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-struct06.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-struct06.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-struct07.csproj b/tests/src/baseservices/exceptions/generics/try-catch-struct07.csproj
index ce2fbf2c09..b54e469f04 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-struct07.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-struct07.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-struct08.csproj b/tests/src/baseservices/exceptions/generics/try-catch-struct08.csproj
index e0a740b8b1..d35a2aa156 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-struct08.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-struct08.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch-struct09.csproj b/tests/src/baseservices/exceptions/generics/try-catch-struct09.csproj
index f7dec8f25a..7766afeee8 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch-struct09.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch-struct09.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch01.csproj b/tests/src/baseservices/exceptions/generics/try-catch01.csproj
index 1220178615..8c47fdaf49 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch01.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch02.csproj b/tests/src/baseservices/exceptions/generics/try-catch02.csproj
index d17d2814ed..0c1ee1898f 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch02.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch03.csproj b/tests/src/baseservices/exceptions/generics/try-catch03.csproj
index 6853ebc5da..0dc24bee92 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch03.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch04.csproj b/tests/src/baseservices/exceptions/generics/try-catch04.csproj
index f12fcdbde4..bce1bfea01 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch04.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch04.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch05.csproj b/tests/src/baseservices/exceptions/generics/try-catch05.csproj
index e2180672d5..60a94d2d5f 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch05.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch05.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch06.csproj b/tests/src/baseservices/exceptions/generics/try-catch06.csproj
index 2836f093c8..fd082be1ba 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch06.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch06.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch07.csproj b/tests/src/baseservices/exceptions/generics/try-catch07.csproj
index 5625f632ed..2a1b577ef9 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch07.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch07.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch08.csproj b/tests/src/baseservices/exceptions/generics/try-catch08.csproj
index 31b4f32a8e..e9feb78b82 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch08.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch08.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-catch09.csproj b/tests/src/baseservices/exceptions/generics/try-catch09.csproj
index ef0f5e58c6..1f44529d34 100644
--- a/tests/src/baseservices/exceptions/generics/try-catch09.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-catch09.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-fault-struct01.ilproj b/tests/src/baseservices/exceptions/generics/try-fault-struct01.ilproj
index 9720c2a068..cf354c19e8 100644
--- a/tests/src/baseservices/exceptions/generics/try-fault-struct01.ilproj
+++ b/tests/src/baseservices/exceptions/generics/try-fault-struct01.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-fault-struct02.ilproj b/tests/src/baseservices/exceptions/generics/try-fault-struct02.ilproj
index e74165eb89..2777951d42 100644
--- a/tests/src/baseservices/exceptions/generics/try-fault-struct02.ilproj
+++ b/tests/src/baseservices/exceptions/generics/try-fault-struct02.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-fault-struct03.ilproj b/tests/src/baseservices/exceptions/generics/try-fault-struct03.ilproj
index 9baca23341..bbf4762d4f 100644
--- a/tests/src/baseservices/exceptions/generics/try-fault-struct03.ilproj
+++ b/tests/src/baseservices/exceptions/generics/try-fault-struct03.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-fault01.ilproj b/tests/src/baseservices/exceptions/generics/try-fault01.ilproj
index cc79ed1764..d7cf77ea46 100644
--- a/tests/src/baseservices/exceptions/generics/try-fault01.ilproj
+++ b/tests/src/baseservices/exceptions/generics/try-fault01.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-fault02.ilproj b/tests/src/baseservices/exceptions/generics/try-fault02.ilproj
index ad9e01d4f2..a21ad07d09 100644
--- a/tests/src/baseservices/exceptions/generics/try-fault02.ilproj
+++ b/tests/src/baseservices/exceptions/generics/try-fault02.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-fault03.ilproj b/tests/src/baseservices/exceptions/generics/try-fault03.ilproj
index 516967e7d5..9c980fb304 100644
--- a/tests/src/baseservices/exceptions/generics/try-fault03.ilproj
+++ b/tests/src/baseservices/exceptions/generics/try-fault03.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-filter-finally01.ilproj b/tests/src/baseservices/exceptions/generics/try-filter-finally01.ilproj
index 49bbad6512..2319d7de8d 100644
--- a/tests/src/baseservices/exceptions/generics/try-filter-finally01.ilproj
+++ b/tests/src/baseservices/exceptions/generics/try-filter-finally01.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-filter-finally02.ilproj b/tests/src/baseservices/exceptions/generics/try-filter-finally02.ilproj
index 418e59ba7d..c78728a281 100644
--- a/tests/src/baseservices/exceptions/generics/try-filter-finally02.ilproj
+++ b/tests/src/baseservices/exceptions/generics/try-filter-finally02.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-filter-struct02.ilproj b/tests/src/baseservices/exceptions/generics/try-filter-struct02.ilproj
index cf20a493cc..76299d4efc 100644
--- a/tests/src/baseservices/exceptions/generics/try-filter-struct02.ilproj
+++ b/tests/src/baseservices/exceptions/generics/try-filter-struct02.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-filter02.ilproj b/tests/src/baseservices/exceptions/generics/try-filter02.ilproj
index bebcd6a537..a3b0e9e1a3 100644
--- a/tests/src/baseservices/exceptions/generics/try-filter02.ilproj
+++ b/tests/src/baseservices/exceptions/generics/try-filter02.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-finally-struct01.csproj b/tests/src/baseservices/exceptions/generics/try-finally-struct01.csproj
index a7fd90f8b5..e81d35fdc4 100644
--- a/tests/src/baseservices/exceptions/generics/try-finally-struct01.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-finally-struct01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-finally-struct02.csproj b/tests/src/baseservices/exceptions/generics/try-finally-struct02.csproj
index 873ccbe0d7..7ff5b1ea69 100644
--- a/tests/src/baseservices/exceptions/generics/try-finally-struct02.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-finally-struct02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-finally-struct03.csproj b/tests/src/baseservices/exceptions/generics/try-finally-struct03.csproj
index 91447d92fc..8b80e8e446 100644
--- a/tests/src/baseservices/exceptions/generics/try-finally-struct03.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-finally-struct03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-finally01.csproj b/tests/src/baseservices/exceptions/generics/try-finally01.csproj
index c053746e21..94fffa30e5 100644
--- a/tests/src/baseservices/exceptions/generics/try-finally01.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-finally01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-finally02.csproj b/tests/src/baseservices/exceptions/generics/try-finally02.csproj
index c16cdfbbef..c7956dc15b 100644
--- a/tests/src/baseservices/exceptions/generics/try-finally02.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-finally02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/generics/try-finally03.csproj b/tests/src/baseservices/exceptions/generics/try-finally03.csproj
index 2d04532eec..d45b82e703 100644
--- a/tests/src/baseservices/exceptions/generics/try-finally03.csproj
+++ b/tests/src/baseservices/exceptions/generics/try-finally03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj b/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj
index a8c40a1478..138f2b0ff4 100644
--- a/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj
+++ b/tests/src/baseservices/exceptions/regressions/Dev11/147911/test147911.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj b/tests/src/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj
index 2ac58fc9dc..27299464c3 100644
--- a/tests/src/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj
+++ b/tests/src/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/finally.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/finally.csproj
index 700fd91d5c..2e89695266 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/finally.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/finally.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.csproj
index 21c3b2effd..175fcfeaa2 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/COOL/rethrow.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/ExternalException.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/ExternalException.csproj
index 33193a8a95..b3c3245e96 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/ExternalException.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/ExternalException.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.csproj
index 63483b96b5..150bd5322a 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/HandlerException.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.csproj
index 9b4caf3a6e..57a68bc25d 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/MultipleException.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx1.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx1.csproj
index 9cc92f0cf9..f7aecf079c 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx1.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx2.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx2.csproj
index f5b6b4f10f..5161f0ed65 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx2.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedEx2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.csproj
index 0f4693fcc2..fc5ba9f8f8 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NestedException.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NormalException.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NormalException.csproj
index f51b9220f4..b84c1c7b6e 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NormalException.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/NormalException.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/RecursiveException.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/RecursiveException.csproj
index 2926c27f10..5d2886d614 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/RecursiveException.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/RecursiveException.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatch.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatch.csproj
index 28d4c7f6dd..8746c4676a 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatch.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatch.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatchFinally.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatchFinally.csproj
index a785878dd3..105941b969 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatchFinally.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/TryCatchFinally.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj
index c5346713a2..9a1c51ba7e 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserException.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserException.csproj
index c5bbae0c9c..8e0e3aacc9 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserException.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserException.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserExceptionThread.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserExceptionThread.csproj
index a49b9acc02..5a3786daaf 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserExceptionThread.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/VJ/UserExceptionThread.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Except.ilproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Except.ilproj
index 80c2e088a6..dddbb6259a 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Except.ilproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Except.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltCatch.ilproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltCatch.ilproj
index a0a5b26d49..aa9fd32237 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltCatch.ilproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltCatch.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltFallThru.ilproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltFallThru.ilproj
index 576d6e6b71..18828d7ffb 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltFallThru.ilproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/FiltFallThru.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Filter.ilproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Filter.ilproj
index 6abe96b182..640d16f054 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Filter.ilproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Filter.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Finally.ilproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Finally.ilproj
index f1ba3e7e27..6cdfa78ce7 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Finally.ilproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/Finally.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/NestedExcept.ilproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/NestedExcept.ilproj
index 3c49c3bbe2..9254b37e8f 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/NestedExcept.ilproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/NestedExcept.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/NestedFilt.ilproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/NestedFilt.ilproj
index 4ad4bf0aed..fa26d55c52 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/NestedFilt.ilproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/asm/NestedFilt.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj b/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj
index 37859e566e..0d55019255 100644
--- a/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj
+++ b/tests/src/baseservices/exceptions/regressions/V1/SEH/coverage/Exceptions.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/v1.0/15266.ilproj b/tests/src/baseservices/exceptions/regressions/v1.0/15266.ilproj
index 53062b501a..d5bb496c96 100644
--- a/tests/src/baseservices/exceptions/regressions/v1.0/15266.ilproj
+++ b/tests/src/baseservices/exceptions/regressions/v1.0/15266.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/v1.0/19896.csproj b/tests/src/baseservices/exceptions/regressions/v1.0/19896.csproj
index 907b705873..4f80f894f5 100644
--- a/tests/src/baseservices/exceptions/regressions/v1.0/19896.csproj
+++ b/tests/src/baseservices/exceptions/regressions/v1.0/19896.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/v4.0/640474/other.csproj b/tests/src/baseservices/exceptions/regressions/v4.0/640474/other.csproj
index 20137e812d..190f243a71 100644
--- a/tests/src/baseservices/exceptions/regressions/v4.0/640474/other.csproj
+++ b/tests/src/baseservices/exceptions/regressions/v4.0/640474/other.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/v4.0/640474/test640474.csproj b/tests/src/baseservices/exceptions/regressions/v4.0/640474/test640474.csproj
index 8f4a638874..a632cc5128 100644
--- a/tests/src/baseservices/exceptions/regressions/v4.0/640474/test640474.csproj
+++ b/tests/src/baseservices/exceptions/regressions/v4.0/640474/test640474.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/v4.0/706099/ManagedCom.csproj b/tests/src/baseservices/exceptions/regressions/v4.0/706099/ManagedCom.csproj
index ea6eaf4947..79d45166fa 100644
--- a/tests/src/baseservices/exceptions/regressions/v4.0/706099/ManagedCom.csproj
+++ b/tests/src/baseservices/exceptions/regressions/v4.0/706099/ManagedCom.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/whidbeyM3.2/151232.csproj b/tests/src/baseservices/exceptions/regressions/whidbeyM3.2/151232.csproj
index 18843974c0..f5a98d9f1f 100644
--- a/tests/src/baseservices/exceptions/regressions/whidbeyM3.2/151232.csproj
+++ b/tests/src/baseservices/exceptions/regressions/whidbeyM3.2/151232.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/whidbeybeta2/349379/349379.csproj b/tests/src/baseservices/exceptions/regressions/whidbeybeta2/349379/349379.csproj
index 9f6b97c69e..d2f17768e3 100644
--- a/tests/src/baseservices/exceptions/regressions/whidbeybeta2/349379/349379.csproj
+++ b/tests/src/baseservices/exceptions/regressions/whidbeybeta2/349379/349379.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/whidbeybeta2/366085/366085.csproj b/tests/src/baseservices/exceptions/regressions/whidbeybeta2/366085/366085.csproj
index 91b60f6918..b8cbbeb179 100644
--- a/tests/src/baseservices/exceptions/regressions/whidbeybeta2/366085/366085.csproj
+++ b/tests/src/baseservices/exceptions/regressions/whidbeybeta2/366085/366085.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/whidbeym3.3/106011/106011.csproj b/tests/src/baseservices/exceptions/regressions/whidbeym3.3/106011/106011.csproj
index cd4e50aaf2..fb5675aee9 100644
--- a/tests/src/baseservices/exceptions/regressions/whidbeym3.3/106011/106011.csproj
+++ b/tests/src/baseservices/exceptions/regressions/whidbeym3.3/106011/106011.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/whidbeym3.3/293674/ReproTrusted.csproj b/tests/src/baseservices/exceptions/regressions/whidbeym3.3/293674/ReproTrusted.csproj
index 5a40aae039..a26d4f1140 100644
--- a/tests/src/baseservices/exceptions/regressions/whidbeym3.3/293674/ReproTrusted.csproj
+++ b/tests/src/baseservices/exceptions/regressions/whidbeym3.3/293674/ReproTrusted.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/302680.csproj b/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/302680.csproj
index 6b288989a6..7f9c39952a 100644
--- a/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/302680.csproj
+++ b/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/302680.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/data.csproj b/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/data.csproj
index 7c96e7e5cc..4e1f3ce533 100644
--- a/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/data.csproj
+++ b/tests/src/baseservices/exceptions/regressions/whidbeym3.3/302680/data.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/sharedexceptions/emptystacktrace/OOMException01.csproj b/tests/src/baseservices/exceptions/sharedexceptions/emptystacktrace/OOMException01.csproj
index d20398d9be..64b0e4dab3 100644
--- a/tests/src/baseservices/exceptions/sharedexceptions/emptystacktrace/OOMException01.csproj
+++ b/tests/src/baseservices/exceptions/sharedexceptions/emptystacktrace/OOMException01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>-trustedexe</CLRTestExecutionArguments>
diff --git a/tests/src/baseservices/exceptions/simple/ArrayInit.csproj b/tests/src/baseservices/exceptions/simple/ArrayInit.csproj
index 49cbf9b91e..41ec023605 100644
--- a/tests/src/baseservices/exceptions/simple/ArrayInit.csproj
+++ b/tests/src/baseservices/exceptions/simple/ArrayInit.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/simple/HardwareEh.csproj b/tests/src/baseservices/exceptions/simple/HardwareEh.csproj
index 50ed947206..ced4f2b27f 100644
--- a/tests/src/baseservices/exceptions/simple/HardwareEh.csproj
+++ b/tests/src/baseservices/exceptions/simple/HardwareEh.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/simple/ILHelper.ilproj b/tests/src/baseservices/exceptions/simple/ILHelper.ilproj
index 7f927c1665..117e027b0e 100644
--- a/tests/src/baseservices/exceptions/simple/ILHelper.ilproj
+++ b/tests/src/baseservices/exceptions/simple/ILHelper.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/simple/VT.ilproj b/tests/src/baseservices/exceptions/simple/VT.ilproj
index e3756d7168..dfbb37aba7 100644
--- a/tests/src/baseservices/exceptions/simple/VT.ilproj
+++ b/tests/src/baseservices/exceptions/simple/VT.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/simple/fault.ilproj b/tests/src/baseservices/exceptions/simple/fault.ilproj
index 454e265e8b..644034be91 100644
--- a/tests/src/baseservices/exceptions/simple/fault.ilproj
+++ b/tests/src/baseservices/exceptions/simple/fault.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/simple/finally.csproj b/tests/src/baseservices/exceptions/simple/finally.csproj
index 700fd91d5c..2e89695266 100644
--- a/tests/src/baseservices/exceptions/simple/finally.csproj
+++ b/tests/src/baseservices/exceptions/simple/finally.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj b/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj
index f1241cc770..6687bdd456 100644
--- a/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj
+++ b/tests/src/baseservices/exceptions/unittests/Baadbaad.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/BaseClass.csproj b/tests/src/baseservices/exceptions/unittests/BaseClass.csproj
index b8a07d9c9b..ba888574fe 100644
--- a/tests/src/baseservices/exceptions/unittests/BaseClass.csproj
+++ b/tests/src/baseservices/exceptions/unittests/BaseClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/CollidedUnwind.csproj b/tests/src/baseservices/exceptions/unittests/CollidedUnwind.csproj
index c091cbc406..332e0402c5 100644
--- a/tests/src/baseservices/exceptions/unittests/CollidedUnwind.csproj
+++ b/tests/src/baseservices/exceptions/unittests/CollidedUnwind.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/EHPatternTests.csproj b/tests/src/baseservices/exceptions/unittests/EHPatternTests.csproj
index 673def16ee..e268f61d57 100644
--- a/tests/src/baseservices/exceptions/unittests/EHPatternTests.csproj
+++ b/tests/src/baseservices/exceptions/unittests/EHPatternTests.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/GoryManagedPresent.csproj b/tests/src/baseservices/exceptions/unittests/GoryManagedPresent.csproj
index 097b335e59..5d9b0c0578 100644
--- a/tests/src/baseservices/exceptions/unittests/GoryManagedPresent.csproj
+++ b/tests/src/baseservices/exceptions/unittests/GoryManagedPresent.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/GoryNativePast.csproj b/tests/src/baseservices/exceptions/unittests/GoryNativePast.csproj
index c4c389be95..ec8a42ec7f 100644
--- a/tests/src/baseservices/exceptions/unittests/GoryNativePast.csproj
+++ b/tests/src/baseservices/exceptions/unittests/GoryNativePast.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/InnerFinally.csproj b/tests/src/baseservices/exceptions/unittests/InnerFinally.csproj
index fe340da307..7a8a6368a0 100644
--- a/tests/src/baseservices/exceptions/unittests/InnerFinally.csproj
+++ b/tests/src/baseservices/exceptions/unittests/InnerFinally.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/InnerFinallyAndCatch.csproj b/tests/src/baseservices/exceptions/unittests/InnerFinallyAndCatch.csproj
index 5ba52747c4..93b4b98f62 100644
--- a/tests/src/baseservices/exceptions/unittests/InnerFinallyAndCatch.csproj
+++ b/tests/src/baseservices/exceptions/unittests/InnerFinallyAndCatch.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/Pending.csproj b/tests/src/baseservices/exceptions/unittests/Pending.csproj
index cfa278e347..40f3f6a462 100644
--- a/tests/src/baseservices/exceptions/unittests/Pending.csproj
+++ b/tests/src/baseservices/exceptions/unittests/Pending.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/Recurse.csproj b/tests/src/baseservices/exceptions/unittests/Recurse.csproj
index f9e30c5e7f..7bde1ed5de 100644
--- a/tests/src/baseservices/exceptions/unittests/Recurse.csproj
+++ b/tests/src/baseservices/exceptions/unittests/Recurse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/RecursiveRethrow.csproj b/tests/src/baseservices/exceptions/unittests/RecursiveRethrow.csproj
index 357f150e08..4f65989bcd 100644
--- a/tests/src/baseservices/exceptions/unittests/RecursiveRethrow.csproj
+++ b/tests/src/baseservices/exceptions/unittests/RecursiveRethrow.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/RecursiveThrowNew.csproj b/tests/src/baseservices/exceptions/unittests/RecursiveThrowNew.csproj
index 40c62b6942..e4a31503f6 100644
--- a/tests/src/baseservices/exceptions/unittests/RecursiveThrowNew.csproj
+++ b/tests/src/baseservices/exceptions/unittests/RecursiveThrowNew.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/RethrowAndFinally.csproj b/tests/src/baseservices/exceptions/unittests/RethrowAndFinally.csproj
index 06a09500ab..6862403a6a 100644
--- a/tests/src/baseservices/exceptions/unittests/RethrowAndFinally.csproj
+++ b/tests/src/baseservices/exceptions/unittests/RethrowAndFinally.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/ReturnFromCatch.csproj b/tests/src/baseservices/exceptions/unittests/ReturnFromCatch.csproj
index 1effe2a6c6..b798f7baf0 100644
--- a/tests/src/baseservices/exceptions/unittests/ReturnFromCatch.csproj
+++ b/tests/src/baseservices/exceptions/unittests/ReturnFromCatch.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/StrSwitchFinally.csproj b/tests/src/baseservices/exceptions/unittests/StrSwitchFinally.csproj
index 135f78923e..5e3350488b 100644
--- a/tests/src/baseservices/exceptions/unittests/StrSwitchFinally.csproj
+++ b/tests/src/baseservices/exceptions/unittests/StrSwitchFinally.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/ThrowInCatch.csproj b/tests/src/baseservices/exceptions/unittests/ThrowInCatch.csproj
index 88e342cff3..8c3914165a 100644
--- a/tests/src/baseservices/exceptions/unittests/ThrowInCatch.csproj
+++ b/tests/src/baseservices/exceptions/unittests/ThrowInCatch.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/ThrowInFinally.csproj b/tests/src/baseservices/exceptions/unittests/ThrowInFinally.csproj
index 2a0d1344a8..957b5ca844 100644
--- a/tests/src/baseservices/exceptions/unittests/ThrowInFinally.csproj
+++ b/tests/src/baseservices/exceptions/unittests/ThrowInFinally.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/ThrowInFinallyNestedInTry.csproj b/tests/src/baseservices/exceptions/unittests/ThrowInFinallyNestedInTry.csproj
index 7fb28cbf7b..1d93f48258 100644
--- a/tests/src/baseservices/exceptions/unittests/ThrowInFinallyNestedInTry.csproj
+++ b/tests/src/baseservices/exceptions/unittests/ThrowInFinallyNestedInTry.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/exceptions/unittests/TryCatchInFinally.csproj b/tests/src/baseservices/exceptions/unittests/TryCatchInFinally.csproj
index 24d7e4acce..9d49c9d9f5 100644
--- a/tests/src/baseservices/exceptions/unittests/TryCatchInFinally.csproj
+++ b/tests/src/baseservices/exceptions/unittests/TryCatchInFinally.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/finalization/Finalizer.csproj b/tests/src/baseservices/finalization/Finalizer.csproj
index 47acddeb0b..91c20aef06 100644
--- a/tests/src/baseservices/finalization/Finalizer.csproj
+++ b/tests/src/baseservices/finalization/Finalizer.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/finalization/FinalizerSigned.csproj b/tests/src/baseservices/finalization/FinalizerSigned.csproj
index 47acddeb0b..91c20aef06 100644
--- a/tests/src/baseservices/finalization/FinalizerSigned.csproj
+++ b/tests/src/baseservices/finalization/FinalizerSigned.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/ilasm_ildasm/regression/dd130885/xlib.csproj b/tests/src/baseservices/ilasm_ildasm/regression/dd130885/xlib.csproj
index 7bd9c3af4c..8de828bce4 100644
--- a/tests/src/baseservices/ilasm_ildasm/regression/dd130885/xlib.csproj
+++ b/tests/src/baseservices/ilasm_ildasm/regression/dd130885/xlib.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey267905/267905.csproj b/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey267905/267905.csproj
index ead8fb9550..4c26b059aa 100644
--- a/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey267905/267905.csproj
+++ b/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey267905/267905.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey305155/305155.csproj b/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey305155/305155.csproj
index 0575fa9d9d..3fb8982186 100644
--- a/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey305155/305155.csproj
+++ b/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey305155/305155.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey395914/395914.csproj b/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey395914/395914.csproj
index 95fb8649f2..6172f239b1 100644
--- a/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey395914/395914.csproj
+++ b/tests/src/baseservices/ilasm_ildasm/regression/vswhidbey395914/395914.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/multidimmarray/enum.csproj b/tests/src/baseservices/multidimmarray/enum.csproj
index 3a1f4675b6..1402a58964 100644
--- a/tests/src/baseservices/multidimmarray/enum.csproj
+++ b/tests/src/baseservices/multidimmarray/enum.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/regression/v1/assembly/vos/cool/helloworld/First.csproj b/tests/src/baseservices/regression/v1/assembly/vos/cool/helloworld/First.csproj
index dedbc847eb..069b709648 100644
--- a/tests/src/baseservices/regression/v1/assembly/vos/cool/helloworld/First.csproj
+++ b/tests/src/baseservices/regression/v1/assembly/vos/cool/helloworld/First.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/regression/v1/assembly/vos/cool/multipleassembly/Assembly1.csproj b/tests/src/baseservices/regression/v1/assembly/vos/cool/multipleassembly/Assembly1.csproj
index e8c77862cd..7757888f32 100644
--- a/tests/src/baseservices/regression/v1/assembly/vos/cool/multipleassembly/Assembly1.csproj
+++ b/tests/src/baseservices/regression/v1/assembly/vos/cool/multipleassembly/Assembly1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/regression/v1/seh/vc/chain/ManagedDll.csproj b/tests/src/baseservices/regression/v1/seh/vc/chain/ManagedDll.csproj
index e6e569caaa..afc37e9690 100644
--- a/tests/src/baseservices/regression/v1/seh/vc/chain/ManagedDll.csproj
+++ b/tests/src/baseservices/regression/v1/seh/vc/chain/ManagedDll.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/regression/v1/threads/functional/thread/TcultureDLL.csproj b/tests/src/baseservices/regression/v1/threads/functional/thread/TcultureDLL.csproj
index cc37677bef..ad86a92569 100644
--- a/tests/src/baseservices/regression/v1/threads/functional/thread/TcultureDLL.csproj
+++ b/tests/src/baseservices/regression/v1/threads/functional/thread/TcultureDLL.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/regression/v1/threads/functional/threadpool/cs_support/ThreadPool_Test.csproj b/tests/src/baseservices/regression/v1/threads/functional/threadpool/cs_support/ThreadPool_Test.csproj
index e375e0e42d..482a038028 100644
--- a/tests/src/baseservices/regression/v1/threads/functional/threadpool/cs_support/ThreadPool_Test.csproj
+++ b/tests/src/baseservices/regression/v1/threads/functional/threadpool/cs_support/ThreadPool_Test.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/regression/v1/threads/functional/threadpool/cs_threadpoolnullchecks/CS_ThreadPoolNullChecks.csproj b/tests/src/baseservices/regression/v1/threads/functional/threadpool/cs_threadpoolnullchecks/CS_ThreadPoolNullChecks.csproj
index 92dc5d38e9..3e1e2039ad 100644
--- a/tests/src/baseservices/regression/v1/threads/functional/threadpool/cs_threadpoolnullchecks/CS_ThreadPoolNullChecks.csproj
+++ b/tests/src/baseservices/regression/v1/threads/functional/threadpool/cs_threadpoolnullchecks/CS_ThreadPoolNullChecks.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>-trustedexe</CLRTestExecutionArguments>
diff --git a/tests/src/baseservices/regression/v1/threads/hostedscenario/apunload/MgdHelper.csproj b/tests/src/baseservices/regression/v1/threads/hostedscenario/apunload/MgdHelper.csproj
index b10f9a6e35..cf8afb442a 100644
--- a/tests/src/baseservices/regression/v1/threads/hostedscenario/apunload/MgdHelper.csproj
+++ b/tests/src/baseservices/regression/v1/threads/hostedscenario/apunload/MgdHelper.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/regression/v1/threads/hostedscenario/apunloadtwo/interoptest.csproj b/tests/src/baseservices/regression/v1/threads/hostedscenario/apunloadtwo/interoptest.csproj
index 30366eb0cd..1e09c7e789 100644
--- a/tests/src/baseservices/regression/v1/threads/hostedscenario/apunloadtwo/interoptest.csproj
+++ b/tests/src/baseservices/regression/v1/threads/hostedscenario/apunloadtwo/interoptest.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/DeadThreads/DeadThreads.cs b/tests/src/baseservices/threading/DeadThreads/DeadThreads.cs
new file mode 100644
index 0000000000..cc9f054dea
--- /dev/null
+++ b/tests/src/baseservices/threading/DeadThreads/DeadThreads.cs
@@ -0,0 +1,43 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+public class DeadThreads
+{
+    /// <summary>
+    /// A sanity test that exercises code paths relevant to the heuristic that triggers GCs based on dead thread count and time
+    /// elapsed since a previous GC. See https://github.com/dotnet/coreclr/pull/10413.
+    /// 
+    /// This test suite runs with the following environment variables relevant to this test (see .csproj):
+    ///     set COMPlus_Thread_DeadThreadCountThresholdForGCTrigger=8
+    ///     set COMPlus_Thread_DeadThreadGCTriggerPeriodMilliseconds=3e8 // 1000
+    /// </summary>
+    private static void GCTriggerSanityTest()
+    {
+        var testDuration = TimeSpan.FromSeconds(8);
+        var startTime = DateTime.UtcNow;
+        do
+        {
+            StartNoOpThread();
+            Thread.Sleep(1);
+        } while (DateTime.UtcNow - startTime < testDuration);
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static void StartNoOpThread()
+    {
+        var t = new Thread(() => { });
+        t.IsBackground = true;
+        t.Start();
+    }
+
+    public static int Main()
+    {
+        GCTriggerSanityTest();
+        return 100;
+    }
+}
diff --git a/tests/src/baseservices/threading/DeadThreads/DeadThreads.csproj b/tests/src/baseservices/threading/DeadThreads/DeadThreads.csproj
new file mode 100644
index 0000000000..b9c27581a9
--- /dev/null
+++ b/tests/src/baseservices/threading/DeadThreads/DeadThreads.csproj
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>DeadThreads</AssemblyName>
+    <ProjectGuid>{649A239B-AB4B-4E20-BDCA-3BA736E8B790}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="DeadThreads.cs" />
+  </ItemGroup>
+  <PropertyGroup>
+    <CLRTestBatchPreCommands><![CDATA[
+$(CLRTestBatchPreCommands)
+set COMPlus_Thread_DeadThreadCountThresholdForGCTrigger=8
+set COMPlus_Thread_DeadThreadGCTriggerPeriodMilliseconds=3e8
+]]></CLRTestBatchPreCommands>
+    <BashCLRTestPreCommands><![CDATA[
+$(BashCLRTestPreCommands)
+export COMPlus_Thread_DeadThreadCountThresholdForGCTrigger=8
+export COMPlus_Thread_DeadThreadGCTriggerPeriodMilliseconds=3e8
+]]></BashCLRTestPreCommands>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+</Project>
diff --git a/tests/src/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj b/tests/src/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
index f9b1274fd9..fe215363fa 100644
--- a/tests/src/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
+++ b/tests/src/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{c485e164-f82c-4a4f-a02e-bc711827e5be}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj b/tests/src/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj
index be7d54ff2a..a543a8e849 100644
--- a/tests/src/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj
+++ b/tests/src/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj b/tests/src/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj
index fd2c79add3..0a64b1aadc 100644
--- a/tests/src/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj
+++ b/tests/src/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj b/tests/src/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj
index 0c7840561d..bd7330c0a2 100644
--- a/tests/src/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj
+++ b/tests/src/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj b/tests/src/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj
index 41d0dddd6f..db9b44930b 100644
--- a/tests/src/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj
+++ b/tests/src/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj b/tests/src/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj
index 2f358880cf..92bd71f912 100644
--- a/tests/src/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj
+++ b/tests/src/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj b/tests/src/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj
index 580a83b291..7c1e4d9957 100644
--- a/tests/src/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj
+++ b/tests/src/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj b/tests/src/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj
index 496cf06ab8..b74fce44b9 100644
--- a/tests/src/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj
+++ b/tests/src/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj b/tests/src/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj
index e7cbf278c3..26a2083920 100644
--- a/tests/src/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj
+++ b/tests/src/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/currentculture/CultureChangeSecurity.csproj b/tests/src/baseservices/threading/currentculture/CultureChangeSecurity.csproj
index c0cf32c8e6..95da857462 100644
--- a/tests/src/baseservices/threading/currentculture/CultureChangeSecurity.csproj
+++ b/tests/src/baseservices/threading/currentculture/CultureChangeSecurity.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj b/tests/src/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj
index b321aac7ca..a778c1bbb1 100644
--- a/tests/src/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj
+++ b/tests/src/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{c485e164-f82c-4a4f-a02e-bc711827e5be}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/AutoResetEvent/ConstructFalse.csproj b/tests/src/baseservices/threading/events/AutoResetEvent/ConstructFalse.csproj
index 2fadb91930..3afe94122f 100644
--- a/tests/src/baseservices/threading/events/AutoResetEvent/ConstructFalse.csproj
+++ b/tests/src/baseservices/threading/events/AutoResetEvent/ConstructFalse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1de36f31-ddef-43ff-a8e8-e09f11711c13}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/AutoResetEvent/ConstructTrue.csproj b/tests/src/baseservices/threading/events/AutoResetEvent/ConstructTrue.csproj
index b87f2ccf73..c235123372 100644
--- a/tests/src/baseservices/threading/events/AutoResetEvent/ConstructTrue.csproj
+++ b/tests/src/baseservices/threading/events/AutoResetEvent/ConstructTrue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1de36f31-ddef-43ff-a8e8-e09f11711c13}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast1.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast1.csproj
index a09f3f2812..74b8c6665c 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast1.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast2.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast2.csproj
index 4f9e6c6aa0..29e46d54fe 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast2.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCast2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor1.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor1.csproj
index 0a5de27e60..374e9d7eb5 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor1.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor2.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor2.csproj
index 31949252ea..e129091b2c 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor2.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/AutoReset/AutoResetCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast1.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast1.csproj
index 1519cd461b..8bdc989aa4 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast1.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast2.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast2.csproj
index 56218ee5a1..df91e9dac3 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast2.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCast2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor1.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor1.csproj
index b021cbfde7..261d21bd03 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor1.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor2.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor2.csproj
index 8ed2e235d0..4c4c3a5bbd 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor2.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/ManualReset/ManualResetCtor2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/unit/AutoConstructFalse.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/unit/AutoConstructFalse.csproj
index 38a38316dc..ebd161ce3c 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/unit/AutoConstructFalse.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/unit/AutoConstructFalse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7e4cd64f-c8d1-491c-bf2e-72f841ec6813}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/unit/AutoConstructTrue.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/unit/AutoConstructTrue.csproj
index ccbb8e1738..e10f96e7fe 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/unit/AutoConstructTrue.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/unit/AutoConstructTrue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7e4cd64f-c8d1-491c-bf2e-72f841ec6813}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/unit/ManualConstructFalse.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/unit/ManualConstructFalse.csproj
index 411351ccbf..279492ecd2 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/unit/ManualConstructFalse.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/unit/ManualConstructFalse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7e4cd64f-c8d1-491c-bf2e-72f841ec6813}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/EventWaitHandle/unit/ManualConstructTrue.csproj b/tests/src/baseservices/threading/events/EventWaitHandle/unit/ManualConstructTrue.csproj
index 3f17e72fbb..6e78162335 100644
--- a/tests/src/baseservices/threading/events/EventWaitHandle/unit/ManualConstructTrue.csproj
+++ b/tests/src/baseservices/threading/events/EventWaitHandle/unit/ManualConstructTrue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7e4cd64f-c8d1-491c-bf2e-72f841ec6813}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/ManualResetEvent/ConstructFalse.csproj b/tests/src/baseservices/threading/events/ManualResetEvent/ConstructFalse.csproj
index 9cfd959502..b47d5afb36 100644
--- a/tests/src/baseservices/threading/events/ManualResetEvent/ConstructFalse.csproj
+++ b/tests/src/baseservices/threading/events/ManualResetEvent/ConstructFalse.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{717a283b-e0af-4ef2-b072-0378decb2d96}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/events/ManualResetEvent/ConstructTrue.csproj b/tests/src/baseservices/threading/events/ManualResetEvent/ConstructTrue.csproj
index 46990bf365..ad58bb20fb 100644
--- a/tests/src/baseservices/threading/events/ManualResetEvent/ConstructTrue.csproj
+++ b/tests/src/baseservices/threading/events/ManualResetEvent/ConstructTrue.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{717a283b-e0af-4ef2-b072-0378decb2d96}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit01.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit01.csproj
index bd17304850..eb87a5ba80 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit01.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit02.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit02.csproj
index 25068cd484..22eabb7e19 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit02.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit03.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit03.csproj
index 59be5afa92..4b1bc4c78c 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit03.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit04.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit04.csproj
index 73dd371392..d7e6905f72 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit04.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit04.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit05.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit05.csproj
index 5d51e0dfef..903813de49 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit05.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit05.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit06.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit06.csproj
index a3cabe3af7..18f1b18cc3 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit06.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit06.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit07.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit07.csproj
index 98d7775f94..d18e156936 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit07.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit07.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit08.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit08.csproj
index 8086661d8d..da5dc97628 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit08.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit08.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit09.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit09.csproj
index 51151b137e..03604bdff5 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit09.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit09.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit10.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit10.csproj
index 6ae9143e7b..df111eddce 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit10.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit11.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit11.csproj
index da1cd6cfc5..f724d65cd5 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit11.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit12.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit12.csproj
index f2e56091b4..79221799d9 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit12.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit12.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit13.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit13.csproj
index cd6256f934..182a539043 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit13.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/EnterExit14.csproj b/tests/src/baseservices/threading/generics/Monitor/EnterExit14.csproj
index 3988883d0f..d500006858 100644
--- a/tests/src/baseservices/threading/generics/Monitor/EnterExit14.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/EnterExit14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/TryEnter01.csproj b/tests/src/baseservices/threading/generics/Monitor/TryEnter01.csproj
index 1afdd54db1..09b4717408 100644
--- a/tests/src/baseservices/threading/generics/Monitor/TryEnter01.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/TryEnter01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/TryEnter03.csproj b/tests/src/baseservices/threading/generics/Monitor/TryEnter03.csproj
index 305c707755..f3dee0a61e 100644
--- a/tests/src/baseservices/threading/generics/Monitor/TryEnter03.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/TryEnter03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/TryEnter04.csproj b/tests/src/baseservices/threading/generics/Monitor/TryEnter04.csproj
index ad2588bb58..d6114730dc 100644
--- a/tests/src/baseservices/threading/generics/Monitor/TryEnter04.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/TryEnter04.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/TryEnter05.csproj b/tests/src/baseservices/threading/generics/Monitor/TryEnter05.csproj
index def628bb85..00fb5580c9 100644
--- a/tests/src/baseservices/threading/generics/Monitor/TryEnter05.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/TryEnter05.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/Monitor/TryEnter06.csproj b/tests/src/baseservices/threading/generics/Monitor/TryEnter06.csproj
index 041d5be26d..c123242ffb 100644
--- a/tests/src/baseservices/threading/generics/Monitor/TryEnter06.csproj
+++ b/tests/src/baseservices/threading/generics/Monitor/TryEnter06.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread01.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread01.csproj
index ce33640b9f..35ceaab3d2 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread01.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread02.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread02.csproj
index 2c4070edc5..0fede4d476 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread02.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread03.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread03.csproj
index 9efacd2e55..dc6641f804 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread03.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread04.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread04.csproj
index c4a425f31f..415edd9f43 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread04.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread04.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread05.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread05.csproj
index 038a235252..a9cb26d6b4 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread05.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread05.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread06.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread06.csproj
index 369a3ab6b7..d7a5f097b6 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread06.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread06.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread07.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread07.csproj
index e8c3b4e577..3b8463cbf0 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread07.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread07.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread08.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread08.csproj
index 7eee61e99e..83ff9164dd 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread08.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread08.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread09.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread09.csproj
index 5af4c9d6e7..f445eefddc 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread09.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread09.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread10.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread10.csproj
index 047d5dd745..14fc222502 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread10.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread11.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread11.csproj
index a2b541b609..0644fe123e 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread11.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread12.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread12.csproj
index fa3fd88273..93b22199e5 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread12.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread12.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread13.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread13.csproj
index 4fbaf3afd4..8a4d0befd2 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread13.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread14.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread14.csproj
index fec7ca9388..684ad69863 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread14.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread15.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread15.csproj
index 186b84536d..983324d423 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread15.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread15.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread16.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread16.csproj
index 3e19a1cdcd..0ec2fc9263 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread16.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread17.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread17.csproj
index 6a1044e621..af836f7b6c 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread17.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread18.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread18.csproj
index 137b2c9b4e..7252b78a52 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread18.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread18.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread19.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread19.csproj
index dcf2f7860c..f1f3f2b502 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread19.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread19.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread20.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread20.csproj
index faaeece6a7..90980b5b96 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread20.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread20.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread21.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread21.csproj
index 1996239dc9..10cc510e18 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread21.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread21.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread22.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread22.csproj
index 19e7597fb6..0a7b420c5d 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread22.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread22.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread23.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread23.csproj
index 64f663730e..a0cf724a9b 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread23.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread23.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread24.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread24.csproj
index b8b24b0051..c8b0ebf68a 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread24.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread24.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread25.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread25.csproj
index 50553c69a0..9d3d1437c7 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread25.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread25.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread26.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread26.csproj
index a943885011..975ad21bdd 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread26.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread26.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread27.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread27.csproj
index f991df64be..3197a0df57 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread27.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread27.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread28.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread28.csproj
index 88016dee2d..5bc87a9615 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread28.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread28.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread29.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread29.csproj
index 4650523f8b..f68e40ed9e 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread29.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread29.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/thread30.csproj b/tests/src/baseservices/threading/generics/TimerCallback/thread30.csproj
index d458fca31b..90681452be 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/thread30.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/thread30.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj b/tests/src/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj
index 31ce9cf85a..60f05b225a 100644
--- a/tests/src/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj
+++ b/tests/src/baseservices/threading/generics/TimerCallback/tighttimercallback.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread01.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread01.csproj
index ce33640b9f..35ceaab3d2 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread01.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread02.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread02.csproj
index 2c4070edc5..0fede4d476 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread02.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread03.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread03.csproj
index 9efacd2e55..dc6641f804 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread03.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread04.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread04.csproj
index c4a425f31f..415edd9f43 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread04.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread04.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread05.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread05.csproj
index 038a235252..a9cb26d6b4 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread05.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread05.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread06.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread06.csproj
index 369a3ab6b7..d7a5f097b6 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread06.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread06.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread07.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread07.csproj
index e8c3b4e577..3b8463cbf0 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread07.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread07.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread08.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread08.csproj
index 7eee61e99e..83ff9164dd 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread08.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread08.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread09.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread09.csproj
index 5af4c9d6e7..f445eefddc 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread09.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread09.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread10.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread10.csproj
index 047d5dd745..14fc222502 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread10.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread11.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread11.csproj
index a2b541b609..0644fe123e 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread11.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread12.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread12.csproj
index fa3fd88273..93b22199e5 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread12.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread12.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread13.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread13.csproj
index 4fbaf3afd4..8a4d0befd2 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread13.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread14.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread14.csproj
index fec7ca9388..684ad69863 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread14.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread15.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread15.csproj
index 186b84536d..983324d423 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread15.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread15.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread16.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread16.csproj
index 3e19a1cdcd..0ec2fc9263 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread16.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread17.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread17.csproj
index 6a1044e621..af836f7b6c 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread17.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread18.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread18.csproj
index 137b2c9b4e..7252b78a52 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread18.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread18.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread19.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread19.csproj
index dcf2f7860c..f1f3f2b502 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread19.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread19.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread20.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread20.csproj
index faaeece6a7..90980b5b96 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread20.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread20.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread21.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread21.csproj
index 1996239dc9..10cc510e18 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread21.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread21.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread22.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread22.csproj
index 19e7597fb6..0a7b420c5d 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread22.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread22.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread23.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread23.csproj
index 64f663730e..a0cf724a9b 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread23.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread23.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread24.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread24.csproj
index b8b24b0051..c8b0ebf68a 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread24.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread24.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread25.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread25.csproj
index 50553c69a0..9d3d1437c7 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread25.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread25.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread26.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread26.csproj
index a943885011..975ad21bdd 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread26.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread26.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread27.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread27.csproj
index f991df64be..3197a0df57 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread27.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread27.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread28.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread28.csproj
index 88016dee2d..5bc87a9615 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread28.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread28.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread29.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread29.csproj
index 4650523f8b..f68e40ed9e 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread29.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread29.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/WaitCallback/thread30.csproj b/tests/src/baseservices/threading/generics/WaitCallback/thread30.csproj
index d458fca31b..90681452be 100644
--- a/tests/src/baseservices/threading/generics/WaitCallback/thread30.csproj
+++ b/tests/src/baseservices/threading/generics/WaitCallback/thread30.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{a1f1c234-d043-412e-bae9-36a26936dab5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread01.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread01.csproj
index c698a228fc..8ec7b63d98 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread01.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread02.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread02.csproj
index d85759edda..42db0403ad 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread02.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread03.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread03.csproj
index 4b7e397537..91d6cf3ccd 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread03.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread04.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread04.csproj
index d57dadc72f..bdfd98ca16 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread04.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread04.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread05.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread05.csproj
index 31d8753c1c..4715fdc0bc 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread05.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread05.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread06.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread06.csproj
index 3cd6365782..52040f6617 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread06.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread06.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread07.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread07.csproj
index cbef961f0a..cb6d163ad1 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread07.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread07.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread08.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread08.csproj
index dc56ae4f5c..bd1bab763d 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread08.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread08.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread09.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread09.csproj
index 509746e2c5..3d2a605f4e 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread09.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread09.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread10.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread10.csproj
index cacd4c4367..7c48ea6188 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread10.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread11.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread11.csproj
index 0ecce49865..c3720f424a 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread11.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread12.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread12.csproj
index 7a4973aa71..bc94c5703e 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread12.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread12.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread13.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread13.csproj
index a97a685367..1edb34c33f 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread13.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread14.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread14.csproj
index 18e5d7445c..ca14901dd2 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread14.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread15.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread15.csproj
index 584cae692e..040e0edda5 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread15.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread15.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread16.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread16.csproj
index d845ee3385..349bf37196 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread16.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread17.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread17.csproj
index d20243abaa..02706128e6 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread17.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread18.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread18.csproj
index 6cdb760ef9..00121f7b50 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread18.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread18.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread19.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread19.csproj
index cc22171d44..cebdced2f6 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread19.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread19.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread20.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread20.csproj
index 4e11b3384f..5794f9d7a2 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread20.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread20.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread21.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread21.csproj
index 3763936378..89712241ee 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread21.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread21.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread22.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread22.csproj
index 38aa2c006b..2cfc8f1420 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread22.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread22.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread23.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread23.csproj
index 168d26be22..10028ebc2b 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread23.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread23.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread24.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread24.csproj
index 97a83d5f35..c629e963e1 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread24.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread24.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread25.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread25.csproj
index d7d9165a12..1add003c12 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread25.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread25.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread26.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread26.csproj
index e099a14795..789a6c2c56 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread26.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread26.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread27.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread27.csproj
index 294e901611..1dc151519f 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread27.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread27.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread28.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread28.csproj
index 69b40e9924..efa8a6185d 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread28.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread28.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread29.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread29.csproj
index 180dfcead0..94ef48d624 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread29.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread29.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/syncdelegate/GThread30.csproj b/tests/src/baseservices/threading/generics/syncdelegate/GThread30.csproj
index 58e4b71fbd..0b0d77c66a 100644
--- a/tests/src/baseservices/threading/generics/syncdelegate/GThread30.csproj
+++ b/tests/src/baseservices/threading/generics/syncdelegate/GThread30.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread01.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread01.csproj
index c698a228fc..8ec7b63d98 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread01.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread02.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread02.csproj
index d85759edda..42db0403ad 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread02.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread03.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread03.csproj
index 4b7e397537..91d6cf3ccd 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread03.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread04.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread04.csproj
index d57dadc72f..bdfd98ca16 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread04.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread04.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread05.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread05.csproj
index 31d8753c1c..4715fdc0bc 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread05.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread05.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread06.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread06.csproj
index 3cd6365782..52040f6617 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread06.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread06.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread07.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread07.csproj
index cbef961f0a..cb6d163ad1 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread07.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread07.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread08.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread08.csproj
index dc56ae4f5c..bd1bab763d 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread08.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread08.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread09.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread09.csproj
index 509746e2c5..3d2a605f4e 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread09.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread09.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread10.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread10.csproj
index cacd4c4367..7c48ea6188 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread10.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread10.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread11.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread11.csproj
index 0ecce49865..c3720f424a 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread11.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread11.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread12.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread12.csproj
index 7a4973aa71..bc94c5703e 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread12.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread12.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread13.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread13.csproj
index a97a685367..1edb34c33f 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread13.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread13.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread14.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread14.csproj
index 18e5d7445c..ca14901dd2 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread14.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread14.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread15.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread15.csproj
index 584cae692e..040e0edda5 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread15.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread15.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread16.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread16.csproj
index d845ee3385..349bf37196 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread16.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread16.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread17.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread17.csproj
index d20243abaa..02706128e6 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread17.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread17.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread18.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread18.csproj
index 6cdb760ef9..00121f7b50 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread18.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread18.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread19.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread19.csproj
index cc22171d44..cebdced2f6 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread19.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread19.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread20.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread20.csproj
index 4e11b3384f..5794f9d7a2 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread20.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread20.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread21.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread21.csproj
index 3763936378..89712241ee 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread21.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread21.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread22.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread22.csproj
index 38aa2c006b..2cfc8f1420 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread22.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread22.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread23.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread23.csproj
index 168d26be22..10028ebc2b 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread23.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread23.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread24.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread24.csproj
index 97a83d5f35..c629e963e1 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread24.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread24.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread25.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread25.csproj
index d7d9165a12..1add003c12 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread25.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread25.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread26.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread26.csproj
index e099a14795..789a6c2c56 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread26.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread26.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread27.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread27.csproj
index 294e901611..1dc151519f 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread27.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread27.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread28.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread28.csproj
index 69b40e9924..efa8a6185d 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread28.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread28.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread29.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread29.csproj
index 180dfcead0..94ef48d624 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread29.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread29.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/generics/threadstart/GThread30.csproj b/tests/src/baseservices/threading/generics/threadstart/GThread30.csproj
index 58e4b71fbd..0b0d77c66a 100644
--- a/tests/src/baseservices/threading/generics/threadstart/GThread30.csproj
+++ b/tests/src/baseservices/threading/generics/threadstart/GThread30.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/add/CheckAddInt.csproj b/tests/src/baseservices/threading/interlocked/add/CheckAddInt.csproj
index 28eba60da4..8fc44fa042 100644
--- a/tests/src/baseservices/threading/interlocked/add/CheckAddInt.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/CheckAddInt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>/start:2147483647 /add:100</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/add/CheckAddInt_1.csproj b/tests/src/baseservices/threading/interlocked/add/CheckAddInt_1.csproj
index 9c7c16f3bd..6e50e76726 100644
--- a/tests/src/baseservices/threading/interlocked/add/CheckAddInt_1.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/CheckAddInt_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/add/CheckAddLong.csproj b/tests/src/baseservices/threading/interlocked/add/CheckAddLong.csproj
index 5759443ea4..fd5501b6a6 100644
--- a/tests/src/baseservices/threading/interlocked/add/CheckAddLong.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/CheckAddLong.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>/start:922337203685477 /add:100</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/add/CheckAddLong_1.csproj b/tests/src/baseservices/threading/interlocked/add/CheckAddLong_1.csproj
index d76d4d5fe0..583a38e08a 100644
--- a/tests/src/baseservices/threading/interlocked/add/CheckAddLong_1.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/CheckAddLong_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt.csproj b/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt.csproj
index f220c42abe..8b755241a9 100644
--- a/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>/loops:100 /addVal:-214748</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_1.csproj b/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_1.csproj
index 695fe67e31..223af1a4e8 100644
--- a/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_1.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_2.csproj b/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_2.csproj
index 95b231eaf7..43826ca6f8 100644
--- a/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_2.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_3.csproj b/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_3.csproj
index 59636a5ea3..38e2d79ddc 100644
--- a/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_3.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/InterlockedAddInt_3.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong.csproj b/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong.csproj
index 8420ded594..14c2f1b15f 100644
--- a/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>/loops:100 /addVal:100</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/add/InterlockedAddLongWithSubtract.csproj b/tests/src/baseservices/threading/interlocked/add/InterlockedAddLongWithSubtract.csproj
index 3248fb5102..af973deb0d 100644
--- a/tests/src/baseservices/threading/interlocked/add/InterlockedAddLongWithSubtract.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/InterlockedAddLongWithSubtract.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/loops:500000 /addVal:1</CLRTestExecutionArguments>
diff --git a/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong_1.csproj b/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong_1.csproj
index c65d0194a6..bc5651d7cd 100644
--- a/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong_1.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong_2.csproj b/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong_2.csproj
index 28d6977606..4e40eec428 100644
--- a/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong_2.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/InterlockedAddLong_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/add/add.csproj b/tests/src/baseservices/threading/interlocked/add/add.csproj
index efd2947a34..80c619ec5e 100644
--- a/tests/src/baseservices/threading/interlocked/add/add.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/add.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/add/interlockedaddintwithsubtract.csproj b/tests/src/baseservices/threading/interlocked/add/interlockedaddintwithsubtract.csproj
index 14bb097713..dbbef722b0 100644
--- a/tests/src/baseservices/threading/interlocked/add/interlockedaddintwithsubtract.csproj
+++ b/tests/src/baseservices/threading/interlocked/add/interlockedaddintwithsubtract.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/loops:500000 /addVal:1</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/checkreturn/intdeccheckreturn.csproj b/tests/src/baseservices/threading/interlocked/checkreturn/intdeccheckreturn.csproj
index b0a14f5041..4f96c483b0 100644
--- a/tests/src/baseservices/threading/interlocked/checkreturn/intdeccheckreturn.csproj
+++ b/tests/src/baseservices/threading/interlocked/checkreturn/intdeccheckreturn.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/checkreturn/intinccheckreturn.csproj b/tests/src/baseservices/threading/interlocked/checkreturn/intinccheckreturn.csproj
index a9918d3a69..0d4d53a5f5 100644
--- a/tests/src/baseservices/threading/interlocked/checkreturn/intinccheckreturn.csproj
+++ b/tests/src/baseservices/threading/interlocked/checkreturn/intinccheckreturn.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/checkreturn/longdeccheckreturn.csproj b/tests/src/baseservices/threading/interlocked/checkreturn/longdeccheckreturn.csproj
index 3327f831b0..9c9d5ca43c 100644
--- a/tests/src/baseservices/threading/interlocked/checkreturn/longdeccheckreturn.csproj
+++ b/tests/src/baseservices/threading/interlocked/checkreturn/longdeccheckreturn.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/checkreturn/longinccheckreturn.csproj b/tests/src/baseservices/threading/interlocked/checkreturn/longinccheckreturn.csproj
index 2453c4055f..6bdb10a13d 100644
--- a/tests/src/baseservices/threading/interlocked/checkreturn/longinccheckreturn.csproj
+++ b/tests/src/baseservices/threading/interlocked/checkreturn/longinccheckreturn.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong.csproj
index f8f3faaf93..945da867c6 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>/loops:100 /addVar:-922337203685477</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_1.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_1.csproj
index b5986d43ca..2791b5b9ac 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_1.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_2.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_2.csproj
index a4d260596d..9665e993a7 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_2.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_3.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_3.csproj
index e97258e434..793826479e 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_3.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeLong_3.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass.csproj
index 21873cffbc..4b45e944ab 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>null</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass_1.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass_1.csproj
index 9af3741086..daff397fd5 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass_1.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTClass_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTString.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTString.csproj
index c19ed90f6f..8771770eb6 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTString.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/CompareExchangeTString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>empty</CLRTestExecutionArguments>
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj
index f7b3e9df7e..89108e462a 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange1_cti.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj
index 25125f41a5..9188889658 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj
index f792ecc72b..9ddd16fbde 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj
index ef093d2431..2c0af62b07 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj
index d47f2f8b14..06ac8a939d 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchange5_cti.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangedouble.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangedouble.csproj
index c7275a0b9a..d6d462cf35 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangedouble.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangedouble.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/loops:100 /addVal:1.79769313486232E+304</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangefloat.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangefloat.csproj
index 289cc69e39..b425023d3a 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangefloat.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangefloat.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeint.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeint.csproj
index 5d26cd3e73..5c0b7d9e13 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeint.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeint.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeintptr.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeintptr.csproj
index a49fafc20f..e6782ceeb6 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeintptr.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeintptr.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeobject.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeobject.csproj
index d2e82e102b..a52e8ad43f 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeobject.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangeobject.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchanget.csproj b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchanget.csproj
index aa86ae9930..5676feb5f1 100644
--- a/tests/src/baseservices/threading/interlocked/compareexchange/compareexchanget.csproj
+++ b/tests/src/baseservices/threading/interlocked/compareexchange/compareexchanget.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/ctorchk/ctorchk.csproj b/tests/src/baseservices/threading/interlocked/ctorchk/ctorchk.csproj
index dd246958b3..d41bb0677a 100644
--- a/tests/src/baseservices/threading/interlocked/ctorchk/ctorchk.csproj
+++ b/tests/src/baseservices/threading/interlocked/ctorchk/ctorchk.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/decrement/intdec.csproj b/tests/src/baseservices/threading/interlocked/decrement/intdec.csproj
index 44b96732f4..b0ffeb4cc2 100644
--- a/tests/src/baseservices/threading/interlocked/decrement/intdec.csproj
+++ b/tests/src/baseservices/threading/interlocked/decrement/intdec.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/decrement/longdec.csproj b/tests/src/baseservices/threading/interlocked/decrement/longdec.csproj
index a782730b33..1f0668498f 100644
--- a/tests/src/baseservices/threading/interlocked/decrement/longdec.csproj
+++ b/tests/src/baseservices/threading/interlocked/decrement/longdec.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/exchange/ExchangeInt.csproj b/tests/src/baseservices/threading/interlocked/exchange/ExchangeInt.csproj
index b6c64d2f0a..7f027c15bf 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/ExchangeInt.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/ExchangeInt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/exchange/ExchangeLong.csproj b/tests/src/baseservices/threading/interlocked/exchange/ExchangeLong.csproj
index a80019a996..1601bb7ba2 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/ExchangeLong.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/ExchangeLong.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/exchange/ExchangeTClass.csproj b/tests/src/baseservices/threading/interlocked/exchange/ExchangeTClass.csproj
index b1ec2cbb86..e4b12d4400 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/ExchangeTClass.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/ExchangeTClass.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString.csproj b/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString.csproj
index fbd958fe1e..c0b5b04874 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString_1.csproj b/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString_1.csproj
index 6b680177c3..717ace21f3 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString_1.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString_2.csproj b/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString_2.csproj
index 36817a41b1..67935f2aa2 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString_2.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/ExchangeTString_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj
index 77988823c5..7cbcfb58f8 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange1_cti.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj
index 11cba3d90c..eaeed3df4d 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj
index 1f4e169fbb..099a06c958 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj
index 0282d265e2..3fa98ee972 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj
index a8cd9082c6..daa493b6af 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange4_cti.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj
index 35ca50ef72..1df482b524 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchange5_cti.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchangedouble.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchangedouble.csproj
index b3cb56c6d3..a0c93af398 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchangedouble.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchangedouble.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchangefloat.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchangefloat.csproj
index 574ca1dcb8..aa836cf5a7 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchangefloat.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchangefloat.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchangeobject.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchangeobject.csproj
index b4b0f5add2..cf4b608d8c 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchangeobject.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchangeobject.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/exchange/exchanget.csproj b/tests/src/baseservices/threading/interlocked/exchange/exchanget.csproj
index 94e98d2bc2..75ab3764b9 100644
--- a/tests/src/baseservices/threading/interlocked/exchange/exchanget.csproj
+++ b/tests/src/baseservices/threading/interlocked/exchange/exchanget.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/increment/intinc.csproj b/tests/src/baseservices/threading/interlocked/increment/intinc.csproj
index f692c977b5..f14bc4379f 100644
--- a/tests/src/baseservices/threading/interlocked/increment/intinc.csproj
+++ b/tests/src/baseservices/threading/interlocked/increment/intinc.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/increment/longinc.csproj b/tests/src/baseservices/threading/interlocked/increment/longinc.csproj
index 499700a9dc..147c3fe0bd 100644
--- a/tests/src/baseservices/threading/interlocked/increment/longinc.csproj
+++ b/tests/src/baseservices/threading/interlocked/increment/longinc.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/read/interlockedread.csproj b/tests/src/baseservices/threading/interlocked/read/interlockedread.csproj
index c84b1c58b3..86432b1b21 100644
--- a/tests/src/baseservices/threading/interlocked/read/interlockedread.csproj
+++ b/tests/src/baseservices/threading/interlocked/read/interlockedread.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/interlocked/read/readthreads.csproj b/tests/src/baseservices/threading/interlocked/read/readthreads.csproj
index 133e9fcc71..203425b05c 100644
--- a/tests/src/baseservices/threading/interlocked/read/readthreads.csproj
+++ b/tests/src/baseservices/threading/interlocked/read/readthreads.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/monitor/ctorchk/ctorchk.csproj b/tests/src/baseservices/threading/monitor/ctorchk/ctorchk.csproj
index dd246958b3..d41bb0677a 100644
--- a/tests/src/baseservices/threading/monitor/ctorchk/ctorchk.csproj
+++ b/tests/src/baseservices/threading/monitor/ctorchk/ctorchk.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/monitor/enter/EnterNull.csproj b/tests/src/baseservices/threading/monitor/enter/EnterNull.csproj
index 3ce834255a..33ad294870 100644
--- a/tests/src/baseservices/threading/monitor/enter/EnterNull.csproj
+++ b/tests/src/baseservices/threading/monitor/enter/EnterNull.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/monitor/enter/monitorenter.csproj b/tests/src/baseservices/threading/monitor/enter/monitorenter.csproj
index 79bc37156a..294df9d6d6 100644
--- a/tests/src/baseservices/threading/monitor/enter/monitorenter.csproj
+++ b/tests/src/baseservices/threading/monitor/enter/monitorenter.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/monitor/exit/ExitNull.csproj b/tests/src/baseservices/threading/monitor/exit/ExitNull.csproj
index cb1c447213..ccaa37b5f0 100644
--- a/tests/src/baseservices/threading/monitor/exit/ExitNull.csproj
+++ b/tests/src/baseservices/threading/monitor/exit/ExitNull.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/monitor/isentered/monitorisentered.csproj b/tests/src/baseservices/threading/monitor/isentered/monitorisentered.csproj
index 7046b7b665..80885a0f0b 100644
--- a/tests/src/baseservices/threading/monitor/isentered/monitorisentered.csproj
+++ b/tests/src/baseservices/threading/monitor/isentered/monitorisentered.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/monitor/pulse/PulseNull.csproj b/tests/src/baseservices/threading/monitor/pulse/PulseNull.csproj
index d942471f08..b21ecc210c 100644
--- a/tests/src/baseservices/threading/monitor/pulse/PulseNull.csproj
+++ b/tests/src/baseservices/threading/monitor/pulse/PulseNull.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/monitor/pulseall/PulseAllNull.csproj b/tests/src/baseservices/threading/monitor/pulseall/PulseAllNull.csproj
index 02a5706b2a..e8d47dc746 100644
--- a/tests/src/baseservices/threading/monitor/pulseall/PulseAllNull.csproj
+++ b/tests/src/baseservices/threading/monitor/pulseall/PulseAllNull.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/monitor/tryenter/longtimeout.csproj b/tests/src/baseservices/threading/monitor/tryenter/longtimeout.csproj
index 4f24c44f81..bd4e134b25 100644
--- a/tests/src/baseservices/threading/monitor/tryenter/longtimeout.csproj
+++ b/tests/src/baseservices/threading/monitor/tryenter/longtimeout.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/monitor/unownedlock/EnterExitExit.csproj b/tests/src/baseservices/threading/monitor/unownedlock/EnterExitExit.csproj
index 8f07466caf..c15e1c3520 100644
--- a/tests/src/baseservices/threading/monitor/unownedlock/EnterExitExit.csproj
+++ b/tests/src/baseservices/threading/monitor/unownedlock/EnterExitExit.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/monitor/unownedlock/NoEnterNewObject.csproj b/tests/src/baseservices/threading/monitor/unownedlock/NoEnterNewObject.csproj
index 61e7f62fa2..e3f6254b84 100644
--- a/tests/src/baseservices/threading/monitor/unownedlock/NoEnterNewObject.csproj
+++ b/tests/src/baseservices/threading/monitor/unownedlock/NoEnterNewObject.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/monitor/unownedlock/NoEnterObject.csproj b/tests/src/baseservices/threading/monitor/unownedlock/NoEnterObject.csproj
index e39e56d803..4adfe127a2 100644
--- a/tests/src/baseservices/threading/monitor/unownedlock/NoEnterObject.csproj
+++ b/tests/src/baseservices/threading/monitor/unownedlock/NoEnterObject.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/monitor/unownedlock/NoEnterValType.csproj b/tests/src/baseservices/threading/monitor/unownedlock/NoEnterValType.csproj
index 7ced1b7953..52410e9bc1 100644
--- a/tests/src/baseservices/threading/monitor/unownedlock/NoEnterValType.csproj
+++ b/tests/src/baseservices/threading/monitor/unownedlock/NoEnterValType.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/monitor/wait/waitnull.csproj b/tests/src/baseservices/threading/monitor/wait/waitnull.csproj
index b5f4be7a33..fb17d99209 100644
--- a/tests/src/baseservices/threading/monitor/wait/waitnull.csproj
+++ b/tests/src/baseservices/threading/monitor/wait/waitnull.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am01waitallneg.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am01waitallneg.csproj
index 8b9f5b63ff..c504a01bd7 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am01waitallneg.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am01waitallneg.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am02waitoneneg.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am02waitoneneg.csproj
index 7cee18deba..be4a01b294 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am02waitoneneg.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am02waitoneneg.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj
index 16e6425b08..1f92833f27 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am04waitany.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:10 /pos:0</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj
index 1a2fb1606c..00a050f120 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am05waitanymutex.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:64 /pos:63</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj
index 27f5c4c153..e6f9e5a7c3 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am06abandonall.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj
index 41e0436e0d..8f588e9237 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am07abandonmultiplemutex.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj b/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj
index b27f4dbcc1..13f46bd263 100644
--- a/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj
+++ b/tests/src/baseservices/threading/mutex/abandonedmutex/am08mixedarray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj b/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj
index dc9e568ca3..4fb5e1652a 100644
--- a/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj
+++ b/tests/src/baseservices/threading/mutex/misc/mutexctor1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj b/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj
index 47f002fb1b..1e9d488082 100644
--- a/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj
+++ b/tests/src/baseservices/threading/mutex/misc/mutexctor2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/misc/waitone1.csproj b/tests/src/baseservices/threading/mutex/misc/waitone1.csproj
index e52d672994..20f9991a77 100644
--- a/tests/src/baseservices/threading/mutex/misc/waitone1.csproj
+++ b/tests/src/baseservices/threading/mutex/misc/waitone1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/misc/waitone2.csproj b/tests/src/baseservices/threading/mutex/misc/waitone2.csproj
index c6210da564..7b2857fb13 100644
--- a/tests/src/baseservices/threading/mutex/misc/waitone2.csproj
+++ b/tests/src/baseservices/threading/mutex/misc/waitone2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj
index b29bb89e3f..9f8039f332 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj
index 01e968c229..c338e1dea1 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj
index be8e49552e..2f4ecca33c 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj
index 3bcc0665c2..d7251ddbc9 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj
index 3cd1dc1a10..f2a850f087 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg5.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj
index 2b29b766b1..7da002409a 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg6.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj
index 6b4584fb5a..c5046f02f6 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg7.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj
index ffe7672d6e..b7a618e4eb 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexneg8.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj
index 4acd8848df..f52ba70111 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj
index 8392fbd3a8..bdf45dc175 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj
index 94afd530e1..393de48254 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj
index 7925a85f92..7c05073295 100644
--- a/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj
+++ b/tests/src/baseservices/threading/mutex/openexisting/openmutexpos4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool.csproj
index e0396cbf54..98ff352960 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>false</CLRTestExecutionArguments>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool_1.csproj
index 25c4235c89..b88974c6e2 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartBool_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestProjectToRun>ThreadStartBool.csproj</CLRTestProjectToRun>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte.csproj
index 8f472a94d3..4675f7948b 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>max</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte_1.csproj
index c06265ca4f..6efbe71628 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte_2.csproj
index 31ed78afb5..344e482b7c 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartByte_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast.csproj
index b02bcd7ea6..a4698a17e2 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast_1.csproj
index 94b36b3a09..6cec4d0e40 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast_2.csproj
index 3dc399184a..c993097d82 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartCast_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar.csproj
index c0d429182f..e3416d0b7a 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>min</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_1.csproj
index a422c77631..9ecc3b73ef 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_2.csproj
index 28bcc4c56f..e3a9c582ee 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_3.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_3.csproj
index 5cd5a1a70d..73f92a03ef 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_3.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartChar_3.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal.csproj
index 8854c85fc3..9a3539518d 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal_1.csproj
index 9ccd38fa99..e78bbb0ece 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal_2.csproj
index 5d85cca0f2..89e140084b 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDecimal_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate.csproj
index 1c529d4ec7..2928bf8d93 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate_1.csproj
index c20e5fe2a9..f68b3ac0f6 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate_2.csproj
index 8f20029d3d..264ccb1ccf 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDelegate_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble.csproj
index ba3dbdf65a..f565cabd76 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>min</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble_1.csproj
index c7b47485c2..9528b50a7f 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble_2.csproj
index 8850e4645e..c5c434630d 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartDouble_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat.csproj
index 1ccd317f30..91020a8d96 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>max</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat_1.csproj
index 3f44019d27..e38e0b4057 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat_2.csproj
index 56ec2ace4d..a396bf65fb 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartFloat_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics.csproj
index 725abdac92..e6dbfdd332 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>min</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics_1.csproj
index eb3d2f7142..9201466f42 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics_2.csproj
index 40636d1c85..9e21526018 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartGenerics_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt.csproj
index 899d192fb8..79466a6cae 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt_1.csproj
index 909b0e3463..b6ce9d5a4f 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt_2.csproj
index 2fc1f23f19..9be5efce26 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartInt_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong.csproj
index d83fea5dca..99a29f9d9d 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>min</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong_1.csproj
index 71f3f64083..f1ec54e83f 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong_2.csproj
index a9a3df2772..26d0c46f99 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartLong_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg1.csproj
index f1c784399d..66d086a93d 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg3.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg3.csproj
index 7d251eb337..a72d5409c5 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg3.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg3.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg4.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg4.csproj
index 1c0e68d151..ec8ba90b0f 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg4.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartNeg4.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull.csproj
index 88aa57ff4b..32d06eb3dd 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull2.csproj
index a7a19f7b58..60059f4963 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartNull2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject.csproj
index 06662b9bbf..ab4e21e260 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>""</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject_1.csproj
index 8cad1cfe83..96968213b3 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject_2.csproj
index 07c71ce07c..0ba71365fc 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartObject_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations.csproj
index fd0477e705..bfee386799 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations_1.csproj
index f656be856c..fd4c16beeb 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations_2.csproj
index 701156a0da..f1c9938d8f 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartOperations_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte.csproj
index 2b3f2b8c80..7b9f1f063e 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>min</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte_1.csproj
index 4363ea3d12..b8937fbec5 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte_2.csproj
index 1fd07b5bef..fc25ebc8ac 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartSByte_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort.csproj
index 6234e2efe5..05a93f8b18 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort_1.csproj
index 535bf0c64a..d85aff83f8 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort_2.csproj
index a538a37744..a49b7a19b0 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartShort_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartString.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartString.csproj
index f6621851e0..32fe403a22 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartString.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartString.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>MyStringHere</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_1.csproj
index 6ddbafbb21..7b29c9822e 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_2.csproj
index 29028f7063..cb33f924d8 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_3.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_3.csproj
index f8bfbaaf3d..1390cf9ab2 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_3.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartString_3.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt.csproj
index 508831de6d..2de2e97d6b 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>0</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt_1.csproj
index 6e87da1910..6ef5727521 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt_2.csproj
index 7d909352df..83982aa66c 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUInt_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong.csproj
index d07cc9c1e7..00d3775652 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>max</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong_1.csproj
index 98022c5992..f6e0c20948 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong_2.csproj
index e68810fb07..2d5a496da0 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartULong_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort.csproj
index e5406ee4dc..3417f6dd83 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestExecutionArguments>max</CLRTestExecutionArguments>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort_1.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort_1.csproj
index d37195bae6..05e6144e40 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort_1.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort_1.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort_2.csproj b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort_2.csproj
index db3365c539..667c9f3d50 100644
--- a/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort_2.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/ThreadStartUShort_2.csproj
@@ -6,12 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestKind>RunOnly</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/baseservices/threading/paramthreadstart/threadstartarray.csproj b/tests/src/baseservices/threading/paramthreadstart/threadstartarray.csproj
index afbf28f535..9e70a3dd8c 100644
--- a/tests/src/baseservices/threading/paramthreadstart/threadstartarray.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/threadstartarray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/paramthreadstart/threadstartclass.csproj b/tests/src/baseservices/threading/paramthreadstart/threadstartclass.csproj
index 48ca36cc61..4b46e892fd 100644
--- a/tests/src/baseservices/threading/paramthreadstart/threadstartclass.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/threadstartclass.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/paramthreadstart/threadstartstruct.csproj b/tests/src/baseservices/threading/paramthreadstart/threadstartstruct.csproj
index 94bb38b9a7..0476419c2c 100644
--- a/tests/src/baseservices/threading/paramthreadstart/threadstartstruct.csproj
+++ b/tests/src/baseservices/threading/paramthreadstart/threadstartstruct.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/regressions/13662/13662-a.csproj b/tests/src/baseservices/threading/regressions/13662/13662-a.csproj
index 8e256b8fb5..fe14768290 100644
--- a/tests/src/baseservices/threading/regressions/13662/13662-a.csproj
+++ b/tests/src/baseservices/threading/regressions/13662/13662-a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/regressions/13662/13662-b.csproj b/tests/src/baseservices/threading/regressions/13662/13662-b.csproj
index 9b8820f579..b739049430 100644
--- a/tests/src/baseservices/threading/regressions/13662/13662-b.csproj
+++ b/tests/src/baseservices/threading/regressions/13662/13662-b.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/regressions/13662/13662-simple.csproj b/tests/src/baseservices/threading/regressions/13662/13662-simple.csproj
index 94e44db77c..b7281a09c0 100644
--- a/tests/src/baseservices/threading/regressions/13662/13662-simple.csproj
+++ b/tests/src/baseservices/threading/regressions/13662/13662-simple.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/regressions/17360/AVHelper.csproj b/tests/src/baseservices/threading/regressions/17360/AVHelper.csproj
index 8f639a42e2..b915cf152c 100644
--- a/tests/src/baseservices/threading/regressions/17360/AVHelper.csproj
+++ b/tests/src/baseservices/threading/regressions/17360/AVHelper.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/regressions/269336/objmonhelper.csproj b/tests/src/baseservices/threading/regressions/269336/objmonhelper.csproj
index ae7e32f7f8..5b2b617854 100644
--- a/tests/src/baseservices/threading/regressions/269336/objmonhelper.csproj
+++ b/tests/src/baseservices/threading/regressions/269336/objmonhelper.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/regressions/30032/30032.csproj b/tests/src/baseservices/threading/regressions/30032/30032.csproj
index 2c5aed90c0..87eb20ae79 100644
--- a/tests/src/baseservices/threading/regressions/30032/30032.csproj
+++ b/tests/src/baseservices/threading/regressions/30032/30032.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/regressions/576463/576463.csproj b/tests/src/baseservices/threading/regressions/576463/576463.csproj
index 7c8c8c834c..d82edd7e98 100644
--- a/tests/src/baseservices/threading/regressions/576463/576463.csproj
+++ b/tests/src/baseservices/threading/regressions/576463/576463.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/regressions/6906/6906.csproj b/tests/src/baseservices/threading/regressions/6906/6906.csproj
index 3cace5d67e..e5ff2509b7 100644
--- a/tests/src/baseservices/threading/regressions/6906/6906.csproj
+++ b/tests/src/baseservices/threading/regressions/6906/6906.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/regressions/beta1/347011.csproj b/tests/src/baseservices/threading/regressions/beta1/347011.csproj
index 1b9d480da2..71772b9632 100644
--- a/tests/src/baseservices/threading/regressions/beta1/347011.csproj
+++ b/tests/src/baseservices/threading/regressions/beta1/347011.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>240</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/regressions/beta2/437017.csproj b/tests/src/baseservices/threading/regressions/beta2/437017.csproj
index cdb2952666..a51eef9918 100644
--- a/tests/src/baseservices/threading/regressions/beta2/437017.csproj
+++ b/tests/src/baseservices/threading/regressions/beta2/437017.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/regressions/beta2/437044.csproj b/tests/src/baseservices/threading/regressions/beta2/437044.csproj
index 794e32fcf1..2fdda7016d 100644
--- a/tests/src/baseservices/threading/regressions/beta2/437044.csproj
+++ b/tests/src/baseservices/threading/regressions/beta2/437044.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/regressions/devdiv489437/test489437.csproj b/tests/src/baseservices/threading/regressions/devdiv489437/test489437.csproj
index 4406829a69..55452ce508 100644
--- a/tests/src/baseservices/threading/regressions/devdiv489437/test489437.csproj
+++ b/tests/src/baseservices/threading/regressions/devdiv489437/test489437.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/regressions/whidbey_m3/200176.csproj b/tests/src/baseservices/threading/regressions/whidbey_m3/200176.csproj
index bef3dcaa2e..a45b526a88 100644
--- a/tests/src/baseservices/threading/regressions/whidbey_m3/200176.csproj
+++ b/tests/src/baseservices/threading/regressions/whidbey_m3/200176.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector1.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector1.csproj
index 990183bbde..83bde86ba5 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector1.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:2147483647 /mCount:2147483647</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj
index 0bef00763c..36f444d2e9 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:0 /mCount:1 /semName:MySemaphoreName</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj
index c2552e8be2..79948025b8 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:10 /mCount:10 /semname:abcdefghijklmnopqrstuvwxyz</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj
index 9092d3c5fb..e1b25f7afc 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:3 /mCount:5 /iRandom:260</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj
index 14346afcb0..d5532dfb90 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorector5.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:2147483647 /mCount:2147483647 /iRandom:220</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg1.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg1.csproj
index 11e7a4a678..2043cd12f8 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg1.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:-2147483647 /mCount:2147483647</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg2.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg2.csproj
index cfac4acfbb..6d430ec403 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg2.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:-1 /mCount:3 /semName:" "</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg3.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg3.csproj
index 3425fec490..4448137f41 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg3.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphorectorneg3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/iCount:-2147483647 /mCount:-2147483647 /semName:null</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj
index 583c32fad5..a5ab0dbc80 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj
index 09f248bbfe..0426a70d40 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj
index 6eb196f8f2..6207a9eb6b 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj
index b3c51ac680..6fc5173543 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj
index 334bd7909d..23662b2341 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg5.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj
index 0449e31666..b24256272a 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg6.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj
index bd94570b09..7389c39421 100644
--- a/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj
+++ b/tests/src/baseservices/threading/semaphore/ctoropen/semaphoreopenneg7.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/semaphore/unit/semdemo.csproj b/tests/src/baseservices/threading/semaphore/unit/semdemo.csproj
index ffcc17e927..5d40bbe81e 100644
--- a/tests/src/baseservices/threading/semaphore/unit/semdemo.csproj
+++ b/tests/src/baseservices/threading/semaphore/unit/semdemo.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/semaphore/unit/semtest.csproj b/tests/src/baseservices/threading/semaphore/unit/semtest.csproj
index 7172597376..4e68878e65 100644
--- a/tests/src/baseservices/threading/semaphore/unit/semtest.csproj
+++ b/tests/src/baseservices/threading/semaphore/unit/semtest.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/stress/sudoku/Stack.csproj b/tests/src/baseservices/threading/stress/sudoku/Stack.csproj
index d73f32607f..d7cfa472db 100644
--- a/tests/src/baseservices/threading/stress/sudoku/Stack.csproj
+++ b/tests/src/baseservices/threading/stress/sudoku/Stack.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/stress/sudoku/SudokuInterfaces.csproj b/tests/src/baseservices/threading/stress/sudoku/SudokuInterfaces.csproj
index d0a6268dde..7115ab9f1c 100644
--- a/tests/src/baseservices/threading/stress/sudoku/SudokuInterfaces.csproj
+++ b/tests/src/baseservices/threading/stress/sudoku/SudokuInterfaces.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
index 72a4521295..6eb7fc0807 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandle1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
index 1d048bc276..35a6daead8 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
index ff9a2c12b1..85eca9b7c4 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
index 2829fd9944..ef626e4c5f 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
index 4ec2074e30..2d621c8d09 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid5.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
index d1e9146526..f72930c9cd 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandleinvalid6.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
index 9442e83cc5..561be189b1 100644
--- a/tests/src/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
+++ b/tests/src/baseservices/threading/threadpool/bindhandle/bindhandlenull.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/threadpool/ctorchk/ctorchk.csproj b/tests/src/baseservices/threading/threadpool/ctorchk/ctorchk.csproj
index dd246958b3..d41bb0677a 100644
--- a/tests/src/baseservices/threading/threadpool/ctorchk/ctorchk.csproj
+++ b/tests/src/baseservices/threading/threadpool/ctorchk/ctorchk.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/threadpool/unregister/regression_749068.csproj b/tests/src/baseservices/threading/threadpool/unregister/regression_749068.csproj
index 2a3690e0a9..11b6b3e5f7 100644
--- a/tests/src/baseservices/threading/threadpool/unregister/regression_749068.csproj
+++ b/tests/src/baseservices/threading/threadpool/unregister/regression_749068.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/threadpool/unregister/unregister01.csproj b/tests/src/baseservices/threading/threadpool/unregister/unregister01.csproj
index ab55a1deee..c568d0381a 100644
--- a/tests/src/baseservices/threading/threadpool/unregister/unregister01.csproj
+++ b/tests/src/baseservices/threading/threadpool/unregister/unregister01.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/threadpool/unregister/unregister03.csproj b/tests/src/baseservices/threading/threadpool/unregister/unregister03.csproj
index 8c604fded6..59397bd60e 100644
--- a/tests/src/baseservices/threading/threadpool/unregister/unregister03.csproj
+++ b/tests/src/baseservices/threading/threadpool/unregister/unregister03.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/threadstatic/ThreadStatic01.csproj b/tests/src/baseservices/threading/threadstatic/ThreadStatic01.csproj
index 5c8207c23d..73bf99cec4 100644
--- a/tests/src/baseservices/threading/threadstatic/ThreadStatic01.csproj
+++ b/tests/src/baseservices/threading/threadstatic/ThreadStatic01.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/threadstatic/ThreadStatic02.csproj b/tests/src/baseservices/threading/threadstatic/ThreadStatic02.csproj
index a4463def65..428170b7a4 100644
--- a/tests/src/baseservices/threading/threadstatic/ThreadStatic02.csproj
+++ b/tests/src/baseservices/threading/threadstatic/ThreadStatic02.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/threadstatic/ThreadStatic03.csproj b/tests/src/baseservices/threading/threadstatic/ThreadStatic03.csproj
index c3e334f074..82f950212e 100644
--- a/tests/src/baseservices/threading/threadstatic/ThreadStatic03.csproj
+++ b/tests/src/baseservices/threading/threadstatic/ThreadStatic03.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/threadstatic/ThreadStatic04Helper.csproj b/tests/src/baseservices/threading/threadstatic/ThreadStatic04Helper.csproj
index 42edcbf1d2..a2fe1ea3ea 100644
--- a/tests/src/baseservices/threading/threadstatic/ThreadStatic04Helper.csproj
+++ b/tests/src/baseservices/threading/threadstatic/ThreadStatic04Helper.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/threadstatic/ThreadStatic05.csproj b/tests/src/baseservices/threading/threadstatic/ThreadStatic05.csproj
index c692c6fa39..4bf416865e 100644
--- a/tests/src/baseservices/threading/threadstatic/ThreadStatic05.csproj
+++ b/tests/src/baseservices/threading/threadstatic/ThreadStatic05.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/threadstatic/ThreadStatic06.csproj b/tests/src/baseservices/threading/threadstatic/ThreadStatic06.csproj
index 9b14b716da..e5cd5a8a00 100644
--- a/tests/src/baseservices/threading/threadstatic/ThreadStatic06.csproj
+++ b/tests/src/baseservices/threading/threadstatic/ThreadStatic06.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/threadstatic/threadstatic07.csproj b/tests/src/baseservices/threading/threadstatic/threadstatic07.csproj
index 0def511c54..62581be792 100644
--- a/tests/src/baseservices/threading/threadstatic/threadstatic07.csproj
+++ b/tests/src/baseservices/threading/threadstatic/threadstatic07.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj b/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj
index 36889b9d96..77b2dff0da 100644
--- a/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj
+++ b/tests/src/baseservices/threading/waithandle/misc/waithandledispose2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj b/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj
index 6f4decbee7..9198647bbf 100644
--- a/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj
+++ b/tests/src/baseservices/threading/waithandle/misc/waithandlewaitone1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/nullarraymember.csproj b/tests/src/baseservices/threading/waithandle/waitall/nullarraymember.csproj
index 7951b95454..75f80ec3fa 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/nullarraymember.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/nullarraymember.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallemptyarray.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallemptyarray.csproj
index e06d074968..0ca13b737c 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallemptyarray.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallemptyarray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj
index 8fb833fab2..e22b994990 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj
index 15f7b44065..f58454a94f 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex10.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:64 /pos:63</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex10a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex10a.csproj
index c1887d3ed8..c66ec014e9 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex10a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex10a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:64 /pos:0</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj
index d738e32130..b8e509f965 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex11.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex11a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex11a.csproj
index 65281cd3c3..ec2a2a9dfc 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex11a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex11a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex1a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex1a.csproj
index 22814dd233..6ab908bf93 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex1a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex1a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj
index 410223566d..49071a51d9 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex2a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex2a.csproj
index 0d8cace3ac..6d9a87f33a 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex2a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex2a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj
index 629c6f9182..b00c2c673f 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex3a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex3a.csproj
index 8e279210fb..17f18a2b6f 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex3a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex3a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj
index d843c88984..bb4d688918 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex4a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex4a.csproj
index c1aa02a883..08e90b7c5c 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex4a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex4a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj
index 0ba55718d7..a29ac4b622 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex5.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex5a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex5a.csproj
index 90cb489307..9f26f9d4a9 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex5a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex5a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj
index 726085c867..45c5b4e81d 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex6.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:2 /pos:0</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex6a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex6a.csproj
index 63d8625a39..23d7509b95 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex6a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex6a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:64 /pos:30</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj
index 72f4abc30b..366e8851e8 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex7.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex7a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex7a.csproj
index 6da32e2b8b..9e1c58b02d 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex7a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex7a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj
index 31d9ced98a..c1146d521e 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex8.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj
index 4d9ef802fa..ea55f9a83b 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex8a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj
index c8526ded8d..d6da8b99ef 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex9.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:64 /pos:63</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallex9a.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallex9a.csproj
index 9d8bf223e5..c5884cfca3 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallex9a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallex9a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:64 /pos:0</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitall/waitallnullarray.csproj b/tests/src/baseservices/threading/waithandle/waitall/waitallnullarray.csproj
index b815d5fb92..649bea0a47 100644
--- a/tests/src/baseservices/threading/waithandle/waitall/waitallnullarray.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitall/waitallnullarray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/nullarraymemberwaitany.csproj b/tests/src/baseservices/threading/waithandle/waitany/nullarraymemberwaitany.csproj
index 7951b95454..75f80ec3fa 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/nullarraymemberwaitany.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/nullarraymemberwaitany.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyemptyarray.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyemptyarray.csproj
index e06d074968..0ca13b737c 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyemptyarray.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyemptyarray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj
index 4176b3abfc..7a4702d43c 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj
index c9988d572a..47b297eeba 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:2 /pos:1</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.csproj
index f930f87de2..10ea28993e 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex10a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:2 /pos:1</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1a.csproj
index 5abdc80c22..9c5a81f8a9 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex1a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex1a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj
index ded25718b8..482dc1afd1 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex2a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex2a.csproj
index 9976547a83..44e6b99d00 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex2a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex2a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj
index 06aaa5d7e6..c5cba8dd40 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.csproj
index c0531d851e..53120026b2 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex3a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj
index 6829a55bd0..a041969c13 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex4a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex4a.csproj
index 3e33d568e8..be4fdb4416 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex4a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex4a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj
index 1a0bca3925..7eb4511eb0 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.csproj
index 2592d55cbc..fa8a8e8c8c 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex5a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj
index a24cfbd47f..6f908ff0ef 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:2 /pos:1</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6a.csproj
index af6c467b40..48bc04141f 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex6a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex6a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:64 /pos:30</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj
index 6d49f016b8..5e2931e5d7 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.csproj
index 9b0747fda0..418582fc21 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex7a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj
index 940aff59ad..c7e42df08e 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj
index 773ff5bd41..c59e08f3c5 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex8a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj
index b3002f7b46..124fd7f68d 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:2 /pos:1</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.csproj
index 8a1d998b70..445ad8132c 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanyex9a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
     <CLRTestExecutionArguments>/size:64 /pos:30</CLRTestExecutionArguments>
   </PropertyGroup>
diff --git a/tests/src/baseservices/threading/waithandle/waitany/waitanynullarray.csproj b/tests/src/baseservices/threading/waithandle/waitany/waitanynullarray.csproj
index b815d5fb92..649bea0a47 100644
--- a/tests/src/baseservices/threading/waithandle/waitany/waitanynullarray.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitany/waitanynullarray.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj
index 94a13fb2be..33447499b5 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex1.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex1a.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex1a.csproj
index 1ab14798d8..b9338d919f 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex1a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex1a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj
index 0288033a9b..4ff86afef0 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex2a.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex2a.csproj
index 48a323bf56..0f0cf4238e 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex2a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex2a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj
index 2af4abd9b8..a75e702cd9 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex3.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex3a.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex3a.csproj
index 7eee7ec63e..4bb18c622b 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex3a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex3a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj
index e6eeaa4b91..f68f9d758c 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex4.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/threading/waithandle/waitone/waitoneex4a.csproj b/tests/src/baseservices/threading/waithandle/waitone/waitoneex4a.csproj
index 78720c5bd6..6e6d8af24a 100644
--- a/tests/src/baseservices/threading/waithandle/waitone/waitoneex4a.csproj
+++ b/tests/src/baseservices/threading/waithandle/waitone/waitoneex4a.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/baseservices/varargs/varargsupport.ilproj b/tests/src/baseservices/varargs/varargsupport.ilproj
index 1f207ac321..10b0011d8c 100644
--- a/tests/src/baseservices/varargs/varargsupport.ilproj
+++ b/tests/src/baseservices/varargs/varargsupport.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/varargs/varargsupport_r.ilproj b/tests/src/baseservices/varargs/varargsupport_r.ilproj
index 39e068117c..574ad7b76d 100644
--- a/tests/src/baseservices/varargs/varargsupport_r.ilproj
+++ b/tests/src/baseservices/varargs/varargsupport_r.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT	.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/tests/src/baseservices/visibility/Target.csproj b/tests/src/baseservices/visibility/Target.csproj
index e246e127f0..2a61306bc9 100644
--- a/tests/src/baseservices/visibility/Target.csproj
+++ b/tests/src/baseservices/visibility/Target.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/dir.props b/tests/src/dir.props
index 2fb2e1942b..cb976cc081 100644
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -47,7 +47,7 @@
       <PropertyGroup>
         <TargetsUnix>true</TargetsUnix>
         <TargetsOSX>true</TargetsOSX>
-        <TestNugetRuntimeId>osx.10.10-x64</TestNugetRuntimeId>
+        <TestNugetRuntimeId>osx.10.12-x64</TestNugetRuntimeId>
       </PropertyGroup>
     </When>
     <When Condition="'$(OSGroup)'=='FreeBSD'">
@@ -70,6 +70,11 @@
     <Language Condition="'$(Language)' == '' and  '$(MSBuildProjectExtension)' == '.ilproj'">IL</Language>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
+    <!-- RAR thinks all EXEs require binding redirects.  That's not the case for CoreCLR -->
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+
   <!-- Set default ZapRequire level (used only when CrossGen is enabled) -->
   <PropertyGroup>
     <ZapRequire Condition="'$(ZapRequire)' == ''">2</ZapRequire>
@@ -80,6 +85,6 @@
     <ProjectLockJson>$(SourceDir)Common\test_dependencies\project.lock.json</ProjectLockJson>
 
     <!-- Specify the target framework of the common test dependency project.json. -->
-    <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker>
+    <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker>
   </PropertyGroup>
 </Project>
diff --git a/tests/src/dir.targets b/tests/src/dir.targets
index 64b56667f3..08c77df7cf 100644
--- a/tests/src/dir.targets
+++ b/tests/src/dir.targets
@@ -50,7 +50,7 @@
     <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true</_CLRTestNeedsProjectToRun>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(ReferenceLocalMscorlib)' == 'true'">
+  <PropertyGroup Condition="'$(ReferenceSystemPrivateCoreLib)' == 'true'">
     <ProjectJson>$(SourceDir)Common/empty/project.json</ProjectJson>
     <ProjectLockJson>$(SourceDir)Common/empty/project.lock.json</ProjectLockJson>
   </PropertyGroup>
@@ -173,4 +173,20 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="UpdateReferenceItems"
+          BeforeTargets="BeforeResolveReferences"
+  >
+    <ItemGroup>
+      <Reference Include="$(TargetingPackPath)/*.dll" >
+        <Private>false</Private>
+      </Reference>
+    </ItemGroup>
+
+  </Target>
+
+  <Target Name="AfterBuild">
+     <Copy SourceFiles="$(AssemblyName).reflect.xml"
+           DestinationFolder="$(OutputPath)"
+       Condition="Exists('$(AssemblyName).reflect.xml')"/>
+  </Target>
 </Project>
diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj
index 5314c27cfa..e49ab945a7 100644
--- a/tests/src/dirs.proj
+++ b/tests/src/dirs.proj
@@ -22,6 +22,8 @@
       <DisabledProjects Include="Common\test_dependencies\test_dependencies.csproj" />
       <DisabledProjects Include="Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" />
       <DisabledProjects Include="Common\targeting_pack_ref\targeting_pack_ref.csproj" />
+      <DisabledProjects Include="Common\external\external.csproj" />
+      <DisabledProjects Include="Common\external\external.depproj" />
       <DisabledProjects Include="GC\Performance\Framework\GCPerfTestFramework.csproj" />
       <DisabledProjects Include="JIT\superpmi\superpmicollect.csproj" Condition="'$(BuildTestsAgainstPackages)' == 'true'" />
       <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" />
diff --git a/tests/src/hosting/coreclr/activation/sxshost/Delegates.csproj b/tests/src/hosting/coreclr/activation/sxshost/Delegates.csproj
index 044908eacd..02af378b29 100644
--- a/tests/src/hosting/coreclr/activation/sxshost/Delegates.csproj
+++ b/tests/src/hosting/coreclr/activation/sxshost/Delegates.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/hosting/coreclr/activation/sxshost/UserCases.csproj b/tests/src/hosting/coreclr/activation/sxshost/UserCases.csproj
index 5ba6fb7976..18bf637af2 100644
--- a/tests/src/hosting/coreclr/activation/sxshost/UserCases.csproj
+++ b/tests/src/hosting/coreclr/activation/sxshost/UserCases.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/hosting/coreclr/activation/sxshost/UserCode.csproj b/tests/src/hosting/coreclr/activation/sxshost/UserCode.csproj
index 7f5451a263..7b371b55d7 100644
--- a/tests/src/hosting/coreclr/activation/sxshost/UserCode.csproj
+++ b/tests/src/hosting/coreclr/activation/sxshost/UserCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/hosting/samples/hosting/usercode/UserCode.csproj b/tests/src/hosting/samples/hosting/usercode/UserCode.csproj
index 7f5451a263..7b371b55d7 100644
--- a/tests/src/hosting/samples/hosting/usercode/UserCode.csproj
+++ b/tests/src/hosting/samples/hosting/usercode/UserCode.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/hosting/samples/resolveevent/usercodedependency/UserCodeDependency.csproj b/tests/src/hosting/samples/resolveevent/usercodedependency/UserCodeDependency.csproj
index 496bbfe76c..d3d18f70d1 100644
--- a/tests/src/hosting/samples/resolveevent/usercodedependency/UserCodeDependency.csproj
+++ b/tests/src/hosting/samples/resolveevent/usercodedependency/UserCodeDependency.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/hosting/stress/testset1/csgen.1.csproj b/tests/src/hosting/stress/testset1/csgen.1.csproj
index fec123df04..c0bc3c1d14 100644
--- a/tests/src/hosting/stress/testset1/csgen.1.csproj
+++ b/tests/src/hosting/stress/testset1/csgen.1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/hosting/stress/testset1/csgen.2.csproj b/tests/src/hosting/stress/testset1/csgen.2.csproj
index c79051fe1b..b628f1afbc 100644
--- a/tests/src/hosting/stress/testset1/csgen.2.csproj
+++ b/tests/src/hosting/stress/testset1/csgen.2.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/hosting/stress/testset1/simple1.csproj b/tests/src/hosting/stress/testset1/simple1.csproj
index 775880950b..332759d1b7 100644
--- a/tests/src/hosting/stress/testset1/simple1.csproj
+++ b/tests/src/hosting/stress/testset1/simple1.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/jit/Performance/CodeQuality/Span/SpanBench.cs b/tests/src/jit/Performance/CodeQuality/Span/SpanBench.cs
deleted file mode 100644
index 7ec2a4a088..0000000000
--- a/tests/src/jit/Performance/CodeQuality/Span/SpanBench.cs
+++ /dev/null
@@ -1,468 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Xunit.Performance;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Xunit;
-
-[assembly: OptimizeForBenchmarks]
-[assembly: MeasureInstructionsRetired]
-
-class Tests
-{
-
-#if DEBUG
-    const int Iterations = 1;
-#else
-    const int Iterations = 10000;
-#endif
-
-    const int Size = 1024;
-
-
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    static void TestFillAllSpan(Span<byte> span)
-    {
-        for (int i = 0; i < span.Length; ++i) {
-            span[i] = unchecked((byte)i);
-        }
-    }
-
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    static void TestFillAllArray(byte[] data)
-    {
-        for (int i = 0; i < data.Length; ++i) {
-            data[i] = unchecked((byte)i);
-        }
-    }
-
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    static void TestFillAllReverseSpan(Span<byte> span)
-    {
-        for (int i = span.Length; --i >= 0;) {
-            span[i] = unchecked((byte)i);
-        }
-    }
-
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    static void TestFillAllReverseArray(byte[] data)
-    {
-        for (int i = data.Length; --i >= 0;) {
-            data[i] = unchecked((byte)i);
-        }
-    }
-
-    static int[] GetUnsortedData()
-    {
-        int[] unsortedData = new int[Size];
-        Random r = new Random(42);
-        for (int i = 0; i < unsortedData.Length; ++i)
-        {
-            unsortedData[i] = r.Next();
-        }
-        return unsortedData;
-    }
-
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    static void TestBubbleSortSpan(Span<int> span)
-    {
-        bool swap;
-        int temp;
-        int n = span.Length - 1;
-        do {
-            swap = false;
-            for (int i = 0; i < n; i++) {
-                if (span[i] > span[i + 1]) {
-                    temp = span[i];
-                    span[i] = span[i + 1];
-                    span[i + 1] = temp;
-                    swap = true;
-                }
-            }
-            --n;
-        }
-        while (swap);
-    }
-
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    static void TestBubbleSortArray(int[] data)
-    {
-        bool swap;
-        int temp;
-        int n = data.Length - 1;
-        do {
-            swap = false;
-            for (int i = 0; i < n; i++) {
-                if (data[i] > data[i + 1]) {
-                    temp = data[i];
-                    data[i] = data[i + 1];
-                    data[i + 1] = temp;
-                    swap = true;
-                }
-            }
-            --n;
-        }
-        while (swap);
-    }
-
-    static void TestQuickSortSpan(Span<int> data)
-    {
-        QuickSortSpan(data);
-    }
-
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    static void QuickSortSpan(Span<int> data)
-    {
-        if (data.Length <= 1) {
-            return;
-        }
-
-        int lo = 0;
-        int hi = data.Length - 1;
-        int i, j;
-        int pivot, temp;
-        for (i = lo, j = hi, pivot = data[hi]; i < j;) {
-            while (i < j && data[i] <= pivot) {
-                ++i;
-            }
-            while (j > i && data[j] >= pivot) {
-                --j;
-            }
-            if (i < j) {
-                temp = data[i];
-                data[i] = data[j];
-                data[j] = temp;
-            }
-        }
-        if (i != hi) {
-            temp = data[i];
-            data[i] = pivot;
-            data[hi] = temp;
-        }
-
-        QuickSortSpan(data.Slice(0, i));
-        QuickSortSpan(data.Slice(i + 1));
-    }
-
-    static void TestQuickSortArray(int[] data)
-    {
-        QuickSortArray(data, 0, data.Length - 1);
-    }
-
-    [MethodImpl(MethodImplOptions.NoInlining)]
-    static void QuickSortArray(int[] data, int lo, int hi)
-    {
-        if (lo >= hi) {
-            return;
-        }
-
-        int i, j;
-        int pivot, temp;
-        for (i = lo, j = hi, pivot = data[hi]; i < j;) {
-            while (i < j && data[i] <= pivot) {
-                ++i;
-            }
-            while (j > i && data[j] >= pivot) {
-                --j;
-            }
-            if (i < j) {
-                temp = data[i];
-                data[i] = data[j];
-                data[j] = temp;
-            }
-        }
-        if (i != hi) {
-            temp = data[i];
-            data[i] = pivot;
-            data[hi] = temp;
-        }
-
-        QuickSortArray(data, lo, i - 1);
-        QuickSortArray(data, i + 1, hi);
-    }
-
-    // XUNIT-PERF tests
-
-    [Benchmark]
-    public static void FillAllSpan()
-    {
-        byte[] a = new byte[Size];
-        Span<byte> s = new Span<byte>(a);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    TestFillAllSpan(s);
-                }
-            }
-        }
-    }
-
-    [Benchmark]
-    public static void FillAllArray()
-    {
-        byte[] a = new byte[Size];
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    TestFillAllArray(a);
-                }
-            }
-        }
-    }
-
-    [Benchmark]
-    public static void FillAllReverseSpan()
-    {
-        byte[] a = new byte[Size];
-        Span<byte> s = new Span<byte>(a);
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    TestFillAllReverseSpan(s);
-                }
-            }
-        }
-    }
-
-    [Benchmark]
-    public static void FillAllReverseArray()
-    {
-        byte[] a = new byte[Size];
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    TestFillAllReverseArray(a);
-                }
-            }
-        }
-    }
-
-    [Benchmark]
-    public static void QuickSortSpan()
-    {
-        int[] data = new int[Size];
-        int[] unsortedData = GetUnsortedData();
-        Span<int> span = new Span<int>(data);
-
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    Array.Copy(unsortedData, data, Size);
-                    TestQuickSortSpan(span);
-                }
-            }
-        }
-    }
-
-    [Benchmark]
-    public static void BubbleSortSpan()
-    {
-        int[] data = new int[Size];
-        int[] unsortedData = GetUnsortedData();
-        Span<int> span = new Span<int>(data);
-
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    Array.Copy(unsortedData, data, Size);
-                    TestBubbleSortSpan(span);
-                }
-            }
-        }
-    }
-
-    [Benchmark]
-    public static void QuickSortArray()
-    {
-        int[] data = new int[Size];
-        int[] unsortedData = GetUnsortedData();
-
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    Array.Copy(unsortedData, data, Size);
-                    TestQuickSortArray(data);
-                }
-            }
-        }
-    }
-
-    [Benchmark]
-    public static void BubbleSortArray()
-    {
-        int[] data = new int[Size];
-        int[] unsortedData = GetUnsortedData();
-
-        foreach (var iteration in Benchmark.Iterations)
-        {
-            using (iteration.StartMeasurement())
-            {
-                for (int i = 0; i < Iterations; i++)
-                {
-                    Array.Copy(unsortedData, data, Size);
-                    TestBubbleSortArray(data);
-                }
-            }
-        }
-    }
-
-    // EXE-based testing
-
-    static void FillAllSpanBase()
-    {
-        byte[] a = new byte[Size];
-        Span<byte> s = new Span<byte>(a);
-        for (int i = 0; i < Iterations; i++)
-        {
-            TestFillAllSpan(s);
-        }
-    }
-
-    static void FillAllArrayBase()
-    {
-        byte[] a = new byte[Size];
-        for (int i = 0; i < Iterations; i++)
-        {
-            TestFillAllArray(a);
-        }
-    }
-
-    static void FillAllReverseSpanBase()
-    {
-        byte[] a = new byte[Size];
-        Span<byte> s = new Span<byte>(a);
-        for (int i = 0; i < Iterations; i++)
-        {
-            TestFillAllReverseSpan(s);
-        }
-    }
-
-    static void FillAllReverseArrayBase()
-    {
-        byte[] a = new byte[Size];
-        for (int i = 0; i < Iterations; i++)
-        {
-            TestFillAllReverseArray(a);
-        }
-    }
-
-    static void QuickSortSpanBase()
-    {
-        int[] data = new int[Size];
-        int[] unsortedData = GetUnsortedData();
-        Span<int> span = new Span<int>(data);
-
-        for (int i = 0; i < Iterations; i++)
-        {
-            Array.Copy(unsortedData, data, Size);
-            TestQuickSortSpan(span);
-        }
-    }
-
-    static void BubbleSortSpanBase()
-    {
-        int[] data = new int[Size];
-        int[] unsortedData = GetUnsortedData();
-        Span<int> span = new Span<int>(data);
-
-        for (int i = 0; i < Iterations; i++)
-        {
-            Array.Copy(unsortedData, data, Size);
-            TestBubbleSortSpan(span);
-        }
-    }
-
-    static void QuickSortArrayBase()
-    {
-        int[] data = new int[Size];
-        int[] unsortedData = GetUnsortedData();
-
-        for (int i = 0; i < Iterations; i++)
-        {
-            Array.Copy(unsortedData, data, Size);
-            TestQuickSortArray(data);
-        }
-    }
-
-    static void BubbleSortArrayBase()
-    {
-        int[] data = new int[Size];
-        int[] unsortedData = GetUnsortedData();
-
-        for (int i = 0; i < Iterations; i++)
-        {
-            Array.Copy(unsortedData, data, Size);
-            TestBubbleSortArray(data);
-        }
-    }
-
-    static double Bench(Action f)
-    {
-        Stopwatch sw = Stopwatch.StartNew();
-        f();
-        sw.Stop();
-        return sw.Elapsed.TotalMilliseconds;
-    }
-
-    static IEnumerable<object[]> MakeArgs(params string[] args)
-    {
-        return args.Select(arg => new object[] { arg });
-    }
-
-    static IEnumerable<object[]> TestFuncs = MakeArgs(
-        "FillAllSpanBase", "FillAllArrayBase",
-        "FillAllReverseSpanBase", "FillAllReverseArrayBase",
-        "BubbleSortSpanBase", "BubbleSortArrayBase",
-        "QuickSortSpanBase", "QuickSortArrayBase"
-    );
-
-    static Action LookupFunc(object o)
-    {
-        TypeInfo t = typeof(Tests).GetTypeInfo();
-        MethodInfo m = t.GetDeclaredMethod((string) o);
-        return m.CreateDelegate(typeof(Action)) as Action;
-    }
-
-    public static int Main(string[] args)
-    {
-        bool result = true;
-
-        foreach(object[] o in TestFuncs)
-        {
-            string funcName = (string) o[0];
-            Action func = LookupFunc(funcName);
-            double timeInMs = Bench(func);
-            Console.WriteLine("{0}: {1}ms", funcName, timeInMs);
-        }
-
-        return (result ? 100 : -1);
-    }
-}
-
diff --git a/tests/src/managed/Compilation/Compilation.csproj b/tests/src/managed/Compilation/Compilation.csproj
index cde09aa8fc..7a2b31bb28 100644
--- a/tests/src/managed/Compilation/Compilation.csproj
+++ b/tests/src/managed/Compilation/Compilation.csproj
@@ -8,13 +8,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{39DD9A75-2535-4EBD-94A4-C7DF7EF12CF5}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
 
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <GCStressIncompatible>true</GCStressIncompatible>
   </PropertyGroup>
diff --git a/tests/src/managed/Compilation/HelloWorld.cs b/tests/src/managed/Compilation/HelloWorld.cs
index bbf92a3117..289afe482b 100644
--- a/tests/src/managed/Compilation/HelloWorld.cs
+++ b/tests/src/managed/Compilation/HelloWorld.cs
@@ -3,12 +3,12 @@
 // See the LICENSE file in the project root for more information.
 //
 
-using System;
+using Internal;
 class C
 {
     static int Main()
     {
-        LowLevelConsole.WriteLine("Hello " + "world");
+        Console.WriteLine("Hello " + "world");
         return 100;
     }
 }
diff --git a/tests/src/performance/perflab/PerfLab.csproj b/tests/src/performance/perflab/PerfLab.csproj
index 38fe57364a..ed197261fb 100644
--- a/tests/src/performance/perflab/PerfLab.csproj
+++ b/tests/src/performance/perflab/PerfLab.csproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{507E3CC2-5D95-414D-9F01-2A106FC177DC}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
     <NuGetTargetMoniker>.NETStandard,Version=v1.4</NuGetTargetMoniker>
   </PropertyGroup>
diff --git a/tests/src/performance/project.json b/tests/src/performance/project.json
index e1af7fc15f..1d0eb6d538 100644
--- a/tests/src/performance/project.json
+++ b/tests/src/performance/project.json
@@ -1,18 +1,20 @@
 {
   "dependencies": {
-    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
+    "xunit.performance.api": "1.0.0-alpha-build0049",
+    "xunit.performance.core": "1.0.0-alpha-build0049",
+    "xunit.performance.execution": "1.0.0-alpha-build0049",
+    "xunit.performance.metrics": "1.0.0-alpha-build0049",
+    "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
+    "Microsoft.NETCore.Platforms": "2.0.0-preview1-25210-01",
     "System.Collections.NonGeneric": "4.4.0-beta-24913-02",
     "System.Console": "4.4.0-beta-24913-02",
     "System.IO.FileSystem": "4.4.0-beta-24913-02",
     "System.Linq": "4.4.0-beta-24913-02",
     "System.Linq.Expressions": "4.4.0-beta-24913-02",
-    "System.Numerics.Vectors": "4.4.0-beta-24913-02",
+    "System.Numerics.Vectors": "4.4.0-preview1-25210-01",
     "System.Reflection": "4.4.0-beta-24913-02",
     "System.Reflection.Extensions": "4.4.0-beta-24913-02",
-    "System.Reflection.TypeExtensions": "4.4.0-beta-24913-02",
+    "System.Reflection.TypeExtensions": "4.4.0-preview1-25210-01",
     "System.Runtime": "4.4.0-beta-24913-02",
     "System.Runtime.Extensions": "4.4.0-beta-24913-02",
     "System.Runtime.Numerics": "4.4.0-beta-24913-02",
diff --git a/tests/src/readytorun/fieldgetter.ilproj b/tests/src/readytorun/fieldgetter.ilproj
index deece681ed..b3f2aa9e13 100644
--- a/tests/src/readytorun/fieldgetter.ilproj
+++ b/tests/src/readytorun/fieldgetter.ilproj
@@ -7,10 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Library</OutputType>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/readytorun/generics.csproj b/tests/src/readytorun/generics.csproj
index 6b00984f66..4ea64b30d6 100644
--- a/tests/src/readytorun/generics.csproj
+++ b/tests/src/readytorun/generics.csproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>0</CLRTestPriority>
diff --git a/tests/src/readytorun/genericsload/callgenericctor.csproj b/tests/src/readytorun/genericsload/callgenericctor.csproj
index 27a5e1528a..0f73092f43 100644
--- a/tests/src/readytorun/genericsload/callgenericctor.csproj
+++ b/tests/src/readytorun/genericsload/callgenericctor.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7DECC55A-B584-4456-83BA-6C42A5B3B3CB}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <ZapRequire>1</ZapRequire>
   </PropertyGroup>
diff --git a/tests/src/readytorun/genericsload/genericslib.ilproj b/tests/src/readytorun/genericsload/genericslib.ilproj
index d68af8b867..04548543af 100644
--- a/tests/src/readytorun/genericsload/genericslib.ilproj
+++ b/tests/src/readytorun/genericsload/genericslib.ilproj
@@ -8,12 +8,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/readytorun/genericsload/usegenericfield.csproj b/tests/src/readytorun/genericsload/usegenericfield.csproj
index 23b6f38270..6b9e15a733 100644
--- a/tests/src/readytorun/genericsload/usegenericfield.csproj
+++ b/tests/src/readytorun/genericsload/usegenericfield.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7DECC55A-B584-4456-83BA-6C42A5B3B3CB}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <ZapRequire>1</ZapRequire>
   </PropertyGroup>
diff --git a/tests/src/readytorun/mainv1.csproj b/tests/src/readytorun/mainv1.csproj
index f5b3b7b612..cca0b4106b 100644
--- a/tests/src/readytorun/mainv1.csproj
+++ b/tests/src/readytorun/mainv1.csproj
@@ -7,13 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7DECC55A-B584-4456-83BA-6C42A5B3B3CB}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <CLRTestKind>BuildAndRun</CLRTestKind>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
diff --git a/tests/src/readytorun/mainv2.csproj b/tests/src/readytorun/mainv2.csproj
index 84176669b2..acf898e7f9 100644
--- a/tests/src/readytorun/mainv2.csproj
+++ b/tests/src/readytorun/mainv2.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{840300BB-0DD2-4BD3-A3C1-51C92DD4ADAD}</ProjectGuid>
     <OutputType>exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <CLRTestKind>BuildAndRun</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/readytorun/testv1/test.csproj b/tests/src/readytorun/testv1/test.csproj
index 74588166b3..c56c53cad9 100644
--- a/tests/src/readytorun/testv1/test.csproj
+++ b/tests/src/readytorun/testv1/test.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F74F55A1-DFCF-4C7C-B462-E96E1D0BB667}</ProjectGuid>
     <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;CORECLR</DefineConstants>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/readytorun/testv2/test.csproj b/tests/src/readytorun/testv2/test.csproj
index b64c8cc42b..058a0d6346 100644
--- a/tests/src/readytorun/testv2/test.csproj
+++ b/tests/src/readytorun/testv2/test.csproj
@@ -7,12 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DefineConstants>$(DefineConstants);STATIC;CORECLR;V2</DefineConstants>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>
diff --git a/tests/src/reflection/ActivateStructDefCtor/ActivateStructDefCtor.il b/tests/src/reflection/ActivateStructDefCtor/ActivateStructDefCtor.il
new file mode 100644
index 0000000000..83bab84883
--- /dev/null
+++ b/tests/src/reflection/ActivateStructDefCtor/ActivateStructDefCtor.il
@@ -0,0 +1,107 @@
+.assembly extern mscorlib
+{
+  .publickeytoken = (B7 7A 5C 56 19 34 E0 89 )                         
+  .ver 2:0:0:0
+}
+.assembly ActivateStructDefCtor
+{
+}
+
+// =============== CLASS MEMBERS DECLARATION ===================
+
+.class private abstract auto ansi sealed beforefieldinit Program
+       extends [System.Runtime]System.Object
+{
+  .class sequential ansi sealed nested private beforefieldinit Foo
+         extends [System.Runtime]System.ValueType
+  {
+    .field public int32 x
+
+    .method public hidebysig specialname rtspecialname 
+            instance void  .ctor() cil managed
+    {
+      // Code size       8 (0x8)
+      .maxstack  8
+      IL_0000:  ldarg.0
+      IL_0001:  ldc.i4.1
+      IL_0002:  stfld      int32 Program/Foo::x
+      IL_0007:  ret
+    } // end of method Foo::.ctor
+  } // end of class Foo
+
+  .field private static int32 Pass
+  .field private static int32 Fail
+
+  .method public hidebysig static int32  Main() cil managed
+  {
+    .entrypoint
+    // Code size       89 (0x59)
+    .maxstack  2
+    .locals init ([0] int32 testIndex,
+             [1] int32 i,
+             [2] valuetype Program/Foo foo)
+    IL_0000:  ldc.i4.m1
+    IL_0001:  stloc.0
+    IL_0002:  ldc.i4.0
+    IL_0003:  stloc.1
+    IL_0004:  br.s       IL_004f
+
+    IL_0006:  ldloc.0
+    IL_0007:  ldc.i4.1
+    IL_0008:  add
+    IL_0009:  stloc.0
+    IL_000a:  call       !!0 [System.Runtime]System.Activator::CreateInstance<valuetype Program/Foo>()
+    IL_000f:  stloc.2
+    IL_0010:  ldloc.2
+    IL_0011:  ldfld      int32 Program/Foo::x
+    IL_0016:  ldc.i4.1
+    IL_0017:  beq.s      IL_0021
+
+    IL_0019:  ldsfld     int32 Program::Fail
+    IL_001e:  ldloc.0
+    IL_001f:  add
+    IL_0020:  ret
+
+    IL_0021:  ldloc.0
+    IL_0022:  ldc.i4.1
+    IL_0023:  add
+    IL_0024:  stloc.0
+    IL_0025:  ldtoken    Program/Foo
+    IL_002a:  call       class [System.Runtime]System.Type [System.Runtime]System.Type::GetTypeFromHandle(valuetype [System.Runtime]System.RuntimeTypeHandle)
+    IL_002f:  call       object [System.Runtime]System.Activator::CreateInstance(class [System.Runtime]System.Type)
+    IL_0034:  unbox.any  Program/Foo
+    IL_0039:  stloc.2
+    IL_003a:  ldloc.2
+    IL_003b:  ldfld      int32 Program/Foo::x
+    IL_0040:  ldc.i4.1
+    IL_0041:  beq.s      IL_004b
+
+    IL_0043:  ldsfld     int32 Program::Fail
+    IL_0048:  ldloc.0
+    IL_0049:  add
+    IL_004a:  ret
+
+    IL_004b:  ldloc.1
+    IL_004c:  ldc.i4.1
+    IL_004d:  add
+    IL_004e:  stloc.1
+    IL_004f:  ldloc.1
+    IL_0050:  ldc.i4.2
+    IL_0051:  blt.s      IL_0006
+
+    IL_0053:  ldsfld     int32 Program::Pass
+    IL_0058:  ret
+  } // end of method Program::Main
+
+  .method private hidebysig specialname rtspecialname static 
+          void  .cctor() cil managed
+  {
+    // Code size       15 (0xf)
+    .maxstack  8
+    IL_0000:  ldc.i4.s   100
+    IL_0002:  stsfld     int32 Program::Pass
+    IL_0007:  ldc.i4.s   101
+    IL_0009:  stsfld     int32 Program::Fail
+    IL_000e:  ret
+  } // end of method Program::.cctor
+} // end of class Program
diff --git a/tests/src/reflection/ActivateStructDefCtor/ActivateStructDefCtor.ilproj b/tests/src/reflection/ActivateStructDefCtor/ActivateStructDefCtor.ilproj
new file mode 100644
index 0000000000..ac335b92bf
--- /dev/null
+++ b/tests/src/reflection/ActivateStructDefCtor/ActivateStructDefCtor.ilproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
+    <ProjectGuid>{F8D9C0E2-F86F-493F-8D18-0D19ADF6E3FD}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <!-- Default configurations to help VS understand the configurations -->
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "/>
+  <ItemGroup>
+    <Compile Include="ActivateStructDefCtor.il" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
+  </PropertyGroup> 
+</Project>
diff --git a/tests/src/reflection/ldtoken/byrefs.ilproj b/tests/src/reflection/ldtoken/byrefs.ilproj
index 3baecd4fd3..eb813c8d75 100644
--- a/tests/src/reflection/ldtoken/byrefs.ilproj
+++ b/tests/src/reflection/ldtoken/byrefs.ilproj
@@ -7,11 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
     <OutputType>Exe</OutputType>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
diff --git a/tests/src/reflection/ldtoken/ldtokenmember.il b/tests/src/reflection/ldtoken/ldtokenmember.il
new file mode 100644
index 0000000000..f67d73c8c6
--- /dev/null
+++ b/tests/src/reflection/ldtoken/ldtokenmember.il
@@ -0,0 +1,371 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+.assembly extern mscorlib
+{
+}
+
+.assembly ldtokenmember
+{
+}
+
+.method private hidebysig static int32 Main() cil managed
+{
+  .entrypoint
+  .maxstack  8
+  .locals init (class [mscorlib]System.Type nonGenericHolderType,
+                class [mscorlib]System.Reflection.FieldInfo staticField,
+                class [mscorlib]System.Reflection.MethodBase staticInt32Method,
+                class [mscorlib]System.Reflection.MethodBase staticMethodT,
+                class [mscorlib]System.Reflection.MethodBase staticMethodU,
+                class [mscorlib]System.Reflection.FieldInfo staticFieldT,
+                class [mscorlib]System.Reflection.MethodBase weirdoGenericMethod,
+                class [mscorlib]System.Reflection.MethodBase otherWeirdoGenericMethod)
+
+  //
+  // Type nonGenericHolderType = typeof(NonGenericHolder)
+  //
+  ldtoken    class NonGenericHolder
+  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(
+                 valuetype [mscorlib]System.RuntimeTypeHandle)
+  stloc      nonGenericHolderType
+
+  //
+  // FieldInfo staticField = infoof(NonGenericHolder.StaticField)
+  //
+  ldtoken    field object NonGenericHolder::StaticField
+  call       class [mscorlib]System.Reflection.FieldInfo 
+                 [mscorlib]System.Reflection.FieldInfo::GetFieldFromHandle(
+                     valuetype [mscorlib]System.RuntimeFieldHandle)
+  stloc      staticField
+
+  //
+  // if (staticField.Name != "StaticField" || staticField.DeclaringType != nonGenericHolderType)
+  //     return 1;
+  //
+  ldloc      staticField
+  callvirt   instance string [mscorlib]System.Reflection.FieldInfo::get_Name()
+  ldstr      "StaticField"
+  callvirt   instance bool [mscorlib]System.Object::Equals(object)
+  ldloc      staticField
+  callvirt   instance class [mscorlib]System.Type [mscorlib]System.Reflection.FieldInfo::get_DeclaringType()
+  ldloc      nonGenericHolderType
+  ceq
+  and
+  brtrue     NonGenericStaticFieldOK
+  ldc.i4     1
+  ret
+NonGenericStaticFieldOK:
+
+  //
+  // MethodInfo staticInt32Method = infoof(NonGenericHolder.StaticMethod)
+  //
+  ldtoken    method int32 NonGenericHolder::StaticMethod()
+  call       class [mscorlib]System.Reflection.MethodBase 
+                 [mscorlib]System.Reflection.MethodBase::GetMethodFromHandle(
+                     valuetype [mscorlib]System.RuntimeMethodHandle)
+  stloc      staticInt32Method
+
+  //
+  // if (staticInt32Method.Name != "StaticField" || staticInt32Method.DeclaringType != nonGenericHolderType)
+  //     return 2;
+  //
+  ldloc      staticInt32Method
+  callvirt   instance string [mscorlib]System.Reflection.MethodBase::get_Name()
+  ldstr      "StaticMethod"
+  callvirt   instance bool [mscorlib]System.Object::Equals(object)
+  ldloc      staticInt32Method
+  callvirt   instance class [mscorlib]System.Type [mscorlib]System.Reflection.MethodBase::get_DeclaringType()
+  ldloc      nonGenericHolderType
+  ceq
+  and
+  brtrue     NonGenericStaticMethodOK
+  ldc.i4     2
+  ret
+NonGenericStaticMethodOK:
+
+  //
+  // if (staticInt32Method.Equals(infoof(NonGenericHolder.StaticMethod))
+  //     return 3;
+  //
+  ldtoken    method int16 NonGenericHolder::StaticMethod()
+  call       class [mscorlib]System.Reflection.MethodBase 
+                 [mscorlib]System.Reflection.MethodBase::GetMethodFromHandle(
+                     valuetype [mscorlib]System.RuntimeMethodHandle)
+  ldloc      staticInt32Method
+  callvirt   instance bool [mscorlib]System.Object::Equals(object)
+  brfalse    OverloadsOK
+  ldc.i4     3
+  ret
+OverloadsOK:
+
+  //
+  // MethodBase staticMethodT = GenericHolder<string, string>.GetInfoOfMethodT();
+  //
+  call       class [mscorlib]System.Reflection.MethodBase class GenericHolder`2<string, string>::GetInfoOfMethodT()
+  stloc      staticMethodT
+
+  //
+  // if (!staticMethodT.Equals(infoof(GenericHolder<string, string>.StaticMethod)))
+  //     return 4
+  //
+  ldtoken    method void class GenericHolder`2<string, string>::StaticMethod(!0)
+  ldtoken    class GenericHolder`2<string,string>
+  call       class [mscorlib]System.Reflection.MethodBase 
+               [mscorlib]System.Reflection.MethodBase::GetMethodFromHandle(
+                   valuetype [mscorlib]System.RuntimeMethodHandle,
+                   valuetype [mscorlib]System.RuntimeTypeHandle)
+  ldloc      staticMethodT
+  callvirt   instance bool [mscorlib]System.Object::Equals(object)
+  brtrue     MethodFromSharedContextOK
+  ldc.i4     4
+  ret
+MethodFromSharedContextOK:
+
+  //
+  // MethodBase staticMethodU = GenericHolder<string, string>.GetInfoOfMethodU();
+  //
+  call        class [mscorlib]System.Reflection.MethodBase class GenericHolder`2<string, string>::GetInfoOfMethodU()
+  stloc       staticMethodU
+
+  //
+  // if (staticMethodT.Equals(staticMethodU))
+  //     return 5;
+  //
+  ldloc      staticMethodU
+  ldloc      staticMethodT
+  callvirt   instance bool [mscorlib]System.Object::Equals(object)
+  brfalse    MethodOverloadsFromSharedContextOK
+  ldc.i4     5
+  ret
+MethodOverloadsFromSharedContextOK:
+
+  //
+  // if (staticMethodT.DeclaringType != typeof(GenericHolder<string, string>))
+  //     return 6;
+  //
+  ldloc      staticMethodT
+  callvirt   instance class [mscorlib]System.Type [mscorlib]System.Reflection.MethodBase::get_DeclaringType()
+  ldtoken    class GenericHolder`2<string,string>
+  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(
+                 valuetype [mscorlib]System.RuntimeTypeHandle)
+  ceq
+  brtrue     MethodGenericOwningTypeOK
+  ldc.i4     6
+  ret
+MethodGenericOwningTypeOK:
+
+  //
+  // FieldInfo staticFieldT = GenericHolder<string, string>.GetInfoOfFieldT();
+  //
+  call        class [mscorlib]System.Reflection.FieldInfo class GenericHolder`2<string, string>::GetInfoOfFieldT()
+  stloc       staticFieldT
+
+  //
+  // if (staticFieldT.DeclaringType != typeof(GenericHolder<string, string>))
+  //     return 7;
+  //
+  ldloc      staticFieldT
+  callvirt   instance class [mscorlib]System.Type [mscorlib]System.Reflection.FieldInfo::get_DeclaringType()
+  ldtoken    class GenericHolder`2<string,string>
+  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(
+                 valuetype [mscorlib]System.RuntimeTypeHandle)
+  ceq
+  brtrue     FieldGenericOwningTypeOK
+  ldc.i4     7
+  ret
+FieldGenericOwningTypeOK:
+
+  //
+  // if (!infoof(NonGenericHolder.GenericMethod<>).IsGenericMethodDefinition)
+  //     return 8;
+  //
+  ldtoken    method void NonGenericHolder::GenericMethod<[1]>()
+  call       class [mscorlib]System.Reflection.MethodBase 
+                 [mscorlib]System.Reflection.MethodBase::GetMethodFromHandle(
+                     valuetype [mscorlib]System.RuntimeMethodHandle)
+  callvirt   instance bool [mscorlib]System.Reflection.MethodBase::get_IsGenericMethodDefinition()
+  brtrue     StaticGenericMethodIsDefinition
+  ldc.i4     8
+  ret
+StaticGenericMethodIsDefinition:
+
+  //
+  // if (infoof(NonGenericHolder.GenericMethod<int>).IsGenericMethodDefinition)
+  //     return 9;
+  //
+  ldtoken    method void NonGenericHolder::GenericMethod<int32>()
+  call       class [mscorlib]System.Reflection.MethodBase 
+                 [mscorlib]System.Reflection.MethodBase::GetMethodFromHandle(
+                     valuetype [mscorlib]System.RuntimeMethodHandle)
+  callvirt   instance bool [mscorlib]System.Reflection.MethodBase::get_IsGenericMethodDefinition()
+  brfalse    StaticGenericMethodIsInstantiated
+  ldc.i4     9
+  ret
+StaticGenericMethodIsInstantiated:
+
+  //
+  // if (!infoof(GenericHolder<,>.GenericMethod<>).IsGenericMethodDefinition)
+  //     return 10;
+  //
+  ldtoken    method void GenericHolder`2::GenericMethod<[1]>(!1, !!0)
+  ldtoken    GenericHolder`2
+  call       class [mscorlib]System.Reflection.MethodBase 
+               [mscorlib]System.Reflection.MethodBase::GetMethodFromHandle(
+                   valuetype [mscorlib]System.RuntimeMethodHandle,
+                   valuetype [mscorlib]System.RuntimeTypeHandle)
+  callvirt   instance bool [mscorlib]System.Reflection.MethodBase::get_IsGenericMethodDefinition()
+  brtrue     StaticGenericMethodOnGenericTypeIsDefinition
+  ldc.i4     10
+  ret
+StaticGenericMethodOnGenericTypeIsDefinition:
+
+  //
+  // MethodBase weirdoGenericMethod = infoof(GenericHolder<,>.GenericMethod<int>);
+  // if (weirdoGenericMethod.IsGenericMethodDefinition)
+  //     return 11;
+  //
+  ldtoken    method void GenericHolder`2::GenericMethod<int32>(!1, !!0)
+  ldtoken    GenericHolder`2
+  call       class [mscorlib]System.Reflection.MethodBase 
+               [mscorlib]System.Reflection.MethodBase::GetMethodFromHandle(
+                   valuetype [mscorlib]System.RuntimeMethodHandle,
+                   valuetype [mscorlib]System.RuntimeTypeHandle)
+  stloc      weirdoGenericMethod
+  ldloc      weirdoGenericMethod
+  callvirt   instance bool [mscorlib]System.Reflection.MethodBase::get_IsGenericMethodDefinition()
+  brfalse    WeirdoGenericMethodIsNotDefinition
+  ldc.i4     11
+  ret
+WeirdoGenericMethodIsNotDefinition:
+
+  //
+  // if (weirdoGenericMethod.DeclaringType != typeof(GenericHolder<,>))
+  //     return 12;
+  //
+  ldloc      weirdoGenericMethod
+  callvirt   instance class [mscorlib]System.Type [mscorlib]System.Reflection.MethodBase::get_DeclaringType()
+  ldtoken    GenericHolder`2
+  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(
+                 valuetype [mscorlib]System.RuntimeTypeHandle)
+  ceq
+  brtrue     WeirdoGenericMethodOwningTypeOK
+  ldc.i4     12
+  ret
+WeirdoGenericMethodOwningTypeOK:
+
+  //
+  // MethodBase otherWeirdoGenericMethod = infoof(GenericHolder<int,int>.GenericMethod<>);
+  // if (!otherWeirdoGenericMethod.IsGenericMethodDefinition)
+  //     return 13;
+  //
+  ldtoken    method void class GenericHolder`2<int32,int32>::GenericMethod<[1]>(!1, !!0)
+  ldtoken    class GenericHolder`2<int32,int32>
+  call       class [mscorlib]System.Reflection.MethodBase 
+               [mscorlib]System.Reflection.MethodBase::GetMethodFromHandle(
+                   valuetype [mscorlib]System.RuntimeMethodHandle,
+                   valuetype [mscorlib]System.RuntimeTypeHandle)
+  stloc      otherWeirdoGenericMethod
+  ldloc      otherWeirdoGenericMethod
+  callvirt   instance bool [mscorlib]System.Reflection.MethodBase::get_IsGenericMethodDefinition()
+  brtrue     OtherWeirdoGenericMethodIsDefinition
+  ldc.i4     13
+  ret
+OtherWeirdoGenericMethodIsDefinition:
+
+  //
+  // if (otherWeirdoGenericMethod.DeclaringType != typeof(GenericHolder<int, int>))
+  //     return 14;
+  //
+  ldloc      otherWeirdoGenericMethod
+  callvirt   instance class [mscorlib]System.Type [mscorlib]System.Reflection.MethodBase::get_DeclaringType()
+  ldtoken    class GenericHolder`2<int32,int32>
+  call       class [mscorlib]System.Type [mscorlib]System.Type::GetTypeFromHandle(
+                 valuetype [mscorlib]System.RuntimeTypeHandle)
+  ceq
+  brtrue     OtherWeirdoGenericMethodOwningTypeOK
+  ldc.i4     14
+  ret
+OtherWeirdoGenericMethodOwningTypeOK:
+
+  ldc.i4     100
+  ret
+}
+
+.class private auto ansi beforefieldinit NonGenericHolder
+       extends [mscorlib]System.Object
+{
+  .field public static object StaticField
+
+  .method public hidebysig static int32 StaticMethod()
+  {
+    ldc.i4.0
+    ret
+  }
+
+  .method public hidebysig static int16 StaticMethod()
+  {
+    ldc.i4.0
+    ret
+  }
+
+  .method public hidebysig static void GenericMethod<T>()
+  {
+    ret
+  }
+}
+
+.class private auto ansi beforefieldinit GenericHolder`2<T,U>
+       extends [mscorlib]System.Object
+{
+  .field public static !0 StaticFieldT;
+
+  .method public hidebysig static void StaticMethod(!0 x)
+  {
+    ret
+  }
+
+  .method public hidebysig static void StaticMethod(!1 x)
+  {
+    ret
+  }
+
+  .method public hidebysig static void GenericMethod<V>(!1 x, !!0 y)
+  {
+    ret
+  }
+
+  .method public hidebysig static class [mscorlib]System.Reflection.FieldInfo GetInfoOfFieldT()
+  {
+    ldtoken    field !0 class GenericHolder`2<!T,!U>::StaticFieldT
+    ldtoken    class GenericHolder`2<!T,!U>
+    call       class [mscorlib]System.Reflection.FieldInfo
+                 [mscorlib]System.Reflection.FieldInfo::GetFieldFromHandle(
+                     valuetype [mscorlib]System.RuntimeFieldHandle,
+                     valuetype [mscorlib]System.RuntimeTypeHandle)
+    ret
+  }
+
+  .method public hidebysig static class [mscorlib]System.Reflection.MethodBase GetInfoOfMethodT()
+  {
+    ldtoken    method void class GenericHolder`2<!T,!U>::StaticMethod(!0)
+    ldtoken    class GenericHolder`2<!T,!U>
+    call       class [mscorlib]System.Reflection.MethodBase 
+                 [mscorlib]System.Reflection.MethodBase::GetMethodFromHandle(
+                     valuetype [mscorlib]System.RuntimeMethodHandle,
+                     valuetype [mscorlib]System.RuntimeTypeHandle)
+    ret
+  }
+
+  .method public hidebysig static class [mscorlib]System.Reflection.MethodBase GetInfoOfMethodU()
+  {
+    ldtoken    method void class GenericHolder`2<!T,!U>::StaticMethod(!1)
+    ldtoken    class GenericHolder`2<!T,!U>
+    call       class [mscorlib]System.Reflection.MethodBase 
+                 [mscorlib]System.Reflection.MethodBase::GetMethodFromHandle(
+                     valuetype [mscorlib]System.RuntimeMethodHandle,
+                     valuetype [mscorlib]System.RuntimeTypeHandle)
+    ret
+  }
+}
diff --git a/tests/src/reflection/ldtoken/ldtokenmember.ilproj b/tests/src/reflection/ldtoken/ldtokenmember.ilproj
new file mode 100644
index 0000000000..bd0098d91c
--- /dev/null
+++ b/tests/src/reflection/ldtoken/ldtokenmember.ilproj
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <AssemblyName>ldtokenmember</AssemblyName>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F836E0D5-A909-4E8B-A77C-06B603BEFBD9}</ProjectGuid>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <OutputType>Exe</OutputType>
+    <CLRTestKind>BuildAndRun</CLRTestKind>
+    <CLRTestPriority>0</CLRTestPriority>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="ldtokenmember.il" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+</Project>
diff --git a/tests/src/reflection/regression/dev10bugs/Dev10_629953.csproj b/tests/src/reflection/regression/dev10bugs/Dev10_629953.csproj
index 4b7c84dd32..9dd3b79326 100644
--- a/tests/src/reflection/regression/dev10bugs/Dev10_629953.csproj
+++ b/tests/src/reflection/regression/dev10bugs/Dev10_629953.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/reflection/regression/dev10bugs/Dev10_630880.csproj b/tests/src/reflection/regression/dev10bugs/Dev10_630880.csproj
index 10beb6cd03..dba0afd990 100644
--- a/tests/src/reflection/regression/dev10bugs/Dev10_630880.csproj
+++ b/tests/src/reflection/regression/dev10bugs/Dev10_630880.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>BuildAndRun</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/src/reflection/regression/reflectionrepromasterforsl/Helper.csproj b/tests/src/reflection/regression/reflectionrepromasterforsl/Helper.csproj
index e5b520410a..f6db30f550 100644
--- a/tests/src/reflection/regression/reflectionrepromasterforsl/Helper.csproj
+++ b/tests/src/reflection/regression/reflectionrepromasterforsl/Helper.csproj
@@ -7,14 +7,9 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ReferenceLocalMscorlib>false</ReferenceLocalMscorlib>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
diff --git a/tests/tests.targets b/tests/tests.targets
index 78028cda27..8f00fd7499 100644
--- a/tests/tests.targets
+++ b/tests/tests.targets
@@ -14,7 +14,7 @@
   </PropertyGroup>
   <Target Name="FindTestDirectories">
     <ItemGroup>
-      <AllTestAssemblies Include="$(BaseOutputPathWithConfig)\*\*.XUnitWrapper.dll" />
+      <AllTestAssemblies Include="$(BaseOutputPathWithConfig)\**\*.XUnitWrapper.dll" />
       <TestAssemblies Include="@(AllTestAssemblies)" Exclude="@(_SkipTestAssemblies -> '$(TestAssemblyDir)%(Identity)\%(Identity).XUnitWrapper.dll')" />
     </ItemGroup>
     
diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt
index 901172b394..809433c0ac 100644
--- a/tests/testsFailingOutsideWindows.txt
+++ b/tests/testsFailingOutsideWindows.txt
@@ -78,5 +78,3 @@ Loader/classloader/TypeGeneratorTests/TypeGeneratorTest614/Generated614/Generate
 Loader/classloader/TypeGeneratorTests/TypeGeneratorTest681/Generated681/Generated681.sh
 Loader/classloader/TypeGeneratorTests/TypeGeneratorTest682/Generated682/Generated682.sh
 Loader/classloader/TypeGeneratorTests/TypeGeneratorTest683/Generated683/Generated683.sh
-JIT/opt/perf/doublealign/Locals/Locals.sh
-JIT/Regression/JitBlue/DevDiv_377155/DevDiv_377155/DevDiv_377155.sh
diff --git a/tests/testsUnsupportedOnARM32.txt b/tests/testsUnsupportedOnARM32.txt
index e827550d46..d889b57140 100644
--- a/tests/testsUnsupportedOnARM32.txt
+++ b/tests/testsUnsupportedOnARM32.txt
@@ -1,3 +1,4 @@
+CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests/DynMethodJumpStubTests.sh
 JIT/Directed/tailcall/tailcall/tailcall.sh
 JIT/Methodical/tailcall_v4/hijacking/hijacking.sh
 JIT/Methodical/tailcall_v4/smallFrame/smallFrame.sh
diff --git a/tests/testsUnsupportedOutsideWindows.txt b/tests/testsUnsupportedOutsideWindows.txt
index 0f8f194b41..ef43049316 100644
--- a/tests/testsUnsupportedOutsideWindows.txt
+++ b/tests/testsUnsupportedOutsideWindows.txt
@@ -124,6 +124,7 @@ CoreMangLib/cti/system/double/DoubleToString3/DoubleToString3.sh
 CoreMangLib/cti/system/double/DoubleToString4/DoubleToString4.sh
 CoreMangLib/cti/system/int/Int32ToString3/Int32ToString3.sh
 CoreMangLib/cti/system/int64/Int64ToString3/Int64ToString3.sh
+CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests/DynMethodJumpStubTests.sh
 CoreMangLib/cti/system/string/StringCompare1/StringCompare1.sh
 CoreMangLib/cti/system/string/StringCompare15/StringCompare15.sh
 CoreMangLib/cti/system/string/StringCompare2/StringCompare2.sh
diff --git a/tests/x86_legacy_backend_issues.targets b/tests/x86_legacy_backend_issues.targets
deleted file mode 100644
index 0c294ef7ec..0000000000
--- a/tests/x86_legacy_backend_issues.targets
+++ /dev/null
@@ -1,446 +0,0 @@
-<?xml version="1.0" ?>
-<Project DefaultTargets = "GetListOfTestCmds" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <ItemGroup Condition="'$(XunitTestBinBase)' != ''">
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Coverage\271010\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Coverage\smalloom\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Features\BackgroundGC\foregroundgc\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Features\LOHFragmentation\lohfragmentation\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Features\SustainedLowLatency\scenario\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\Allocation\finalizertest\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\collect\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\getgeneration\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\reregisterforfinalize\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\Regressions\largearraytest\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Regressions\dev10bugs\536168\536168\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\BaseFinal\basefinal\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\DoublinkList\doublinknoleak\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\muldimjagary\muldimjagary\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\Scenarios\ReflectObj\reflectobj\*">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Interop\ArrayMarshalling\BoolArray\MarshalBoolArrayTest\MarshalBoolArrayTest.cmd">
-            <Issue>timed out</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Interop\StructMarshalling\PInvoke\MarshalStructAsLayoutSeq\MarshalStructAsLayoutSeq.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_d\bleref_il_d.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\bleref_il_r\bleref_il_r.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\badldsfld_il_d\badldsfld_il_d.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\badldsfld_il_r\badldsfld_il_r.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_d\ldelemnullarr1_il_d.cmd">
-            <Issue>4851</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\ldelemnullarr1_il_r\ldelemnullarr1_il_r.cmd">
-            <Issue>4851</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_d\nonrefsdarr_il_d.cmd">
-            <Issue>4851</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\coverage\importer\Desktop\nonrefsdarr_il_r\nonrefsdarr_il_r.cmd">
-            <Issue>4851</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\forceinlining\AttributeConflict\AttributeConflict.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\forceinlining\NegativeCases\NegativeCases.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\forceinlining\PositiveCases\PositiveCases.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic1\rva_rvastatic1.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic2\rva_rvastatic2.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic3\rva_rvastatic3.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic4\rva_rvastatic4.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\pinvoke\preemptive_cooperative\preemptive_cooperative.cmd">
-            <Issue>2434</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\RVAInit\extended\extended.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\RVAInit\overlap\overlap.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic1\rvastatic1.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic2\rvastatic2.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic3\rvastatic3.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic4\rvastatic4.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\rvastatics\rvastatic5\rvastatic5.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\mutualrecurthd-tls\mutualrecurthd-tls.cmd">
-            <Issue>2441</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\tls\test-tls\test-tls.cmd">
-            <Issue>2441</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_dynamic\verify01_dynamic.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_large\verify01_large.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\localloc\verify\verify01_small\verify01_small.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\opt\cse\HugeArray1\HugeArray1.cmd">
-            <Issue>2408</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\regress\ndpw\21220\b21220\b21220.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\global_il_d\global_il_d.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\cctor\misc\global_il_r\global_il_r.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_d\badcodeafterfinally_d.cmd">
-            <Issue>2444</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\eh\deadcode\badcodeafterfinally_r\badcodeafterfinally_r.cmd">
-            <Issue>2444</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_dbgpointer\_il_dbgpointer.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_dbgpointer_i\_il_dbgpointer_i.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_relpointer\_il_relpointer.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall\_il_relpointer_i\_il_relpointer_i.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_dbglocalloc\_il_dbglocalloc.cmd">
-            <Issue>2444</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\xxobj\operand\_il_rellocalloc\_il_rellocalloc.cmd">
-            <Issue>2444</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-EJIT\v1-m10\b07847\b07847\b07847.cmd">
-            <Issue>2441</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b49644\b49644\b49644.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b102637\b102637\b102637.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b03689\b03689\b03689.cmd">
-            <Issue>2441</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b08046\b08046\b08046.cmd">
-            <Issue>2414</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\Dev11\dev10_865840\dev10_865840\dev10_865840.cmd">
-            <Issue>2445</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V2.0-Beta2\b410474\b410474\b410474.cmd">
-            <Issue>2451</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest612\Generated612\*">
-            <Issue>6707</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest613\Generated613\*">
-            <Issue>6707</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest614\Generated614\*">
-            <Issue>6707</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest681\Generated681\*">
-            <Issue>6707</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest682\Generated682\*">
-            <Issue>6707</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\Loader\classloader\TypeGeneratorTests\TypeGeneratorTest683\Generated683\*">
-            <Issue>6707</Issue>
-        </ExcludeList>
-    </ItemGroup>
-
-    <!-- The following are x86-specific failures -->
-
-    <ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(BuildArch)' == 'x86'">
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\Allocation\largeexceptiontest\largeexceptiontest.cmd">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\gettotalmemory\gettotalmemory.cmd">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\keepalive\keepalive.cmd">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\GC\LargeMemory\API\gc\suppressfinalize\suppressfinalize.cmd">
-            <Issue>3392</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\divrem\div\u8div_cs_do\u8div_cs_do.cmd">
-            <Issue>2413</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\divrem\div\u8div_cs_ro\u8div_cs_ro.cmd">
-            <Issue>2413</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\divrem\rem\u8rem_cs_do\u8rem_cs_do.cmd">
-            <Issue>2412</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\divrem\rem\u8rem_cs_ro\u8rem_cs_ro.cmd">
-            <Issue>2412</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\tailcall_v4\smallFrame\smallFrame.cmd">
-            <Issue>tail. call pop ret is only supported on amd64</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Inline\regression\mismatch32\mismatch32\mismatch32.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Inline\regression\mismatch64\mismatch64\mismatch64.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\perf\doublealign\Locals\Locals.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd">
-            <Issue>2420. x86 JIT doesn't support implicit tail call optimization or tail. call pop ret sequence</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Performance\CodeQuality\Roslyn\CscBench\CscBench.cmd">
-            <Issue>6844</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\Dev11\External\dev11_239804\ShowLocallocAlignment\ShowLocallocAlignment.cmd">
-            <Issue>7163</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\managed\Compilation\Compilation\Compilation.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\JitBlue\DevDiv_255294\DevDiv_255294\DevDiv_255294.cmd">
-            <Issue>The test is too large for x86 and causes OutOfMemory exception.</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\superpmi\superpmicollect\superpmicollect.cmd">
-            <Issue>The superpmi test depends on setting COMPlus_AltJit, so doesn't work with either the legacy jit test run, which also sets COMPlus_AltJit, or the compatjit test run, which sets COMPlus_UseWindowsX86CoreLegacyJit</Issue>
-        </ExcludeList>
-    </ItemGroup>
-
-    <!-- Tests that need to be triaged for vararg usage as that is not supported -->
-    <ItemGroup Condition="'$(XunitTestBinBase)' != ''">
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\1\arglist\arglist.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\2\arglist\arglist.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\4\arglist\arglist.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\volatile\1\arglist\arglist.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\gc\misc\funclet\funclet.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i00\mcc_i00.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i01\mcc_i01.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i02\mcc_i02.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i03\mcc_i03.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i10\mcc_i10.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i11\mcc_i11.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i12\mcc_i12.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i13\mcc_i13.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i30\mcc_i30.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i31\mcc_i31.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i32\mcc_i32.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i33\mcc_i33.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i50\mcc_i50.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i51\mcc_i51.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i52\mcc_i52.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i53\mcc_i53.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i60\mcc_i60.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i61\mcc_i61.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i62\mcc_i62.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i63\mcc_i63.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i70\mcc_i70.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i71\mcc_i71.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i72\mcc_i72.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i73\mcc_i73.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i80\mcc_i80.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i81\mcc_i81.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i82\mcc_i82.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\jit64\mcc\interop\mcc_i83\mcc_i83.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Coverage\arglist_pos\arglist_pos.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_il_dbgseq\_il_dbgseq.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\refany\_il_relseq\_il_relseq.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-EJIT\V1-M12-Beta2\b26323\b26323\b26323.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b16423\b16423\b16423.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324a\b26324a.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b26324\b26324b\b26324b.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b28901\b28901\b28901.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30838\b30838\b30838.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b30864\b30864\b30864.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M09.5-PDC\b32374\b32374\b32374.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b35784\b35784\b35784.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b36472\b36472\b36472.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b37598\b37598\b37598.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b41391\b41391\b41391.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b46867\b46867\b46867.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31745\b31745\b31745.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b31746\b31746\b31746.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b37646\b37646\b37646.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b41852\b41852\b41852.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b88793\b88793\b88793.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b91248\b91248\b91248.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b409748\b409748\b409748.cmd">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-    </ItemGroup>
-</Project>